Implement persistent leveling and all standalone module templates; validation pending
这个提交包含在:
1 父节点
81b50538b4
当前提交
dc5769492d
33 个文件已更改
+8585
-88
没有与搜索条件相匹配的文件
@@ -63,9 +63,9 @@ NSMutableDictionary *DYMutablePlist(NSDictionary *value){
|
||||
}
|
||||
NSDictionary *DYInitialToolDocument(NSString *starter) {
|
||||
NSMutableDictionary *doc=[NSMutableDictionary dictionaryWithDictionary:@{@"schema":@1,@"layers":@[],@"baseMasks":@{}}];
|
||||
if([starter isEqual:@"primary"]||[starter isEqual:@"hsl"]){
|
||||
if([DYToolTypes() containsObject:starter]||[starter isEqual:@"cst"]){
|
||||
NSMutableArray *removed=[NSMutableArray arrayWithArray:DYToolTypes()];
|
||||
[removed removeObject:starter];
|
||||
[removed removeObject:[starter isEqual:@"cst"]?@"primary":starter];
|
||||
doc[@"removedBase"]=removed;
|
||||
doc[@"starterTool"]=starter;
|
||||
}
|
||||
@@ -112,8 +112,14 @@ 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"];
|
||||
if(starter&&![starter isEqual:@"primary"]&&![starter isEqual:@"hsl"])return nil;
|
||||
if(starter&&![DYToolTypes() containsObject:starter]&&![starter isEqual:@"cst"])return nil;
|
||||
if(level&&(!finiteNumber(level)||fabs([level doubleValue])>M_PI))return nil;
|
||||
id measured=doc[@"levelMeasureOnly"],reference=doc[@"levelReference"];
|
||||
if(measured&&(!finiteNumber(measured)||([measured doubleValue]!=0&&[measured doubleValue]!=1)))return nil;
|
||||
if(reference){
|
||||
if(![reference isKindOfClass:NSDictionary.class]||![reference[@"points"]isKindOfClass:NSArray.class]||[reference[@"points"]count]!=4||!finiteNumber(reference[@"aspect"])||[reference[@"aspect"]doubleValue]<=0||[reference[@"aspect"]doubleValue]>100||(![reference[@"mode"]isEqual:@1]&&![reference[@"mode"]isEqual:@2]))return nil;
|
||||
for(id value in reference[@"points"])if(!finiteNumber(value)||fabs([value doubleValue])>4)return nil;
|
||||
}
|
||||
BOOL references=[doc[@"schema"]isEqual:@3];id shared=doc[@"sharedMasks"];NSMutableSet *sharedIDs=[NSMutableSet set],*ids=[NSMutableSet set];if(shared){if(!references||![shared isKindOfClass:NSArray.class]||[shared count]>DYSharedMaskLimit)return nil;for(NSDictionary *mask in shared){if(!DYValidToolMask(mask)||[ids containsObject:mask[@"id"]]||mask[@"sharedID"])return nil;[ids addObject:mask[@"id"]];if(!mask[@"stampSource"])[sharedIDs addObject:mask[@"id"]];}}
|
||||
id removed=doc[@"removedBase"];if(removed){if(![removed isKindOfClass:NSArray.class]||[removed count]>DYToolTypes().count)return nil;NSMutableSet *unique=[NSMutableSet set];for(id type in removed){if(![type isKindOfClass:NSString.class]||![DYToolTypes()containsObject:type]||[unique containsObject:type]||[doc[@"baseMasks"][type]count])return nil;[unique addObject:type];}}
|
||||
for(NSString *key in doc[@"baseMasks"]){if(![DYToolTypes()containsObject:key]||!validMasks(doc[@"baseMasks"][key],ids,sharedIDs,references))return nil;}
|
||||
|
||||
在新工单中引用
屏蔽一个用户