比较提交

...
共修改 35 个文件,包含 6613 行新增和 191 行删除

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

+14
查看文件
@@ -0,0 +1,14 @@
# 大鱼调色 1.22.6(143)
- 控制面板各调色图层、检查器各模块新增整体强度,可在 0–100% 之间调整;保留模块参数、LUT 与蒙版,两处同步并支持撤销及预设保存。
- 控制面板顶部显示图标和中文按钮名,自适应换行;屏幕工具的操作说明、实时提示与详情入口集中在面板。
- 一级调色分为“常用/影调/更多设置”,改为纵向滚动;其他横向编辑区常显滚动条。
- 精简紧凑窗口的提示区与跟踪预览,保留更多参数和画面空间。
Apple Silicon,macOS 14.6 或更新版本;Final Cut Pro / Motion FxPlug4。退出宿主后安装,再重新打开。固定插件路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。
整体强度在统一色彩管线中混合完整模块结果;旧工程沿用既有逐模块蒙版混合方式。输出转换强度调节色调映射的混合,色域与曲线解释仍按输出域和宿主适配处理。既有图章“最后可信帧”在 FCP 12.4 仍可能需要手动按时间定位。
本轮未修改站点文章和主 APP 更新通道。签名、公证、安装、宿主与下载校验结果见对应版本的 verification 记录;未验收的复杂素材、Motion、HDR 和变速不扩大声明。
正式 PKG:44,599,258 字节,SHA-256 `e43967ea2efa5ee83b7426e3cb28cefc9e46da0eb86500a5af459c652949eaa9`。APP 与 PKG 均经 Developer ID 签名、Apple 公证和票据验证;1130 项构建与正式安装检查及 FCP 12.4 双向强度、冷重开保存和分组滚动通过。
+28
查看文件
@@ -1,3 +1,31 @@
# 2026-11-17 模块强度与简化面板 1.22.6(143)
远程 `https://dayu.media/git/dayu/dayu-color.git`,main。实际编译源 `e6e5407b7a7e0501d9a8c1f70a161010295ac845`;发行标签 `v1.22.6-panel-strength-20261117` 将关联本版本验包提交。恢复登录后克隆,以 `git switch --detach e6e5407b7a7e0501d9a8c1f70a161010295ac845` 恢复实际编译源码,或检出发行标签恢复安装包验证记录。
Apple Silicon、macOS14.6+、Xcode27.2、FxPlug4.3.5与当前Metal组件;依赖已随仓库保存,无LFS或子模块。复用tools/deliver.py、Packaging/build_pkg.py和publish_release.py,产品/仓库锁及固定缓存;签名私钥、公证profile、账号凭据和用户媒体/LUT需独立恢复。正式APP固定 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID com.dayu.color、服务com.dayu.color.XPC、团队B3W25FX5H5。
APP公证04e79de0-4515-4c41-8b90-ca5d1ba0df27 Accepted,签名/票据/Gatekeeper与构建、正式安装各1130项检查通过。FCP12.4实测37%/62%双向强度,退出FCP及插件服务冷重开仍62%,验收后恢复100%;中文工具栏、三级设置、纵向滚动、屏幕工具说明与水平校正详情显示通过。物理OSC绘制/吸管与水平线按钮触发、复杂素材、Motion、HDR、变速未复测。见[安装](verification/Delivery1.22.6.json)、[宿主范围](verification/HostModuleStrength1.22.6.json)。
PKG `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.6.pkg`,44,599,258字节,SHA-256 `e43967ea2efa5ee83b7426e3cb28cefc9e46da0eb86500a5af459c652949eaa9`。Installer签名、公证 `24871d91-fead-4193-9143-b95e7b2a76ac` Accepted、票据、Gatekeeper与20项验包通过;未再次运行系统安装器。[验包](verification/Package1.22.6.json)。Release上传与完整下载核验准备中,完成结果见main后续交接及版本验证记录。
独立HTTPS检出实际编译节点的1064个文件、Git完整性及346个构建/源码/工具/模板输入核对通过(工程字典仅排序等价),未在恢复目录重编。正式APP外的本轮构建APP、公证ZIP、旧142回滚APP已清理;临时恢复检出待标签核验后清理。本轮无NAS生产改动,文章15792仍1.22.2(137),主APP更新通道仍1.21.8(126)。[当前交接](开发交接.md)。下文保留历史。
---
# 2026-11-17 控件联动与蒙版保形1.22.5(142)
远程 `https://dayu.media/git/dayu/dayu-color.git`,main。实际编译源 `a1eb334840e1af285e878e7c094b06aaf01cba49`;发行标签 `v1.22.5-controls-sync-20261117` → `a20e734f6691313771df67d91402c200fec0b401` 已推送回读。新机器重新登录大鱼Git后克隆,以 `git switch --detach a1eb334840e1af285e878e7c094b06aaf01cba49` 恢复编译源码,或检出发行标签恢复PKG验包记录;发布后下载与交接记录在随后main证据提交,标签保持不变。
独立HTTPS检出编译节点1050个文件与发行标签全部跟踪文件,Git完整性通过,409个源码/工程/依赖/模板/构建输入核对通过(408个逐字节相同,工程plist仅排序等价)。无LFS/子模块;未在恢复目录重新编译,临时克隆已清理。[恢复核验](verification/Recovery1.22.5.json)。Xcode27.2、FxPlug SDK4.3.5、Metal组件、Apple Silicon/macOS14.6+与锁定依赖;指定当前Xcode的DEVELOPER_DIR及MacOSX.sdk,复用tools/deliver.py和Packaging脚本。证书私钥、公证profile、账号凭据、用户LUT及媒体独立恢复,不包含在Git。
APP公证 `f3c42a54-a85b-4f7b-a569-14fa34b80f5c` Accepted;签名/票据/Gatekeeper、正式安装与1113项自检通过。正式APP `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID com.dayu.color,服务com.dayu.color.XPC,团队B3W25FX5H5。FCP12.4验证新增LUT模块、37%/62%双向强度、100帧合成蒙版保形(最大相对比例漂移7.8537e-8)、马赛克关联及冷启动持久化。物理画布拖动/吸管与2秒提示未直接GUI验收;复杂素材、遮挡/透视、Motion/HDR/变速仍需复测。[安装](verification/Delivery1.22.5.json) · [宿主范围](verification/HostControlsSync1.22.5.json)。
PKG `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.5.pkg`,44,585,448字节,SHA-256 `194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a`。Installer签名、公证 `9ee8e167-6d03-4c1a-93bc-efab671754af` Accepted、票据、Gatekeeper与20项验包通过;未再次运行系统安装器。[验包](verification/Package1.22.5.json)。[Release450](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.5-controls-sync-20261117),附件79,发布前/发布后完整下载均匹配上述字节数及SHA。[首次发布](verification/ReleaseInitialPublish1.22.5.json) · [发布后下载](verification/Release1.22.5.json)。
构建APP、公证ZIP、旧141回滚APP、验包展开与恢复克隆已清理。保留当前/历史PKG、QA库和用户资料;限定目录核对仅正式APP,PluginKit仅正式路径。[清理](verification/Cleanup1.22.5.json)。本轮无NAS生产改动,文章15792仍1.22.2(137),主APP更新通道仍1.21.8(126);既有图章最后可信帧自动跳转限制保留。[当前交接](开发交接.md)。下文为历史发行。
---
# 2026-11-16 DJI 机型色域 1.22.4(141)
用户范围仅御4Pro、Pocket4和Pocket4P,新增色域ID29–32,对应既有曲线ID31–34及D-Gamut/D-Gamut2;旧编号保留。实际编译源 `f241a470caf39c5e44bb1e0a5544c01f16ee5bb3`,远程 `https://dayu.media/git/dayu/dayu-color.git`,main。最终标签 `v1.22.4-dji-gamut-20261116` → `c66a9ba9b683c66d59676111916d7d81da4ab8c7` 已推送回读。恢复认证后克隆并 `git switch --detach f241a470caf39c5e44bb1e0a5544c01f16ee5bb3` 获取实际编译源,或检出发行标签获取验包记录。独立HTTPS检出1041个跟踪文件、403个构建输入核对通过,工程字典仅排序差异;Git完整性通过,无LFS/子模块,未在检出中重编,临时检出已清理。[恢复核验](verification/Recovery1.22.4.json)。
+6
查看文件
@@ -42,3 +42,9 @@ FCP12.4正式142:LUT新增模块及37%/62%双向刷新通过;合成运动片
## 正式PKG
PKG公证9ee8e167-6d03-4c1a-93bc-efab671754af Accepted,Installer签名、票据、Gatekeeper与20项展开验包通过;44585448字节,SHA-256 194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a。实际载荷来源为已验收正式142,编译节点a1eb334;本轮未重复运行系统安装器。待Release上传与完整下载校验。
## 最终交付
Release450/附件79已发布;发布前与发布后完整下载均为44,585,448字节、SHA-256 194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a。标签v1.22.5-controls-sync-20261117固定a20e734f6691313771df67d91402c200fec0b401,实际编译源a1eb334不变。独立HTTPS恢复检出、Git完整性与构建输入核对完成,无LFS/子模块,未重新编译。临时克隆/旧APP/提交ZIP清理;正式与历史PKG及QA库保留。详细结果见verification/Release1.22.5.json、Recovery1.22.5.json、Cleanup1.22.5.json。
最终交付保留明确验收缺口:OSC物理拖动/吸管和提示2秒到期未直接GUI验证,用户原始复杂运动需复测;不把1113项原生回归或100帧合成测试扩大为全部素材通过。
@@ -0,0 +1,29 @@
# 大鱼调色开发交接
更新于2026-11-17(Asia/Shanghai)。
## 当前版本与目标
正式安装已更新为 **1.22.5(142)**,路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID `com.dayu.color`、服务 `com.dayu.color.XPC`、团队B3W25FX5H5。Release构建、Developer ID签名、Apple公证Accepted、票据、Gatekeeper、正式安装及启动完成;构建/正式安装各1113项自检通过。[安装](verification/Delivery1.22.5.json) · [身份](verification/InstalledIdentity1.22.5.json) · [本轮详细记录](research/ControlsSync-20261117.md)。
本轮修复:同帧源时钟相位导致曲线/畸变/白平衡画布写入被拒;面板模型事件及动态模块布局刷新;LUT浏览器五位置强度;马赛克共享蒙版与跟踪入口;巨大常驻状态框改紧凑半透明、点击穿透、2秒收起提示;Vision运动整体约束为平移/旋转/等比缩放,保持用户绘制的蒙版形状。
## 已验证范围与缺口
FCP12.4正式142实测:控制面板新增风格LUT模块后检查器出现同一模块,控制面板37%→检查器37%,检查器62%→控制面板62%。100帧合成运动正方形蒙版跟踪完成,最大相对宽高比漂移7.8537e-8;应用马赛克后100键和关联保留,选中蒙版可继续编辑跟踪。FCP及XPC退出后冷重开,保存预设的整个工具文档一致。[宿主范围](verification/HostControlsSync1.22.5.json) · [轨迹数据](verification/HostShapeTracking1.22.5.json) · [Vision回归](verification/SimilarityTracking1.22.5.json)。
**物理OSC拖动/画面吸管、提示2秒消失未完成直接GUI验收**:自动化坐标输入未触发OSC回调,不能据此判定产品通过或失败。同帧写入及下一帧拒绝有原生桥接回归。复杂真实素材、遮挡、透视、Motion/HDR/变速及真实DJI色彩未测;合成100帧不代表任意素材。关闭重开面板会默认选首工具,重新选中蒙版可见跟踪编辑器。既有图章“最后可信帧”在FCP12.4自动跳转仍需手动定位。
## 源码、发行与恢复
工程 `/Volumes/备份/大鱼调色/大鱼调色`,分支main,远程 `https://dayu.media/git/dayu/dayu-color.git`。实际编译源 `a1eb334840e1af285e878e7c094b06aaf01cba49`;发行标签 `v1.22.5-controls-sync-20261117` → `a20e734f6691313771df67d91402c200fec0b401` 已推送回读,标签不随后续证据提交移动。接手遗留Xcode工程引用排序改动保留、未提交。
[Release450](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.5-controls-sync-20261117),附件79;正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.5.pkg`,44,585,448字节,SHA-256 `194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a`。PKG公证 `9ee8e167-6d03-4c1a-93bc-efab671754af` Accepted,20项展开验包通过;发布前及发布后完整下载均匹配。本轮未再次运行系统安装器。[验包](verification/Package1.22.5.json) · [发布后下载](verification/Release1.22.5.json) · [恢复步骤](RECOVERY.md)。
独立HTTPS克隆检出1050个编译节点文件和发行标签全部文件、Git完整性、409个构建输入(工程字典仅排序等价)核对通过,无LFS/子模块,未在恢复目录重编。旧141回滚APP、构建APP、公证ZIP、临时验包和恢复目录已清理;保留正式/历史PKG、源码、QA媒体与库,未宣称全盘仅一个副本。[恢复核验](verification/Recovery1.22.5.json) · [清理](verification/Cleanup1.22.5.json)。
## 继续工作
优先用用户原始素材手动复测曲线松手、畸变拖动和白平衡吸管,以及2秒提示,再扩大复杂跟踪素材范围。FCP QA库包含用户真实媒体,勿上传或清理整库。缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`;Xcode27.2、FxPlug4.3.5、当前MacOSX.sdk;复用tools/deliver.py、Packaging/build_pkg.py与publish_release.py及产品/仓库锁。
本轮无NAS生产改动,文章15792仍1.22.2(137),主APP更新通道仍1.21.8(126)。[上一轮完整交接](research/HandoffHistory-20261117-before-controls-sync.md)。
+34
查看文件
@@ -0,0 +1,34 @@
{
"passResult": true,
"date": "2026-11-16T17:15:13.369780+00:00",
"product": "com.dayu.color",
"version": "1.22.5",
"build": 142,
"searchedRoots": [
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color",
"/Volumes/备份/大鱼调色",
"/Library/Plug-Ins/FxPlug",
"/Applications",
"/Users/mac/Library/Plug-Ins/FxPlug"
],
"matchingOuterApps": [
{
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"version": "1.22.5",
"build": "142"
}
],
"pluginKit": " com.dayu.color.XPC(1.1)\n\t Path = /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n\t UUID = 281BA504-21BF-48C3-B003-13F35E34E8C2\n\t Timestamp = 2026-11-16 16:52:32 +0000\n\t Parent Bundle = /Library/Plug-Ins/FxPlug/大鱼调色.app\n\t Display Name = 大鱼调色\n\t Short Name = 大鱼调色 XPC Service\n\t Parent Name = 大鱼调色\n\t Platform = macOS\n\n (1 plug-in)\n",
"previous141RollbackRemoved": true,
"buildAppAndSubmissionZipRemovedByDeliveryTool": true,
"recoveryCloneRemoved": true,
"temporaryPackageStageRemoved": true,
"productDeliveryLockReleased": true,
"preserved": [
"Current signed notarizedPKG",
"HistoricalPKGs",
"Source and project",
"QA library with user media, synthetic fixtures and native acceptance presets"
],
"scope": "Targeted product inventory in listed roots; no whole-machine uniqueness claim. Existing sources, user media and historical packages retained."
}
+6 -6
查看文件
@@ -2,14 +2,14 @@
"status": "verified",
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.22.5",
"build": "142",
"version": "1.22.6",
"build": "143",
"team": "B3W25FX5H5",
"notaryID": "f3c42a54-a85b-4f7b-a569-14fa34b80f5c",
"notaryID": "04e79de0-4515-4c41-8b90-ca5d1ba0df27",
"notaryStatus": "Accepted",
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
"sourceCommit": "a1eb334840e1af285e878e7c094b06aaf01cba49",
"deliveryToolCommit": "a1eb334840e1af285e878e7c094b06aaf01cba49",
"sourceCommit": "e6e5407b7a7e0501d9a8c1f70a161010295ac845",
"deliveryToolCommit": "e6e5407b7a7e0501d9a8c1f70a161010295ac845",
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
"templateSHA256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
"installedTemplateSHA256": {
@@ -66,5 +66,5 @@
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
},
"shaderSHA256": "c278fc6751ed5ea6b5fc9e94c446d2279750624ee593b479c8e8bab1cec8817a",
"hostVerification": "verification/HostControlsSync1.22.5.json"
"hostVerification": "verification/HostModuleStrength1.22.6.json"
}
+70
查看文件
@@ -0,0 +1,70 @@
{
"status": "verified",
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.22.6",
"build": "143",
"team": "B3W25FX5H5",
"notaryID": "04e79de0-4515-4c41-8b90-ca5d1ba0df27",
"notaryStatus": "Accepted",
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
"sourceCommit": "e6e5407b7a7e0501d9a8c1f70a161010295ac845",
"deliveryToolCommit": "e6e5407b7a7e0501d9a8c1f70a161010295ac845",
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
"templateSHA256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
"installedTemplateSHA256": {
"大鱼调色/大鱼调色.moef": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
"一级调色/一级调色.moef": "e4612f58eee5bf07a0a44cc5f6d65f9ca207b7f6946da938ed05f7d254ca7924",
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "68e91d3747a119e684f659093cb520a7fbd495336e8a1552316e52031e975ad5",
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
"基础调整/基础调整.moef": "ca6a584dd168990870fa774df8ba3fcfce5ad2e8de4d28bd656057fdaa1dbdca",
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
"肤色保护/肤色保护.moef": "06fdf5964f487a7cca3d6dce6e68013d3c0ba5b5c73c4bb392c7b58f5d916212",
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
"风格 LUT/风格 LUT.moef": "595f722d3ac99555d4e22611907b6273a3fb36fea59b8949be58eb1f7d319501",
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
"HSL/HSL.moef": "97bcbf240f86f485299c298d90f9339aa87a2751cef475e3d6a1637144d4ab13",
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
"曲线/曲线.moef": "3f235de32384a3b268982609583702d28470ed91c756f1b13947454f22bf3fc0",
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
"颜色分级/颜色分级.moef": "c49877ada4fa0ac49fa497b62f3a3e09bfe15f0d73b352bdfbeb0a9a2b7b1aad",
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
"三原色/三原色.moef": "6015ecc2cc89116b05d601df920ae674bad9ad4c6e7bad1f0eac889e08cda60d",
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
"色阶/色阶.moef": "b653b0981e0975605d2857a87bd495885d3370d3e9bcd9dc3a59b0012bf1f79e",
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
"黑白混色/黑白混色.moef": "96f2d1fc2fe5ed2a8eabdf3a3bf5eb7fff145d55a0ce05807dcd834d2b8e9b32",
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
"色彩平衡/色彩平衡.moef": "be935b1e399e2a47394b54b24fc2e32eb0622ae0cd28f83e1d2d895c3c1133d6",
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
"通道混合器/通道混合器.moef": "7c5889c052534edd0043f439f59fe31a987c9c626d9097ce7f3d7280a888b1e3",
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
"胶片模拟/胶片模拟.moef": "a559c654976ce711d01ef5b81ccaf01df8d81a9de501780cccc519fb72c4b7f2",
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
"镜头畸变修复/镜头畸变修复.moef": "5ddb7e97d718d1b78cbc162b042aed1debdd0fecd12b8596590d5de5307c19ae",
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
"CST 色彩空间转换/CST 色彩空间转换.moef": "96d684ec87cbef801316abd83a1c247360d9adf9dca52ae84881c400c898f1da",
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
},
"shaderSHA256": "c278fc6751ed5ea6b5fc9e94c446d2279750624ee593b479c8e8bab1cec8817a",
"hostVerification": "verification/HostModuleStrength1.22.6.json"
}
@@ -0,0 +1,32 @@
{
"passResult": true,
"version": "1.22.6",
"build": "143",
"host": "Final Cut Pro 12.4",
"sourceCommit": "e6e5407b7a7e0501d9a8c1f70a161010295ac845",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"processes": [
"25294 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/MacOS/大鱼调色",
"25432 /Applications/Final Cut Pro.app/Contents/MacOS/Final Cut Pro",
"25440 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service"
],
"method": "CUA native accessibility actions and rendered screenshots against signed notarized formal installation",
"checks": [
"inspector 1.22.6 and independent strength controls for every module including repeated LUT layer",
"workspace Chinese icon+text toolbar",
"primary common/tone/more settings groups reachable",
"vertical scrollbar visible; scroll to bottom exposes output settings",
"workspace primary strength 37% -> inspector 37%",
"inspector primary strength 62% -> workspace 62%",
"Final Cut Pro menu quit, plugin process ended, cold reopen -> 62% persisted",
"test strength restored to original 100%, final workspace primary/common selected",
"screen-tool menu exposes all image tools, mask help and details",
"level details show horizontal/vertical/measure/reset controls and rotation/zoom in panel"
],
"limitations": [
"Motion, complex media, HDR and retiming not retested",
"physical OSC drawing/eyedropper and level-line command activation not directly exercised this round",
"pixel interpolation at 0/50/100 and secure preset roundtrip covered by native GPU/fake-host regression, distinct from live UI checks",
"PKG installation scripts not run; formal APP installed and tested independently"
]
}
+162 -88
查看文件
@@ -1,6 +1,6 @@
{
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
"checks": 1113,
"checks": 1130,
"gpu": "Apple M4",
"limitations": [
"Finite states and a 64x48 frame; live FCP discovery, inspector interaction, timeline persistence and real host export require separate acceptance.",
@@ -12,7 +12,7 @@
"error": "未提供错误信息",
"name": "runtime-directory",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/594D4035-E2C1-4523-8D54-6FC0F73A5ADF"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/700B4F5F-D0C9-4C1F-8343-8BE769AE1AC7"
},
{
"descriptors": 285,
@@ -1272,7 +1272,7 @@
"error": "未提供错误信息",
"name": "renderer-export-33cube",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/594D4035-E2C1-4523-8D54-6FC0F73A5ADF/diagnostic-export.cube"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/700B4F5F-D0C9-4C1F-8343-8BE769AE1AC7/diagnostic-export.cube"
},
{
"bytes": 1186074,
@@ -1291,8 +1291,8 @@
"pass": true
},
{
"heartbeats": 2,
"maximumGapMS": 19.83687502797693,
"heartbeats": 1,
"maximumGapMS": 22.91674993466586,
"name": "external-activation-main-loop-responsive",
"pass": true
},
@@ -1783,8 +1783,8 @@
"closePixels": 128,
"name": "workspace-offscreen-compact-icons-and-close-render-pixels",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/594D4035-E2C1-4523-8D54-6FC0F73A5ADF/workspace-topbar.png",
"toolbarPixels": 3867
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/700B4F5F-D0C9-4C1F-8343-8BE769AE1AC7/workspace-topbar.png",
"toolbarPixels": 12524
},
{
"name": "workspace-content-and-scope-pane-explicitly-clip",
@@ -1802,7 +1802,7 @@
"closePixels": 128,
"name": "workspace-topbar-survives-minimum-resize-and-large-dirty-redraw",
"pass": true,
"toolbarPixels": 3867
"toolbarPixels": 11683
},
{
"name": "workspace-tracking-preview-replaces-scopes-with-readable-progress-and-image",
@@ -1854,7 +1854,7 @@
},
{
"name": "workspace-independent-style-fixture-inserted",
"node": "C19F8359-5999-49BB-8595-253DAEE7623C",
"node": "DC505ADD-E9D3-470A-8AEE-9D4C2B8CB2DF",
"pass": true,
"validDocument": true
},
@@ -1863,10 +1863,10 @@
"error": "none",
"name": "workspace-independent-style1-writes-target-node-inside-undo",
"nodePaths": {
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/594D4035-E2C1-4523-8D54-6FC0F73A5ADF/node.cube"
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/700B4F5F-D0C9-4C1F-8343-8BE769AE1AC7/node.cube"
},
"pass": true,
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/594D4035-E2C1-4523-8D54-6FC0F73A5ADF/user-new.cube",
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/700B4F5F-D0C9-4C1F-8343-8BE769AE1AC7/user-new.cube",
"undoStartsAfter": 3,
"undoStartsBefore": 2,
"written": true
@@ -1945,13 +1945,21 @@
"pass": true
},
{
"name": "workspace-toolbar-lists-every-inspector-tool-including-distortion",
"name": "workspace-toolbar-wraps-labelled-tools-without-hidden-buttons",
"pass": true
},
{
"name": "workspace-toolbar-adds-real-uuid-and-synchronizes-regular-inspector",
"pass": true
},
{
"name": "module-strength-workspace-to-inspector-and-host",
"pass": true
},
{
"name": "module-strength-inspector-to-workspace-and-host",
"pass": true
},
{
"name": "workspace-curve-coalesces-pending-samples",
"pass": true
@@ -1972,40 +1980,40 @@
"buttons": 6,
"frames": [
{
"button": "{{145, 2}, {24, 24}}",
"cell": "{{0, 0}, {174, 28}}",
"table": "{{145, 2}, {24, 24}}",
"visible": "{{0, 0}, {174, 229}}"
"button": "{{128, 2}, {24, 24}}",
"cell": "{{0, 0}, {157, 28}}",
"table": "{{128, 2}, {24, 24}}",
"visible": "{{0, 0}, {157, 173}}"
},
{
"button": "{{145, 2}, {24, 24}}",
"cell": "{{0, 0}, {174, 28}}",
"table": "{{145, 30}, {24, 24}}",
"visible": "{{0, 0}, {174, 229}}"
"button": "{{128, 2}, {24, 24}}",
"cell": "{{0, 0}, {157, 28}}",
"table": "{{128, 30}, {24, 24}}",
"visible": "{{0, 0}, {157, 173}}"
},
{
"button": "{{145, 2}, {24, 24}}",
"cell": "{{0, 0}, {174, 28}}",
"table": "{{145, 58}, {24, 24}}",
"visible": "{{0, 0}, {174, 229}}"
"button": "{{128, 2}, {24, 24}}",
"cell": "{{0, 0}, {157, 28}}",
"table": "{{128, 58}, {24, 24}}",
"visible": "{{0, 0}, {157, 173}}"
},
{
"button": "{{145, 2}, {24, 24}}",
"cell": "{{0, 0}, {174, 28}}",
"table": "{{145, 86}, {24, 24}}",
"visible": "{{0, 0}, {174, 229}}"
"button": "{{128, 2}, {24, 24}}",
"cell": "{{0, 0}, {157, 28}}",
"table": "{{128, 86}, {24, 24}}",
"visible": "{{0, 0}, {157, 173}}"
},
{
"button": "{{145, 2}, {24, 24}}",
"cell": "{{0, 0}, {174, 28}}",
"table": "{{145, 114}, {24, 24}}",
"visible": "{{0, 0}, {174, 229}}"
"button": "{{128, 2}, {24, 24}}",
"cell": "{{0, 0}, {157, 28}}",
"table": "{{128, 114}, {24, 24}}",
"visible": "{{0, 0}, {157, 173}}"
},
{
"button": "{{145, 2}, {24, 24}}",
"cell": "{{0, 0}, {174, 28}}",
"table": "{{145, 142}, {24, 24}}",
"visible": "{{0, 0}, {174, 229}}"
"button": "{{128, 2}, {24, 24}}",
"cell": "{{0, 0}, {157, 28}}",
"table": "{{128, 142}, {24, 24}}",
"visible": "{{0, 0}, {157, 173}}"
}
],
"name": "workspace-native-row-bypass-buttons-remain-visible-at-minimum-width",
@@ -2065,20 +2073,20 @@
"pass": true
},
{
"document": "{{0, 0}, {600.5, 295}}",
"document": "{{0, 0}, {600.5, 268}}",
"name": "workspace-default-wide-strip-keeps-entire-rectangle-editor-visible",
"pass": true,
"viewport": "{600.5, 295}"
"viewport": "{600.5, 268}"
},
{
"name": "workspace-mask-number-fields-accept-direct-editing",
"pass": true
},
{
"mask": "{{0, 0}, {600.5, 295}}",
"mask": "{{0, 0}, {600.5, 268}}",
"name": "workspace-mask-editor-and-assignments-fit-height-without-vertical-scrollers",
"pass": true,
"viewport": "{600.5, 295}"
"viewport": "{600.5, 268}"
},
{
"name": "workspace-deleting-selected-mask-clears-editor-and-all-shared-bindings",
@@ -2093,54 +2101,58 @@
"pass": true
},
{
"document": "{{0, 0}, {1727, 235}}",
"name": "workspace-horizontal-minimum-height-primary",
"document": "{{0, 0}, {407, 434}}",
"name": "workspace-discoverable-scroll-minimum-height-primary",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{407, 235}"
},
{
"document": "{{0, 0}, {514, 235}}",
"name": "workspace-horizontal-minimum-height-spider",
"name": "workspace-primary-three-pages-reach-common-tone-and-advanced-controls",
"pass": true
},
{
"document": "{{0, 0}, {514, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-spider",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"name": "workspace-spider-places-disc-left-and-parameters-right",
"pass": true
},
{
"document": "{{0, 0}, {896, 235}}",
"name": "workspace-horizontal-minimum-height-base",
"document": "{{0, 0}, {896, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-base",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {424, 235}}",
"name": "workspace-horizontal-minimum-height-skin",
"document": "{{0, 0}, {424, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-skin",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {1488, 235}}",
"name": "workspace-horizontal-minimum-height-look",
"document": "{{0, 0}, {1488, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-look",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"name": "workspace-look-shortcuts-fit-below-visible-lut-controls",
"pass": true
},
{
"document": "{{0, 0}, {424, 235}}",
"name": "workspace-horizontal-minimum-height-hsl",
"document": "{{0, 0}, {424, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-hsl",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"name": "workspace-hsl-swatch-and-axes-stay-together-424",
@@ -2155,67 +2167,67 @@
"pass": true
},
{
"document": "{{0, 0}, {544, 235}}",
"name": "workspace-horizontal-minimum-height-curve",
"document": "{{0, 0}, {544, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-curve",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {960, 235}}",
"name": "workspace-horizontal-minimum-height-grading",
"document": "{{0, 0}, {960, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-grading",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {424, 235}}",
"name": "workspace-horizontal-minimum-height-primaries",
"document": "{{0, 0}, {424, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-primaries",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {424, 235}}",
"name": "workspace-horizontal-minimum-height-levels",
"document": "{{0, 0}, {424, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-levels",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {600, 235}}",
"name": "workspace-horizontal-minimum-height-blackwhite",
"document": "{{0, 0}, {600, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-blackwhite",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {424, 235}}",
"name": "workspace-horizontal-minimum-height-balance",
"document": "{{0, 0}, {424, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-balance",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {600, 235}}",
"name": "workspace-horizontal-minimum-height-mixer",
"document": "{{0, 0}, {600, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-mixer",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {600, 235}}",
"name": "workspace-horizontal-minimum-height-film",
"document": "{{0, 0}, {600, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-film",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {424, 235}}",
"name": "workspace-horizontal-minimum-height-lens",
"document": "{{0, 0}, {424, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-lens",
"outside": [],
"pass": true,
"viewport": "{424, 235}"
"viewport": "{424, 218}"
},
{
"name": "workspace-background-remote-reply-attaches-only-current-session",
@@ -4523,6 +4535,68 @@
"name": "unified-zero-mask-is-exact-neutral",
"pass": true
},
{
"name": "module-strength-old-documents-default-to-full-without-migration",
"pass": true
},
{
"error": "未提供错误信息",
"name": "module-strength-base-zero-render",
"pass": true
},
{
"name": "module-strength-zero-preserves-negative-superwhite-and-alpha",
"pass": true
},
{
"error": "未提供错误信息",
"name": "module-strength-base-half-render",
"pass": true
},
{
"maximumError": 0.0009765625,
"name": "module-strength-half-matches-independent-linear-pixel-reference",
"pass": true
},
{
"error": "未提供错误信息",
"name": "module-strength-base-full-render",
"pass": true
},
{
"name": "module-strength-one-retains-exact-existing-output",
"pass": true
},
{
"error": "未提供错误信息",
"name": "module-strength-extra-zero-render",
"pass": true
},
{
"name": "module-strength-repeated-layer-zero-is-exact-bypass",
"pass": true
},
{
"error": "未提供错误信息",
"name": "module-strength-extra-half-render",
"pass": true
},
{
"name": "module-strength-independent-layer-half-matches-base",
"pass": true
},
{
"name": "module-strength-secure-preset-roundtrip",
"pass": true
},
{
"name": "module-strength-rejects-invalid-values-and-stale-node",
"pass": true
},
{
"name": "module-strength-delete-cleans-up-state-with-valid-document",
"pass": true
},
{
"error": "未提供错误信息",
"name": "unified-last-output",
@@ -4613,7 +4687,7 @@
"pass": true
},
{
"height": 3501,
"height": 4011,
"name": "inspector-default-opens-three-tools-and-retains-other-headers",
"pass": true,
"visibleModules": 15
@@ -5167,7 +5241,7 @@
{
"name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/594D4035-E2C1-4523-8D54-6FC0F73A5ADF/viewer-workspace.png"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/700B4F5F-D0C9-4C1F-8343-8BE769AE1AC7/viewer-workspace.png"
},
{
"name": "canvas-hsl-plot-captures-outside-and-commits-one-undo",
@@ -5566,6 +5640,6 @@
"pass": true
}
],
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/594D4035-E2C1-4523-8D54-6FC0F73A5ADF",
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/700B4F5F-D0C9-4C1F-8343-8BE769AE1AC7",
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
}
文件差异过大,未显示。 加载差异
@@ -0,0 +1,193 @@
{
"passResult": true,
"checks": 1130,
"sourceCommit": "e6e5407b7a7e0501d9a8c1f70a161010295ac845",
"version": "1.22.6",
"build": "143",
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document.",
"results": [
{
"name": "workspace-toolbar-wraps-labelled-tools-without-hidden-buttons",
"pass": true
},
{
"name": "module-strength-workspace-to-inspector-and-host",
"pass": true
},
{
"name": "module-strength-inspector-to-workspace-and-host",
"pass": true
},
{
"document": "{{0, 0}, {407, 434}}",
"name": "workspace-discoverable-scroll-minimum-height-primary",
"outside": [],
"pass": true,
"viewport": "{407, 235}"
},
{
"name": "workspace-primary-three-pages-reach-common-tone-and-advanced-controls",
"pass": true
},
{
"document": "{{0, 0}, {514, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-spider",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {896, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-base",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {424, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-skin",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {1488, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-look",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {424, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-hsl",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {544, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-curve",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {960, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-grading",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {424, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-primaries",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {424, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-levels",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {600, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-blackwhite",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {424, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-balance",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {600, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-mixer",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {600, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-film",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"document": "{{0, 0}, {424, 218}}",
"name": "workspace-discoverable-scroll-minimum-height-lens",
"outside": [],
"pass": true,
"viewport": "{424, 218}"
},
{
"name": "module-strength-old-documents-default-to-full-without-migration",
"pass": true
},
{
"error": "未提供错误信息",
"name": "module-strength-base-zero-render",
"pass": true
},
{
"name": "module-strength-zero-preserves-negative-superwhite-and-alpha",
"pass": true
},
{
"error": "未提供错误信息",
"name": "module-strength-base-half-render",
"pass": true
},
{
"maximumError": 0.0009765625,
"name": "module-strength-half-matches-independent-linear-pixel-reference",
"pass": true
},
{
"error": "未提供错误信息",
"name": "module-strength-base-full-render",
"pass": true
},
{
"name": "module-strength-one-retains-exact-existing-output",
"pass": true
},
{
"error": "未提供错误信息",
"name": "module-strength-extra-zero-render",
"pass": true
},
{
"name": "module-strength-repeated-layer-zero-is-exact-bypass",
"pass": true
},
{
"error": "未提供错误信息",
"name": "module-strength-extra-half-render",
"pass": true
},
{
"name": "module-strength-independent-layer-half-matches-base",
"pass": true
},
{
"name": "module-strength-secure-preset-roundtrip",
"pass": true
},
{
"name": "module-strength-rejects-invalid-values-and-stale-node",
"pass": true
},
{
"name": "module-strength-delete-cleans-up-state-with-valid-document",
"pass": true
}
]
}
+15 -15
查看文件
@@ -1,7 +1,7 @@
{
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.5.pkg",
"sha256": "194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a",
"bytes": 44585448,
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.6.pkg",
"sha256": "e43967ea2efa5ee83b7426e3cb28cefc9e46da0eb86500a5af459c652949eaa9",
"bytes": 44599258,
"testUnsigned": false,
"installationExecuted": false,
"checks": [
@@ -31,27 +31,27 @@
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.22.5",
"build": "142"
"version": "1.22.6",
"build": "143"
},
{
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-tajrrl43/大鱼调色",
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.a4340dea-8024-4218-bc7e-046705b3f2c4/8F4631C2-B8B7-4708-A9E0-6BC1060283E8/大鱼调色"
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-57wn_rer/大鱼调色",
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.446c8f83-33fd-413f-9be6-688535702e53/70974620-7DDD-462C-AB35-01DD41F995B0/大鱼调色"
}
],
"signature": "Package \"大鱼调色-1.22.5.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-16 17:10:47 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.5.pkg: accepted\nsource=Notarized Developer ID",
"signature": "Package \"大鱼调色-1.22.6.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-16 18:15:06 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.6.pkg: accepted\nsource=Notarized Developer ID",
"pass": true,
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
"notarization": {
"createdDate": "2026-11-16T18:15:09.148Z",
"status": "Accepted",
"id": "9ee8e167-6d03-4c1a-93bc-efab671754af",
"message": "Successfully received submission info",
"name": "大鱼调色-1.22.5.pkg",
"createdDate": "2026-11-16T17:10:50.468Z"
"name": "大鱼调色-1.22.6.pkg",
"id": "24871d91-fead-4193-9143-b95e7b2a76ac"
},
"appCompiledSource": "a1eb334840e1af285e878e7c094b06aaf01cba49",
"appBuild": "142",
"appCompiledSource": "e6e5407b7a7e0501d9a8c1f70a161010295ac845",
"appBuild": "143",
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
"residentAppClosing": {
"identifiers": [
@@ -127,6 +127,6 @@
"entries": 192,
"scope": "Read/traverse modes for installer-owned app entries, from the package BOM"
},
"installedAppHostAcceptance": "verification/HostControlsSync1.22.5.json",
"installedAppHostAcceptance": "verification/HostModuleStrength1.22.6.json",
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
}
+132
查看文件
@@ -0,0 +1,132 @@
{
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.6.pkg",
"sha256": "e43967ea2efa5ee83b7426e3cb28cefc9e46da0eb86500a5af459c652949eaa9",
"bytes": 44599258,
"testUnsigned": false,
"installationExecuted": false,
"checks": [
"PKG Developer ID Installer signature",
"PKG stapled ticket and Gatekeeper install assessment",
"must-close attached to root-authorized payload",
"all four FCP/Motion host identifiers",
"bundle relocation disabled",
"desktop and Bundle ID preinstall guards",
"postinstall contains actual FxPlug verification invocations",
"GUI worker, registration repair and Finder reveal present",
"successful completion and consecutive registration checks",
"exact payload contents: 大鱼调色.app",
"fixed FxPlug outer APP install path",
"outer APP has one real verification action",
"service path/identifier/registration version: com.dayu.color.XPC",
"nonempty FxPlug service manifest",
"payload APP signature, independent ticket and Gatekeeper",
"exact payload contents: 大鱼调色",
"login-user resource destination: ~/Movies/Motion Templates.localized/Effects.localized",
"complete outer APP payload present",
"welcome warns to save work and close hosts",
"conclusion gives manual APP and host restart instructions"
],
"resources": [
{
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.22.6",
"build": "143"
},
{
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-57wn_rer/大鱼调色",
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.446c8f83-33fd-413f-9be6-688535702e53/70974620-7DDD-462C-AB35-01DD41F995B0/大鱼调色"
}
],
"signature": "Package \"大鱼调色-1.22.6.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-16 18:15:06 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.6.pkg: accepted\nsource=Notarized Developer ID",
"pass": true,
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
"notarization": {
"createdDate": "2026-11-16T18:15:09.148Z",
"status": "Accepted",
"message": "Successfully received submission info",
"name": "大鱼调色-1.22.6.pkg",
"id": "24871d91-fead-4193-9143-b95e7b2a76ac"
},
"appCompiledSource": "e6e5407b7a7e0501d9a8c1f70a161010295ac845",
"appBuild": "143",
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
"residentAppClosing": {
"identifiers": [
"com.apple.FinalCut",
"com.apple.FinalCutApp",
"com.apple.motionapp",
"com.apple.motionappApp",
"com.dayu.color"
],
"preinstallGuardCount": 1,
"normalQuit": true
},
"packageEntryAdaptation": {
"upstreamEntrySHA256": "a1a8bc8920cfa2dfe4a7d65c4403eec8a8f3ec81b0736951578a81a80389bfc0",
"adaptedEntrySHA256": "4d9cef08673a690427de0757a5cfe42251d01aa47e40902a5155d46d01c71503",
"requiredApplication": "com.dayu.color"
},
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
"templateSHA256": {
"大鱼调色/大鱼调色.moef": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
"一级调色/一级调色.moef": "e4612f58eee5bf07a0a44cc5f6d65f9ca207b7f6946da938ed05f7d254ca7924",
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "68e91d3747a119e684f659093cb520a7fbd495336e8a1552316e52031e975ad5",
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
"基础调整/基础调整.moef": "ca6a584dd168990870fa774df8ba3fcfce5ad2e8de4d28bd656057fdaa1dbdca",
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
"肤色保护/肤色保护.moef": "06fdf5964f487a7cca3d6dce6e68013d3c0ba5b5c73c4bb392c7b58f5d916212",
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
"风格 LUT/风格 LUT.moef": "595f722d3ac99555d4e22611907b6273a3fb36fea59b8949be58eb1f7d319501",
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
"HSL/HSL.moef": "97bcbf240f86f485299c298d90f9339aa87a2751cef475e3d6a1637144d4ab13",
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
"曲线/曲线.moef": "3f235de32384a3b268982609583702d28470ed91c756f1b13947454f22bf3fc0",
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
"颜色分级/颜色分级.moef": "c49877ada4fa0ac49fa497b62f3a3e09bfe15f0d73b352bdfbeb0a9a2b7b1aad",
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
"三原色/三原色.moef": "6015ecc2cc89116b05d601df920ae674bad9ad4c6e7bad1f0eac889e08cda60d",
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
"色阶/色阶.moef": "b653b0981e0975605d2857a87bd495885d3370d3e9bcd9dc3a59b0012bf1f79e",
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
"黑白混色/黑白混色.moef": "96f2d1fc2fe5ed2a8eabdf3a3bf5eb7fff145d55a0ce05807dcd834d2b8e9b32",
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
"色彩平衡/色彩平衡.moef": "be935b1e399e2a47394b54b24fc2e32eb0622ae0cd28f83e1d2d895c3c1133d6",
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
"通道混合器/通道混合器.moef": "7c5889c052534edd0043f439f59fe31a987c9c626d9097ce7f3d7280a888b1e3",
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
"胶片模拟/胶片模拟.moef": "a559c654976ce711d01ef5b81ccaf01df8d81a9de501780cccc519fb72c4b7f2",
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
"镜头畸变修复/镜头畸变修复.moef": "5ddb7e97d718d1b78cbc162b042aed1debdd0fecd12b8596590d5de5307c19ae",
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
"CST 色彩空间转换/CST 色彩空间转换.moef": "96d684ec87cbef801316abd83a1c247360d9adf9dca52ae84881c400c898f1da",
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
},
"payloadBundleAccess": {
"entries": 192,
"scope": "Read/traverse modes for installer-owned app entries, from the package BOM"
},
"installedAppHostAcceptance": "verification/HostModuleStrength1.22.6.json",
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
}
+11 -2
查看文件
@@ -13,6 +13,15 @@
"LFSObjectsRequired": false,
"submodules": false,
"remoteRebuildPerformed": false,
"temporaryCloneRemoved": false,
"scope": "Compiled-source checkout retrieved via HTTPS, all versioned source/build/template/tool inputs compared with actual working source; pbxproj canonical property lists equal. Release-tag verification and clone cleanup pending."
"temporaryCloneRemoved": true,
"scope": "Independent HTTPS checkout of compiled source and final release tag; every release file present, clean tracked checkout and Git integrity checked. Working source/build/template inputs match compiled source, except equivalent pbxproj ordering. Release.json was regenerated after tag for this publication and is preserved in subsequent main evidence commit. No clean rebuild performed.",
"tag": "v1.22.5-controls-sync-20261117",
"releaseCommit": "a20e734f6691313771df67d91402c200fec0b401",
"trackedFilesInRelease": 1060,
"releaseFilesByteMatchedToCurrent": 1058,
"postTagGeneratedRecordDifferences": [
"verification/Release.json"
],
"packageSHA256": "194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a",
"packageBytes": 44585448
}
+9 -9
查看文件
@@ -3,15 +3,15 @@
"repository": "dayu/dayu-color",
"repositoryID": 52,
"private": false,
"tag": "v1.22.4-dji-gamut-20261116",
"releaseCommit": "c66a9ba9b683c66d59676111916d7d81da4ab8c7",
"releaseID": 449,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.4-dji-gamut-20261116",
"assetID": 78,
"assetName": "大鱼调色-1.22.4.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.22.4-dji-gamut-20261116/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.22.4.pkg",
"bytes": 44582577,
"sha256": "5bdee54986925565761d6a6ddd20c16047fc573f99564c9232a9e6afb410d992",
"tag": "v1.22.5-controls-sync-20261117",
"releaseCommit": "a20e734f6691313771df67d91402c200fec0b401",
"releaseID": 450,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.5-controls-sync-20261117",
"assetID": 79,
"assetName": "大鱼调色-1.22.5.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.22.5-controls-sync-20261117/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.22.5.pkg",
"bytes": 44585448,
"sha256": "194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a",
"existingAssetReused": true,
"verification": "Authenticated full download SHA-256 and byte count, then release/asset read-back.",
"credentialSource": "macOS Keychain: dayu-git-browser-read"
+18
查看文件
@@ -0,0 +1,18 @@
{
"passResult": true,
"repository": "dayu/dayu-color",
"repositoryID": 52,
"private": false,
"tag": "v1.22.5-controls-sync-20261117",
"releaseCommit": "a20e734f6691313771df67d91402c200fec0b401",
"releaseID": 450,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.5-controls-sync-20261117",
"assetID": 79,
"assetName": "大鱼调色-1.22.5.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.22.5-controls-sync-20261117/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.22.5.pkg",
"bytes": 44585448,
"sha256": "194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a",
"existingAssetReused": true,
"verification": "Authenticated full download SHA-256 and byte count, then release/asset read-back.",
"credentialSource": "macOS Keychain: dayu-git-browser-read"
}
@@ -0,0 +1,18 @@
{
"passResult": true,
"repository": "dayu/dayu-color",
"repositoryID": 52,
"private": false,
"tag": "v1.22.5-controls-sync-20261117",
"releaseCommit": "a20e734f6691313771df67d91402c200fec0b401",
"releaseID": 450,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.5-controls-sync-20261117",
"assetID": 79,
"assetName": "大鱼调色-1.22.5.pkg",
"downloadURL": "https://dayu.media/git/attachments/97201bb4-d56e-492f-bb06-85307e78bd6f",
"bytes": 44585448,
"sha256": "194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a",
"existingAssetReused": false,
"verification": "Authenticated full download SHA-256 and byte count, then release/asset read-back.",
"credentialSource": "macOS Keychain: dayu-git-browser-read"
}
+12 -9
查看文件
@@ -8,6 +8,7 @@
#import "DYManagedColor.h"
#include "DYSpiderScopeDrawing.h"
#include "DYScopeDisplayTime.h"
#include "DYLevelGeometry.h"
#include <cmath>
static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButton *b=[NSButton buttonWithTitle:title target:target action:action];b.bezelStyle=NSBezelStyleRounded;b.bordered=NO;b.font=[NSFont systemFontOfSize:11];b.accessibilityLabel=title;return b;}
@@ -115,7 +116,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
NSUInteger _session,_selectionID;
NSView *_toolPane,*_editorHost,*_toolbar,*_maskPane;NSScrollView *_toolbarScroll,*_layerScroll,*_maskScroll,*_assignmentScroll;
NSSplitView *_split;NSTableView *_layerTable;DYInspector *_toolEditor;NSView<DYWorkspaceMaskEditing> *_maskEditor;
NSTextField *_selectionTitle;NSButton *_addMask,*_deleteLayer;
NSTextField *_selectionTitle;NSButton *_addMask,*_deleteLayer;DYModuleStrengthControl *_moduleStrength;NSTextField *_screenHint,*_screenStatus;NSPopUpButton *_screenTools;NSButton *_screenDetails;NSString *_screenType;CGFloat _toolbarHeight;NSView *_screenSettings;NSTextField *_levelNumbers;
NSArray *_layerRows;NSDictionary *_toolDocument;NSString *_selectedNode,*_selectedMask,*_maskNode,*_editorNode;
id<PROAPIAccessing> _lutTarget;CMTime _toolTime;BOOL _refreshingStack,_sizingSplit,_hasUserSelection;CGFloat _splitFraction,_scopeFraction;
}
@@ -149,7 +150,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
- (void)dealloc{
[self close];_lifetime.owner=nil;[NSNotificationCenter.defaultCenter removeObserver:self];_root.owner=nil;
[_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_scopePlots release];[_trackingPreview release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_close release];[_hostScopes release];[_sizeMode release];[_title release];[_lastError release];[_lifetime release];
[_lutStrengthBar release];[_toolPane release];[_editorHost release];[_toolbar release];[_maskPane release];[_toolbarScroll release];[_layerScroll release];[_maskScroll release];[_assignmentScroll release];[_split release];[_layerTable release];[_toolEditor release];[_maskEditor release];[_selectionTitle release];[_addMask release];[_deleteLayer release];[_layerRows release];[_toolDocument release];[_selectedNode release];[_selectedMask release];[_maskNode release];[_editorNode release];[(id)_lutTarget release];[super dealloc];
[_screenSettings release];[_moduleStrength release];[_screenHint release];[_screenStatus release];[_screenTools release];[_screenDetails release];[_screenType release];[_lutStrengthBar release];[_toolPane release];[_editorHost release];[_toolbar release];[_maskPane release];[_toolbarScroll release];[_layerScroll release];[_maskScroll release];[_assignmentScroll release];[_split release];[_layerTable release];[_toolEditor release];[_maskEditor release];[_selectionTitle release];[_addMask release];[_deleteLayer release];[_layerRows release];[_toolDocument release];[_selectedNode release];[_selectedMask release];[_maskNode release];[_editorNode release];[(id)_lutTarget release];[super dealloc];
}
- (BOOL)visible{return _visible||_opening;}
- (NSString *)lastError{return _lastError;}
@@ -196,13 +197,15 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
}
- (void)layoutWorkspace{
CGFloat w=_root.bounds.size.width,h=_root.bounds.size.height;
_heading.hidden=YES;_toolbarScroll.frame=NSMakeRect(6,3,MAX(1,w-78),30);_sizeMode.frame=NSMakeRect(MAX(0,w-68),3,26,27);_close.frame=NSMakeRect(MAX(0,w-34),3,26,27);
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");
_sizingSplit=YES;_split.frame=NSMakeRect(0,36,w,MAX(1,h-36));_sizingSplit=NO;[self layoutToolWorkspace];
CGFloat ew=_editorHost.bounds.size.width;
_lutStrengthBar.frame=NSMakeRect(0,0,ew,34);_lutSlot.frame=NSMakeRect(8,5,105,24);
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);
_lutPane.frame=NSMakeRect(0,34,ew,MAX(1,_editorHost.bounds.size.height-34));_lutExplanation.hidden=YES;
_lutPane.frame=NSMakeRect(0,64,ew,MAX(1,_editorHost.bounds.size.height-64));_lutExplanation.hidden=YES;
CGFloat sw=_scopePane.bounds.size.width,sh=_scopePane.bounds.size.height;_description.frame=NSMakeRect(8,3,MAX(1,sw-50),19);_hostScopes.frame=NSMakeRect(sw-40,1,34,21);_status.hidden=YES;
_trackingPreview.frame=_scopePane.bounds;
CGFloat gap=4,pw=MAX(1,(sw-12-gap)/2),ph=MAX(1,(sh-30-gap)/2);for(NSUInteger i=0;i<_scopePlots.count;i++)[_scopePlots[i]setFrame:NSMakeRect(6+(i%2)*(pw+gap),26+(i/2)*(ph+gap),pw,ph)];
@@ -225,7 +228,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
}
}
- (void)pageChanged:(id)sender{
if(_editorMode==2)[self bindLUTTarget];_scopePane.hidden=NO;_lutPane.hidden=_editorMode!=2;_lutExplanation.hidden=YES;_toolEditor.hidden=_editorMode!=0;_maskPane.hidden=_editorMode!=1;_selectionTitle.hidden=_editorMode==2;_lutStrengthBar.hidden=_editorMode!=2;if(_editorMode==2)[self refreshLUTStrength];
if(_editorMode==2)[self bindLUTTarget];_scopePane.hidden=NO;_lutPane.hidden=_editorMode!=2;_lutExplanation.hidden=YES;_toolEditor.hidden=_editorMode!=0;_screenSettings.hidden=_editorMode!=3;_moduleStrength.hidden=_editorMode==3;_maskPane.hidden=_editorMode!=1;_selectionTitle.hidden=NO;_lutStrengthBar.hidden=_editorMode!=2;if(_editorMode==2)[self refreshLUTStrength];
CMTime currentTime=_toolTime,frameDuration=kCMTimeInvalid;BOOL exclusiveEnd=NO;
id<FxCustomParameterActionAPI_v4>action=[self actionAPI];if(_visible&&!_renderer.scopeEnabled&&action){[action startAction:self];@try{
currentTime=action.currentTime;
@@ -250,7 +253,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
- (void)previewChanged:(NSNotification *)notification{if(_visible&&_editorMode==2)[_browser updatePreview:[_renderer lookLUTPreviewFrames]];}
- (void)themeChanged:(NSNotification *)notification{[self updatePalette];}
- (void)updatePalette{
[_root setNeedsDisplay:YES];for(NSTextField *label in @[_heading,_description,_status,_lutExplanation])label.textColor=DYThemeColor(label==_heading?@"text":@"secondary");[_browser updatePalette:DYWorkspacePalette()];
_root.appearance=[NSAppearance appearanceNamed:DYThemeIsLight()?NSAppearanceNameAqua:NSAppearanceNameDarkAqua];[_root setNeedsDisplay:YES];for(NSTextField *label in @[_heading,_description,_status,_lutExplanation,_screenHint,_screenStatus,_levelNumbers])label.textColor=DYThemeColor(label==_heading?@"text":@"secondary");[_browser updatePalette:DYWorkspacePalette()];
}
- (void)ensureBrowser{
if(_browser.visible)return;[_browser release];_browser=nil;id<FxCustomParameterActionAPI_v4> action=[[self lutManager] apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!action){[self reportError:@"宿主暂时无法读取风格1"];return;}
+17 -8
查看文件
@@ -570,8 +570,8 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
b.toolTip=[DYThemeNames()[i] stringByAppendingString:@"主题"];b.accessibilityLabel=b.toolTip;[self addSubview:b];b.hidden=_embedded||_workspaceEditor;[themes addObject:b];
}_themeButtons=[themes copy];
if(!_embedded||_workspaceEditor)_scroll=[[DYInspectorScrollView alloc] initWithFrame:NSZeroRect];
_scroll.hasVerticalScroller=NO; _scroll.hasHorizontalScroller=_workspaceEditor;_scroll.scrollerStyle=NSScrollerStyleOverlay;_scroll.automaticallyAdjustsContentInsets=NO;_scroll.contentInsets=NSEdgeInsetsZero; _scroll.drawsBackground=NO;
_scroll.autohidesScrollers=YES; _scroll.borderType=NSNoBorder;
_scroll.hasVerticalScroller=_workspaceEditor&&[workspaceType isEqual:@"primary"]; _scroll.hasHorizontalScroller=_workspaceEditor&&![workspaceType isEqual:@"primary"];_scroll.scrollerStyle=_workspaceEditor?NSScrollerStyleLegacy:NSScrollerStyleOverlay;_scroll.automaticallyAdjustsContentInsets=NO;_scroll.contentInsets=NSEdgeInsetsZero; _scroll.drawsBackground=NO;
_scroll.autohidesScrollers=!_workspaceEditor; _scroll.borderType=NSNoBorder;
_scroll.clipsToBounds=YES;_scroll.wantsLayer=YES;_scroll.layer.masksToBounds=YES;
_scroll.contentView.clipsToBounds=YES;
_scroll.contentView.wantsLayer=YES;_scroll.contentView.layer.masksToBounds=YES;
@@ -734,6 +734,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
[card addSubview:reset];
NSMutableArray *body=[NSMutableArray array];
NSString *key=section[@"key"]?:@"";
if(_workspaceEditor&&[key isEqual:@"primary"]){NSSegmentedControl *pages=[NSSegmentedControl segmentedControlWithLabels:@[@"常用",@"影调",@"更多设置"] trackingMode:NSSegmentSwitchTrackingSelectOne target:self action:@selector(tabChanged:)];pages.identifier=@"primaryWorkspace";pages.selectedSegment=0;pages.accessibilityLabel=@"一级调色设置分组";[card addSubview:pages];[body addObject:pages];}
if([key isEqual:@"primary"]) {
NSButton *migrate=DYButton(@"旧版输入 → 改用 CST",self,@selector(useCST:));migrate.identifier=@"legacyInput";migrate.toolTip=@"保留旧工程输入效果;点击后改用上方 CST 设置,可撤销";[card addSubview:migrate];[body addObject:migrate];
}
@@ -842,12 +843,13 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
NSMutableDictionary *record=[NSMutableDictionary dictionaryWithDictionary:@{@"section":section,@"view":card,@"header":header,@"enabled":enabled,@"reset":reset,@"body":body,@"collapsed":@YES}];
if([key isEqual:@"look"]){NSButton *add=DYButton(@"+",self,@selector(addLook:));add.bordered=NO;add.font=[NSFont boldSystemFontOfSize:20];add.accessibilityLabel=@"添加风格 LUT";[card addSubview:add];record[@"add"]=add;}
id<PROAPIAccessing> host=_embedded?[(DYToolManager*)_manager host]:_manager;
NSString *nodeID=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:key];
NSString *nodeID=_embedded?[(DYToolManager*)_manager nodeID]:[key isEqual:@"output"]?@"output":[@"base:" stringByAppendingString:key];
DYToolMaskPanel *maskPanel=[[[DYToolMaskPanel alloc]initWithManager:host nodeID:nodeID]autorelease];[card addSubview:maskPanel];[body insertObject:maskPanel atIndex:0];record[@"maskPanel"]=maskPanel;
NSButton *mask=DYButton(@"",self,@selector(toolMask:));mask.tag=index;mask.bordered=NO;mask.identifier=@"layerAction";mask.image=[NSImage imageWithSystemSymbolName:@"circle.dashed.inset.filled" accessibilityDescription:@"添加蒙版"];mask.toolTip=@"添加本工具的独立蒙版";mask.accessibilityLabel=[section[@"title"]stringByAppendingString:@"添加蒙版"];[card addSubview:mask];record[@"maskButton"]=mask;
DYMaskCountBadge *maskBadge=[[[DYMaskCountBadge alloc]initWithFrame:NSZeroRect]autorelease];maskBadge.hidden=YES;maskBadge.accessibilityLabel=[section[@"title"] stringByAppendingString:@"蒙版数量"];[card addSubview:maskBadge];record[@"maskBadge"]=maskBadge;
NSButton *repeat=DYButton(@"",self,@selector(repeatTool:));repeat.tag=index;repeat.bordered=NO;repeat.identifier=@"layerAction";repeat.image=[NSImage imageWithSystemSymbolName:@"plus.square.on.square" accessibilityDescription:@"再加一层"];repeat.toolTip=@"紧接当前工具插入一层初始化工具";repeat.accessibilityLabel=[section[@"title"]stringByAppendingString:@"再加一层"];[card addSubview:repeat];record[@"repeatButton"]=repeat;
NSButton *remove=DYButton(@"",self,@selector(removeTool:));remove.tag=index;remove.bordered=NO;remove.identifier=@"layerAction";remove.image=[NSImage imageWithSystemSymbolName:@"minus.square" accessibilityDescription:@"删除此层"];remove.toolTip=@"删除此层并还原参数、LUT 与蒙版";remove.accessibilityLabel=[section[@"title"]stringByAppendingString:_embedded?@"删除此层":@"删除模块"];[card addSubview:remove];record[@"removeButton"]=remove;
if(!_workspaceEditor&&([DYToolTypes()containsObject:key]||[key isEqual:@"output"])){DYModuleStrengthControl *strength=[[[DYModuleStrengthControl alloc]initWithManager:host nodeID:nodeID]autorelease];strength.identifier=@"moduleStrength";[card addSubview:strength];record[@"strength"]=strength;}
[_cards addObject:record];
index++;
}
@@ -868,6 +870,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
}
- (BOOL)showRow:(NSView *)row section:(NSString *)section {
if(_workspaceEditor&&[row.identifier isEqual:@"toolMasks"])return NO;
if(_workspaceEditor&&[section isEqual:@"primary"]){NSString *key=row.identifier?:@"";if([key isEqual:@"primaryWorkspace"])return YES;NSInteger page=[_tabs[@"primaryWorkspace"]integerValue];NSArray *common=@[@"primaryBalance",@"cmexposure",@"cmsaturation",@"cmcontrast",@"cmpivot"],*tone=@[@"cmhiContrast",@"cmhiPivot",@"cmshadowContrast",@"cmshadowPivot",@"cmwhite",@"cmshoulder",@"cmhighlights",@"cmmidtones",@"cmshadows",@"cmblack",@"cmtoe"];NSInteger group=[common containsObject:key]?0:[tone containsObject:key]?1:2;if(group!=page)return NO;}
if([row.identifier isEqual:@"toolMasks"])return [(DYToolMaskPanel*)row contentHeight]>0;
NSString *key=row.identifier?:@"";NSInteger tab=[_tabs[section]integerValue];
if(!_embedded&&[section isEqual:@"base"]&&[key isEqual:@"skinEnabled"])for(NSDictionary *card in _cards)if([card[@"section"][@"key"]isEqual:@"skin"])return ![card[@"removed"]boolValue];
@@ -909,7 +912,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
[c[@"enabled"]setFrame:NSMakeRect(12,12,20,20)];
BOOL narrow=cw<300;CGFloat titleWidth=MIN(cw-(narrow?60:171),MAX(94,[[(NSButton *)c[@"header"]title]sizeWithAttributes:@{NSFontAttributeName:[NSFont boldSystemFontOfSize:12]}].width+36));
[c[@"header"]setFrame:NSMakeRect(42,8,titleWidth,28)];
CGFloat headerHeight=_workspaceEditor?0:narrow?69:43,buttonY=narrow?38:10;
CGFloat headerHeight=_workspaceEditor?0:narrow?69:43,buttonY=narrow?38:10;CGFloat strengthTop=headerHeight;if(c[@"strength"]){[c[@"strength"]setFrame:NSMakeRect(12,strengthTop,cw-24,30)];headerHeight+=34;}
if(_workspaceEditor)for(NSString *name in @[@"header",@"enabled",@"reset",@"repeatButton",@"removeButton",@"maskButton",@"maskBadge"])[c[name]setHidden:YES];
card.frame=NSMakeRect(16,y,cw,headerHeight+(contentHeight>0?contentHeight+8:0));y+=card.frame.size.height+12;
[c[@"reset"]setFrame:NSMakeRect(cw-34,buttonY,24,24)];
@@ -931,11 +934,16 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
if(_workspaceEditor){
// Keep module controls together, then distribute ordinary parameter
// columns across the actual viewport instead of a fixed 250pt strip.
CGFloat height=MAX(160,_scroll.contentSize.height-12),available=MAX(280,_scroll.contentSize.width-24),x=12;
CGFloat strengthHeight=c[@"strength"]?34:0;CGFloat height=MAX(126,_scroll.contentSize.height-12-strengthHeight),available=MAX(280,_scroll.contentSize.width-24),x=12;
NSMutableArray *rows=[NSMutableArray array],*graphics=[NSMutableArray array];NSView *tabs=nil;
for(NSView *row in body)if(!row.hidden){NSString *identifier=row.identifier?:@"";if([identifier isEqual:@"hslTabs"])tabs=row;
else if([identifier hasSuffix:@"Graph"]||[identifier isEqual:@"gradingWheels"]||[identifier isEqual:@"primaryBalance"])[graphics addObject:row];else [rows addObject:row];}
if([key isEqual:@"spider"]){
if([key isEqual:@"primary"]){
CGFloat top=42;NSInteger columns=available>=620?2:1;CGFloat rw=(available-16*(columns-1))/columns;NSInteger index=0;
for(NSView *row in rows){if([row.identifier isEqual:@"primaryWorkspace"]){row.frame=NSMakeRect(12,2,MIN(available,360),30);continue;}row.frame=NSMakeRect(12+(index%columns)*(rw+16),top+(index/columns)*36,rw,34);index++;}
CGFloat bottom=top+ceil(double(index)/columns)*36;for(NSView *graphic in graphics){graphic.frame=NSMakeRect(12,bottom,MIN(available,260),218);for(NSView *view in graphic.subviews)view.frame=graphic.bounds;bottom+=228;}
card.frame=NSMakeRect(0,6,_scroll.contentSize.width,MAX(_scroll.contentSize.height-6,bottom+8));y=NSMaxY(card.frame)+6;continue;
}else if([key isEqual:@"spider"]){
CGFloat groupWidth=MAX(490,available);_spiderPanel.frame=NSMakeRect(x,0,groupWidth,height);
for(NSView *row in rows)if([row.identifier isEqual:@"spiderMix"]){[_spiderPanel addSubview:row];_spiderPanel.accessoryRow=row;}
[_spiderPanel setNeedsLayout:YES];[_spiderPanel layoutSubtreeIfNeeded];x+=groupWidth;
@@ -993,7 +1001,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
}
_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));
@@ -1080,7 +1088,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
for(NSDictionary *card in _cards){
NSString *type=card[@"section"][@"key"];
BOOL removed=[type isEqual:@"output"]?!_unified:!_embedded&&DYBaseToolRemoved(tools,type);groupingChanged|=[card[@"removed"]boolValue]!=removed;((NSMutableDictionary *)card)[@"removed"]=@(removed);
[card[@"maskPanel"]refreshWithDocument:tools time:t];
[card[@"maskPanel"]refreshWithDocument:tools time:t];[(DYModuleStrengthControl*)card[@"strength"]refreshWithDocument:tools];
NSString *nodeID=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:card[@"section"][@"key"]];NSUInteger count=[DYMasksForTool(tools,nodeID) count];
[(DYMaskCountBadge*)card[@"maskBadge"]setCount:count];NSString *hint=count?[NSString stringWithFormat:@"已有 %lu 个蒙版;点击添加独立蒙版",(unsigned long)count]:@"添加本工具的独立蒙版";
[card[@"maskButton"]setToolTip:hint];[card[@"maskButton"]setAccessibilityHelp:hint];
@@ -1339,6 +1347,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
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,[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);}
@@ -3,7 +3,7 @@
- (void)postToolCanvasStatus:(NSString*)message {
NSString *node=nil,*maskID=nil;uint64_t revision;@synchronized(self){node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];revision=_toolCanvasRevision;}
dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;if(message&&![message isEqual:@"已选中本层蒙版"]&&DYSharedMaskWithID(self->_toolCanvasDocument,maskID)[@"stampSource"])self->_toolTrackingMessages[maskID]=message;
drawing=self->_toolDrawingPen||self->_toolDrawingShape||self->_toolDrawingStampReference||self->_toolCanvasCommitPending;}if(message){if(!self->_canvasStatusToast)self->_canvasStatusToast=[DYCanvasStatusToast new];[self->_canvasStatusToast showMessage:message];}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release];
drawing=self->_toolDrawingPen||self->_toolDrawingShape||self->_toolDrawingStampReference||self->_toolCanvasCommitPending;}if(message)DYPublishScreenToolInfo(self->_apiManager,nil,message);if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release];
}
- (void)discardToolCanvasDraft {
@synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=_toolDrawingShape=_toolDrawingStampReference=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil];
+1 -1
查看文件
@@ -58,4 +58,4 @@
- (CGFloat)layoutRepeatedToolsAfter:(NSString*)anchor y:(CGFloat)y width:(CGFloat)w {if(_embedded||_workspaceEditor||_measuringDefaultHeight)return y;for(NSString *ID in _stackOrder)if([_stackRoots[ID]isEqual:anchor]){DYInspector *child=_stackViews[ID];child.frame=NSMakeRect(0,y,w,MAX(60,child->_stackHeight));[child setNeedsLayout:YES];[child layoutSubtreeIfNeeded];CGFloat height=MAX(60,child->_stackHeight);child.frame=NSMakeRect(0,y,w,height);y+=height;}return y;}
- (void)resetRepeatedTool{if(!_embedded)return;id<PROAPIAccessing>host=[(DYToolManager*)_manager host];id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSMutableDictionary *node=(id)DYToolWithID(doc,[(DYToolManager*)_manager nodeID]);if(!node)return;NSDictionary *fresh=DYNewTool(node[@"type"]);node[@"values"]=DYMutablePlist(fresh[@"values"]);if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms root;DYReadUniforms(host,a.currentTime,&root);DYSeedPrimaryWorkingSpace(node,root.cm.workingTransfer,root.cm.workingGamut);}node[@"paths"]=@{};[node removeObjectForKey:@"spider"];node[@"spiderLinked"]=@YES;id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"还原独立工具层"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[self postChanged];}
- (void)resetRepeatedTool{if(!_embedded)return;id<PROAPIAccessing>host=[(DYToolManager*)_manager host];id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSMutableDictionary *node=(id)DYToolWithID(doc,[(DYToolManager*)_manager nodeID]);if(!node)return;NSDictionary *fresh=DYNewTool(node[@"type"]);node[@"values"]=DYMutablePlist(fresh[@"values"]);if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms root;DYReadUniforms(host,a.currentTime,&root);DYSeedPrimaryWorkingSpace(node,root.cm.workingTransfer,root.cm.workingGamut);}DYSetToolStrength(doc,node[@"id"],1);node[@"paths"]=@{};[node removeObjectForKey:@"spider"];node[@"spiderLinked"]=@YES;id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"还原独立工具层"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[self postChanged];}
+3 -16
查看文件
@@ -105,17 +105,7 @@
- (void)drawLevelControls {
if(!_levelMode)return;
NSRect viewport=NSIntersectionRect(_imageRect,NSMakeRect(0,0,_canvasWidth,_height));
CGFloat scale=MIN(_uiScale,NSWidth(viewport)/420.);
NSRect prompt=NSMakeRect(NSMinX(viewport)+8*scale,NSMinY(viewport)+8*scale,400*scale,72*scale);
DYDrawSoftControl(prompt,4*scale,NO,NO,NO);
NSString *title=_levelFailure?:(_levelSaving?@"正在保存水平校正…":_levelPlaced?@"拖动端点修正 · 空白处重画 · Esc 收起":_levelHasFirst?@"选择参考线终点 · Esc 取消":@"点击两点或拖出参考线 · Esc 收起");
NSDictionary *attrs=@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:12*scale]};
[title drawInRect:NSMakeRect(NSMinX(prompt)+6*scale,NSMinY(prompt)+5*scale,388*scale,18*scale) withAttributes:attrs];
DYLevelTransform result(_levelAngle,_level.aspect);
NSString *numbers=[NSString stringWithFormat:@"FCP 旋转 %+.2f° 缩放 %.2f%%(增加 %.2f%%)",-_levelAngle*180/M_PI,result.zoom*100,(result.zoom-1)*100];
[numbers drawInRect:NSMakeRect(NSMinX(prompt)+6*scale,NSMinY(prompt)+27*scale,388*scale,18*scale) withAttributes:attrs];
NSString *hint=_viewerControls.levelMeasureOnly?@"仅测量:数值用于原始变换;已有缩放请乘以上述比例。":@"插件已应用;改用原始变换前,请切换「仅测量」。";
[hint drawInRect:NSMakeRect(NSMinX(prompt)+6*scale,NSMinY(prompt)+49*scale,388*scale,18*scale) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:10*scale]}];
NSString *title=_levelFailure?:(_levelSaving?@"正在保存水平校正…":_levelPlaced?@"拖动端点修正;空白处重画;Esc 收起":_levelHasFirst?@"选择参考线终点;Esc 取消":@"点击两点或拖出参考线;Esc 收起");DYLevelTransform result(_levelAngle,_level.aspect);NSString *numbers=[NSString stringWithFormat:@"%@ · FCP旋转 %+.2f° · 缩放 %.2f%%%@",title,-_levelAngle*180/M_PI,result.zoom*100,_viewerControls.levelMeasureOnly?@" · 仅测量":@""];[_viewerControls.bridge publishScreenTool:@"level" message:numbers];
if(!_levelHasFirst&&!_levelPlaced)return;
NSPoint first=[self canvasDisplayPoint:_level.toOutput(_levelFirst)],last=[self canvasDisplayPoint:_level.toOutput(_levelLast)];
[NSGraphicsContext saveGraphicsState];NSRectClip(viewport);
@@ -173,10 +163,7 @@
- (void)drawStampControls{
NSArray *source=_mask[@"stampSource"];
if(_viewerControls.stampArmed){
NSRect cell=NSUnionRect([self stampControlRect:0],[self stampControlRect:3]);
DYDrawSoftControl(cell,4,NO,NO,NO);
NSString *prompt=_stampSaving?@"正在保存仿制图章…":_stampFailure?:(_stampHasSource?@"拖出要覆盖的椭圆 · Esc 取消":@"点击画面选择取样中心 · Esc 取消");
[prompt drawInRect:NSInsetRect(cell,6,4) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:MAX(8.,NSHeight(cell)*.48)]}];
NSString *prompt=_stampSaving?@"正在保存仿制图章…":_stampFailure?:(_stampHasSource?@"拖出要覆盖的椭圆;Esc 取消":@"点击画面选择取样中心;Esc 取消");[_viewerControls.bridge publishScreenTool:@"cloneStamp" message:prompt];
if(_stampHasSource)[self drawStampSource:_stampSource];
if(_stampDragging||_stampSaving||_stampFailure){
NSRect target=[self stampTarget];
@@ -238,7 +225,7 @@
for(NSInteger item=9;item<=10;item++){NSString *title=item==9?@"✓ 完成":@"取消";NSRect cell=[self toolbarRectForItem:item];CGFloat size=cell.size.height*.48;[title drawInRect:NSInsetRect(cell,0,MAX(0.,(cell.size.height-size-3)/2))withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:size weight:NSFontWeightMedium],NSForegroundColorAttributeName:NSColor.whiteColor,NSShadowAttributeName:shadow,NSParagraphStyleAttributeName:style}];}
}
}if(_levelMode)[self drawLevelControls];else [self drawStampControls];[_viewerControls draw];
if(_hslSampling){NSRect prompt=[self hslPickerRect];DYDrawSoftControl(prompt,4,NO,NO,NO);[@"HSL 吸管:点击画面取色 · Esc 取消" drawInRect:NSInsetRect(prompt,7*_uiScale,5*_uiScale) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:11*_uiScale]}];}
if(_hslSampling)[_viewerControls.bridge publishScreenTool:@"hsl" message:@"HSL 吸管:点击画面取色;Esc 取消"];
[NSGraphicsContext restoreGraphicsState];CIImage *overlay=[CIImage imageWithCGImage:bitmap.CGImage options:@{kCIImageColorSpace:NSNull.null}];overlay=[overlay imageByApplyingTransform:CGAffineTransformMakeTranslation(NSMinX(region),texture.height-NSMaxY(region))];[_context render:overlay toMTLTexture:texture commandBuffer:commands bounds:CGRectMake(0,0,texture.width,texture.height) colorSpace:nil];
}[commands commit];[commands waitUntilCompleted];
}}}
+2 -1
查看文件
@@ -83,9 +83,10 @@
- (BOOL)renderToolsSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
if(!tools)tools=@{@"schema":@1,@"layers":@[],@"baseMasks":@{}};if(!DYValidToolDocument(tools))return fail(error,@"工具或蒙版数据损坏,未更改原工程");
if(tools[@"sharedMasks"])tools=DYResolvedToolDocument(tools);
NSMutableDictionary *weighted=[[tools mutableCopy]autorelease],*baseWeights=[NSMutableDictionary dictionaryWithDictionary:tools[@"baseMasks"]?:@{}];for(NSString *type in DYToolTypes()){double amount=DYToolStrength(tools,[@"base:" stringByAppendingString:type]);if(amount<1)baseWeights[type]=DYToolStrengthMasks(baseWeights[type],amount);}weighted[@"baseMasks"]=baseWeights;NSMutableArray *weightedLayers=[NSMutableArray array];for(NSDictionary *node in tools[@"layers"]){NSMutableDictionary *copy=[[node mutableCopy]autorelease];double amount=DYToolStrength(tools,node[@"id"]);copy[@"masks"]=DYToolStrengthMasks(node[@"masks"],amount);copy[@"renderStrength"]=@(amount);[weightedLayers addObject:copy];}weighted[@"layers"]=weightedLayers;NSMutableArray *bypassed=[NSMutableArray arrayWithArray:tools[@"removedBase"]?:@[]];for(NSString *type in DYToolTypes())if(DYToolStrength(tools,[@"base:" stringByAppendingString:type])==0&&![bypassed containsObject:type])[bypassed addObject:type];if(bypassed.count)weighted[@"removedBase"]=bypassed;tools=weighted;
DYApplyRemovedBaseTools(&u,tools);paths=DYVisibleBaseToolPaths(paths,tools);if(DYBaseToolRemoved(tools,@"spider"))spider=nil;
NSMutableSet *activeIDs=nil;BOOL anchored=NO;
for(NSDictionary *node in tools[@"layers"])if(!DYToolIsNeutral(node)){
for(NSDictionary *node in tools[@"layers"])if([node[@"renderStrength"]doubleValue]>0&&!DYToolIsNeutral(node)){
if(!activeIDs)activeIDs=[NSMutableSet set];
[activeIDs addObject:node[@"id"]];
anchored|=![DYToolRootAnchor(tools,node[@"id"])isEqual:@"tail"];
+11
查看文件
@@ -20,6 +20,17 @@ NSDictionary *DYNewTool(NSString *type);
// layers without an anchor retain their historical end-of-chain semantics.
NSDictionary *DYInsertTool(NSMutableDictionary *document,NSString *type,NSString *afterID);
BOOL DYRemoveTool(NSMutableDictionary *document,NSString *nodeID);
NSDictionary *DYScreenToolCatalog(void);
void DYPublishScreenToolInfo(id host,NSString *type,NSString *message);
NSDictionary *DYCurrentScreenToolInfo(id host);
double DYToolStrength(NSDictionary *document,NSString *nodeID);
BOOL DYSetToolStrength(NSMutableDictionary *document,NSString *nodeID,double strength);
// Runtime-only constant intersection; never consumes an authored mask slot.
NSArray *DYToolStrengthMasks(NSArray *masks,double strength);
@interface DYModuleStrengthControl : NSView
- (instancetype)initWithManager:(id<PROAPIAccessing>)manager nodeID:(NSString*)nodeID;
- (void)refreshWithDocument:(NSDictionary*)document;
@end
NSArray *DYToolDisplayOrder(NSDictionary *document);
NSArray *DYUnifiedRenderOrder(NSDictionary *document);
NSString *DYToolRootAnchor(NSDictionary *document,NSString *nodeID);
+58 -2
查看文件
@@ -7,6 +7,10 @@
#import <CommonCrypto/CommonDigest.h>
#import <os/log.h>
static char DYScreenInfoKey;
NSDictionary *DYScreenToolCatalog(void){static NSDictionary *catalog;static dispatch_once_t once;dispatch_once(&once,^{catalog=[@{@"curve":@"点击曲线加点,拖动调整;通道、整体强度和精细参数在面板中设置。",@"lens":@"拖动画面网格调整畸变,拖动中心点定位光学中心;缩放与强度在详情中设置。",@"skin":@"切换画面肤色保护区域;保护程度、色相及人脸限定在详情中设置。",@"look":@"在控制面板选择 LUT;整体强度与各风格位置的强度分别调节。",@"whiteBalance":@"点击画面中的中性白色或灰色取样;Esc 取消,色温和色调可在详情中精调。",@"cloneStamp":@"先点击取样中心,再拖出覆盖区域;取样、羽化、参考区域和跟踪在蒙版详情中设置。",@"level":@"点击两点或拖出参考线;水平、垂直、仅测量和重置在详情中设置。",@"mosaic":@"选择人脸或已绘制蒙版,调整方块大小;蒙版跟踪保留在蒙版详情中。",@"rectangle":@"在画面拖出矩形,松开保存;位置、尺寸、羽化、强度及跟踪在蒙版详情中设置。",@"ellipse":@"在画面拖出椭圆,松开保存;位置、尺寸、羽化、强度及跟踪在蒙版详情中设置。",@"pen":@"点击放点,拖出曲柄,点首节点或回车闭合;Esc 取消,删除键撤回最后一点。"}copy];});return catalog;}
NSDictionary *DYCurrentScreenToolInfo(id host){return objc_getAssociatedObject(host,&DYScreenInfoKey);}
void DYPublishScreenToolInfo(id host,NSString *type,NSString *message){if(!host)return;dispatch_async(dispatch_get_main_queue(),^{NSDictionary *old=DYCurrentScreenToolInfo(host);NSString *kind=type?:old[@"type"]?:@"";NSDictionary *info=@{@"type":kind,@"message":message?:DYScreenToolCatalog()[kind]?:@""};if([old isEqual:info])return;objc_setAssociatedObject(host,&DYScreenInfoKey,info,OBJC_ASSOCIATION_COPY_NONATOMIC);[NSNotificationCenter.defaultCenter postNotificationName:@"DYScreenToolInfo" object:host userInfo:info];});}
NSArray *DYToolTypes(void){return @[@"primary",@"spider",@"base",@"skin",@"look",@"hsl",@"curve",@"grading",@"primaries",@"levels",@"blackwhite",@"balance",@"mixer",@"film",@"lens"];}
NSDictionary *DYToolSection(NSString *type){for(NSDictionary *s in DYSections())if([s[@"key"]isEqual:type])return s;return nil;}
static NSArray *DYBaseToolParts(NSString *type){return [type isEqual:@"primary"]?@[@"input",@"primary",@"output"]:[type isEqual:@"base"]?@[@"base",@"color"]:@[type];}
@@ -29,7 +33,7 @@ NSArray<NSDictionary *> *DYBaseToolDescriptors(NSString *type){return DYToolRemo
BOOL DYBaseToolRemoved(NSDictionary *doc,NSString *type){return [doc[@"removedBase"]containsObject:type];}
BOOL DYSetBaseToolRemoved(NSMutableDictionary *doc,NSString *type,BOOL removed){
if(!DYValidToolDocument(doc)||![DYToolTypes()containsObject:type])return NO;
NSMutableArray *types=[NSMutableArray arrayWithArray:doc[@"removedBase"]?:@[]];[types removeObject:type];if(removed){[types addObject:type];[doc[@"baseMasks"]removeObjectForKey:type];}
NSMutableArray *types=[NSMutableArray arrayWithArray:doc[@"removedBase"]?:@[]];[types removeObject:type];if(removed){[types addObject:type];[doc[@"baseMasks"]removeObjectForKey:type];[doc[@"strengths"]removeObjectForKey:[@"base:" stringByAppendingString:type]];}
if(types.count)doc[@"removedBase"]=types;else[doc removeObjectForKey:@"removedBase"];return YES;
}
void DYApplyRemovedBaseTools(DYUniforms *u,NSDictionary *doc){
@@ -126,6 +130,7 @@ static BOOL validMasks(id masks,NSMutableSet *ids,NSSet *sharedIDs,BOOL referenc
static NSData *DYValidatedToolData(NSDictionary *doc){
if(![NSPropertyListSerialization propertyList:doc isValidForFormat:NSPropertyListBinaryFormat_v1_0])return nil;
if(![doc isKindOfClass:NSDictionary.class]||(![doc[@"schema"]isEqual:@1]&&![doc[@"schema"]isEqual:@2]&&![doc[@"schema"]isEqual:@3])||![doc[@"layers"]isKindOfClass:NSArray.class]||[doc[@"layers"]count]>DYToolLimit||![doc[@"baseMasks"]isKindOfClass:NSDictionary.class]||[doc[@"baseMasks"]count]>DYToolTypes().count)return nil;
id starter=doc[@"starterTool"],level=doc[@"levelRotation"];
id mosaic=doc[@"mosaic"];
if(mosaic){
@@ -152,6 +157,7 @@ static NSData *DYValidatedToolData(NSDictionary *doc){
for(NSString *key in node[@"values"]){NSDictionary *d=descriptors[key];id v=node[@"values"][key];if(!d||!finiteNumber(v)||[v doubleValue]<[d[@"min"]doubleValue]||[v doubleValue]>[d[@"max"]doubleValue]||(d[@"values"]&&![d[@"values"]containsObject:@((int)llround([v doubleValue]))]))return nil;}
for(id key in node[@"paths"]){id p=node[@"paths"][key];if(![@[@"input",@"look0",@"look1",@"look2",@"look3",@"look4"]containsObject:key]||![p isKindOfClass:NSString.class]||[p length]>8192||![p isAbsolutePath]||![[p pathExtension].lowercaseString isEqual:@"cube"])return nil;}if(node[@"spider"]&&(![node[@"spider"]isKindOfClass:NSData.class]||!DYSpiderMeshIsValid(node[@"spider"])))return nil;
}
id strengths=doc[@"strengths"];if(strengths){if(![strengths isKindOfClass:NSDictionary.class]||[strengths count]>DYToolLimit+DYToolTypes().count+1)return nil;for(id ID in strengths){id value=strengths[ID];if(![ID isKindOfClass:NSString.class]||!finiteNumber(value)||[value doubleValue]<0||[value doubleValue]>1)return nil;BOOL base=[ID hasPrefix:@"base:"]&&[DYToolTypes()containsObject:[ID substringFromIndex:5]];if(!base&&![ID isEqual:@"output"]&&!DYToolWithID(doc,ID))return nil;}}
// Anchors are stable identities, never an array index or a translated title.
// Reject unknown anchors/cycles so layout, rendering and undo share one order.
for(NSDictionary *node in doc[@"layers"]){id after=node[@"after"];if(!after)continue;if([doc[@"schema"]isEqual:@1]||![after isKindOfClass:NSString.class])return nil;NSMutableSet *seen=[NSMutableSet setWithObject:node[@"id"]];while(after){if([after hasPrefix:@"base:"]){if(![DYToolTypes()containsObject:[after substringFromIndex:5]])return nil;break;}if([seen containsObject:after])return nil;[seen addObject:after];NSDictionary *parent=DYToolWithID(doc,after);if(!parent)return nil;after=parent[@"after"];}}
@@ -175,12 +181,23 @@ BOOL DYValidToolDocument(NSDictionary *doc){return DYValidatedToolData(doc)!=nil
DYToolDocument *DYReadTools(id<PROAPIAccessing>m,CMTime t){DYToolDocument *d=nil;[[(id)m apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&d fromParameter:DYToolsParameterID atTime:t];return [d isKindOfClass:DYToolDocument.class]?d:[[[DYToolDocument alloc]init]autorelease];}
BOOL DYWriteTools(id<PROAPIAccessing>m,NSDictionary *d,CMTime t){NSData *data=DYValidatedToolData(d);if(!data)return NO;DYToolDocument *v=[[[DYToolDocument alloc]init]autorelease];[v setImmutableDocument:[NSPropertyListSerialization propertyListWithData:data options:NSPropertyListImmutable format:NULL error:nil]];return [[m apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:v toParameter:DYToolsParameterID atTime:t];}
NSDictionary *DYToolWithID(NSDictionary *doc,NSString *ID){for(NSDictionary *n in doc[@"layers"])if([n[@"id"]isEqual:ID])return n;return nil;}
double DYToolStrength(NSDictionary *doc,NSString *ID){NSNumber *value=doc[@"strengths"][ID?:@""];return value?value.doubleValue:1;}
BOOL DYSetToolStrength(NSMutableDictionary *doc,NSString *ID,double strength){
if(!DYValidToolDocument(doc)||!std::isfinite(strength)||strength<0||strength>1)return NO;
BOOL base=[ID hasPrefix:@"base:"]&&[DYToolTypes()containsObject:[ID substringFromIndex:5]];
if(!base&&![ID isEqual:@"output"]&&!DYToolWithID(doc,ID))return NO;
NSMutableDictionary *values=[NSMutableDictionary dictionaryWithDictionary:doc[@"strengths"]?:@{}];if(strength==1)[values removeObjectForKey:ID];else values[ID]=@(strength);if(values.count)doc[@"strengths"]=values;else[doc removeObjectForKey:@"strengths"];return YES;
}
NSArray *DYToolStrengthMasks(NSArray *masks,double strength){
if(strength>=1)return masks?:@[];NSMutableArray *result=[NSMutableArray arrayWithArray:masks?:@[]];DYMaskParameters p=dyDefaultMaskParameters();p.kind=DYMaskRectangle;p.width=p.height=4000;p.feather=0;p.outputBlack=p.outputWhite=1;p.strength=strength;
[result addObject:@{@"enabled":@YES,@"combine":@2,@"parameters":parameterData(p),@"nodes":[NSData data],@"keys":@[]}];return result;
}
static void DYAppendToolChildren(NSDictionary *doc,NSString *parent,NSMutableArray *order,NSMutableSet *seen){for(NSDictionary *node in doc[@"layers"])if([node[@"after"]isEqual:parent]&&![seen containsObject:node[@"id"]]){[seen addObject:node[@"id"]];[order addObject:node[@"id"]];DYAppendToolChildren(doc,node[@"id"],order,seen);}}
NSArray *DYToolDisplayOrder(NSDictionary *doc){NSMutableArray *order=[NSMutableArray array];NSMutableSet *seen=[NSMutableSet set];for(NSString *type in DYToolTypes()){NSString *base=[@"base:" stringByAppendingString:type];[order addObject:base];DYAppendToolChildren(doc,base,order,seen);}for(NSDictionary *node in doc[@"layers"])if(!node[@"after"]&&![seen containsObject:node[@"id"]]){[seen addObject:node[@"id"]];[order addObject:node[@"id"]];DYAppendToolChildren(doc,node[@"id"],order,seen);}return order;}
NSString *DYToolRootAnchor(NSDictionary *doc,NSString *ID){NSMutableSet *seen=[NSMutableSet set];NSDictionary *node=DYToolWithID(doc,ID);while(node[@"after"]){NSString *after=node[@"after"];if([after hasPrefix:@"base:"])return after;if([seen containsObject:after])return nil;[seen addObject:after];node=DYToolWithID(doc,after);}return @"tail";}
NSArray *DYUnifiedRenderOrder(NSDictionary *doc){NSMutableArray *order=[NSMutableArray arrayWithArray:DYToolDisplayOrder(doc)];NSString *after=doc[@"outputAfter"]?:@"tail";NSUInteger index=[order indexOfObject:after];[order insertObject:@"output" atIndex:index==NSNotFound?order.count:index+1];return order;}
NSDictionary *DYInsertTool(NSMutableDictionary *doc,NSString *type,NSString *after){if(!DYValidToolDocument(doc)||[doc[@"layers"]count]>=DYToolLimit)return nil;if(!([after hasPrefix:@"base:"]&&[DYToolTypes()containsObject:[after substringFromIndex:5]])&&!DYToolWithID(doc,after))return nil;NSDictionary *fresh=DYNewTool(type);if(!fresh)return nil;NSMutableDictionary *node=DYMutablePlist(fresh);node[@"after"]=after;NSMutableArray *layers=doc[@"layers"];for(NSMutableDictionary *old in layers)if([old[@"after"]isEqual:after])old[@"after"]=node[@"id"];NSUInteger index=0;NSDictionary *parent=DYToolWithID(doc,after);if(parent)index=[layers indexOfObjectIdenticalTo:parent]+1;[layers insertObject:node atIndex:MIN(index,layers.count)];if(![doc[@"schema"]isEqual:@3])doc[@"schema"]=@2;return node;}
BOOL DYRemoveTool(NSMutableDictionary *doc,NSString *ID){NSMutableDictionary *node=(id)DYToolWithID(doc,ID);if(!node)return NO;NSString *after=node[@"after"];if([doc[@"outputAfter"]isEqual:ID])doc[@"outputAfter"]=after?:@"tail";for(NSMutableDictionary *child in doc[@"layers"])if([child[@"after"]isEqual:ID]){if(after)child[@"after"]=after;else[child removeObjectForKey:@"after"];}[doc[@"layers"]removeObject:node];return YES;}
BOOL DYRemoveTool(NSMutableDictionary *doc,NSString *ID){NSMutableDictionary *node=(id)DYToolWithID(doc,ID);if(!node)return NO;NSString *after=node[@"after"];if([doc[@"outputAfter"]isEqual:ID])doc[@"outputAfter"]=after?:@"tail";for(NSMutableDictionary *child in doc[@"layers"])if([child[@"after"]isEqual:ID]){if(after)child[@"after"]=after;else[child removeObjectForKey:@"after"];}[doc[@"layers"]removeObject:node];[doc[@"strengths"]removeObjectForKey:ID];return YES;}
NSArray *DYSharedMasks(NSDictionary *doc){return [doc[@"sharedMasks"]isKindOfClass:NSArray.class]?doc[@"sharedMasks"]:@[];}
NSDictionary *DYSharedMaskWithID(NSDictionary *doc,NSString *ID){for(NSDictionary *mask in DYSharedMasks(doc))if([mask[@"id"]isEqual:ID])return mask;return nil;}
static NSArray *DYRawMasksForTool(NSDictionary *doc,NSString *ID){return [ID hasPrefix:@"base:"]?doc[@"baseMasks"][[ID substringFromIndex:5]]?:@[]:DYToolWithID(doc,ID)[@"masks"]?:@[];}
@@ -500,3 +517,42 @@ BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms
- (BOOL)getCustomParameterValue:(id*)out fromParameter:(UInt32)pid atTime:(CMTime)t{if(pid==DYAssetsParameterID){DYAssetState *a=[[[DYAssetState alloc]init]autorelease];NSDictionary *n=[self node];a.paths=n[@"paths"]?:@{};a.spiderMesh=n[@"spider"];a.spiderLinked=[n[@"spiderLinked"]boolValue];*out=a;return YES;}if(pid==DYInspectorParameterID){DYInspectorToken *global=_token; if(!global)[[_host apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&global fromParameter:pid atTime:t];DYInspectorToken *local=[[[DYInspectorToken alloc]init]autorelease];NSMutableDictionary *folds=[NSMutableDictionary dictionary];for(NSString *key in global.folds)if([key hasPrefix:[_nodeID stringByAppendingString:@":"]])folds[[key substringFromIndex:_nodeID.length+1]]=global.folds[key];local.folds=folds;*out=local;return YES;}return NO;}
- (BOOL)setCustomParameterValue:(id)v toParameter:(UInt32)pid atTime:(CMTime)t{if(!_depth)return NO;NSMutableDictionary *n=(id)[self node];if(!n)return NO;if(pid==DYAssetsParameterID&&[v isKindOfClass:DYAssetState.class]){n[@"paths"]=DYMutablePlist([v paths]);if([v spiderMesh])n[@"spider"]=[v spiderMesh];else[n removeObjectForKey:@"spider"];n[@"spiderLinked"]=@([v spiderLinked]);return YES;}if(pid==DYInspectorParameterID){DYInspectorToken *old=nil;[[_host apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&old fromParameter:pid atTime:t];[_token release];_token=old?[old copy]:[DYInspectorToken new];NSMutableDictionary *folds=[[_token.folds mutableCopy]autorelease];for(NSString *key in [v folds])folds[[_nodeID stringByAppendingFormat:@":%@",key]]=[v folds][key];_token.folds=folds;return YES;}return NO;}
@end
#import "DYTheme.h"
@interface DYModuleStrengthControl (Gesture)
- (void)beginStrengthGesture;
- (void)endStrengthGesture;
@end
@interface DYModuleStrengthSlider : NSSlider @end
@implementation DYModuleStrengthSlider
- (void)mouseDown:(NSEvent*)event{id target=[self.target retain];[target performSelector:@selector(beginStrengthGesture)];@try{[super mouseDown:event];}@finally{[target performSelector:@selector(endStrengthGesture)];[target release];}}
@end
@implementation DYModuleStrengthControl {
id<PROAPIAccessing> _manager;NSString *_nodeID;NSTextField *_label,*_field;NSSlider *_slider;NSButton *_reset;BOOL _editing,_grouped;CMTime _editTime;
}
- (BOOL)isFlipped{return YES;}
- (instancetype)initWithManager:(id<PROAPIAccessing>)manager nodeID:(NSString*)nodeID{
if((self=[super initWithFrame:NSMakeRect(0,0,280,30)])){
_manager=manager;_nodeID=[nodeID copy];self.accessibilityLabel=@"模块整体强度";
_label=[NSTextField labelWithString:@"强度"];_label.font=[NSFont systemFontOfSize:11];[self addSubview:_label];
_slider=[[[DYModuleStrengthSlider alloc]initWithFrame:NSZeroRect]autorelease];_slider.minValue=0;_slider.maxValue=100;_slider.continuous=YES;_slider.target=self;_slider.action=@selector(strengthChanged:);_slider.accessibilityLabel=@"模块整体强度百分比";[self addSubview:_slider];
_field=[[[NSTextField alloc]initWithFrame:NSZeroRect]autorelease];_field.font=[NSFont monospacedDigitSystemFontOfSize:11 weight:NSFontWeightRegular];_field.alignment=NSTextAlignmentRight;_field.target=self;_field.action=@selector(strengthChanged:);_field.accessibilityLabel=@"模块整体强度百分比";[self addSubview:_field];
_reset=[NSButton buttonWithTitle:@"↺" target:self action:@selector(resetStrength:)];_reset.bordered=NO;_reset.toolTip=@"还原整体强度为 100%";_reset.accessibilityLabel=_reset.toolTip;[self addSubview:_reset];
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(strengthModelChanged:) name:DYModelChanged object:manager];
[self strengthModelChanged:nil];[self resizeSubviewsWithOldSize:NSZeroSize];
}return self;
}
- (void)dealloc{[NSNotificationCenter.defaultCenter removeObserver:self];[_nodeID release];[super dealloc];}
- (void)resizeSubviewsWithOldSize:(NSSize)old{CGFloat w=self.bounds.size.width;_label.frame=NSMakeRect(0,7,32,18);_slider.frame=NSMakeRect(38,6,MAX(26,w-126),20);_field.frame=NSMakeRect(MAX(65,w-81),3,54,24);_reset.frame=NSMakeRect(w-24,3,24,24);}
- (void)refreshWithDocument:(NSDictionary*)doc{if(_editing)return;double amount=DYToolStrength(doc,_nodeID)*100;_slider.doubleValue=amount;_field.stringValue=[NSString stringWithFormat:@"%.0f%%",amount];_label.textColor=DYThemeColor(@"text");_slider.toolTip=@"0% 旁路本模块,100% 完整应用;保留原参数与蒙版";}
- (void)strengthModelChanged:(NSNotification*)note{if(_editing||!_manager)return;id<FxCustomParameterActionAPI_v4>a=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{[self refreshWithDocument:DYReadTools(_manager,a.currentTime).document];}@finally{[a endAction:self];}}
- (void)beginStrengthGesture{if(_editing)return;id<FxCustomParameterActionAPI_v4>a=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{_editTime=a.currentTime;_grouped=[[_manager apiForProtocol:@protocol(FxUndoAPI)]startUndoGroup:@"调整模块整体强度"];_editing=YES;}@finally{[a endAction:self];}}
- (void)endStrengthGesture{if(!_editing)return;id<FxCustomParameterActionAPI_v4>a=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self];@try{if(_grouped)[[_manager apiForProtocol:@protocol(FxUndoAPI)]endUndoGroup];_grouped=NO;_editing=NO;}@finally{[a endAction:self];}[self strengthModelChanged:nil];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_manager];}
- (void)strengthChanged:(NSControl*)sender{
double amount=sender.doubleValue;if(sender==_field){NSString *text=[_field.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];if([text hasSuffix:@"%"]||[text hasSuffix:@"%"])text=[text substringToIndex:text.length-1];NSScanner *scanner=[NSScanner scannerWithString:text];if(![scanner scanDouble:&amount]||!scanner.isAtEnd||!std::isfinite(amount)){NSBeep();[self strengthModelChanged:nil];return;}}
if(!std::isfinite(amount))return;amount=MAX(0.,MIN(100.,amount));BOOL discrete=!_editing;if(discrete)[self beginStrengthGesture];
id<FxCustomParameterActionAPI_v4>a=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL written=NO;[a startAction:self];@try{if(CMTimeCompare(a.currentTime,_editTime)==0){NSMutableDictionary *doc=DYMutablePlist(DYReadTools(_manager,a.currentTime).document);if(DYSetToolStrength(doc,_nodeID,amount/100))written=DYWriteTools(_manager,doc,a.currentTime);}}@finally{[a endAction:self];}
if(written){_slider.doubleValue=amount;_field.stringValue=[NSString stringWithFormat:@"%.0f%%",amount];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_manager];}else NSBeep();if(discrete)[self endStrengthGesture];
}
- (void)resetStrength:(id)sender{_field.stringValue=@"100%";[self strengthChanged:_field];}
@end
+3 -3
查看文件
@@ -156,9 +156,9 @@
_title.frame=NSMakeRect(8,6,MAX(1,w-108),18);
_action.frame=NSMakeRect(MAX(0,w-98),2,92,24);
_progress.frame=NSMakeRect(8,28,body,10);
_status.frame=NSMakeRect(8,43,body,64);
_preview.frame=NSMakeRect(8,112,body,MAX(1,h-138));
_detail.frame=NSMakeRect(8,MAX(112,h-22),body,18);
BOOL compact=h<280;_status.maximumNumberOfLines=compact?1:3;_status.frame=NSMakeRect(8,compact?38:43,body,compact?18:52);
CGFloat previewTop=compact?60:102;_preview.frame=NSMakeRect(8,previewTop,body,MAX(1,h-previewTop-24));
_detail.frame=NSMakeRect(8,MAX(previewTop,h-20),body,18);
}
- (void)applyUpdate:(NSDictionary *)info {
if(![_maskID isEqual:info[@"mask"]]){[_maskID release];_maskID=[info[@"mask"]copy];}
@@ -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<half.size();i++)worst=MAX(worst,fabs((float)half[i]-.5*((float)plain[i]+(float)raised[i])));run.record(@"module-strength-half-matches-independent-linear-pixel-reference",worst<.008,@{@"maximumError":@(worst)});
DYSetToolStrength(strengthDoc,@"base:base",1);Pixels full=frame(exposure,strengthDoc,@"module-strength-base-full-render");run.record(@"module-strength-one-retains-exact-existing-output",difference(full,raised).maximum==0&&!strengthDoc[@"strengths"]);
NSMutableDictionary *layer=(id)DYInsertTool(strengthDoc,@"base",@"base:base");NSString *ID=layer[@"id"];layer[@"values"][@"exposure"]=@1;DYSetToolStrength(strengthDoc,ID,0);Pixels extraZero=frame(u,strengthDoc,@"module-strength-extra-zero-render");run.record(@"module-strength-repeated-layer-zero-is-exact-bypass",difference(extraZero,plain).maximum==0);
DYSetToolStrength(strengthDoc,ID,.5);Pixels extraHalf=frame(u,strengthDoc,@"module-strength-extra-half-render");run.record(@"module-strength-independent-layer-half-matches-base",difference(extraHalf,half).maximum<.008);
DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=strengthDoc;NSData *encoded=[NSKeyedArchiver archivedDataWithRootObject:saved requiringSecureCoding:YES error:nil];DYToolDocument *decoded=[NSKeyedUnarchiver unarchivedObjectOfClass:DYToolDocument.class fromData:encoded error:nil];run.record(@"module-strength-secure-preset-roundtrip",decoded&&[decoded.document isEqual:strengthDoc]&&DYToolStrength(decoded.document,ID)==.5);
BOOL invalid=!DYSetToolStrength(strengthDoc,ID,NAN)&&!DYSetToolStrength(strengthDoc,ID,-.1)&&!DYSetToolStrength(strengthDoc,ID,1.1)&&!DYSetToolStrength(strengthDoc,@"unknown",.5);run.record(@"module-strength-rejects-invalid-values-and-stale-node",invalid);
DYRemoveTool(strengthDoc,ID);run.record(@"module-strength-delete-cleans-up-state-with-valid-document",DYValidToolDocument(strengthDoc)&&!strengthDoc[@"strengths"][ID]);
}
changed.cm.outputTransfer=1002;changed.cm.toneMapping=1;changed.hslSatA.x=40;Pixels last=frame(changed,doc,@"unified-last-output");doc[@"outputAfter"]=@"base:primary";Pixels middle=frame(changed,doc,@"unified-middle-output");run.record(@"unified-moving-output-changes-actual-domain-order",difference(last,middle).maximum>.001,@{@"difference":@(difference(last,middle).maximum)});
{
Pixels patch(w*h*4);
+5 -2
查看文件
@@ -61,17 +61,20 @@
};
for(NSString *ID in DYUnifiedRenderOrder(tools)){
if([ID isEqual:@"output"]){
if(u.cm.outputEnabled>.5){CSTParams output={wg,wt,(int)lroundf(u.cm.outputGamut),(int)lroundf(u.cm.outputTransfer),0};
double amount=DYToolStrength(tools,@"output");if(u.cm.outputEnabled>.5&&amount>0){id<MTLTexture>before=current;[pinned addObject:before];int priorGamut=wg,priorTransfer=wt;CSTParams output={wg,wt,(int)lroundf(u.cm.outputGamut),(int)lroundf(u.cm.outputTransfer),0};
if(u.cm.toneMapping>.5)output.toneMapping=(wt>1000?2:0)+(output.outputTransfer>1000?1:0);
if(!transform(output))return NO;wg=output.outputGamut;wt=output.outputTransfer;
if(amount<1){id<MTLTexture>converted=current;[pinned addObject:converted];current=before;BOOL ok=transform({priorGamut,priorTransfer,wg,wt,0});id<MTLTexture>adapted=current;[pinned addObject:adapted];current=converted;if(ok)ok=blend(adapted,@[],amount,@"primary");[pinned removeObject:adapted];[pinned removeObject:converted];if(!ok)return NO;}[pinned removeObject:before];
}continue;
}
BOOL base=[ID hasPrefix:@"base:"];NSDictionary *node=base?nil:DYToolWithID(tools,ID);NSString *type=base?[ID substringFromIndex:5]:node[@"type"];
if(base&&DYBaseToolRemoved(tools,type))continue;
double strength=DYToolStrength(tools,ID);if(strength<=0)continue;id<MTLTexture>moduleBefore=current;if(strength<1)[pinned addObject:moduleBefore];
DYUniforms values=base?u:DYToolUniforms(node);NSArray *masks=base?tools[@"baseMasks"][type]:node[@"masks"];
if([type isEqual:@"primary"]){values.inputSectionEnabled=values.cm.outputEnabled=0;values.cm.workingTransfer=wt;values.cm.workingGamut=wg;if(!grade(values,masks,NO))return NO;continue;}
if([type isEqual:@"primary"]){values.inputSectionEnabled=values.cm.outputEnabled=0;values.cm.workingTransfer=wt;values.cm.workingGamut=wg;if(!grade(values,masks,NO))return NO;if(strength<1){BOOL ok=blend(moduleBefore,@[],strength,type);[pinned removeObject:moduleBefore];if(!ok)return NO;}continue;}
if([type isEqual:@"film"]){if(!print(values,masks))return NO;values.filmPrint.x=0;}
if(!isolated(type,values,base?DYVisibleBaseToolPaths(paths,tools):node[@"paths"],base?spider:node[@"spider"],masks))return NO;
if(strength<1){BOOL ok=blend(moduleBefore,@[],strength,type);[pinned removeObject:moduleBefore];if(!ok)return NO;}
}
[pinned removeObject:originalWorking];
// Final host adaptation is separate from the movable output node. Cube uses
+4 -3
查看文件
@@ -71,7 +71,7 @@ static void DYDrawCloneStamp(NSRect rect,NSColor *color){
- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[self finishCapture];for(DYViewerParameterPanel*p in _panels)p.bridge=nil;[_panels removeAllObjects];[_bridge release];_bridge=[bridge retain];_pendingSkinPreview=NO;_stampArmed=NO;_levelMode=0;_levelResetRequested=_levelMeasureRequested=_levelDirectionRequested=NO;}
- (void)setViewport:(NSRect)viewport{_viewport=viewport;_hasViewport=YES;}
- (void)prepareWithSize:(NSSize)size scale:(CGFloat)scale atTime:(CMTime)time{
_size=size;_time=time;_backingScale=scale;
_size=size;_time=time;_backingScale=scale;NSDictionary *command=[_bridge takeScreenCommand];if([command[@"type"]isEqual:@"level"]){_levelMode=[command[@"mode"]integerValue];if(_levelMode<0||_levelMode>2)_levelMode=0;_stampArmed=NO;}
if(_pendingSkinPreview){NSDictionary *snapshot=[_bridge snapshotAtTime:time];if(snapshot&&[self skinNodeInSnapshot:snapshot]){_pendingSkinPreview=NO;[self toggleSkinPreview];}}
NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersectionRect(_viewport,bounds):bounds;_viewport=v;
_scale=MAX(.6,MIN(MAX(1.,scale),MIN(v.size.width/420.,v.size.height/350.)));CGFloat s=_scale;
@@ -153,10 +153,11 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
[a[@"title"]drawInRect:NSInsetRect(r,1,MAX(1.,(r.size.height-fontSize-3)/2)) withAttributes:attributes];
if(selected){NSBezierPath *mark=[NSBezierPath bezierPath];[mark moveToPoint:NSMakePoint(NSMinX(r),NSMidY(r)-3*s)];[mark lineToPoint:NSMakePoint(NSMinX(r),NSMidY(r)+3*s)];[NSColor.systemCyanColor setStroke];mark.lineWidth=2*s;[mark stroke];}
}
for(NSDictionary *a in _areas)if(a[@"symbol"]&&_hover==[a[@"part"]integerValue]){NSRect r=[a[@"rect"]rectValue],tip=NSMakeRect(NSMidX(r)-36*s,NSMinY(r)-28*s,72*s,25*s);DYDrawSoftControl(tip,4*s,NO,NO,NO);[a[@"title"]drawInRect:NSInsetRect(tip,5*s,5*s)withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:10*s],NSForegroundColorAttributeName:NSColor.whiteColor}];break;}
[NSGraphicsContext restoreGraphicsState];
}
- (void)activateTool:(NSString*)type{
[_bridge publishScreenTool:type message:nil];
if([type isEqual:@"mosaic"]){[self finishCapture];_stampArmed=NO;_levelMode=0;[_bridge requestMosaicMenu];return;}
if([type isEqual:@"level"]){[self finishCapture];_stampArmed=NO;_levelMode=_levelMode?0:1;return;}
BOOL returningFromLevel=_levelMode!=0;_levelMode=0;
@@ -183,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
@@ -25,6 +25,8 @@
- (void)requestWorkspacePage:(NSString *)page;
- (void)requestMask:(NSInteger)kind;
- (void)requestTool:(NSString*)type;
- (void)publishScreenTool:(NSString*)type message:(NSString*)message;
- (NSDictionary*)takeScreenCommand;
- (void)requestWhiteBalanceAtTime:(CMTime)time;
@property(nonatomic,retain) DYRenderer *renderer;
- (NSData*)canvasHistogramAtTime:(CMTime)time;
@@ -65,7 +67,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
@implementation DYViewerParameterBridge {
id<PROAPIAccessing> _apiManager;
NSDictionary *_snapshot,*_sourceDocument;NSString *_selectedNode;
NSDictionary *_screenCommand;NSDictionary *_snapshot,*_sourceDocument;NSString *_selectedNode;
CMTime _snapshotTime;
BOOL _invalidated,_validationScheduled;
uint64_t _requestSequence,_requestedGesture,_completedGesture;
@@ -82,13 +84,13 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
}
@synthesize renderer=_renderer;
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager {
if((self=[super init])){_apiManager=manager;_snapshotTime=kCMTimeInvalid;_writerTime=kCMTimeInvalid;[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceSelected:) name:@"DYWorkspaceToolSelection" object:manager];[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(mosaicMenuRequested:) name:@"DYMosaicMenuRequested" object:manager];}return self;
if((self=[super init])){_apiManager=manager;[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(screenCommand:) name:@"DYScreenToolCommand" object:manager];_snapshotTime=kCMTimeInvalid;_writerTime=kCMTimeInvalid;[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceSelected:) name:@"DYWorkspaceToolSelection" object:manager];[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(mosaicMenuRequested:) name:@"DYMosaicMenuRequested" object:manager];}return self;
}
- (void)dealloc {
// invalidate enqueues closure before the owner releases its final reference;
// the queued block keeps the bridge alive until its host group is closed.
NSCAssert(!_writerUndoOpen,@"Viewer parameter group must be closed before teardown");
[NSNotificationCenter.defaultCenter removeObserver:self];[_renderer release];[_selectedNode release];[_snapshot release];[_sourceDocument release];[_writerHost release];[_writerTarget release];
[NSNotificationCenter.defaultCenter removeObserver:self];[_screenCommand release];[_renderer release];[_selectedNode release];[_snapshot release];[_sourceDocument release];[_writerHost release];[_writerTarget release];
[_writerDescriptors release];[_writerLastValues release];[_writerCompanions release];[_writerNode release];[_writerType release];[_pendingSpiderMeshes release];[super dealloc];
}
- (void)publishAssets:(DYAssetState*)assets atTime:(CMTime)time {
@@ -107,6 +109,9 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYViewerWhiteBalanceRequested" object:manager userInfo:@{@"time":[(NSDictionary*)CMTimeCopyAsDictionary(time,kCFAllocatorDefault) autorelease]}];
});
}
- (void)screenCommand:(NSNotification*)note{@synchronized(self){[_screenCommand release];_screenCommand=[note.userInfo copy];}}
- (NSDictionary*)takeScreenCommand{@synchronized(self){NSDictionary *value=[_screenCommand autorelease];_screenCommand=nil;return value;}}
- (void)publishScreenTool:(NSString*)type message:(NSString*)message{dispatch_async(dispatch_get_main_queue(),^{id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}if(manager)DYPublishScreenToolInfo(manager,type,message);});}
- (void)requestTool:(NSString*)type {
if(![DYToolTypes()containsObject:type])return;
dispatch_async(dispatch_get_main_queue(),^{id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYViewerToolRequested" object:manager userInfo:@{@"type":type}];});
@@ -191,12 +191,20 @@
NSView *toolbar=[stack valueForKey:@"toolbar"];NSTableView *table=[stack valueForKey:@"layerTable"];
auto toolbarButton=[&](NSString *type)->NSButton *{for(NSButton *button in toolbar.subviews)if([button.identifier isEqual:type])return button;return nil;};
auto chooseNode=[&](NSString *node)->BOOL{NSArray *rows=[stack valueForKey:@"layerRows"];for(NSUInteger i=0;i<rows.count;i++)if([rows[i][@"node"]isEqual:node]&&[rows[i][@"kind"]isEqual:@"tool"]){[table selectRowIndexes:[NSIndexSet indexSetWithIndex:i]byExtendingSelection:NO];[stack tableViewSelectionDidChange:nil];return YES;}return NO;};
BOOL horizontal=YES;CGFloat previous=-1;for(NSView *button in toolbar.subviews){horizontal&=button.frame.origin.x>previous&&button.frame.origin.y==0;previous=button.frame.origin.x;}
run.record(@"workspace-toolbar-lists-every-inspector-tool-including-distortion",toolbar.subviews.count==DYToolTypes().count&&horizontal&&toolbarButton(@"lens"));
BOOL horizontal=YES;for(NSButton *button in toolbar.subviews){horizontal&=NSContainsRect(toolbar.bounds,button.frame)&&button.imagePosition==NSImageLeft&&button.title.length>0;}
run.record(@"workspace-toolbar-wraps-labelled-tools-without-hidden-buttons",toolbar.subviews.count==DYToolTypes().count&&horizontal&&toolbarButton(@"lens"));
NSUInteger originalLayers=[DYReadTools(stackHost,kCMTimeZero).document[@"layers"]count];int undo=stackHost->_undoStarts;
[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();
}
undo=stackHost->_undoStarts;
NSDictionary *beforeCurve=DYReadTools(stackHost,kCMTimeZero).document;
[curveEditor graphicGesture:YES title:@"测试曲线手势"];
[curveEditor writeGraphicValues:@{@"masterX0":@.3,@"curveY0":@12}];
@@ -256,9 +264,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));}
+30 -6
查看文件
@@ -5,10 +5,10 @@
_splitFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.layerFraction.v3"];if(_splitFraction<.12||_splitFraction>.4)_splitFraction=.18;_scopeFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.scopeFraction.v1"];if(_scopeFraction<.15||_scopeFraction>.45)_scopeFraction=.27;_toolTime=kCMTimeInvalid;_sizingSplit=YES;
_toolbarScroll=[[NSScrollView alloc]init];_toolbarScroll.hasHorizontalScroller=YES;_toolbarScroll.autohidesScrollers=YES;_toolbarScroll.drawsBackground=NO;
_toolbar=[[DYWorkspaceList alloc]initWithFrame:NSMakeRect(0,0,1200,34)];_toolbarScroll.documentView=_toolbar;[_root addSubview:_toolbarScroll];
CGFloat x=0;for(NSString *type in DYToolTypes()) {NSString *title=DYToolSection(type)[@"title"]?:type;NSButton *button=DYWorkspaceButton(title,self,@selector(addWorkspaceTool:));button.identifier=type;button.toolTip=[@"添加独立模块:" stringByAppendingString:title];button.image=[NSImage imageWithSystemSymbolName:DYWorkspaceSymbol(type) accessibilityDescription:title];button.imagePosition=NSImageOnly;button.contentTintColor=DYThemeColor(@"text");CGFloat width=28;button.frame=NSMakeRect(x,0,width,27);[_toolbar addSubview:button];x+=width+2;}_toolbar.frame=NSMakeRect(0,0,x,30);
CGFloat x=0;for(NSString *type in DYToolTypes()) {NSString *title=DYToolSection(type)[@"title"]?:type;NSButton *button=DYWorkspaceButton(title,self,@selector(addWorkspaceTool:));button.identifier=type;button.toolTip=[@"添加独立模块:" stringByAppendingString:title];button.image=[NSImage imageWithSystemSymbolName:DYWorkspaceSymbol(type) accessibilityDescription:title];button.imagePosition=NSImageLeft;button.imageHugsTitle=YES;button.contentTintColor=DYThemeColor(@"text");CGFloat width=MAX(66,ceil([title sizeWithAttributes:@{NSFontAttributeName:button.font}].width)+32);button.frame=NSMakeRect(x,0,width,27);[_toolbar addSubview:button];x+=width+2;}_toolbar.frame=NSMakeRect(0,0,x,30);
_split=[[NSSplitView alloc]init];_split.vertical=YES;_split.dividerStyle=NSSplitViewDividerStyleThin;_split.delegate=self;_split.accessibilityLabel=@"调整图层与参数宽度";[_root addSubview:_split];
_toolPane=[[DYWorkspaceList alloc]init];_editorHost=[[DYWorkspaceList alloc]init];_editorHost.clipsToBounds=YES;[_split addSubview:_toolPane];[_split addSubview:_editorHost];
_layerScroll=[[NSScrollView alloc]init];_layerScroll.hasVerticalScroller=NO;_layerScroll.autohidesScrollers=YES;_layerScroll.scrollerStyle=NSScrollerStyleOverlay;_layerScroll.automaticallyAdjustsContentInsets=NO;_layerScroll.contentInsets=NSEdgeInsetsZero;_layerScroll.drawsBackground=NO;[_toolPane addSubview:_layerScroll];
_layerScroll=[[NSScrollView alloc]init];_layerScroll.hasVerticalScroller=YES;_layerScroll.autohidesScrollers=NO;_layerScroll.scrollerStyle=NSScrollerStyleLegacy;_layerScroll.automaticallyAdjustsContentInsets=NO;_layerScroll.contentInsets=NSEdgeInsetsZero;_layerScroll.drawsBackground=NO;[_toolPane addSubview:_layerScroll];
_layerTable=[[NSTableView alloc]init];_layerTable.style=NSTableViewStylePlain;_layerTable.intercellSpacing=NSZeroSize;NSTableColumn *column=[[[NSTableColumn alloc]initWithIdentifier:@"layer"]autorelease];column.title=@"模块与蒙版";[_layerTable addTableColumn:column];_layerTable.headerView=nil;_layerTable.rowHeight=28;_layerTable.dataSource=self;_layerTable.delegate=self;_layerTable.target=self;_layerTable.action=@selector(workspaceRowClicked:);_layerTable.backgroundColor=DYWorkspacePalette()[@"background"];_layerTable.columnAutoresizingStyle=NSTableViewLastColumnOnlyAutoresizingStyle;_layerTable.accessibilityLabel=@"模块与共享蒙版";_layerScroll.documentView=_layerTable;
_addMask=[DYWorkspaceButton(@"+ 蒙版",self,@selector(addWorkspaceMask:))retain];[_toolPane addSubview:_addMask];
_deleteLayer=[DYWorkspaceButton(@"删除",self,@selector(deleteWorkspaceSelection:))retain];[_toolPane addSubview:_deleteLayer];
@@ -24,6 +24,12 @@
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(refreshToolWorkspace:) name:DYModelChanged object:[self rootHost]];
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceCanvasSelection:) name:@"DYToolCanvasSelection" object:[self rootHost]];
[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=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;
}
- (void)layoutToolWorkspace {
@@ -31,7 +37,7 @@
CGFloat w=_split.bounds.size.width,h=_split.bounds.size.height,scope=MAX(240,MIN(420,w*_scopeFraction)),left=MAX(174,MIN(MIN(300,w-scope-322),w*_splitFraction)),divider=_split.dividerThickness,editor=MAX(1,w-left-scope-2*divider);
_toolPane.frame=NSMakeRect(0,0,left,h);_editorHost.frame=NSMakeRect(left+divider,0,editor,h);_scopePane.frame=NSMakeRect(left+divider+editor+divider,0,scope,h);
_layerScroll.frame=NSMakeRect(0,0,left,MAX(1,h-35));[_layerScroll layoutSubtreeIfNeeded];NSSize layerViewport=_layerScroll.contentView.bounds.size;_layerTable.frame=NSMakeRect(0,0,layerViewport.width,MAX(layerViewport.height,_layerRows.count*_layerTable.rowHeight));[_layerTable.tableColumns.firstObject setWidth:layerViewport.width];_addMask.frame=NSMakeRect(6,MAX(0,h-32),MAX(80,left-76),28);_deleteLayer.frame=NSMakeRect(MAX(92,left-66),MAX(0,h-32),60,28);
CGFloat ew=_editorHost.bounds.size.width;_selectionTitle.frame=NSMakeRect(12,5,MAX(1,ew-24),22);_toolEditor.frame=NSMakeRect(0,29,ew,MAX(1,h-29));
CGFloat ew=_editorHost.bounds.size.width;CGFloat strengthWidth=MIN(260,MAX(200,ew*.48));_selectionTitle.frame=NSMakeRect(12,5,MAX(1,ew-strengthWidth-30),22);_moduleStrength.frame=NSMakeRect(ew-strengthWidth-8,0,strengthWidth,30);_toolEditor.frame=NSMakeRect(0,29,ew,MAX(1,h-29));
_maskPane.frame=NSMakeRect(0,29,ew,MAX(1,h-29));CGFloat aw=MIN(188,MAX(152,ew*.23));_assignmentScroll.frame=NSMakeRect(ew-aw,0,aw,_maskPane.bounds.size.height);_maskScroll.frame=NSMakeRect(0,0,MAX(1,ew-aw-8),_maskPane.bounds.size.height);
if(_maskEditor){_maskEditor.frame=NSMakeRect(0,0,MAX(536,_maskScroll.contentSize.width),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];_maskEditor.frame=NSMakeRect(0,0,MAX(_maskScroll.contentSize.width,_maskEditor.contentWidth),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];}
[self layoutMaskAssignments];
@@ -102,8 +108,8 @@
if(_selectedMask)_editorMode=1;else if(![_editorNode isEqual:_selectedNode]||_editorMode==1)_editorMode=[type isEqual:@"look"]?2:0;
BOOL stamp=DYSharedMaskWithID(_toolDocument,_selectedMask)[@"stampSource"]!=nil;
_selectionTitle.stringValue=_selectedMask?(stamp?@"仿制图章 · 编辑与跟踪":@"蒙版 · 编辑与跟踪"):DYToolSection(type)[@"title"]?:@"从上方添加模块";if(!_selectedMask)for(NSDictionary*row in _layerRows)if([row[@"node"]isEqual:_selectedNode]&&!row[@"mask"]){_selectionTitle.stringValue=row[@"title"];break;}
if(![_editorNode isEqual:_selectedNode]){[_toolEditor removeFromSuperview];[_toolEditor release];_toolEditor=nil;[_editorNode release];_editorNode=[_selectedNode copy];if(type){id<PROAPIAccessing>target=node?[[[DYToolManager alloc]initWithHost:[self rootHost]node:node]autorelease]:[self rootHost];_toolEditor=[[DYInspector alloc]initWithAPIManager:target renderer:_renderer workspaceType:type];[_editorHost addSubview:_toolEditor positioned:NSWindowBelow relativeTo:_maskPane];}}
[_toolEditor refresh];
if(![_editorNode isEqual:_selectedNode]){[_moduleStrength removeFromSuperview];[_moduleStrength release];_moduleStrength=nil;if([DYToolTypes()containsObject:type]||[type isEqual:@"output"]){_moduleStrength=[[DYModuleStrengthControl alloc]initWithManager:[self rootHost]nodeID:_selectedNode];[_editorHost addSubview:_moduleStrength];}[_toolEditor removeFromSuperview];[_toolEditor release];_toolEditor=nil;[_editorNode release];_editorNode=[_selectedNode copy];if(type){id<PROAPIAccessing>target=node?[[[DYToolManager alloc]initWithHost:[self rootHost]node:node]autorelease]:[self rootHost];_toolEditor=[[DYInspector alloc]initWithAPIManager:target renderer:_renderer workspaceType:type];[_editorHost addSubview:_toolEditor positioned:NSWindowBelow relativeTo:_maskPane];}}
[_toolEditor refresh];[_moduleStrength refreshWithDocument:_toolDocument];double angle=[_toolDocument[@"levelRotation"]doubleValue];double aspect=[_toolDocument[@"levelReference"][@"aspect"]doubleValue];if(!(aspect>0))aspect=16./9;DYLevelTransform level(angle,aspect);_levelNumbers.stringValue=[NSString stringWithFormat:@"FCP 旋转 %+.2f°\n缩放 %.2f%% · %@",-angle*180/M_PI,level.zoom*100,[_toolDocument[@"levelMeasureOnly"]boolValue]?@"仅测量,数值供原始变换使用":@"插件应用校正"];
if(_selectedNode.length&&![_selectedNode isEqual:@"shared"])[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:[self rootHost]userInfo:@{@"node":_selectedNode}];
if(_selectedMask){BOOL shared=DYSharedMaskWithID(_toolDocument,_selectedMask)!=nil;NSString*maskNode=shared?@"shared":_selectedNode;if(![_maskNode isEqual:maskNode]){[_maskEditor release];_maskEditor=nil;[_maskNode release];_maskNode=[maskNode copy];_maskEditor=[DYCreateWorkspaceMaskEditor([self rootHost],maskNode)retain];_maskScroll.documentView=_maskEditor;}[_maskEditor refreshWithDocument:_toolDocument time:_toolTime];[_maskEditor selectMaskID:_selectedMask];}
else {_maskScroll.documentView=nil;[_maskEditor release];_maskEditor=nil;[_maskNode release];_maskNode=nil;}
@@ -141,7 +147,7 @@
BOOL closing=_closing;_closing=YES;[_browser close];[_browser release];_browser=nil;_closing=closing;[self refreshLUTStrength];[self ensureBrowser];
}
- (void)addWorkspaceTool:(NSButton*)sender {
NSString*type=sender.identifier;if([type isEqual:@"lens"]||![DYToolTypes()containsObject:type])return;id<PROAPIAccessing>host=[self rootHost];id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;NSString*added=nil;
NSString*type=sender.identifier;if(![DYToolTypes()containsObject:type])return;id<PROAPIAccessing>host=[self rootHost];id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;NSString*added=nil;
[a startAction:self];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSString*anchor=(DYToolWithID(doc,_selectedNode)||[_selectedNode hasPrefix:@"base:"])?_selectedNode:[@"base:" stringByAppendingString:type];NSMutableDictionary*node=(id)DYInsertTool(doc,type,anchor);if(!node){[self reportError:@"模块达到上限,未添加"];return;}if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms u;DYReadUniforms(host,a.currentTime,&u);DYSeedPrimaryWorkingSpace(node,u.cm.workingTransfer,u.cm.workingGamut);}id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"添加调色模块"];if(DYWriteTools(host,doc,a.currentTime))added=[node[@"id"]copy];if(grouped)[undo endUndoGroup];}@finally{[a endAction:self];}
if(added){_editorMode=0;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host userInfo:@{@"scrollToTool":added}];[added release];}
}
@@ -190,3 +196,21 @@
id<PROAPIAccessing>host=[self rootHost];id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL changed=NO;
[a startAction:self];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);if(DYSharedMaskWithID(doc,_selectedMask))changed=DYRemoveSharedMask(doc,_selectedMask);else{NSMutableArray*masks=[[DYMasksForTool(doc,_selectedNode)mutableCopy]autorelease];[masks filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary*m,NSDictionary*b){return ![m[@"id"]isEqual:self->_selectedMask];}]];changed=DYSetToolMasks(doc,_selectedNode,masks);}if(changed){id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"删除蒙版对象"];changed=DYWriteTools(host,doc,a.currentTime);if(grouped)[undo endUndoGroup];}}@finally{[a endAction:self];}if(changed){[_selectedMask release];_selectedMask=nil;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];}
}
- (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.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;}
if([type isEqual:@"mosaic"]){[NSNotificationCenter.defaultCenter postNotificationName:@"DYMosaicMenuRequested" object:[self rootHost]userInfo:@{@"anchor":_screenDetails}];return;}
if([@[@"cloneStamp",@"rectangle",@"ellipse",@"pen"]containsObject:type]){NSInteger kind=[@[@"ellipse",@"rectangle",@"pen"]indexOfObject:type];for(NSDictionary *row in _layerRows)if(row[@"mask"]){NSDictionary *mask=DYSharedMaskWithID(_toolDocument,row[@"mask"]);if(!mask)for(NSDictionary *m in DYMasksForTool(_toolDocument,row[@"node"]))if([m[@"id"]isEqual:row[@"mask"]])mask=m;BOOL match=[type isEqual:@"cloneStamp"]?mask[@"stampSource"]!=nil:!mask[@"stampSource"]&&DYMaskAtTime(mask,_toolTime).kind==kind;if(match){[_selectedNode release];_selectedNode=[row[@"node"]copy];[_selectedMask release];_selectedMask=[row[@"mask"]copy];_editorMode=1;[self rebuildWorkspaceEditor];return;}}_screenStatus.stringValue=@"先在画面绘制区域,再打开详情;已有蒙版可直接在左侧选择。";return;}
if([type isEqual:@"whiteBalance"])type=@"base";
NSString *ID=nil;NSDictionary *selected=DYToolWithID(_toolDocument,_selectedNode);if([selected[@"type"]isEqual:type]||[_selectedNode isEqual:[@"base:" stringByAppendingString:type]])ID=_selectedNode;else for(NSDictionary *row in _layerRows)if([row[@"type"]isEqual:type]&&!row[@"mask"]){ID=row[@"node"];break;}
if(!ID){NSButton *button=DYWorkspaceButton(@"",nil,nil);button.identifier=type;[self addWorkspaceTool:button];return;}
[ID retain];[_selectedNode release];_selectedNode=ID;[_selectedMask release];_selectedMask=nil;_editorMode=[type isEqual:@"look"]?2:0;[self rebuildWorkspaceEditor];
}
- (void)levelSetting:(NSButton*)sender{
if(sender.tag==1||sender.tag==2){[NSNotificationCenter.defaultCenter postNotificationName:@"DYScreenToolCommand" object:[self rootHost]userInfo:@{@"type":@"level",@"mode":@(sender.tag)}];_screenStatus.stringValue=sender.tag==1?@"回到画面绘制水平参考线":@"回到画面绘制垂直参考线";return;}
id<PROAPIAccessing>host=[self rootHost];id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL written=NO;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);if(sender.tag==3)doc[@"levelMeasureOnly"]=@(![doc[@"levelMeasureOnly"]boolValue]);else{[doc removeObjectForKey:@"levelRotation"];[doc removeObjectForKey:@"levelReference"];[doc removeObjectForKey:@"levelMeasureOnly"];}id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL group=[undo startUndoGroup:sender.tag==3?@"切换水平校正测量方式":@"重置水平校正"];written=DYWriteTools(host,doc,a.currentTime);if(group)[undo endUndoGroup];}@finally{[a endAction:self];}if(written)[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];
}
+2 -2
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.22.5</string>
<string>1.22.6</string>
<key>CFBundleVersion</key>
<string>142</string>
<string>143</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>PlugInKit</key>
+2 -2
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.22.5</string>
<string>1.22.6</string>
<key>CFBundleVersion</key>
<string>142</string>
<string>143</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
+8 -8
查看文件
@@ -4,18 +4,18 @@
## 当前目标与进展
1.22.5(142)已完成Release编译、两轮1113项自检(构建和正式安装)、Developer ID签名、公证Accepted、票据及正式位置安装;FCP宿主验收已按范围完成,正式PKG公证9ee8e167-6d03-4c1a-93bc-efab671754af已Accepted,20项验包通过,Release待上传。实际编译 `a1eb334840e1af285e878e7c094b06aaf01cba49`,Apple提交 `f3c42a54-a85b-4f7b-a569-14fa34b80f5c`。[本轮记录](research/ControlsSync-20261117.md) · [正式身份](verification/InstalledIdentity1.22.5.json) · [自检](verification/InstalledSelfTest1.22.5.json)。
本轮增加控制面板各图层、检查器模块整体强度;屏幕工具说明、实时提示与详情入口集中到控制面板;顶部图标加中文;简化一级调色拥挤横向布局,改常用/影调/更多设置分组、纵向滚动,并常显其他参数区滚动条。正式1.22.6(143)已签名、公证Accepted、票据与Gatekeeper通过,安装在固定路径;构建与正式安装各1130项原生回归全部通过。FCP12.4正式宿主37%/62%双向同步、冷重开62%持久化、恢复100%、三级设置与滚动和工具详情显示通过。PKG签名、公证、票据、Gatekeeper和20项验包通过;Release上传及完整下载准备中。
FCP12.4正式安装实测通过新增LUT模块、37%/62%双向刷新、100帧合成运动蒙版保形、马赛克关联及跟踪编辑器、冷启动完整工具文档持久化。最大相对宽高比漂移7.8537e-8。物理OSC拖动/吸管与2秒提示消失未直接验收,详见[宿主报告](verification/HostControlsSync1.22.5.json)。已清理141回滚APP并释放宿主验收锁,PKG完成并释放产品锁。
工程 `/Volumes/备份/大鱼调色/大鱼调色`,main,远程 `https://dayu.media/git/dayu/dayu-color.git`。基线0388b79bd82100f493dd691a3126f00fc398fe40已远端核验;接手遗留project.pbxproj引用排序改动保留,不混入提交。Release编译通过;首轮1128项原生回归中仅紧凑高度下跟踪预览和最后一行旁路按钮可见性两项失败,已压缩提示行修正。整体强度像素、序列化和三组设置可达性通过;已补控制面板/检查器37%与62%双向回归,第二轮1130项中强度双向回归通过;跟踪预览固定138点标题开销仍使小窗画面偏小,已改为自适应紧凑布局。另修正新增测试前后撤销计数基准;正式交付工具将重新完整回归。
## 正式基线与工程入口
强度存入宿主tools文档,默认100%,保留原参数/蒙版;统一色彩路径按完整模块结果混合,旧版路径复用逐模块蒙版混合。控制面板共用固定强度入口,检查器每模块独立控件。主要路径:DYToolState、DYToolRender、DYUnifiedRender、DYInspector、DYColorWorkspace、DYWorkspaceTools、DYViewerParameterBridge、DYToolOSC。
接手正式基线1.22.4(141),当前已替换为1.22.5(142),路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID `com.dayu.color`,服务 `com.dayu.color.XPC`,团队B3W25FX5H5。141签名、公证、票据、宿主及PKG Release已完成。[上一轮完整交接](research/HandoffHistory-20261117-before-controls-sync.md) · [恢复](RECOVERY.md)。
## 待完成
工程 `/Volumes/备份/大鱼调色/大鱼调色`,main;远程 `https://dayu.media/git/dayu/dayu-color.git`,接手SHA `3a7985195569b9def93aa35912cc5fbd6f5de41a`,已与远端核对。接手时唯一未提交改动为Xcode工程引用排序,保留,不混入当前修复。无其他活跃产品构建聊天。缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`;使用Xcode27.2/FxPlug4.3.5及当前MacOSX.sdk。正式交付使用tools/deliver.py,包使用Packaging/build_pkg.py和publish_release.py;遵循产品锁及仓库锁。
编译与模型/渲染/布局回归、Developer ID签名与公证、固定路径替换、FCP正式宿主验收、PKG签名公证验包、Release上传和完整下载、独立远端恢复核验、生成副本清理。正式APP固定 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID com.dayu.color。复用tools/deliver.py及Packaging脚本、产品与仓库锁。
## 接手第一步与未完成项
本轮不涉及NAS后端、站点文章或更新通道。前序142及验收限制见[上一轮交接](research/HandoffHistory-20261117-before-module-strength.md)及[恢复记录](RECOVERY.md)。
先读本轮记录并检查工作区/远端。APP交付与有范围的FCP验收已完成;PKG公证及验包完成;继续版本标签、Release及下载校验。独立HTTPS克隆1050个编译节点文件、Git完整性和构建输入核对通过,尚待发行标签核对与临时克隆清理。不得把自动诊断等同用户素材实测。
正式APP公证04e79de0-4515-4c41-8b90-ca5d1ba0df27,实际编译源e6e5407b7a7e0501d9a8c1f70a161010295ac845。详见[安装](verification/Delivery1.22.6.json)、[宿主](verification/HostModuleStrength1.22.6.json)、[原生回归](verification/ModuleStrengthPreflight1.22.6.json)。生成构建APP、公证ZIP及旧142回滚APP已由交付工具清理;正式PKG与Release准备中。
FCP QA库包含用户真实媒体,不上传/清理整库。用户已授权任务进程及FCP/Motion强退。既有图章最后可信帧自动跳转限制、Motion/HDR/真实DJI色彩未测仍保留。文章15792仍1.22.2(137),更新通道仍1.21.8(126);本轮无NAS生产变更。
PKG已完成:44,599,258字节,SHA-256 e43967ea2efa5ee83b7426e3cb28cefc9e46da0eb86500a5af459c652949eaa9,公证24871d91-fead-4193-9143-b95e7b2a76ac Accepted;见verification/Package1.22.6.json。本轮未再次运行PKG安装器。待推送标签v1.22.6-panel-strength-20261117、Release与下载校验。