From d6b37e7cb4d0103223bc30b36d47d7e2de959572 Mon Sep 17 00:00:00 2001
From: ask <ask@lazarus-ide.org>
Date: Sat, 5 Jun 2010 14:22:22 +0000
Subject: [PATCH] TAChart: Use EnsureOrder and NormalizeRect throughout the
 code

git-svn-id: trunk@25919 -
---
 components/tachart/tachartaxis.pas  | 3 +--
 components/tachart/tachartutils.pas | 4 ++--
 components/tachart/tagraph.pas      | 2 +-
 components/tachart/tatools.pas      | 7 +------
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/components/tachart/tachartaxis.pas b/components/tachart/tachartaxis.pas
index 4a4f4ced63..2c32cc0386 100644
--- a/components/tachart/tachartaxis.pas
+++ b/components/tachart/tachartaxis.pas
@@ -485,8 +485,7 @@ var
 begin
   AMin := GetTransform.GraphToAxis(AMin);
   AMax := GetTransform.GraphToAxis(AMax);
-  if AMin > AMax then
-    Exchange(AMin, AMax);
+  EnsureOrder(AMin, AMax);
   Marks.SourceDef.ValuesInRange(
     AMin, AMax, Marks.Format, IsVertical, FMarkValues, FMarkTexts);
   if Inverted then
diff --git a/components/tachart/tachartutils.pas b/components/tachart/tachartutils.pas
index 5aab4a70e4..ee4228d0c3 100644
--- a/components/tachart/tachartutils.pas
+++ b/components/tachart/tachartutils.pas
@@ -558,8 +558,8 @@ function RectIntersectsRect(
 
   function RangesIntersect(L1, R1, L2, R2: Double; out L, R: Double): Boolean;
   begin
-    if L1 > R1 then Exchange(L1, R1);
-    if L2 > R2 then Exchange(L2, R2);
+    EnsureOrder(L1, R1);
+    EnsureOrder(L2, R2);
     L := Max(L1, L2);
     R := Min(R1, R2);
     Result := L <= R;
diff --git a/components/tachart/tagraph.pas b/components/tachart/tagraph.pas
index a86ad71d43..f7e51016c0 100644
--- a/components/tachart/tagraph.pas
+++ b/components/tachart/tagraph.pas
@@ -1021,7 +1021,7 @@ procedure TChart.UpdateExtent;
           AHi += DEFAULT_WIDTH / 2;
         end
         else begin
-          if ALo > AHi then Exchange(ALo, AHi);
+          EnsureOrder(ALo, AHi);
           // Expand view slightly to avoid data points on the chart edge.
           ExpandRange(ALo, AHi, ExpandPercentage * PERCENT);
         end;
diff --git a/components/tachart/tatools.pas b/components/tachart/tatools.pas
index 2eb501bfbe..91658f3ede 100644
--- a/components/tachart/tatools.pas
+++ b/components/tachart/tatools.pas
@@ -659,12 +659,7 @@ begin
     ext.a := FChart.ImageToGraph(TopLeft);
     ext.b := FChart.ImageToGraph(BottomRight);
   end;
-  with ext do begin
-    if a.X > b.X then
-      Exchange(a.X, b.X);
-    if a.Y > b.Y then
-      Exchange(a.Y, b.Y);
-  end;
+  NormalizeRect(ext);
   CheckProportions;
   FChart.LogicalExtent := ext;
   Handled;