From 2c1e9b1a49e7bd582dc3f733ae027743e70e4da2 Mon Sep 17 00:00:00 2001
From: ask <ask@lazarus-ide.org>
Date: Mon, 21 Mar 2011 14:15:42 +0000
Subject: [PATCH] TAChart: Remove TOpenGLDrawer -> Graphics dependency

git-svn-id: trunk@29967 -
---
 components/tachart/demo/opengl/Main.pas |  2 +-
 components/tachart/tadraweraggpas.pas   |  4 ++--
 components/tachart/tadraweropengl.pas   | 22 ++++++++++------------
 components/tachart/tadrawutils.pas      |  2 +-
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/components/tachart/demo/opengl/Main.pas b/components/tachart/demo/opengl/Main.pas
index 83eedec5f6..6f15816596 100644
--- a/components/tachart/demo/opengl/Main.pas
+++ b/components/tachart/demo/opengl/Main.pas
@@ -47,7 +47,7 @@ begin
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
 
-  d := TOpenGLDrawer.Create(OpenGLControl1);
+  d := TOpenGLDrawer.Create;
   Chart1.DisableRedrawing;
   Chart1.Title.Text.Text := 'OpenGL';
   Chart1.Draw(d, Rect(0, 0, OpenGLControl1.Width, OpenGLControl1.Height));
diff --git a/components/tachart/tadraweraggpas.pas b/components/tachart/tadraweraggpas.pas
index 93371494b7..fbafd13187 100644
--- a/components/tachart/tadraweraggpas.pas
+++ b/components/tachart/tadraweraggpas.pas
@@ -15,7 +15,7 @@ Authors: Alexander Klenin
 }
 unit TADrawerAggPas;
 
-{$mode objfpc}
+{$H+}
 
 interface
 
@@ -26,7 +26,7 @@ type
 
   { TAggPasDrawer }
 
-  TAggPasDrawer = class(TBasicDrawer, IChartDrawer, ISimpleTextOut)
+  TAggPasDrawer = class(TBasicDrawer, IChartDrawer)
   strict private
     FCanvas: TAggLCLCanvas;
     procedure SetBrush(ABrush: TFPCustomBrush);
diff --git a/components/tachart/tadraweropengl.pas b/components/tachart/tadraweropengl.pas
index 8738cc8749..af0c70bb26 100644
--- a/components/tachart/tadraweropengl.pas
+++ b/components/tachart/tadraweropengl.pas
@@ -15,13 +15,12 @@ Authors: Alexander Klenin
 }
 unit TADrawerOpenGL;
 
-{$mode objfpc}
+{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, FPCanvas, FPImage, OpenGLContext, GL, GLu, Glut,
-  TADrawUtils;
+  Classes, FPCanvas, FPImage, GL, GLu, Glut, TADrawUtils;
 
 type
 
@@ -30,7 +29,6 @@ type
   TOpenGLDrawer = class(TBasicDrawer, IChartDrawer)
   strict private
     FBrushColor: TFPColor;
-    FContext: TOpenGLControl;
     FFontColor: TFPColor;
     FPenColor: TFPColor;
     FPenWidth: Integer;
@@ -45,7 +43,7 @@ type
     function SimpleTextExtent(const AText: String): TPoint; override;
     procedure SimpleTextOut(AX, AY: Integer; const AText: String); override;
   public
-    constructor Create(AContext: TOpenGLControl);
+    constructor Create;
   public
     procedure AddToFontOrientation(ADelta: Integer);
     procedure ClippingStart;
@@ -74,10 +72,11 @@ type
     procedure SetBrushParams(AStyle: TFPBrushStyle; AColor: TChartColor);
     procedure SetPenParams(AStyle: TFPPenStyle; AColor: TChartColor);
   end;
+
 implementation
 
 uses
-  Graphics, TAChartUtils;
+  TAChartUtils;
 
 procedure ChartGLColor(AColor: TFPColor);
 begin
@@ -130,9 +129,8 @@ begin
   glDisable(GL_CLIP_PLANE3);
 end;
 
-constructor TOpenGLDrawer.Create(AContext: TOpenGLControl);
+constructor TOpenGLDrawer.Create;
 begin
-  FContext := AContext;
 end;
 
 procedure TOpenGLDrawer.Ellipse(AX1, AY1, AX2, AY2: Integer);
@@ -150,7 +148,7 @@ end;
 
 function TOpenGLDrawer.GetBrushColor: TChartColor;
 begin
-  Result := FPColorToTColor(FBrushColor);
+  Result := FPColorToChartColor(FBrushColor);
 end;
 
 function TOpenGLDrawer.GetFontAngle: Double;
@@ -224,7 +222,7 @@ end;
 procedure TOpenGLDrawer.PrepareSimplePen(AColor: TChartColor);
 begin
   FPenWidth := 1;
-  FPenColor := TColorToFPColor(ColorToRGB(AColor));
+  FPenColor := ChartColorToFPColor(AColor);
 end;
 
 procedure TOpenGLDrawer.RadialPie(
@@ -261,7 +259,7 @@ end;
 
 procedure TOpenGLDrawer.SetBrushColor(AColor: TChartColor);
 begin
-  FBrushColor := TColorToFPColor(ColorToRGB(AColor));
+  FBrushColor := ChartColorToFPColor(AColor);
 end;
 
 procedure TOpenGLDrawer.SetBrushParams(
@@ -285,7 +283,7 @@ end;
 procedure TOpenGLDrawer.SetPenParams(AStyle: TFPPenStyle; AColor: TChartColor);
 begin
   Unused(AStyle);
-  FPenColor := TColorToFPColor(ColorToRGB(AColor));
+  FPenColor := ChartColorToFPColor(AColor);
 end;
 
 function TOpenGLDrawer.SimpleTextExtent(const AText: String): TPoint;
diff --git a/components/tachart/tadrawutils.pas b/components/tachart/tadrawutils.pas
index d9cd89d977..7a934389bd 100644
--- a/components/tachart/tadrawutils.pas
+++ b/components/tachart/tadrawutils.pas
@@ -21,7 +21,7 @@ unit TADrawUtils;
 interface
 
 uses
-  Classes, FPCanvas, FPImage, Graphics, SysUtils, Types;
+  Classes, FPCanvas, FPImage, Graphics, Types;
 
 type
   TChartColor = -$7FFFFFFF-1..$7FFFFFFF;