paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-19 06:39:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fpvectorial: Fix svg writer for elliptical arc: clockwise flag for top/left coordinates and x rotation angle

Browse Source 
git-svn-id: trunk@52901 -
This commit is contained in:
wp 2016-09-01 11:39:04 +00:00
parent 71f957004a
commit 66bd6bf419
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/fpvectorial/svgvectorialwriter.pas
View File

@ -424,7 +424,7 @@ var
cx, cy, rx, ry, phi: Double; cx, cy, rx, ry, phi: Double;
t1, t2: Double; t1, t2: Double;
x1,y1,x2,y2: Double; x1,y1,x2,y2: Double;
sweep, longArc: Integer; sweep, longarc: Integer;
segment: TPathSegment; segment: TPathSegment;
l2DSegment: T2DSegment absolute segment; l2DSegment: T2DSegment absolute segment;
l2DBSegment: T2DBezierSegment absolute segment; l2DBSegment: T2DBezierSegment absolute segment;
@ -494,13 +494,8 @@ begin
y1 := OldPtY; y1 := OldPtY;
x2 := OldPtX + PtX; x2 := OldPtX + PtX;
y2 := OldPtY + PtY; y2 := OldPtY + PtY;
if APage.UseTopLeftCoordinates then begin phi := l2DArcSegment.XRotation * APage.GetTopLeftCoords_Adjustment();
phi := l2DArcSegment.XRotation; sweep := IfThen(l2DArcSegment.ClockwiseArcFlag, 1, 0);
sweep := IfThen(l2DArcSegment.ClockwiseArcFlag, 0, 1);
end else begin
phi := -l2DArcSegment.XRotation;
sweep := IfThen(l2DArcSegment.ClockwiseArcFlag, 1, 0);
end;
t1 := CalcEllipsePointAngle(x1, y1, rx, ry, cx, cy, phi); t1 := CalcEllipsePointAngle(x1, y1, rx, ry, cx, cy, phi);
t2 := CalcEllipsePointAngle(x2, y2, rx, ry, cx, cy, phi); t2 := CalcEllipsePointAngle(x2, y2, rx, ry, cx, cy, phi);
if sweep = 1 then if sweep = 1 then
@ -517,7 +512,7 @@ begin
longarc := IfThen(abs(t2 - t1) < pi, 0, 1); longarc := IfThen(abs(t2 - t1) < pi, 0, 1);
PathStr := PathStr + Format('a %g,%g %g %d,%d %g,%g', PathStr := PathStr + Format('a %g,%g %g %d,%d %g,%g',
[rx, ry, phi, longArc, sweep, PtX, PtY], FPointSeparator); [rx, ry, RadToDeg(phi), longarc, sweep, PtX, PtY], FPointSeparator);
end; end;
// Store the current position for future points // Store the current position for future points