保存仿制图章修复与前轮发布诊断,待正式验收
这个提交包含在:
1 父节点
5a10408557
当前提交
ca9936ee3c
25 个文件已更改
+1354
-58
没有与搜索条件相匹配的文件
@@ -42,7 +42,7 @@
|
||||
frame[@"sourceShape"]?@"取样与覆盖区域":@"蒙版轮廓"]:@"等待源帧";
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
- (void)drawShape:(NSData *)shape nodes:(NSData *)nodes inRect:(NSRect)rect source:(BOOL)source {
|
||||
- (void)drawShape:(NSData *)shape nodes:(NSData *)nodes inRect:(NSRect)rect source:(BOOL)source reference:(BOOL)reference {
|
||||
if(shape.length!=sizeof(DYMaskParameters))return;
|
||||
DYMaskParameters p;[shape getBytes:&p length:sizeof(p)];
|
||||
double aspect=rect.size.width/rect.size.height,c=cos(p.angle),s=sin(p.angle);
|
||||
@@ -64,7 +64,7 @@
|
||||
}
|
||||
[path closePath];path.lineWidth=3.5;[NSColor.blackColor setStroke];[path stroke];
|
||||
if(source){CGFloat dashes[]={4,3};[path setLineDash:dashes count:2 phase:0];}
|
||||
[(source?NSColor.systemCyanColor:NSColor.systemYellowColor) setStroke];path.lineWidth=1.6;[path stroke];
|
||||
[(reference?NSColor.systemGreenColor:source?NSColor.systemCyanColor:NSColor.systemYellowColor) setStroke];path.lineWidth=1.6;[path stroke];
|
||||
}
|
||||
- (void)drawRect:(NSRect)dirty {
|
||||
[NSColor.blackColor setFill];NSRectFill(NSIntersectionRect(dirty,self.bounds));
|
||||
@@ -81,8 +81,9 @@
|
||||
}
|
||||
[_image drawInRect:picture fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];
|
||||
if([_frame[@"flip"] boolValue])[NSGraphicsContext restoreGraphicsState];
|
||||
[self drawShape:_frame[@"shape"] nodes:_frame[@"nodes"] inRect:picture source:NO];
|
||||
[self drawShape:_frame[@"sourceShape"] nodes:nil inRect:picture source:YES];
|
||||
[self drawShape:_frame[@"shape"] nodes:_frame[@"nodes"] inRect:picture source:NO reference:NO];
|
||||
[self drawShape:_frame[@"sourceShape"] nodes:nil inRect:picture source:YES reference:NO];
|
||||
if(_frame[@"referenceShape"]){[self drawShape:_frame[@"referenceShape"] nodes:nil inRect:picture source:YES reference:YES];}
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
@end
|
||||
@@ -140,7 +141,7 @@
|
||||
self.identifier=@"DYTrackingPreview";
|
||||
_title=[DYThemeLabel labelWithString:@"跟踪预览"];_title.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];
|
||||
_detail=[DYThemeLabel labelWithString:@""];_detail.font=[NSFont monospacedDigitSystemFontOfSize:10 weight:NSFontWeightRegular];
|
||||
_status=[DYThemeLabel labelWithString:@""];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=2;_status.lineBreakMode=NSLineBreakByWordWrapping;
|
||||
_status=[DYThemeLabel labelWithString:@""];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=4;_status.lineBreakMode=NSLineBreakByWordWrapping;
|
||||
_action=DYWorkspaceButton(@"停止跟踪",target,action);
|
||||
_progress=[[[DYTrackingProgressBar alloc]init]autorelease];_progress.accessibilityLabel=@"跟踪进度";
|
||||
_preview=[[[DYTrackingPreviewImage alloc]init]autorelease];[_preview showFrame:nil];
|
||||
@@ -155,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,32);
|
||||
_preview.frame=NSMakeRect(8,80,body,MAX(1,h-106));
|
||||
_detail.frame=NSMakeRect(8,MAX(80,h-22),body,18);
|
||||
_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);
|
||||
}
|
||||
- (void)applyUpdate:(NSDictionary *)info {
|
||||
if(![_maskID isEqual:info[@"mask"]]){[_maskID release];_maskID=[info[@"mask"]copy];}
|
||||
@@ -167,7 +168,7 @@
|
||||
BOOL stamp=info[@"sourceShape"]!=nil;
|
||||
_title.stringValue=stamp?@"图章跟踪预览":@"蒙版跟踪预览";
|
||||
[_preview showFrame:info];
|
||||
_detail.stringValue=[NSString stringWithFormat:@"%.3fs %@",[info[@"time"] doubleValue],stamp?@"青色取样 · 黄色覆盖":@"黄色轮廓"];
|
||||
_detail.stringValue=[NSString stringWithFormat:@"%.3fs %@",[info[@"time"] doubleValue],stamp?(info[@"referenceShape"]?@"青色取样 · 黄色覆盖 · 绿色参考":@"青色取样 · 黄色覆盖"):@"黄色轮廓"];
|
||||
}
|
||||
NSUInteger total=[info[@"total"] unsignedIntegerValue];
|
||||
if(active)_progress.doubleValue=total?[info[@"completed"] doubleValue]/total:0;
|
||||
|
||||
在新工单中引用
屏蔽一个用户