From 1bb99f869bc13470f9b3248dbdd696afb60413cf Mon Sep 17 00:00:00 2001
From: ask <ask@lazarus-ide.org>
Date: Wed, 29 Feb 2012 15:25:04 +0000
Subject: [PATCH] TAChart: Add RotatePointX utility function

git-svn-id: trunk@35623 -
---
 components/tachart/tadrawutils.pas    |  4 ++--
 components/tachart/tageometry.pas     | 18 +++++++++++++-----
 components/tachart/taradialseries.pas |  2 +-
 components/tachart/tatypes.pas        | 11 ++++++-----
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/components/tachart/tadrawutils.pas b/components/tachart/tadrawutils.pas
index a6a1443bf1..f5f3a904b9 100644
--- a/components/tachart/tadrawutils.pas
+++ b/components/tachart/tadrawutils.pas
@@ -225,8 +225,8 @@ begin
     lineExtent := FSimpleTextOut.SimpleTextExtent(FText2[i]);
     p := FPos;
     case FAlignment of
-      taCenter: p += RotatePoint(Point((FWidth - lineExtent.X) div 2, 0), a);
-      taRightJustify: p += RotatePoint(Point(FWidth - lineExtent.X, 0), a);
+      taCenter: p += RotatePointX((FWidth - lineExtent.X) div 2, a);
+      taRightJustify: p += RotatePointX(FWidth - lineExtent.X, a);
     end;
     FSimpleTextOut.SimpleTextOut(p.X, p.Y, FText2[i]);
     FPos += RotatePoint(Point(0, lineExtent.Y + LINE_INTERVAL), a);
diff --git a/components/tachart/tageometry.pas b/components/tachart/tageometry.pas
index 3777d51dab..7ec77376ce 100644
--- a/components/tachart/tageometry.pas
+++ b/components/tachart/tageometry.pas
@@ -58,6 +58,7 @@ function RectIntersectsRect(
   var ARect: TDoubleRect; const AFixed: TDoubleRect): Boolean;
 function RotatePoint(const APoint: TDoublePoint; AAngle: Double): TDoublePoint; overload;
 function RotatePoint(const APoint: TPoint; AAngle: Double): TPoint; overload;
+function RotatePointX(AX, AAngle: Double): TPoint;
 function RotateRect(const ASize: TPoint; AAngle: Double): TPointArray;
 
 operator +(const A: TPoint; B: TSize): TPoint; overload; inline;
@@ -134,17 +135,15 @@ procedure ExpandRect(
   var ARect: TRect; const ACenter: TPoint; ARadius: Integer;
   AAngle1, AAngle2: Double);
 var
-  p: TPoint;
   i, j: Integer;
 begin
-  p := Point(ARadius, 0);
   EnsureOrder(AAngle1, AAngle2);
-  ExpandRect(ARect, RotatePoint(p, AAngle1) + ACenter);
-  ExpandRect(ARect, RotatePoint(p, AAngle2) + ACenter);
+  ExpandRect(ARect, RotatePointX(ARadius, AAngle1) + ACenter);
+  ExpandRect(ARect, RotatePointX(ARadius, AAngle2) + ACenter);
   j := Floor(AAngle1 / Pi * 2);
   for i := j to j + 4 do
     if InRange(Pi / 2 * i, AAngle1, AAngle2) then
-      ExpandRect(ARect, RotatePoint(p, Pi / 2 * i) + ACenter);
+      ExpandRect(ARect, RotatePointX(ARadius, Pi / 2 * i) + ACenter);
 end;
 
 function IsPointOnLine(const AP, A1, A2: TPoint): Boolean;
@@ -407,6 +406,15 @@ begin
   Result.Y := Round(sa * APoint.X + ca * APoint.Y);
 end;
 
+function RotatePointX(AX, AAngle: Double): TPoint;
+var
+  sa, ca: Extended;
+begin
+  SinCos(AAngle, sa, ca);
+  Result.X := Round(ca * AX);
+  Result.Y := Round(sa * AX);
+end;
+
 function RotateRect(const ASize: TPoint; AAngle: Double): TPointArray;
 var
   i: Integer;
diff --git a/components/tachart/taradialseries.pas b/components/tachart/taradialseries.pas
index 96bb75cdfc..1d236ef9c3 100644
--- a/components/tachart/taradialseries.pas
+++ b/components/tachart/taradialseries.pas
@@ -346,7 +346,7 @@ function TCustomPieSeries.TryRadius(ADrawer: IChartDrawer): TRect;
 
   function EndPoint(AAngle, ARadius: Double): TPoint;
   begin
-    Result := RotatePoint(Point(Round(ARadius), 0), -AAngle);
+    Result := RotatePointX(ARadius, -AAngle);
   end;
 
   function LabelExtraDist(APoly: TPointArray; AAngle: Double): Double;
diff --git a/components/tachart/tatypes.pas b/components/tachart/tatypes.pas
index 3c2ae91dff..bfe4007651 100644
--- a/components/tachart/tatypes.pas
+++ b/components/tachart/tatypes.pas
@@ -1201,16 +1201,17 @@ procedure TChartArrow.Draw(
   APen: TFPCustomPen);
 var
   da: Double;
-  pt, pt1, pt2, ptBase: TPoint;
+  diag: Integer;
+  pt1, pt2, ptBase: TPoint;
 begin
   if not Visible then exit;
   da := ArcTan2(Width, Length);
 
-  pt := Point(-ADrawer.Scale(Round(Sqrt(Sqr(Length) + Sqr(Width)))), 0);
-  pt1 := AEndPos + RotatePoint(pt, AAngle - da);
-  pt2 := AEndPos + RotatePoint(pt, AAngle + da);
+  diag := -ADrawer.Scale(Round(Sqrt(Sqr(Length) + Sqr(Width))));
+  pt1 := AEndPos + RotatePointX(diag, AAngle - da);
+  pt2 := AEndPos + RotatePointX(diag, AAngle + da);
   if BaseLength > 0 then begin
-    ptBase := AEndPos + RotatePoint(Point(-ADrawer.Scale(BaseLength), 0), AAngle);
+    ptBase := AEndPos + RotatePointX(-ADrawer.Scale(BaseLength), AAngle);
     ADrawer.SetBrushParams(bsSolid, FPColorToChartColor(APen.FPColor));
     ADrawer.Polygon([pt1, AEndPos, pt2, ptBase], 0, 4);
   end