paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-03 03:20:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: Simplify InitHelper interface

Browse Source 
git-svn-id: trunk@22694 -
This commit is contained in:
ask 2009-11-20 11:47:12 +00:00
parent b3b953b3d1
commit 91daeebbea
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/tachart/talegend.pas
View File

@ -113,7 +113,7 @@ type
implementation
uses
FPCanvas, Math, Types;
Math, Types;
const
SYMBOL_TEXT_SPACING = 4;
@ -200,9 +200,9 @@ begin
FUseSidebar := true;
Visible := false;
InitHelper(TFPCanvasHelper(FBackgroundBrush), TChartLegendBrush);
InitHelper(TFPCanvasHelper(FFont), TFont);
InitHelper(TFPCanvasHelper(FFrame), TChartPen);
InitHelper(FBackgroundBrush, TChartLegendBrush);
InitHelper(FFont, TFont);
InitHelper(FFrame, TChartPen);
end;
destructor TChartLegend.Destroy;

30
components/tachart/tatypes.pas
View File

@ -66,8 +66,7 @@ type
procedure SetVisible(const AValue: Boolean);
protected
FOwner: TCustomChart;
procedure InitHelper(
var AResult: TFPCanvasHelper; AClass: TFPCanvasHelperClass);
procedure InitHelper(var AResult; AClass: TFPCanvasHelperClass);
procedure StyleChanged(Sender: TObject);
public
constructor Create(AOwner: TCustomChart);
@ -427,11 +426,10 @@ begin
FOwner := AOwner;
end;
procedure TChartElement.InitHelper(
var AResult: TFPCanvasHelper; AClass: TFPCanvasHelperClass);
procedure TChartElement.InitHelper(var AResult; AClass: TFPCanvasHelperClass);
begin
AResult := AClass.Create;
AResult.OnChange := @StyleChanged;
TFPCanvasHelper(AResult) := AClass.Create;
TFPCanvasHelper(AResult).OnChange := @StyleChanged;
end;
procedure TChartElement.SetOwner(AOwner: TCustomChart);
@ -473,11 +471,11 @@ begin
inherited Create(AOwner);
FAlignment := taCenter;
InitHelper(TFPCanvasHelper(FBrush), TBrush);
InitHelper(FBrush, TBrush);
FBrush.Color := FOwner.Color;
InitHelper(TFPCanvasHelper(FFont), TFont);
InitHelper(FFont, TFont);
FFont.Color := clBlue;
InitHelper(TFPCanvasHelper(FFrame), TChartPen);
InitHelper(FFrame, TChartPen);
FText := TStringList.Create;
end;
@ -538,7 +536,7 @@ constructor TChartAxisTitle.Create(AOwner: TCustomChart);
begin
inherited Create(AOwner);
FDistance := DEF_TITLE_DISTANCE;
InitHelper(TFPCanvasHelper(FFont), TFont);
InitHelper(FFont, TFont);
end;
destructor TChartAxisTitle.Destroy;
@ -929,11 +927,11 @@ begin
inherited Create(AOwner);
FClipped := true;
FDistance := DEF_MARKS_DISTANCE;
InitHelper(TFPCanvasHelper(FFrame), TChartPen);
InitHelper(TFPCanvasHelper(FLabelBrush), TChartLabelBrush);
InitHelper(FFrame, TChartPen);
InitHelper(FLabelBrush, TChartLabelBrush);
FLabelBrush.Color := clYellow;
InitHelper(TFPCanvasHelper(FLabelFont), TFont);
InitHelper(TFPCanvasHelper(FLinkPen), TChartLinkPen);
InitHelper(FLabelFont, TFont);
InitHelper(FLinkPen, TChartLinkPen);
FLinkPen.Color := clWhite;
FStyle := smsNone;
FVisible := true;
@ -1050,8 +1048,8 @@ constructor TSeriesPointer.Create(AOwner: TCustomChart);
begin
inherited Create(AOwner);
InitHelper(TFPCanvasHelper(FBrush), TBrush);
InitHelper(TFPCanvasHelper(FPen), TChartPen);
InitHelper(FBrush, TBrush);
InitHelper(FPen, TChartPen);
FHorizSize := DEF_POINTER_SIZE;
FStyle := psRectangle;