fix: align spider vectorscope with CbCr scope and separate trace from controls
这个提交包含在:
1 父节点
01efcc8a29
当前提交
b16a6326a4
17 个文件已更改
+411
-114
没有与搜索条件相匹配的文件
@@ -76,19 +76,40 @@
|
||||
if(c=='\t'){_selected=(_selected+(e.modifierFlags&NSEventModifierFlagShift?[self nodeCount]-1:1)+[self nodeCount])%[self nodeCount];[_selection removeAllIndexes];[_selection addIndex:_selected];[self describeSelection];self.needsDisplay=YES;return;}
|
||||
if(c==' '){[self toggleLock];return;}if(c==NSDeleteCharacter||c==NSBackspaceCharacter){[self resetSelected];return;}
|
||||
float step=e.modifierFlags&NSEventModifierFlagShift?.02f:.005f;
|
||||
if(c==NSLeftArrowFunctionKey)[self moveFrom:_grade x:-step y:0];else if(c==NSRightArrowFunctionKey)[self moveFrom:_grade x:step y:0];else if(c==NSUpArrowFunctionKey)[self moveFrom:_grade x:0 y:-step];else if(c==NSDownArrowFunctionKey)[self moveFrom:_grade x:0 y:step];else[super keyDown:e];
|
||||
NSPoint move=NSZeroPoint;
|
||||
if(c==NSLeftArrowFunctionKey)move.x=-step;
|
||||
else if(c==NSRightArrowFunctionKey)move.x=step;
|
||||
else if(c==NSUpArrowFunctionKey)move.y=-step;
|
||||
else if(c==NSDownArrowFunctionKey)move.y=step;
|
||||
else{[super keyDown:e];return;}
|
||||
if(_selection.count){
|
||||
NSInteger lead=_selected>=0&&[_selection containsIndex:_selected]?_selected:_selection.firstIndex;
|
||||
NSRect rect=self.discRect;
|
||||
NSPoint delta=DYSpiderMeshDelta(rect,_mesh.x[lead],_mesh.y[lead],NSMakePoint(move.x*NSWidth(rect),move.y*NSHeight(rect)));
|
||||
[self moveFrom:_grade x:delta.x y:delta.y];
|
||||
}
|
||||
}
|
||||
- (instancetype)initWithFrame:(NSRect)r{if((self=[super initWithFrame:r])){_grade=dyDefaultGrade();_mesh=dy::legacyMesh(_grade);_selected=-1;self.pinData=nil;self.selection=[NSMutableIndexSet indexSet];_interactionEnabled=YES;self.accessibilityLabel=@"蜘蛛盘,含矢量示波器和肤色指示线";}return self;}
|
||||
- (NSRect)discRect{CGFloat s=MAX(0,MIN(self.bounds.size.width,self.bounds.size.height)-32);return NSMakeRect((self.bounds.size.width-s)/2,(self.bounds.size.height-s)/2,s,s);}
|
||||
- (NSPoint)point:(NSInteger)i{NSRect r=self.discRect;return NSMakePoint(r.origin.x+_mesh.x[i]*r.size.width,r.origin.y+_mesh.y[i]*r.size.height);}
|
||||
- (NSPoint)point:(NSInteger)i{return DYSpiderPlotPoint(self.discRect,_mesh.x[i],_mesh.y[i]);}
|
||||
- (void)setGrade:(DYGrade)g{if(memcmp(g.spiderX,_grade.spiderX,sizeof(g.spiderX))||memcmp(g.spiderY,_grade.spiderY,sizeof(g.spiderY))){_grade=g;self.meshData=nil;}else _grade=g;self.needsDisplay=YES;}
|
||||
- (void)drawRect:(NSRect)dirty{
|
||||
NSRect r=self.discRect;if(NSIsEmptyRect(r))return;NSPoint c=NSMakePoint(NSMidX(r),NSMidY(r));CGFloat rad=r.size.width/2;
|
||||
for(int s=0;s<64;s++)for(int ring=1;ring<=5;ring++){double a=s*M_PI/32,b=(s+1)*M_PI/32;NSBezierPath*p=[NSBezierPath bezierPath];[p moveToPoint:NSMakePoint(c.x+cos(a)*(ring-1)*rad/5,c.y+sin(a)*(ring-1)*rad/5)];[p lineToPoint:NSMakePoint(c.x+cos(a)*ring*rad/5,c.y+sin(a)*ring*rad/5)];[p lineToPoint:NSMakePoint(c.x+cos(b)*ring*rad/5,c.y+sin(b)*ring*rad/5)];[p lineToPoint:NSMakePoint(c.x+cos(b)*(ring-1)*rad/5,c.y+sin(b)*(ring-1)*rad/5)];[p closePath];[[NSColor colorWithCalibratedHue:s/64. saturation:ring/5. brightness:.22 alpha:1]setFill];[p fill];}
|
||||
NSRect r=self.discRect;if(NSIsEmptyRect(r))return;
|
||||
DYDrawSpiderScope(r,[self canDisplayScope]?[_scopeRenderer outputSpiderScope]:nil,1);
|
||||
[[NSColor colorWithWhite:1 alpha:.26]setStroke];for(int ring=1;ring<=_mesh.rings;ring++){NSBezierPath *p=[NSBezierPath bezierPath];for(int s=0;s<=_mesh.hues;s++){NSPoint q=[self point:dy::meshIndex(_mesh,s%_mesh.hues,ring)];if(s==0)[p moveToPoint:q];else[p lineToPoint:q];}[p stroke];}
|
||||
for(int s=0;s<_mesh.hues;s++){NSBezierPath*p=[NSBezierPath bezierPath];[p moveToPoint:[self point:[self nodeCount]-1]];for(int ring=1;ring<=_mesh.rings;ring++)[p lineToPoint:[self point:dy::meshIndex(_mesh,s,ring)]];[p stroke];}
|
||||
for(int i=0;i<[self nodeCount];i++){NSPoint p=[self point:i];CGFloat z=[_selection containsIndex:i]?4.5:2.6;NSBezierPath *d=[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(p.x-z,p.y-z,z*2,z*2)];[([_selection containsIndex:i]?DYAccent():[NSColor colorWithWhite:1 alpha:.85])setFill];[d fill];[[NSColor colorWithWhite:0 alpha:.8]setStroke];d.lineWidth=.85;[d stroke];if([_selection containsIndex:i]){[NSColor.whiteColor setStroke];[d stroke];}if([_pinned containsIndex:i]){[NSColor.blackColor setFill];NSRectFill(NSMakeRect(p.x-1,p.y-1,2,2));}}
|
||||
NSBezierPath *net=[NSBezierPath bezierPath];
|
||||
for(int ring=1;ring<=_mesh.rings;ring++){
|
||||
for(int hue=0;hue<=_mesh.hues;hue++){
|
||||
NSPoint q=[self point:dy::meshIndex(_mesh,hue%_mesh.hues,ring)];
|
||||
if(hue==0)[net moveToPoint:q];else[net lineToPoint:q];
|
||||
}
|
||||
}
|
||||
for(int hue=0;hue<_mesh.hues;hue++){
|
||||
[net moveToPoint:[self point:[self nodeCount]-1]];
|
||||
for(int ring=1;ring<=_mesh.rings;ring++)[net lineToPoint:[self point:dy::meshIndex(_mesh,hue,ring)]];
|
||||
}
|
||||
DYDrawSpiderNet(net,1);
|
||||
for(int i=0;i<[self nodeCount];i++)
|
||||
DYDrawSpiderNode([self point:i],1,[_selection containsIndex:i]?DYAccent():nil,[_pinned containsIndex:i]);
|
||||
if(_marquee){
|
||||
NSRect box=NSMakeRect(MIN(_dragOrigin.x,_marqueeEnd.x),MIN(_dragOrigin.y,_marqueeEnd.y),fabs(_dragOrigin.x-_marqueeEnd.x),fabs(_dragOrigin.y-_marqueeEnd.y));
|
||||
NSBezierPath*outline=[NSBezierPath bezierPathWithRect:box];outline.lineWidth=1.25;
|
||||
@@ -115,7 +136,8 @@
|
||||
- (void)mouseDragged:(NSEvent*)e {
|
||||
if(!_interactionEnabled)return;NSPoint p=[self convertPoint:e.locationInWindow fromView:nil];
|
||||
if(_marquee){_marqueeEnd=p;NSRect box=NSMakeRect(MIN(_dragOrigin.x,p.x),MIN(_dragOrigin.y,p.y),fabs(p.x-_dragOrigin.x),fabs(p.y-_dragOrigin.y));self.selection=[[_selectionStart mutableCopy]autorelease];for(int i=0;i<[self nodeCount];i++)if(NSPointInRect([self point:i],box))[_selection addIndex:i];[self describeSelection];self.needsDisplay=YES;}
|
||||
else if(_dragging){if(!_gestureActive){_gestureActive=YES;if(_gesture)_gesture(YES);}NSRect r=self.discRect;[self moveFrom:_dragGrade x:(p.x-_dragOrigin.x)/r.size.width y:(p.y-_dragOrigin.y)/r.size.height];}
|
||||
else if(_dragging){if(!_gestureActive){_gestureActive=YES;if(_gesture)_gesture(YES);}NSPoint delta=DYSpiderMeshDelta(self.discRect,_dragMesh.x[_selected],_dragMesh.y[_selected],
|
||||
NSMakePoint(p.x-_dragOrigin.x,p.y-_dragOrigin.y));[self moveFrom:_dragGrade x:delta.x y:delta.y];}
|
||||
}
|
||||
- (void)mouseUp:(NSEvent*)e{_dragging=_marquee=NO;[self finishGesture];self.needsDisplay=YES;}
|
||||
@end
|
||||
|
||||
在新工单中引用
屏蔽一个用户