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

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

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

+18 -11
查看文件
@@ -68,15 +68,8 @@ NSArray<NSDictionary *> *DYCMGamuts(void) { return @[
@{ @"id":@6, @"name":@"Blackmagic Wide Gamut" },
@{ @"id":@7, @"name":@"Canon Cinema Gamut" },
@{ @"id":@16, @"name":@"DaVinci Wide Gamut" },
@{ @"id":@8, @"name":@"DJI Action 5" },
@{ @"id":@9, @"name":@"DJI Air 2S" },
@{ @"id":@10, @"name":@"DJI D-Gamut" },
@{ @"id":@28, @"name":@"DJI D-Gamut 2" },
@{ @"id":@11, @"name":@"DJI Mavic2 Pro" },
@{ @"id":@12, @"name":@"DJI Mavic 3 Pro" },
@{ @"id":@13, @"name":@"DJI Mini 4 Pro" },
@{ @"id":@14, @"name":@"DJI Mini 5 Pro" },
@{ @"id":@15, @"name":@"DJI Pocket 3" },
@{ @"id":@10, @"name":@"DJI D-Gamut", @"help":@"D-Log 共用色域:御 4 Pro、Pocket 4、Pocket 4P 的 D-Log 模式选此项;不适用于 D-Log M。" },
@{ @"id":@28, @"name":@"DJI D-Gamut 2", @"help":@"Pocket 4P 的 D-Log 2 模式选此项;D-Log 模式使用 DJI D-Gamut。" },
@{ @"id":@17, @"name":@"Fujifilm F-GamutC" },
@{ @"id":@18, @"name":@"GoPro GP-Log" },
@{ @"id":@19, @"name":@"P3-DCI" },
@@ -87,12 +80,26 @@ NSArray<NSDictionary *> *DYCMGamuts(void) { return @[
@{ @"id":@24, @"name":@"RED Wide Gamut RGB" },
@{ @"id":@25, @"name":@"Sony S-Gamut" },
@{ @"id":@26, @"name":@"Sony S-Gamut3" },
@{ @"id":@27, @"name":@"Sony S-Gamut3.Cine" }
@{ @"id":@27, @"name":@"Sony S-Gamut3.Cine" },
// Distinct historical matrices remain addressable by their original IDs.
// They are not aliases of D-Gamut, or a complete DJI camera catalogue.
@{ @"id":@8, @"name":@"DJI Action 5", @"group":@"旧版 DJI 机型矩阵(兼容)" },
@{ @"id":@9, @"name":@"DJI Air 2S", @"group":@"旧版 DJI 机型矩阵(兼容)" },
@{ @"id":@11, @"name":@"DJI Mavic2 Pro", @"group":@"旧版 DJI 机型矩阵(兼容)" },
@{ @"id":@12, @"name":@"DJI Mavic 3 Pro", @"group":@"旧版 DJI 机型矩阵(兼容)" },
@{ @"id":@13, @"name":@"DJI Mini 4 Pro", @"group":@"旧版 DJI 机型矩阵(兼容)" },
@{ @"id":@14, @"name":@"DJI Mini 5 Pro", @"group":@"旧版 DJI 机型矩阵(兼容)" },
@{ @"id":@15, @"name":@"DJI Pocket 3", @"group":@"旧版 DJI 机型矩阵(兼容)" }
]; }
static NSDictionary *cmRow(NSString*k,NSString*t,NSUInteger o,double lo,double hi,double def,int tab,NSArray *choices=nil){
NSMutableDictionary *d=[[row(k,t,offsetof(DYUniforms,cm)+o,lo,hi,def,choices?@"popup":@"float")mutableCopy]autorelease];d[@"cmTab"]=@(tab);
if(choices){d[@"notAnimatable"]=@YES;d[@"options"]=[choices valueForKey:@"name"];d[@"values"]=[choices valueForKey:@"id"];}
if(choices){d[@"notAnimatable"]=@YES;d[@"options"]=[choices valueForKey:@"name"];d[@"values"]=[choices valueForKey:@"id"];
if([k hasSuffix:@"Gamut"]){NSMutableArray *groups=[NSMutableArray array],*help=[NSMutableArray array];
for(NSDictionary *choice in choices){[groups addObject:choice[@"group"]?:@"通用色域(多机型共用)"];[help addObject:choice[@"help"]?:(choice[@"group"]?@"机型专用转换;仅匹配所列机型,不代表完整机型列表。":@"")];}
d[@"optionGroups"]=groups;d[@"optionHelp"]=help;
}
}
[descriptors replaceObjectAtIndex:descriptors.count-1 withObject:d];return d;
}
static void initialize(){static dispatch_once_t once;dispatch_once(&once,^{