gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 15:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

New method [currentPoint], gets used in [DPScurrentpoint::].

Browse source 
Corrected [DPSarc:::::] and [DPSarcn:::::] to draw the arc in user
space and transfrom it afterwards and implemented  [DPSarct:::::].


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@14365 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2002-08-28 22:04:23 +00:00
parent 6288d91659
commit 97038af148
1 changed files with 57 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
Source/gsc/GSGState.m
View file

@ -510,16 +510,29 @@
[self subclassResponsibility: _cmd];
}
- (void)DPScurrentpoint: (float *)x : (float *)y
- (NSPoint) currentPoint
{
NSAffineTransform *ictm;
NSPoint user;
if (path == nil)
{
return NSMakePoint(0, 0);
}
// This is rather slow, but it is not used very often
ictm = [ctm copyWithZone: GSObjCZone(self)];
[ictm invert];
user = [ictm pointInMatrixSpace: [path currentPoint]];
user = [ictm transformPoint: [path currentPoint]];
RELEASE(ictm);
return user;
}
- (void)DPScurrentpoint: (float *)x : (float *)y
{
NSPoint user;
user = [self currentPoint];
*x = user.x;
*y = user.y;
}
@ -613,33 +626,60 @@
/* ----------------------------------------------------------------------- */
- (void) DPSarc: (float)x : (float)y : (float)r : (float)angle1 : (float)angle2
{
NSPoint center = [ctm pointInMatrixSpace: NSMakePoint(x, y)];
NSSize radius = [ctm sizeInMatrixSpace: NSMakeSize(r, r)];
NSBezierPath *newPath;
newPath = [[NSBezierPath alloc] init];
if ((path != nil) && ([path elementCount] != 0))
{
[newPath lineToPoint: [self currentPoint]];
}
[newPath appendBezierPathWithArcWithCenter: NSMakePoint(x, y)
radius: r
startAngle: angle1
endAngle: angle2
clockwise: NO];
[newPath transformUsingAffineTransform: ctm];
CHECK_PATH;
[path appendBezierPathWithArcWithCenter: center
radius: radius.width
startAngle: angle1
endAngle: angle2
clockwise: NO];
[path appendBezierPath: newPath];
RELEASE(newPath);
}
- (void) DPSarcn: (float)x : (float)y : (float)r : (float)angle1 : (float)angle2
{
NSPoint center = [ctm pointInMatrixSpace: NSMakePoint(x, y)];
NSSize radius = [ctm sizeInMatrixSpace: NSMakeSize(r, r)];
NSBezierPath *newPath;
newPath = [[NSBezierPath alloc] init];
if ((path != nil) && ([path elementCount] != 0))
{
[newPath lineToPoint: [self currentPoint]];
}
[newPath appendBezierPathWithArcWithCenter: NSMakePoint(x, y)
radius: r
startAngle: angle1
endAngle: angle2
clockwise: YES];
[newPath transformUsingAffineTransform: ctm];
CHECK_PATH;
[path appendBezierPathWithArcWithCenter: center
radius: radius.width
startAngle: angle1
endAngle: angle2
clockwise: YES];
[path appendBezierPath: newPath];
RELEASE(newPath);
}
- (void)DPSarct: (float)x1 : (float)y1 : (float)x2 : (float)y2 : (float)r
{
[self notImplemented: _cmd];
NSBezierPath *newPath;
newPath = [[NSBezierPath alloc] init];
if ((path != nil) && ([path elementCount] != 0))
{
[newPath lineToPoint: [self currentPoint]];
}
[newPath appendBezierPathWithArcFromPoint: NSMakePoint(x1, y1)
toPoint: NSMakePoint(x2, y2)
radius: r];
[newPath transformUsingAffineTransform: ctm];
CHECK_PATH;
[path appendBezierPath: newPath];
RELEASE(newPath);
}
- (void) DPSclip