完善吸管图标与紧凑布局,按稳定ID分组显示通用色域和旧DJI机型矩阵

这个提交包含在:
mac 于 2026-11-16 17:55:32 +08:00 提交
1 父节点 dd9f9597bc
当前提交 876c5f1270
11 个文件已更改
+302 -67

没有与搜索条件相匹配的文件

@@ -34,3 +34,22 @@
NSData *pickAfter=[NSKeyedArchiver archivedDataWithRootObject:DYReadTools(pickHost,kCMTimeZero) requiringSecureCoding:YES error:nil];
run.record(@"hsl-picker-only-selects-no-grading-or-undo-write",[pickBefore isEqual:pickHost->_values]&&[pickTools isEqual:pickAfter]&&pickHost->_undoStarts==0);
}
// Menu headings must never shift persisted raw IDs. Exercise every selectable
// value through the real inspector action and refresh, including old DJI IDs.
{
DYDiagnosticManager *menuHost=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(menuHost,nil);
DYInspector *menuEditor=[[[DYInspector alloc]initWithAPIManager:menuHost]autorelease];[menuEditor refresh];
NSDictionary *controls=[menuEditor valueForKey:@"controls"];
for(NSString *key in @[@"cminputGamut",@"cmworkingGamut",@"cmoutputGamut",@"cminputTransfer",@"cmworkingTransfer",@"cmoutputTransfer"]){
NSDictionary *record=nil;for(NSDictionary *r in controls.allValues)if([r[@"descriptor"][@"key"]isEqual:key])record=r;
NSDictionary *descriptor=record[@"descriptor"];NSPopUpButton *popup=record[@"popup"];NSArray *values=descriptor[@"values"];BOOL matches=popup&&values.count;
NSUInteger headings=0,selectable=0;for(NSMenuItem *item in popup.itemArray){if(item.separatorItem)continue;if(item.tag==-1){headings++;matches&=!item.enabled;}else selectable++;}
matches&=selectable==values.count&&headings==([key hasSuffix:@"Gamut"]?2:0);
for(NSNumber *value in values){
matches&=[popup selectItemWithTag:value.integerValue];[menuEditor performSelector:@selector(scalarChanged:) withObject:popup];
double stored=-1;[menuHost getFloatValue:&stored fromParameter:[descriptor[@"pid"]unsignedIntValue] atTime:kCMTimeZero];[menuEditor refresh];
matches&=stored==value.doubleValue&&popup.selectedItem.tag==value.integerValue;
}
run.record([@"cst-grouped-popup-retains-all-raw-ids-" stringByAppendingString:key],matches);
}
}
+13 -4
查看文件
@@ -753,6 +753,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
if([key isEqual:@"hsl"]) {
DYFlippedView *pickActions=[[[DYFlippedView alloc]initWithFrame:NSZeroRect]autorelease];pickActions.identifier=@"hslPickerControls";
NSButton *autoPicker=DYButton(@"HSL 吸管",self,@selector(sampleHSLLane:));autoPicker.identifier=@"hslLanePicker";autoPicker.toolTip=@"点击画面取色,自动切换到对应颜色;肤色优先进入橙色。Esc 取消。";autoPicker.accessibilityLabel=@"HSL 吸管";
autoPicker.image=[NSImage imageWithSystemSymbolName:@"eyedropper" accessibilityDescription:@"吸管选色"];autoPicker.imagePosition=NSImageLeft;autoPicker.imageScaling=NSImageScaleProportionallyDown;
[pickActions addSubview:autoPicker];[card addSubview:pickActions];[body addObject:pickActions];
DYFlippedView *tabs=[[[DYFlippedView alloc]initWithFrame:NSZeroRect]autorelease];tabs.identifier=@"hslTabs";
for(NSInteger i=0;i<9;i++){DYSwatchButton *b=[[[DYSwatchButton alloc]initWithFrame:NSZeroRect]autorelease];[b setButtonType:NSButtonTypePushOnPushOff];b.swatch=i<8?[NSColor colorWithSRGBRed:((double[]){1,1,1,.15,0,0,.75,1})[i] green:((double[]){.2,.55,.84,.76,.76,.47,.15,.15})[i] blue:((double[]){.25,.12,0,.25,.8,1,.9,.65})[i] alpha:1]:DYAccent();b.title=@"";if(i==8)b.identifier=@"customColorSwatch";b.tag=i;b.target=self;b.action=@selector(tabChanged:);b.state=i==0?NSControlStateValueOn:NSControlStateValueOff;b.accessibilityLabel=[@[@"红",@"橙",@"黄",@"绿",@"青",@"蓝",@"紫",@"洋红",@"自定义"][i] stringByAppendingString:@" HSL"];[tabs addSubview:b];}
@@ -795,7 +796,13 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
[row addSubview:toggle]; record[@"toggle"]=toggle;
} else if([kind isEqualToString:@"popup"]) {
NSPopUpButton *popup=[[[DYThemePopUpButton alloc] initWithFrame:NSZeroRect pullsDown:NO] autorelease];
[popup addItemsWithTitles:d[@"options"]?:@[]]; popup.font=[NSFont systemFontOfSize:11];
NSArray *options=d[@"options"]?:@[],*values=d[@"values"],*groups=d[@"optionGroups"],*help=d[@"optionHelp"];NSString *previousGroup=nil;
for(NSUInteger i=0;i<options.count;i++){
if(groups&&![previousGroup isEqual:groups[i]]){if(previousGroup)[popup.menu addItem:NSMenuItem.separatorItem];NSMenuItem *heading=[[[NSMenuItem alloc]initWithTitle:groups[i] action:nil keyEquivalent:@""]autorelease];heading.enabled=NO;heading.tag=-1;[popup.menu addItem:heading];previousGroup=groups[i];}
[popup addItemWithTitle:options[i]];NSMenuItem *item=popup.lastItem;if(values)item.tag=[values[i]integerValue];if(help)item.toolTip=help[i];
}
popup.font=[NSFont systemFontOfSize:11];
if(groups)popup.toolTip=@"按素材的实际色域选择;D-Log 使用 D-Gamut,D-Log 2 使用 D-Gamut 2。下方机型矩阵供既有配置使用,机型共用标准色域时无需单列。";
popup.target=self; popup.action=@selector(scalarChanged:); popup.tag=[pid integerValue];
popup.accessibilityLabel=d[@"title"]; [row addSubview:popup]; record[@"popup"]=popup;
} else {
@@ -914,7 +921,8 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
CGFloat rh=[self heightForRow:row];row.frame=NSMakeRect(12,rowY,cw-24,rh-1);rowY+=rh;
if([row.identifier isEqual:@"primaryBalance"])for(NSView *v in row.subviews)v.frame=row.bounds;
if([row.identifier hasPrefix:@"heading:"])for(NSView *v in row.subviews)v.frame=NSMakeRect(3,7,row.bounds.size.width-6,18);
if([row.identifier isEqual:@"autoControls"]||[row.identifier isEqual:@"sampleControls"]||[row.identifier isEqual:@"hslPickerControls"]) {
if([row.identifier isEqual:@"hslPickerControls"]){NSButton *button=row.subviews.firstObject;button.frame=NSMakeRect(0,3,MIN(row.bounds.size.width,MAX(132.,button.cell.cellSize.width+20)),25);}
if([row.identifier isEqual:@"autoControls"]||[row.identifier isEqual:@"sampleControls"]) {
CGFloat buttonWidth=(row.bounds.size.width-4*(row.subviews.count-1))/MAX((NSUInteger)1,row.subviews.count);NSInteger i=0;
for(NSView *button in row.subviews)[button setFrame:NSMakeRect((buttonWidth+4)*i++,3,buttonWidth,25)];
}
@@ -1049,7 +1057,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
if(d[@"enabled"]) {double enabled=readValue(d[@"enabled"],1);[r[@"itemEnabled"] setState:enabled>=.5?NSControlStateValueOn:NSControlStateValueOff];[r[@"itemEnabled"] setImage:[NSImage imageWithSystemSymbolName:enabled>=.5?@"eye":@"eye.slash" accessibilityDescription:enabled>=.5?@"启用":@"旁路"]];for(NSString *control in @[@"slider",@"field",@"popup"]) [r[control] setAlphaValue:enabled>=.5?1:.45];}
[r[@"slider"] setDoubleValue:v]; [r[@"field"] setStringValue:DYNumber(v,d)];
[r[@"toggle"] setState:v>=.5?NSControlStateValueOn:NSControlStateValueOff];
NSPopUpButton *popup=r[@"popup"]; if(popup.numberOfItems>0){NSArray *values=d[@"values"];NSInteger index=values?[values indexOfObject:@((int)llround(v))]:(NSInteger)llround(v);[popup selectItemAtIndex:index==NSNotFound?0:MAX(0,MIN(index,popup.numberOfItems-1))];}
NSPopUpButton *popup=r[@"popup"]; if(popup.numberOfItems>0){NSArray *values=d[@"values"];if(values){NSInteger tag=(NSInteger)llround(v);if(![values containsObject:@(tag)])tag=[values.firstObject integerValue];[popup selectItemWithTag:tag];}else [popup selectItemAtIndex:MAX(0,MIN((NSInteger)llround(v),popup.numberOfItems-1))];}
}
for(NSDictionary *d in DYDescriptors())if([@[@"cmbalanceAngle",@"cmbalanceStrength"]containsObject:d[@"key"]]){double v=[d[@"default"]doubleValue];[get getFloatValue:&v fromParameter:[d[@"pid"]unsignedIntValue] atTime:t];graphicValues[d[@"key"]]=@(v);}
for(id graphic in _graphics)[graphic setValues:graphicValues];
@@ -1107,7 +1115,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
if(_refreshing)return;
NSNumber *pid=@(sender.tag); NSDictionary *r=_controls[pid],*d=r[@"descriptor"]; if(!d)return;
double v;
if([sender isKindOfClass:[NSPopUpButton class]]){NSInteger i=[(NSPopUpButton *)sender indexOfSelectedItem];v=d[@"values"]?[d[@"values"][i]doubleValue]:i;}
if([sender isKindOfClass:[NSPopUpButton class]]){NSPopUpButton *popup=sender;if(d[@"values"]){NSNumber *value=@(popup.selectedItem.tag);if(![d[@"values"]containsObject:value])return;v=value.doubleValue;}else v=popup.indexOfSelectedItem;}
else if([sender isKindOfClass:[NSButton class]])v=[(NSButton *)sender state]==NSControlStateValueOn?1:0;
else {
if([sender isKindOfClass:[NSTextField class]]) {
@@ -1558,6 +1566,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
if(_hslPickerToken){[NSNotificationCenter.defaultCenter postNotificationName:@"DYHSLPickerRequest" object:host userInfo:@{@"token":_hslPickerToken,@"cancel":@YES}];return;}
_hslPickerToken=[NSUUID.UUID.UUIDString copy];
for(NSDictionary *card in _cards)for(NSView *row in card[@"body"])if([row.identifier isEqual:@"hslPickerControls"])[(NSButton*)row.subviews.firstObject setTitle:@"点击画面取色 · Esc 取消"];
[self setNeedsLayout:YES];[self layoutSubtreeIfNeeded];
[NSNotificationCenter.defaultCenter postNotificationName:@"DYHSLPickerRequest" object:host userInfo:@{@"token":_hslPickerToken}];
}
- (void)sampleColorForWhiteBalance:(BOOL)whiteBalance {
+18 -11
查看文件
@@ -68,15 +68,8 @@ NSArray<NSDictionary *> *DYCMGamuts(void) { return @[
@{ @"id":@6, @"name":@"Blackmagic Wide Gamut" },
@{ @"id":@7, @"name":@"Canon Cinema Gamut" },
@{ @"id":@16, @"name":@"DaVinci Wide Gamut" },
@{ @"id":@8, @"name":@"DJI Action 5" },
@{ @"id":@9, @"name":@"DJI Air 2S" },
@{ @"id":@10, @"name":@"DJI D-Gamut" },
@{ @"id":@28, @"name":@"DJI D-Gamut 2" },
@{ @"id":@11, @"name":@"DJI Mavic2 Pro" },
@{ @"id":@12, @"name":@"DJI Mavic 3 Pro" },
@{ @"id":@13, @"name":@"DJI Mini 4 Pro" },
@{ @"id":@14, @"name":@"DJI Mini 5 Pro" },
@{ @"id":@15, @"name":@"DJI Pocket 3" },
@{ @"id":@10, @"name":@"DJI D-Gamut", @"help":@"D-Log 共用色域:御 4 Pro、Pocket 4、Pocket 4P 的 D-Log 模式选此项;不适用于 D-Log M。" },
@{ @"id":@28, @"name":@"DJI D-Gamut 2", @"help":@"Pocket 4P 的 D-Log 2 模式选此项;D-Log 模式使用 DJI D-Gamut。" },
@{ @"id":@17, @"name":@"Fujifilm F-GamutC" },
@{ @"id":@18, @"name":@"GoPro GP-Log" },
@{ @"id":@19, @"name":@"P3-DCI" },
@@ -87,12 +80,26 @@ NSArray<NSDictionary *> *DYCMGamuts(void) { return @[
@{ @"id":@24, @"name":@"RED Wide Gamut RGB" },
@{ @"id":@25, @"name":@"Sony S-Gamut" },
@{ @"id":@26, @"name":@"Sony S-Gamut3" },
@{ @"id":@27, @"name":@"Sony S-Gamut3.Cine" }
@{ @"id":@27, @"name":@"Sony S-Gamut3.Cine" },
// Distinct historical matrices remain addressable by their original IDs.
// They are not aliases of D-Gamut, or a complete DJI camera catalogue.
@{ @"id":@8, @"name":@"DJI Action 5", @"group":@"旧版 DJI 机型矩阵(兼容)" },
@{ @"id":@9, @"name":@"DJI Air 2S", @"group":@"旧版 DJI 机型矩阵(兼容)" },
@{ @"id":@11, @"name":@"DJI Mavic2 Pro", @"group":@"旧版 DJI 机型矩阵(兼容)" },
@{ @"id":@12, @"name":@"DJI Mavic 3 Pro", @"group":@"旧版 DJI 机型矩阵(兼容)" },
@{ @"id":@13, @"name":@"DJI Mini 4 Pro", @"group":@"旧版 DJI 机型矩阵(兼容)" },
@{ @"id":@14, @"name":@"DJI Mini 5 Pro", @"group":@"旧版 DJI 机型矩阵(兼容)" },
@{ @"id":@15, @"name":@"DJI Pocket 3", @"group":@"旧版 DJI 机型矩阵(兼容)" }
]; }
static NSDictionary *cmRow(NSString*k,NSString*t,NSUInteger o,double lo,double hi,double def,int tab,NSArray *choices=nil){
NSMutableDictionary *d=[[row(k,t,offsetof(DYUniforms,cm)+o,lo,hi,def,choices?@"popup":@"float")mutableCopy]autorelease];d[@"cmTab"]=@(tab);
if(choices){d[@"notAnimatable"]=@YES;d[@"options"]=[choices valueForKey:@"name"];d[@"values"]=[choices valueForKey:@"id"];}
if(choices){d[@"notAnimatable"]=@YES;d[@"options"]=[choices valueForKey:@"name"];d[@"values"]=[choices valueForKey:@"id"];
if([k hasSuffix:@"Gamut"]){NSMutableArray *groups=[NSMutableArray array],*help=[NSMutableArray array];
for(NSDictionary *choice in choices){[groups addObject:choice[@"group"]?:@"通用色域(多机型共用)"];[help addObject:choice[@"help"]?:(choice[@"group"]?@"机型专用转换;仅匹配所列机型,不代表完整机型列表。":@"")];}
d[@"optionGroups"]=groups;d[@"optionHelp"]=help;
}
}
[descriptors replaceObjectAtIndex:descriptors.count-1 withObject:d];return d;
}
static void initialize(){static dispatch_once_t once;dispatch_once(&once,^{
+1 -1
查看文件
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.22.3</string>
<key>CFBundleVersion</key>
<string>139</string>
<string>140</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>PlugInKit</key>
+1 -1
查看文件
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.22.3</string>
<key>CFBundleVersion</key>
<string>139</string>
<string>140</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>