TAChart: Merge duplicate definitions of TChartColor

git-svn-id: trunk@31392 -
This commit is contained in:
ask 2011-06-26 07:14:37 +00:00
parent 2cca7ee1a8
commit 980591b46b
9 changed files with 15 additions and 17 deletions

View File

@ -42,6 +42,9 @@ type
EListenerError = class(EChartError); EListenerError = class(EChartError);
EDrawDataError = class(EChartError); EDrawDataError = class(EChartError);
// Like TColor, but avoiding dependency on Graphics.
TChartColor = -$7FFFFFFF-1..$7FFFFFFF;
TDoublePoint = record TDoublePoint = record
X, Y: Double; X, Y: Double;
end; end;

View File

@ -29,9 +29,6 @@ type
EEditableSourceRequired = class(EChartError); EEditableSourceRequired = class(EChartError);
EYCountError = class(EChartError); EYCountError = class(EChartError);
// Like TColor, but avoiding dependency on Graphics.
TChartColor = -$7FFFFFFF-1..$7FFFFFFF;
{ TChartDataItem } { TChartDataItem }
TChartDataItem = object TChartDataItem = object

View File

@ -20,7 +20,7 @@ unit TADrawerAggPas;
interface interface
uses uses
Classes, FPCanvas, Agg_LCL, TADrawUtils; Classes, FPCanvas, Agg_LCL, TAChartUtils, TADrawUtils;
type type
@ -68,7 +68,7 @@ type
implementation implementation
uses uses
Math, TAChartUtils, TAGeometry; Math, TAGeometry;
{ TAggPasDrawer } { TAggPasDrawer }

View File

@ -20,7 +20,7 @@ unit TADrawerBGRA;
interface interface
uses uses
BGRABitmap, BGRABitmapTypes, Classes, FPCanvas, TADrawUtils; BGRABitmap, BGRABitmapTypes, Classes, FPCanvas, TAChartUtils, TADrawUtils;
type type
@ -78,7 +78,7 @@ type
implementation implementation
uses uses
TAChartUtils, TAGeometry; TAGeometry;
function PointsToPointsF( function PointsToPointsF(
APoints: array of TPoint; AStartIndex, ANumPts: Integer): ArrayOfTPointF; APoints: array of TPoint; AStartIndex, ANumPts: Integer): ArrayOfTPointF;

View File

@ -21,7 +21,7 @@ unit TADrawerCanvas;
interface interface
uses uses
Classes, FPCanvas, FPImage, Graphics, SysUtils, TADrawUtils; Classes, FPCanvas, FPImage, Graphics, SysUtils, TAChartUtils, TADrawUtils;
type type
IChartTCanvasDrawer = interface IChartTCanvasDrawer = interface
@ -81,7 +81,7 @@ type
implementation implementation
uses uses
TAChartUtils, TAGeometry; TAGeometry;
function CanvasGetFontOrientationFunc(AFont: TFPCustomFont): Integer; function CanvasGetFontOrientationFunc(AFont: TFPCustomFont): Integer;
begin begin

View File

@ -20,7 +20,7 @@ unit TADrawerFPVectorial;
interface interface
uses uses
Classes, FPCanvas, FPImage, FPVectorial, TADrawUtils; Classes, FPCanvas, FPImage, FPVectorial, TAChartUtils, TADrawUtils;
type type
@ -77,7 +77,7 @@ type
implementation implementation
uses uses
Math, TAChartUtils, TAGeometry; Math, TAGeometry;
{ TFPVectorialDrawer } { TFPVectorialDrawer }

View File

@ -20,7 +20,7 @@ unit TADrawerSVG;
interface interface
uses uses
Classes, FPImage, FPCanvas, TADrawUtils; Classes, FPImage, FPCanvas, TAChartUtils, TADrawUtils;
type type
@ -90,7 +90,7 @@ type
implementation implementation
uses uses
Math, SysUtils, TAChartUtils, TAGeometry; Math, SysUtils, TAGeometry;
const const
RECT_FMT = RECT_FMT =

View File

@ -73,7 +73,6 @@ type
property MMWidth: Integer read FMMWidth write SetMMWidth; property MMWidth: Integer read FMMWidth write SetMMWidth;
end; end;
{ TMetafileCanvas } { TMetafileCanvas }
TMetafileCanvas = class(TCanvas) TMetafileCanvas = class(TCanvas)

View File

@ -21,11 +21,10 @@ unit TADrawUtils;
interface interface
uses uses
Classes, FPCanvas, FPImage, Types; Classes, FPCanvas, FPImage, Types, TAChartUtils;
type type
// Same types as in Graphics unit, but without dependency. // Same types as in Graphics unit, but without dependency.
TChartColor = -$7FFFFFFF-1..$7FFFFFFF;
TChartAntialiasingMode = (amDontCare, amOn, amOff); TChartAntialiasingMode = (amDontCare, amOn, amOff);
type type
@ -155,7 +154,7 @@ type
implementation implementation
uses uses
Math, TAChartUtils, TAGeometry; Math, TAGeometry;
const const
LINE_INTERVAL = 2; LINE_INTERVAL = 2;