From 876c5f127072aeff3fc7719690bab95417438d2a Mon Sep 17 00:00:00 2001 From: mac Date: Mon, 16 Nov 2026 17:55:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=B8=E7=AE=A1=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E4=B8=8E=E7=B4=A7=E5=87=91=E5=B8=83=E5=B1=80=EF=BC=8C?= =?UTF-8?q?=E6=8C=89=E7=A8=B3=E5=AE=9AID=E5=88=86=E7=BB=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=80=9A=E7=94=A8=E8=89=B2=E5=9F=9F=E5=92=8C=E6=97=A7?= =?UTF-8?q?DJI=E6=9C=BA=E5=9E=8B=E7=9F=A9=E9=98=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Publishing/1.22.3/Release.md | 4 +- README.md | 2 + research/DJICameraCurves.md | 6 + research/HSLPicker.md | 2 + template/sources/RegisteredParameters.json | 284 +++++++++++++++---- 大鱼调色/Plugin/DYHSLPickerDiagnostics.inc.h | 19 ++ 大鱼调色/Plugin/DYInspector.mm | 17 +- 大鱼调色/Plugin/DYModel.mm | 29 +- 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 开发交接.md | 2 + 11 files changed, 302 insertions(+), 67 deletions(-) diff --git a/Publishing/1.22.3/Release.md b/Publishing/1.22.3/Release.md index 8f2078c..a52ca40 100644 --- a/Publishing/1.22.3/Release.md +++ b/Publishing/1.22.3/Release.md @@ -1,4 +1,4 @@ -大鱼调色 1.22.3(139)新增 HSL 吸管:直接点击 FCP 画面取色后,自动切换到颜色对应的 HSL 调整项,暖肤色优先进入橙色。中性色与 Esc 取消保留当前项,取色只选择颜色,不改动调色数值。主模块、独立 HSL 层及控制面板共用。 +大鱼调色 1.22.3(140)新增 HSL 吸管:直接点击 FCP 画面取色后,自动切换到颜色对应的 HSL 调整项,暖肤色优先进入橙色。中性色与 Esc 取消保留当前项,取色只选择颜色,不改动调色数值。主模块、独立 HSL 层及控制面板共用。 在一级调色与独立 CST 的曲线菜单中新增: @@ -10,3 +10,5 @@ D-Log 搭配 DJI D-Gamut,D-Log 2 搭配 DJI D-Gamut 2;曲线与色域仍独立选择。新增机型名称复用既有标准 Log 编码与解码,输入、工作和输出位置均可选,保留既有参数编号和工程默认行为。御 4 Pro 的 D-Log M 素材须使用对应的 D-Log M 处理,不能选 D-Log。 适用于 Apple Silicon Mac,macOS 14.6 或更高版本。唯一正式安装路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。本版本不修改站点文章或主 APP 更新通道。 + +HSL 吸管采用吸管图标与紧凑按钮。色域菜单分为通用色域及旧版 DJI 机型矩阵,D-Gamut / D-Gamut 2 提示对应拍摄模式与机型;保留旧参数编号与转换结果,机型共用标准色域时无需逐个列出。 diff --git a/README.md b/README.md index b119679..5701cac 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ HSL 新增“吸管”:点取画面颜色后自动进入对应八色调整项 一级调色与独立 CST 的输入/工作/输出曲线菜单新增御 4 Pro D-Log、Pocket 4 D-Log、Pocket 4P D-Log 和 D-Log 2。D-Log 手选搭配 DJI D-Gamut,D-Log 2 搭配 DJI D-Gamut 2;仍保持曲线与色域独立。御4Pro的D-Log M素材使用相应D-Log M处理。[模式依据及ID映射](research/DJICameraCurves.md)。 +140 将 HSL 吸管增加吸管图标并改为紧凑按钮;色域菜单分通用色域与旧版 DJI 机型矩阵,保留原有转换编号。 + ## 独立效果与水平校正 在 Final Cut Pro 的「效果 → 大鱼调色」可选「大鱼调色」「一级调色」或「HSL」。独立效果打开对应模块,保留画面工具栏和控制面板,可继续添加其他调色模块。 diff --git a/research/DJICameraCurves.md b/research/DJICameraCurves.md index 08b665a..c87502c 100644 --- a/research/DJICameraCurves.md +++ b/research/DJICameraCurves.md @@ -18,3 +18,9 @@ - [Pocket4P官方说明(D-Log2限1×)](https://www.dji.com/uk/osmo-pocket-4p) 验证:正式安装版原生自检覆盖四个机型条目,并在输入/工作/输出各阶段与原有通用D-Log/D-Log2比较实际Metal像素,包括非零一级曝光;宿主验收另记录,不以自动检查代替宿主实测。 + +## 140 色域菜单整理 + +色域原有 DJI Action 5 / Air 2S / Mavic2 Pro / Mavic 3 Pro / Mini 4 Pro / Mini 5 Pro / Pocket 3(ID 8、9、11–15)来自既有 CST 内核的独立 RGB 转换矩阵;`CSTKernel.ll` 的输入矩阵 `%v865–%v867` 对应不同常量,不是 D-Gamut 的名称别名。这些选项不构成完整机型目录,无法据此认定所有同名 Log 模式跨机型相同。 + +140将输入/工作/输出色域显示为“通用色域(多机型共用)”和“旧版 DJI 机型矩阵(兼容)”。D-Gamut 的帮助说明御4Pro与Pocket4/4P的D-Log模式,D-Gamut2说明Pocket4P的D-Log2模式;不虚构新的机型色域。旧机型项仍可选,数值ID、参数默认及GPU内核不变。菜单分组标题不可选,菜单按真实数值ID读写,新增全值往返检查避免插入标题后错误偏移。 diff --git a/research/HSLPicker.md b/research/HSLPicker.md index 2583100..b3bd71f 100644 --- a/research/HSLPicker.md +++ b/research/HSLPicker.md @@ -9,3 +9,5 @@ 自动验证覆盖八个颜色项、四类肤色和偏粉跨红色边界、黑白灰与无效输入,以及三个原生编辑器中的标签状态、色条互斥和参数不变。正式宿主实点与画面检查另记 `verification/HostDJIHSL1.22.3.json`,不能把自动检查替代为真人肤色识别或真实拍摄素材的色彩准确度承诺。 139以唯一请求令牌回送到发起的主模块/独立层/工作区;别的面板不改变选项。Esc 或再次按吸管取消,当前帧未就绪时保留取色状态供重试。138系统取色候选只完成加载与原生自检,实点未通过,不据此发布。 + +140保留已由用户在139确认的原生取色路径,仅将按钮加上系统吸管图标、按文字宽度紧凑显示,等待取色和结果状态仍有文字及无障碍标签。 diff --git a/template/sources/RegisteredParameters.json b/template/sources/RegisteredParameters.json index 2c8e7d8..473e897 100644 --- a/template/sources/RegisteredParameters.json +++ b/template/sources/RegisteredParameters.json @@ -172,6 +172,68 @@ "min": 0, "notAnimatable": true, "offset": 952, + "optionGroups": [ + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)" + ], + "optionHelp": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "D-Log 共用色域:御 4 Pro、Pocket 4、Pocket 4P 的 D-Log 模式选此项;不适用于 D-Log M。", + "Pocket 4P 的 D-Log 2 模式选此项;D-Log 模式使用 DJI D-Gamut。", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。" + ], "options": [ "KOLOR Default", "ACES AP0", @@ -182,15 +244,8 @@ "Blackmagic Wide Gamut", "Canon Cinema Gamut", "DaVinci Wide Gamut", - "DJI Action 5", - "DJI Air 2S", "DJI D-Gamut", "DJI D-Gamut 2", - "DJI Mavic2 Pro", - "DJI Mavic 3 Pro", - "DJI Mini 4 Pro", - "DJI Mini 5 Pro", - "DJI Pocket 3", "Fujifilm F-GamutC", "GoPro GP-Log", "P3-DCI", @@ -201,7 +256,14 @@ "RED Wide Gamut RGB", "Sony S-Gamut", "Sony S-Gamut3", - "Sony S-Gamut3.Cine" + "Sony S-Gamut3.Cine", + "DJI Action 5", + "DJI Air 2S", + "DJI Mavic2 Pro", + "DJI Mavic 3 Pro", + "DJI Mini 4 Pro", + "DJI Mini 5 Pro", + "DJI Pocket 3" ], "pid": 2238, "step": 1, @@ -216,15 +278,8 @@ 6, 7, 16, - 8, - 9, 10, 28, - 11, - 12, - 13, - 14, - 15, 17, 18, 19, @@ -235,7 +290,14 @@ 24, 25, 26, - 27 + 27, + 8, + 9, + 11, + 12, + 13, + 14, + 15 ] }, { @@ -340,6 +402,68 @@ "min": 0, "notAnimatable": true, "offset": 960, + "optionGroups": [ + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)" + ], + "optionHelp": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "D-Log 共用色域:御 4 Pro、Pocket 4、Pocket 4P 的 D-Log 模式选此项;不适用于 D-Log M。", + "Pocket 4P 的 D-Log 2 模式选此项;D-Log 模式使用 DJI D-Gamut。", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。" + ], "options": [ "KOLOR Default", "ACES AP0", @@ -350,15 +474,8 @@ "Blackmagic Wide Gamut", "Canon Cinema Gamut", "DaVinci Wide Gamut", - "DJI Action 5", - "DJI Air 2S", "DJI D-Gamut", "DJI D-Gamut 2", - "DJI Mavic2 Pro", - "DJI Mavic 3 Pro", - "DJI Mini 4 Pro", - "DJI Mini 5 Pro", - "DJI Pocket 3", "Fujifilm F-GamutC", "GoPro GP-Log", "P3-DCI", @@ -369,7 +486,14 @@ "RED Wide Gamut RGB", "Sony S-Gamut", "Sony S-Gamut3", - "Sony S-Gamut3.Cine" + "Sony S-Gamut3.Cine", + "DJI Action 5", + "DJI Air 2S", + "DJI Mavic2 Pro", + "DJI Mavic 3 Pro", + "DJI Mini 4 Pro", + "DJI Mini 5 Pro", + "DJI Pocket 3" ], "pid": 2240, "step": 1, @@ -384,15 +508,8 @@ 6, 7, 16, - 8, - 9, 10, 28, - 11, - 12, - 13, - 14, - 15, 17, 18, 19, @@ -403,7 +520,14 @@ 24, 25, 26, - 27 + 27, + 8, + 9, + 11, + 12, + 13, + 14, + 15 ] }, { @@ -808,6 +932,68 @@ "min": 0, "notAnimatable": true, "offset": 980, + "optionGroups": [ + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "通用色域(多机型共用)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)", + "旧版 DJI 机型矩阵(兼容)" + ], + "optionHelp": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "D-Log 共用色域:御 4 Pro、Pocket 4、Pocket 4P 的 D-Log 模式选此项;不适用于 D-Log M。", + "Pocket 4P 的 D-Log 2 模式选此项;D-Log 模式使用 DJI D-Gamut。", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。", + "机型专用转换;仅匹配所列机型,不代表完整机型列表。" + ], "options": [ "KOLOR Default", "ACES AP0", @@ -818,15 +1004,8 @@ "Blackmagic Wide Gamut", "Canon Cinema Gamut", "DaVinci Wide Gamut", - "DJI Action 5", - "DJI Air 2S", "DJI D-Gamut", "DJI D-Gamut 2", - "DJI Mavic2 Pro", - "DJI Mavic 3 Pro", - "DJI Mini 4 Pro", - "DJI Mini 5 Pro", - "DJI Pocket 3", "Fujifilm F-GamutC", "GoPro GP-Log", "P3-DCI", @@ -837,7 +1016,14 @@ "RED Wide Gamut RGB", "Sony S-Gamut", "Sony S-Gamut3", - "Sony S-Gamut3.Cine" + "Sony S-Gamut3.Cine", + "DJI Action 5", + "DJI Air 2S", + "DJI Mavic2 Pro", + "DJI Mavic 3 Pro", + "DJI Mini 4 Pro", + "DJI Mini 5 Pro", + "DJI Pocket 3" ], "pid": 2245, "step": 1, @@ -852,15 +1038,8 @@ 6, 7, 16, - 8, - 9, 10, 28, - 11, - 12, - 13, - 14, - 15, 17, 18, 19, @@ -871,7 +1050,14 @@ 24, 25, 26, - 27 + 27, + 8, + 9, + 11, + 12, + 13, + 14, + 15 ] }, { @@ -3743,7 +3929,7 @@ "大鱼调色/Plugin/DYManagedColor.h": "36ae3c92cb0ce6ada6535e096154daeee221c6d73a8a8ee6117dc285939b22a8", "大鱼调色/Plugin/DYManagedColor.mm": "3fbafab029c5568a8b235f615615e1278ab8c2419a6604c87278d4a6be0e61f0", "大鱼调色/Plugin/DYModel.h": "a28652bd53aa9e1d085af1108c344b5d673c5e1b3731531e1bb2982efeb8708c", - "大鱼调色/Plugin/DYModel.mm": "544937dcab852bf2dd524377c3dd7577535b4af835638596a68ca9c6db2e888c", + "大鱼调色/Plugin/DYModel.mm": "2d95b92c0cf5ea0955361bb1a33c53b47ec0d48cc7a5938e7c97357c05540de5", "大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9", "大鱼调色/Plugin/DYToolState.h": "0dac1087c4c5e18b43b674ff50b7be5a9b47a151401d87ca7adc1b72908bdec0", "大鱼调色/Plugin/DYToolState.mm": "5ea14fa293a881cccd9a7f56f7126ea5d0c4f81217a788a06d94ea2825404688", diff --git a/大鱼调色/Plugin/DYHSLPickerDiagnostics.inc.h b/大鱼调色/Plugin/DYHSLPickerDiagnostics.inc.h index b4464f4..76ea8c5 100644 --- a/大鱼调色/Plugin/DYHSLPickerDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYHSLPickerDiagnostics.inc.h @@ -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); + } +} diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index d52f551..2d501f4 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -753,6 +753,7 @@ NSView *DYCreateWorkspaceMaskEditor(id 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 *DYCreateWorkspaceMaskEditor(id [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 *DYCreateWorkspaceMaskEditor(id 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 *DYCreateWorkspaceMaskEditor(id 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 *DYCreateWorkspaceMaskEditor(id 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 *DYCreateWorkspaceMaskEditor(id 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 { diff --git a/大鱼调色/Plugin/DYModel.mm b/大鱼调色/Plugin/DYModel.mm index e33f52d..1e1a1cc 100644 --- a/大鱼调色/Plugin/DYModel.mm +++ b/大鱼调色/Plugin/DYModel.mm @@ -68,15 +68,8 @@ NSArray *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 *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,^{ diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index afaf08e..45d1ea6 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.22.3 CFBundleVersion - 139 + 140 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 44f06fd..264b00e 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.22.3 CFBundleVersion - 139 + 140 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/开发交接.md b/开发交接.md index 8e38e9b..82bd515 100644 --- a/开发交接.md +++ b/开发交接.md @@ -29,3 +29,5 @@ FCP 合成素材与 XML 位于固定缓存 `fcp-qa/dji-hsl-1.22.3/`,库 `fcp-qa/大鱼调色_验收.fcpbundle`;不纳入软件源码上传。Motion、HDR 和真实 DJI 素材未测。此前图章“最后可信帧”自动跳转在 FCP 12.4 返回失败,按显示时间手动定位;本轮未更改。[此前完整交接](research/HandoffHistory-20261116-before-dji-hsl.md) · [恢复说明](RECOVERY.md)。 本机可直接强退任务涉及 APP/FCP/Motion/相关服务的用户授权已写入 `/Users/mac/.codex/AGENTS.md`,同步规则仓库 `machines/mac-mini-m4`,提交 `a613b4dafc53b4d0a43d9d8d9cc44c9792bde500` 并独立恢复核验;不扩展到其他聊天构建、用户文件或 NAS 生产。 + +140修改已进入源码:HSL增加系统吸管图标与自适应紧凑按钮;三个色域菜单分通用与旧机型兼容矩阵,用真实ID选择,新增六个全选项读写/刷新检查。待模板静态验证与完整Release自检、签名公证、安装界面检查,再生成最终PKG。139的实点验收单独保留,不冒充140界面观察。