From afff5cb5f3d894f25a3887374846fbde8093c587 Mon Sep 17 00:00:00 2001 From: mac Date: Tue, 17 Nov 2026 02:02:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=B4=A7=E5=87=91=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E9=AB=98=E5=BA=A6=E5=92=8C=E7=BA=B5=E5=90=91=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E8=8C=83=E5=9B=B4=EF=BC=8C=E8=A1=A5=E5=BC=BA=E5=BA=A6?= =?UTF-8?q?=E5=83=8F=E7=B4=A0=E5=8F=8A=E5=8F=8C=E5=90=91=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=9B=9E=E5=BD=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 大鱼调色/Plugin/DYColorWorkspace.mm | 4 ++-- 大鱼调色/Plugin/DYInspector.mm | 4 ++-- 大鱼调色/Plugin/DYUnifiedDiagnostics.inc.h | 11 +++++++++++ 大鱼调色/Plugin/DYViewerControls.inc.h | 2 +- 大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h | 12 ++++++++++-- 大鱼调色/Plugin/DYWorkspaceTools.inc.h | 8 ++++---- 开发交接.md | 2 +- 7 files changed, 31 insertions(+), 12 deletions(-) diff --git a/大鱼调色/Plugin/DYColorWorkspace.mm b/大鱼调色/Plugin/DYColorWorkspace.mm index c86f435..773102c 100644 --- a/大鱼调色/Plugin/DYColorWorkspace.mm +++ b/大鱼调色/Plugin/DYColorWorkspace.mm @@ -200,8 +200,8 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b CGFloat toolbarWidth=MAX(1,w-86),tx=0,ty=0;for(NSView *button in _toolbar.subviews){CGFloat width=button.frame.size.width;if(tx>0&&tx+width>toolbarWidth){tx=0;ty+=29;}button.frame=NSMakeRect(tx,ty,width,27);tx+=width+3;}_toolbarHeight=ty+30;_toolbar.frame=NSMakeRect(0,0,toolbarWidth,_toolbarHeight);_toolbarScroll.hasHorizontalScroller=NO; _heading.hidden=YES;_toolbarScroll.frame=NSMakeRect(6,3,toolbarWidth,_toolbarHeight);_sizeMode.frame=NSMakeRect(MAX(0,w-68),3,26,27);_close.frame=NSMakeRect(MAX(0,w-34),3,26,27); _sizeMode.image=[NSImage imageWithSystemSymbolName:_expanded?@"arrow.down.right.and.arrow.up.left":@"arrow.up.left.and.arrow.down.right" accessibilityDescription:_expanded?@"收为窄条":@"扩大工作区"];_sizeMode.accessibilityLabel=_expanded?@"收为窄条":@"扩大工作区";_sizeMode.toolTip=_sizeMode.accessibilityLabel;_sizeMode.contentTintColor=DYThemeColor(@"text"); - CGFloat infoTop=_toolbarHeight+5;_screenTools.frame=NSMakeRect(8,infoTop,134,25);_screenDetails.frame=NSMakeRect(145,infoTop,68,25);_screenHint.frame=NSMakeRect(224,infoTop+2,MAX(1,w-238),32);_screenStatus.frame=NSMakeRect(10,infoTop+29,MAX(1,w-24),16); - _sizingSplit=YES;_split.frame=NSMakeRect(0,infoTop+50,w,MAX(1,h-infoTop-50));_sizingSplit=NO;[self layoutToolWorkspace]; + CGFloat infoTop=_toolbarHeight+5;_screenTools.frame=NSMakeRect(8,infoTop,134,25);_screenDetails.frame=NSMakeRect(145,infoTop,68,25);_screenHint.frame=NSMakeRect(224,infoTop+5,MAX(1,w-238),18);_screenStatus.frame=_screenHint.frame; + _sizingSplit=YES;_split.frame=NSMakeRect(0,infoTop+28,w,MAX(1,h-infoTop-28));_sizingSplit=NO;[self layoutToolWorkspace]; CGFloat ew=_editorHost.bounds.size.width;_screenSettings.frame=NSMakeRect(8,34,MAX(1,ew-16),MAX(1,_editorHost.bounds.size.height-34));_levelNumbers.frame=NSMakeRect(6,48,MAX(1,ew-30),70); _lutStrengthBar.frame=NSMakeRect(0,30,ew,34);_lutSlot.frame=NSMakeRect(8,5,105,24); _lutStrength.frame=NSMakeRect(121,7,MAX(32,ew-198),20);_lutStrengthField.frame=NSMakeRect(MAX(157,ew-69),5,60,24); diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 28145b7..837fac4 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -1001,7 +1001,7 @@ NSView *DYCreateWorkspaceMaskEditor(id } _stackHeight=y;CGFloat documentWidth=_scroll?_scroll.contentSize.width:w;if(_workspaceEditor)for(NSDictionary *card in _cards)documentWidth=MAX(documentWidth,[card[@"view"]frame].size.width); - _document.frame=NSMakeRect(0,0,documentWidth,_workspaceEditor?_scroll.contentSize.height:y); + _document.frame=NSMakeRect(0,0,documentWidth,_workspaceEditor?MAX(y,_scroll.contentSize.height):y); if(!_embedded&&!_workspaceEditor){ CGFloat budget=_maximumViewportHeight>0?_maximumViewportHeight:top+y; CGFloat viewport=MIN(MAX(12,y),MAX(12,MIN(h,budget)-top)); @@ -1347,7 +1347,7 @@ NSView *DYCreateWorkspaceMaskEditor(id NSNumber *extra=section[@"extraEnabled"];if(extra)[set setFloatValue:defaultEnabled toParameter:extra.unsignedIntValue atTime:t]; NSString *key=section[@"key"]?:@""; - NSMutableDictionary *strengthDoc=DYMutablePlist(DYReadTools(_manager,t).document);if(DYSetToolStrength(strengthDoc,[@"base:" stringByAppendingString:key],1))DYWriteTools(_manager,strengthDoc,t); + NSMutableDictionary *strengthDoc=DYMutablePlist(DYReadTools(_manager,t).document);if(DYSetToolStrength(strengthDoc,[key isEqual:@"output"]?@"output":[@"base:" stringByAppendingString:key],1))DYWriteTools(_manager,strengthDoc,t); if([key isEqual:@"primary"]){for(NSDictionary *d in DYDescriptors())if([d[@"key"]hasPrefix:@"cm"])[set setFloatValue:[d[@"default"]doubleValue] toParameter:[d[@"pid"]unsignedIntValue] atTime:t];[set setFloatValue:1 toParameter:2236 atTime:t];for(NSNumber *linked in section[@"enableParameters"])[set setFloatValue:1 toParameter:linked.unsignedIntValue atTime:t];[set setFloatValue:0 toParameter:2013 atTime:t];DYAssetState *state=[[DYReadAssets(_manager,t)copy]autorelease];NSMutableDictionary *paths=[[state.paths mutableCopy]autorelease];[paths removeObjectForKey:@"input"];state.paths=paths;DYWriteAssets(_manager,state,t);} if([key isEqual:@"primary"])DYPrimaryControlChanged(_manager,t,@"cmworkingTransfer"); if([key isEqual:@"spider"]){DYAssetState *state=[[DYReadAssets(_manager,t)copy]autorelease];auto m=DYSpiderMesh(state.spiderMesh);m=dy::neutralMesh(m.hues,m.rings+1);state.spiderMesh=[NSData dataWithBytes:&m length:sizeof(m)];DYWriteAssets(_manager,state,t);} diff --git a/大鱼调色/Plugin/DYUnifiedDiagnostics.inc.h b/大鱼调色/Plugin/DYUnifiedDiagnostics.inc.h index 69f0e0e..932ccfc 100644 --- a/大鱼调色/Plugin/DYUnifiedDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYUnifiedDiagnostics.inc.h @@ -17,6 +17,17 @@ DYUniforms changed=u;changed.hslHueA.x=20;changed.hslHueB.x=20;Pixels modified=frame(changed,doc,@"unified-HSL-before-output-accepts-linear-domain");run.record(@"unified-active-bounded-tool-carries-superwhite-residual",modified[2]>2.9&&difference(plain,modified).nonfinite==0); NSMutableDictionary *zero=DYMutablePlist(DYNewMask(DYMaskRectangle));DYMaskParameters p=DYMaskAtTime(zero,kCMTimeZero);p.strength=0;zero[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];doc[@"baseMasks"][@"hsl"]=@[zero]; Pixels masked=frame(changed,doc,@"unified-zero-mask");run.record(@"unified-zero-mask-is-exact-neutral",difference(masked,plain).maximum==0);[doc[@"baseMasks"]removeObjectForKey:@"hsl"]; + { + NSMutableDictionary *strengthDoc=DYMutablePlist(DYInitialToolDocument(nil));BOOL defaultsOK=YES;for(NSString *type in DYToolTypes())defaultsOK&=DYToolStrength(strengthDoc,[@"base:" stringByAppendingString:type])==1;run.record(@"module-strength-old-documents-default-to-full-without-migration",defaultsOK); + DYSetToolStrength(strengthDoc,@"base:base",0);Pixels strengthZero=frame(exposure,strengthDoc,@"module-strength-base-zero-render");run.record(@"module-strength-zero-preserves-negative-superwhite-and-alpha",difference(strengthZero,plain).maximum==0); + DYSetToolStrength(strengthDoc,@"base:base",.5);Pixels half=frame(exposure,strengthDoc,@"module-strength-base-half-render");double worst=0;for(NSUInteger i=0;i.001,@{@"difference":@(difference(last,middle).maximum)}); { Pixels patch(w*h*4); diff --git a/大鱼调色/Plugin/DYViewerControls.inc.h b/大鱼调色/Plugin/DYViewerControls.inc.h index 304f3ac..65da52b 100644 --- a/大鱼调色/Plugin/DYViewerControls.inc.h +++ b/大鱼调色/Plugin/DYViewerControls.inc.h @@ -184,6 +184,6 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti } - (BOOL)capturing{return _pressed||[_capture capturing];} - (BOOL)finishCapture{BOOL had=[self capturing];for(DYViewerParameterPanel*p in _panels)[p finishCapture];_capture=nil;_pressed=0;return had;} -- (BOOL)mouseMoved:(NSPoint)p{NSInteger h=[self partAtPoint:p];BOOL changed=h!=_hover;_hover=h;for(DYViewerParameterPanel*panel in _panels)changed=[panel mouseMoved:p]||changed;return changed;} +- (BOOL)mouseMoved:(NSPoint)p{NSInteger h=[self partAtPoint:p];BOOL changed=h!=_hover;_hover=h;if(changed&&h)for(NSDictionary *area in _areas)if([area[@"part"]integerValue]==h){NSString *type=area[@"toolType"];if([area[@"kind"]isEqual:@"mask"])type=@[@"ellipse",@"rectangle",@"pen"][[area[@"index"]integerValue]];if(type)[_bridge publishScreenTool:type message:nil];break;}for(DYViewerParameterPanel*panel in _panels)changed=[panel mouseMoved:p]||changed;return changed;} - (BOOL)mouseExited{BOOL changed=_hover!=0;_hover=0;for(DYViewerParameterPanel*p in _panels)changed=[p mouseExited]||changed;return changed;} @end diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h index c921ab5..5c78487 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h @@ -197,6 +197,13 @@ [stack addWorkspaceTool:toolbarButton(@"curve")];workspaceDrain();NSString *curveID=[[[stack valueForKey:@"selectedNode"]copy]autorelease];NSDictionary *tools=DYReadTools(stackHost,kCMTimeZero).document; run.record(@"workspace-toolbar-adds-real-uuid-and-synchronizes-regular-inspector",[tools[@"layers"]count]==originalLayers+1&&[DYToolWithID(tools,curveID)[@"type"]isEqual:@"curve"]&&[[mainInspector valueForKey:@"stackViews"]objectForKey:curveID]&&stackHost->_undoStarts==undo+1&&stackHost->_undoEnds==stackHost->_undoStarts); DYInspector *curveEditor=[stack valueForKey:@"toolEditor"];undo=stackHost->_undoStarts; + { + DYModuleStrengthControl *workspaceStrength=[stack valueForKey:@"moduleStrength"];NSTextField *field=[workspaceStrength valueForKey:@"field"];field.stringValue=@"37%";[field sendAction:field.action to:field.target];workspaceDrain(); + DYInspector *nativeChild=[[mainInspector valueForKey:@"stackViews"]objectForKey:curveID];NSDictionary *card=[[nativeChild valueForKey:@"cards"]firstObject];NSTextField *nativeField=[card[@"strength"]valueForKey:@"field"]; + run.record(@"module-strength-workspace-to-inspector-and-host",fabs(DYToolStrength(DYReadTools(stackHost,kCMTimeZero).document,curveID)-.37)<1e-8&&[nativeField.stringValue isEqual:@"37%"]); + nativeField.stringValue=@"62%";[nativeField sendAction:nativeField.action to:nativeField.target];workspaceDrain();run.record(@"module-strength-inspector-to-workspace-and-host",fabs(DYToolStrength(DYReadTools(stackHost,kCMTimeZero).document,curveID)-.62)<1e-8&&[field.stringValue isEqual:@"62%"]); + nativeField.stringValue=@"100%";[nativeField sendAction:nativeField.action to:nativeField.target];workspaceDrain(); + } NSDictionary *beforeCurve=DYReadTools(stackHost,kCMTimeZero).document; [curveEditor graphicGesture:YES title:@"测试曲线手势"]; [curveEditor writeGraphicValues:@{@"masterX0":@.3,@"curveY0":@12}]; @@ -256,9 +263,10 @@ [NSNotificationCenter.defaultCenter removeObserver:canvasObserver];[NSNotificationCenter.defaultCenter removeObserver:toolObserver]; run.record(@"workspace-new-stack-actions-stay-on-main-in-host-permissions-and-balanced-undo",stackHost->_writesInAction&&!stackHost->_permissionFailure&&stackHost->_actionDepth==0&&stackHost->_undoStarts==stackHost->_undoEnds&&!fixture.visible); for(NSString *type in DYToolTypes()){ - DYInspector *editor=[[[DYInspector alloc]initWithAPIManager:stackHost renderer:stackRenderer workspaceType:type]autorelease];editor.frame=NSMakeRect(0,0,424,235);[editor refresh];[editor layoutSubtreeIfNeeded];NSScrollView *strip=[editor valueForKey:@"scroll"];NSView *document=[editor valueForKey:@"document"];BOOL fits=!strip.hasVerticalScroller&&strip.hasHorizontalScroller&&fabs(document.bounds.size.height-strip.contentSize.height)<1;NSMutableArray *bad=[NSMutableArray array]; + DYInspector *editor=[[[DYInspector alloc]initWithAPIManager:stackHost renderer:stackRenderer workspaceType:type]autorelease];editor.frame=NSMakeRect(0,0,424,235);[editor refresh];[editor layoutSubtreeIfNeeded];NSScrollView *strip=[editor valueForKey:@"scroll"];NSView *document=[editor valueForKey:@"document"];BOOL primaryPage=[type isEqual:@"primary"];BOOL fits=primaryPage?(strip.hasVerticalScroller&&!strip.hasHorizontalScroller&&document.bounds.size.width<=strip.contentSize.width+1):(!strip.hasVerticalScroller&&strip.hasHorizontalScroller&&fabs(document.bounds.size.height-strip.contentSize.height)<1);fits&=!strip.autohidesScrollers&&strip.scrollerStyle==NSScrollerStyleLegacy;NSMutableArray *bad=[NSMutableArray array]; for(NSDictionary *record in [editor valueForKey:@"cards"]){NSView *card=record[@"view"];for(NSView *row in record[@"body"])if(!row.hidden&&!card.hidden){BOOL inside=NSContainsRect(card.bounds,[row.superview convertRect:row.frame toView:card]);fits&=inside;if(!inside)[bad addObject:@{@"id":row.identifier?:@"",@"frame":NSStringFromRect(row.frame),@"card":NSStringFromRect(card.bounds)}];}} - run.record([@"workspace-horizontal-minimum-height-" stringByAppendingString:type],fits,@{@"document":NSStringFromRect(document.bounds),@"viewport":NSStringFromSize(strip.contentSize),@"outside":bad}); + run.record([@"workspace-discoverable-scroll-minimum-height-" stringByAppendingString:type],fits,@{@"document":NSStringFromRect(document.bounds),@"viewport":NSStringFromSize(strip.contentSize),@"outside":bad}); + if(primaryPage){BOOL pages=YES;NSMutableSet *seen=[NSMutableSet set];for(NSInteger page=0;page<3;page++){[(NSMutableDictionary*)[editor valueForKey:@"tabs"]setObject:@(page)forKey:@"primaryWorkspace"];[editor setNeedsLayout:YES];[editor layoutSubtreeIfNeeded];for(NSDictionary *card in [editor valueForKey:@"cards"])for(NSView *row in card[@"body"])if(!row.hidden){[seen addObject:row.identifier?:@""];pages&=NSContainsRect([(NSView*)card[@"view"]bounds],row.frame);}}run.record(@"workspace-primary-three-pages-reach-common-tone-and-advanced-controls",pages&&[seen containsObject:@"cmexposure"]&&[seen containsObject:@"cmtoe"]&&[seen containsObject:@"cmchromaMix"]);} if([type isEqual:@"look"]){NSView *recent=[editor valueForKey:@"recentHost"];CGFloat bottom=0;NSDictionary *lookCard=[[editor valueForKey:@"cards"]firstObject];for(NSView *row in lookCard[@"body"])if(!row.hidden)bottom=MAX(bottom,NSMaxY(row.frame));run.record(@"workspace-look-shortcuts-fit-below-visible-lut-controls",recent&&NSMinY(recent.frame)>bottom&&NSContainsRect([(NSView*)lookCard[@"view"]bounds],recent.frame));} if([type isEqual:@"hsl"]){for(NSNumber *width in @[@424,@760,@1040]){editor.frame=NSMakeRect(0,0,width.doubleValue,260);[editor layoutSubtreeIfNeeded];NSDictionary *cardRecord=[[editor valueForKey:@"cards"]firstObject];NSView *tabs=nil;BOOL together=YES;for(NSView *row in cardRecord[@"body"])if([row.identifier isEqual:@"hslTabs"])tabs=row;for(NSView *row in cardRecord[@"body"])if(!row.hidden&&[row.identifier hasPrefix:@"hsl0_"])together&=NSMinY(row.frame)>NSMaxY(tabs.frame)&&fabs(NSMinX(row.frame)-NSMinX(tabs.frame))<1&&fabs(row.frame.size.width-tabs.frame.size.width)<1;run.record([NSString stringWithFormat:@"workspace-hsl-swatch-and-axes-stay-together-%@",width],together);NSBitmapImageRep *image=[editor bitmapImageRepForCachingDisplayInRect:editor.bounds];[editor cacheDisplayInRect:editor.bounds toBitmapImageRep:image];[[image representationUsingType:NSBitmapImageFileTypePNG properties:@{}]writeToFile:[runtime stringByAppendingPathComponent:[NSString stringWithFormat:@"workspace-hsl-%@.png",width]]atomically:YES];}} if([type isEqual:@"spider"]){NSView *panel=[editor valueForKey:@"spiderPanel"];[panel layoutSubtreeIfNeeded];NSView *disc=[panel valueForKey:@"disc"],*hues=[panel valueForKey:@"hues"];run.record(@"workspace-spider-places-disc-left-and-parameters-right",NSMaxX(disc.frame)<=NSMinX(hues.frame)&&NSContainsRect(panel.bounds,hues.frame));} diff --git a/大鱼调色/Plugin/DYWorkspaceTools.inc.h b/大鱼调色/Plugin/DYWorkspaceTools.inc.h index bdfd792..6635d18 100644 --- a/大鱼调色/Plugin/DYWorkspaceTools.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceTools.inc.h @@ -26,8 +26,8 @@ [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(externalWorkspaceToolSelection:) name:@"DYWorkspaceToolSelection" object:[self rootHost]]; _screenTools=[[NSPopUpButton alloc]initWithFrame:NSZeroRect pullsDown:NO];[_screenTools addItemsWithTitles:@[@"屏幕工具",@"曲线",@"畸变修复",@"肤色",@"LUT",@"白平衡吸管",@"仿制图章",@"水平校正",@"局部马赛克",@"矩形蒙版",@"椭圆蒙版",@"钢笔蒙版"]];_screenTools.target=self;_screenTools.action=@selector(screenToolPicked:);_screenTools.font=[NSFont systemFontOfSize:11];_screenTools.accessibilityLabel=@"屏幕工具说明与设置";[_root addSubview:_screenTools]; _screenDetails=[DYWorkspaceButton(@"详情设置",self,@selector(screenToolDetails:))retain];[_root addSubview:_screenDetails]; - _screenHint=[[NSTextField wrappingLabelWithString:@"从屏幕工具菜单查看操作说明与详细设置"]retain];_screenHint.font=[NSFont systemFontOfSize:11];_screenHint.maximumNumberOfLines=2;[_root addSubview:_screenHint]; - _screenStatus=[[NSTextField labelWithString:@"操作提示会保留在这里"]retain];_screenStatus.font=[NSFont systemFontOfSize:10];_screenStatus.lineBreakMode=NSLineBreakByTruncatingTail;[_root addSubview:_screenStatus]; + _screenHint=[[NSTextField wrappingLabelWithString:@"从屏幕工具菜单查看操作说明与详细设置"]retain];_screenHint.font=[NSFont systemFontOfSize:11];_screenHint.maximumNumberOfLines=1;[_root addSubview:_screenHint]; + _screenStatus=[[NSTextField labelWithString:@"操作提示会保留在这里"]retain];_screenStatus.hidden=YES;_screenStatus.font=[NSFont systemFontOfSize:11];_screenStatus.lineBreakMode=NSLineBreakByTruncatingTail;[_root addSubview:_screenStatus]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(screenToolInfo:) name:@"DYScreenToolInfo" object:[self rootHost]];[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(screenCanvasStatus:) name:@"DYToolTrackingStatus" object:[self rootHost]]; _screenSettings=[[DYWorkspaceList alloc]init];_screenSettings.hidden=YES;[_editorHost addSubview:_screenSettings];NSArray *levelLabels=@[@"画水平线",@"画垂直线",@"仅测量",@"重置"];for(NSInteger i=0;i<4;i++){NSButton *b=DYWorkspaceButton(levelLabels[i],self,@selector(levelSetting:));b.tag=i+1;b.frame=NSMakeRect(6+i*76,5,72,28);[_screenSettings addSubview:b];}_levelNumbers=[NSTextField wrappingLabelWithString:@"在画面选择两点,校正角度与缩放会在这里显示。"];_levelNumbers.font=[NSFont systemFontOfSize:12];[_screenSettings addSubview:_levelNumbers];[self screenToolInfo:[NSNotification notificationWithName:@"DYScreenToolInfo" object:[self rootHost]userInfo:DYCurrentScreenToolInfo([self rootHost])?:@{}]]; _sizingSplit=NO; @@ -198,8 +198,8 @@ } - (NSArray*)screenToolTypes{return @[@"",@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp",@"level",@"mosaic",@"rectangle",@"ellipse",@"pen"];} - (void)screenToolPicked:(NSPopUpButton*)sender{NSInteger index=sender.indexOfSelectedItem;if(index<0||index>=[self screenToolTypes].count)return;NSString *type=[self screenToolTypes][index];[self screenToolInfo:[NSNotification notificationWithName:@"DYScreenToolInfo" object:[self rootHost]userInfo:@{@"type":type,@"message":DYScreenToolCatalog()[type]?:@"从画面选择工具,或使用详情设置。"}]];} -- (void)screenToolInfo:(NSNotification*)note{NSString *type=note.userInfo[@"type"];if(type.length){[_screenType release];_screenType=[type copy];NSUInteger index=[[self screenToolTypes]indexOfObject:type];if(index!=NSNotFound)[_screenTools selectItemAtIndex:index];_screenHint.stringValue=DYScreenToolCatalog()[type]?:@"在控制面板调整当前工具";_screenHint.toolTip=_screenHint.stringValue;}NSString *message=note.userInfo[@"message"];if(message.length){_screenStatus.stringValue=message;_screenStatus.toolTip=message;}_screenDetails.enabled=_screenType.length>0;} -- (void)screenCanvasStatus:(NSNotification*)note{NSString *message=note.userInfo[@"message"];if(message.length){_screenStatus.stringValue=message;_screenStatus.toolTip=message;}} +- (void)screenToolInfo:(NSNotification*)note{NSString *type=note.userInfo[@"type"];if(type.length){[_screenType release];_screenType=[type copy];NSUInteger index=[[self screenToolTypes]indexOfObject:type];if(index!=NSNotFound)[_screenTools selectItemAtIndex:index];_screenHint.stringValue=DYScreenToolCatalog()[type]?:@"在控制面板调整当前工具";_screenHint.toolTip=_screenHint.stringValue;}NSString *message=note.userInfo[@"message"];if(message.length){_screenStatus.hidden=NO;_screenHint.hidden=YES;_screenStatus.stringValue=message;_screenStatus.toolTip=message;}_screenDetails.enabled=_screenType.length>0;} +- (void)screenCanvasStatus:(NSNotification*)note{NSString *message=note.userInfo[@"message"];if(message.length){_screenStatus.hidden=NO;_screenHint.hidden=YES;_screenStatus.stringValue=message;_screenStatus.toolTip=message;}} - (void)screenToolDetails:(id)sender{ NSString *type=_screenType;if(!type.length)return; if([type isEqual:@"level"]){_editorMode=3;[self pageChanged:nil];return;} diff --git a/开发交接.md b/开发交接.md index ff4b5dc..b0bc674 100644 --- a/开发交接.md +++ b/开发交接.md @@ -6,7 +6,7 @@ 本轮增加控制面板各图层、检查器模块整体强度;屏幕工具说明、实时提示与详情入口集中到控制面板;顶部图标加中文;简化一级调色拥挤横向布局,改常用/影调/更多设置分组、纵向滚动,并常显其他参数区滚动条。候选1.22.6(143),尚未交付;正式安装仍1.22.5(142)。 -工程 `/Volumes/备份/大鱼调色/大鱼调色`,main,远程 `https://dayu.media/git/dayu/dayu-color.git`。基线0388b79bd82100f493dd691a3126f00fc398fe40已远端核验;接手遗留project.pbxproj引用排序改动保留,不混入提交。首轮编译发现reset代码插入位置不当,已修正,待回归。 +工程 `/Volumes/备份/大鱼调色/大鱼调色`,main,远程 `https://dayu.media/git/dayu/dayu-color.git`。基线0388b79bd82100f493dd691a3126f00fc398fe40已远端核验;接手遗留project.pbxproj引用排序改动保留,不混入提交。Release编译通过;首轮1128项原生回归中仅紧凑高度下跟踪预览和最后一行旁路按钮可见性两项失败,已压缩提示行修正。整体强度像素、序列化和三组设置可达性通过;已补控制面板/检查器37%与62%双向回归,第二轮待完成。 强度存入宿主tools文档,默认100%,保留原参数/蒙版;统一色彩路径按完整模块结果混合,旧版路径复用逐模块蒙版混合。控制面板共用固定强度入口,检查器每模块独立控件。主要路径:DYToolState、DYToolRender、DYUnifiedRender、DYInspector、DYColorWorkspace、DYWorkspaceTools、DYViewerParameterBridge、DYToolOSC。