paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-17 04:29:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: Remove dependency of TASources on Graphics and LCLIntf, allowing it to be compiled in console-only mode.

Browse Source 
git-svn-id: trunk@26783 -
This commit is contained in:
ask 2010-07-22 16:01:20 +00:00
parent 1d83e92899
commit 0a1544f155
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/tachart/tachartutils.pas
View File

@ -34,6 +34,7 @@ uses
const
CHART_COMPONENT_IDE_PAGE = 'Chart';
PERCENT = 0.01;
clTAColor = $20000000; // = clDefault, but avoiding dependency on Graphics
type
EChartError = class(Exception);

2
components/tachart/tacustomseries.pas
View File

@ -24,7 +24,7 @@ interface
uses
Classes, Graphics, SysUtils,
TAChartUtils, TADrawUtils, TAGraph, TASources, TATypes;
TAChartUtils, TAGraph, TASources, TATypes;
const
DEF_AXIS_INDEX = -1;

1
components/tachart/tadrawutils.pas
View File

@ -27,7 +27,6 @@ const
Colors: array [1..15] of TColor = (
clRed, clGreen, clYellow, clBlue, clWhite, clGray, clFuchsia,
clTeal, clNavy, clMaroon, clLime, clOlive, clPurple, clSilver, clAqua);
clTAColor = clScrollBar;
type
TPenBrushFont = set of (pbfPen, pbfBrush, pbfFont);

33
components/tachart/tasources.pas
View File

@ -22,14 +22,17 @@ unit TASources;
interface
uses
Classes, Graphics, SysUtils, Types, TAChartUtils;
Classes, SysUtils, Types, TAChartUtils;
type
EEditableSourceRequired = class(EChartError);
// Like TColor, but avoiding dependency on Graphics.
TChartColor = -$7FFFFFFF-1..$7FFFFFFF;
TChartDataItem = record
X, Y: Double;
Color: TColor;
Color: TChartColor;
Text: String;
end;
PChartDataItem = ^TChartDataItem;
@ -85,7 +88,7 @@ type
FSorted: Boolean;
procedure AddAt(
APos: Integer; AX, AY: Double; const ALabel: String; AColor: TColor);
APos: Integer; AX, AY: Double; const ALabel: String; AColor: TChartColor);
procedure ClearCaches;
procedure SetDataPoints(AValue: TStrings);
procedure SetSorted(AValue: Boolean);
@ -98,7 +101,7 @@ type
destructor Destroy; override;
public
function Add(
AX, AY: Double; const ALabel: String; AColor: TColor): Integer;
AX, AY: Double; const ALabel: String; AColor: TChartColor): Integer;
procedure Clear;
procedure CopyForm(ASource: TCustomChartSource);
procedure Delete(AIndex: Integer); inline;
@ -217,7 +220,7 @@ procedure SetDataItemDefaults(var AItem: TChartDataItem);
implementation
uses
LCLIntf, Math, StrUtils, TADrawUtils;
Math, StrUtils;
{$IFOPT R+}{$DEFINE RangeChecking}{$ELSE}{$UNDEF RangeChecking}{$ENDIF}
{$IFOPT Q+}{$DEFINE OverflowChecking}{$ELSE}{$UNDEF OverflowChecking}{$ENDIF}
@ -231,13 +234,13 @@ type
FSource: TListChartSource;
procedure Parse(const AString: String; ADataItem: PChartDataItem);
protected
function Get(Index: Integer): string; override;
function Get(Index: Integer): String; override;
function GetCount: Integer; override;
procedure Put(Index: Integer; const S: string); override;
procedure Put(Index: Integer; const S: String); override;
public
procedure Clear; override;
procedure Delete(Index: Integer); override;
procedure Insert(Index: Integer; const S: string); override;
procedure Insert(Index: Integer; const S: String); override;
end;
procedure Register;
@ -457,7 +460,7 @@ begin
FSource.Delete(Index);
end;
function TListChartSourceStrings.Get(Index: Integer): string;
function TListChartSourceStrings.Get(Index: Integer): String;
begin
with FSource[Index]^ do
Result := Format('%g|%g|%s|%s',
@ -469,7 +472,7 @@ begin
Result := FSource.Count;
end;
procedure TListChartSourceStrings.Insert(Index: Integer; const S: string);
procedure TListChartSourceStrings.Insert(Index: Integer; const S: String);
var
item: PChartDataItem;
begin
@ -498,7 +501,7 @@ begin
end;
end;
procedure TListChartSourceStrings.Put(Index: Integer; const S: string);
procedure TListChartSourceStrings.Put(Index: Integer; const S: String);
begin
Parse(S, FSource[Index]);
end;
@ -506,7 +509,7 @@ end;
{ TListChartSource }
function TListChartSource.Add(
AX, AY: Double; const ALabel: String; AColor: TColor): Integer;
AX, AY: Double; const ALabel: String; AColor: TChartColor): Integer;
begin
Result := FData.Count;
if Sorted then
@ -520,8 +523,8 @@ begin
AddAt(Result, AX, AY, ALabel, AColor);
end;
procedure TListChartSource.AddAt(APos: Integer; AX, AY: Double;
const ALabel: String; AColor: TColor);
procedure TListChartSource.AddAt(
APos: Integer; AX, AY: Double; const ALabel: String; AColor: TChartColor);
var
pcd: PChartDataItem;
begin
@ -781,7 +784,7 @@ begin
inherited Create(AOwner);
FCurItem.Color := clTAColor;
FRNG := TMWCRandomGenerator.Create;
RandSeed := GetTickCount;
RandSeed := Trunc(Frac(Now) * MaxInt);
end;
destructor TRandomChartSource.Destroy;