paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 12:19:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: New axis event OnGetMarkText to replace the old OnMarkToText (which does not pass the used axis in a parameter). Deprecate OnMarkToText.

Browse Source 
git-svn-id: trunk@62116 -
This commit is contained in:
wp 2019-10-25 14:48:33 +00:00
parent a8aba970ab
commit 4f81e53b18
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/tachart/tachartaxis.pas
View File

@ -109,6 +109,7 @@ type
FMargin: TChartDistance; FMargin: TChartDistance;
FMarginsForMarks: Boolean; FMarginsForMarks: Boolean;
FMinors: TChartMinorAxisList; FMinors: TChartMinorAxisList;
FOnGetMarkText: TChartGetAxisMarkTextEvent;
FOnMarkToText: TChartAxisMarkToTextEvent; FOnMarkToText: TChartAxisMarkToTextEvent;
FPosition: Double; FPosition: Double;
FPositionUnits: TChartUnits; FPositionUnits: TChartUnits;
@ -130,6 +131,7 @@ type
procedure SetMarginsForMarks(AValue: Boolean); procedure SetMarginsForMarks(AValue: Boolean);
procedure SetMarks(AValue: TChartAxisMarks); procedure SetMarks(AValue: TChartAxisMarks);
procedure SetMinors(AValue: TChartMinorAxisList); procedure SetMinors(AValue: TChartMinorAxisList);
procedure SetOnGetMarkText(AValue: TChartGetAxisMarkTextEvent);
procedure SetOnMarkToText(AValue: TChartAxisMarkToTextEvent); procedure SetOnMarkToText(AValue: TChartAxisMarkToTextEvent);
procedure SetPosition(AValue: Double); procedure SetPosition(AValue: Double);
procedure SetPositionUnits(AValue: TChartUnits); procedure SetPositionUnits(AValue: TChartUnits);
@ -193,8 +195,10 @@ type
read FTransformations write SetTransformations; read FTransformations write SetTransformations;
property ZPosition: TChartDistance read FZPosition write SetZPosition default 0; property ZPosition: TChartDistance read FZPosition write SetZPosition default 0;
published published
property OnGetMarkText: TChartGetAxisMarkTextEvent
read FOnGetMarkText write SetOnGetMarkText;
property OnMarkToText: TChartAxisMarkToTextEvent property OnMarkToText: TChartAxisMarkToTextEvent
read FOnMarkToText write SetOnMarkToText; read FOnMarkToText write SetOnMarkToText; deprecated 'Use "OnGetMarkText';
end; end;
TChartOnSourceVisitor = TChartOnSourceVisitor =
@ -433,6 +437,7 @@ begin
Self.FTransformations := Transformations; Self.FTransformations := Transformations;
Self.FZPosition := ZPosition; Self.FZPosition := ZPosition;
Self.FMarginsForMarks := MarginsForMarks; Self.FMarginsForMarks := MarginsForMarks;
Self.FOnGetMarkText := OnGetMarkText;
Self.FOnMarkToText := OnMarkToText; Self.FOnMarkToText := OnMarkToText;
end; end;
inherited Assign(ASource); inherited Assign(ASource);
@ -704,6 +709,11 @@ begin
FRotationCenter := Marks.RotationCenter; FRotationCenter := Marks.RotationCenter;
end; end;
if Assigned(FOnGetMarkText) then
for i := 0 to High(FMarkValues) do
FOnGetMarkText(self, FMarkValues[i].FText, FMarkValues[i].FValue);
// the following event is deprecated and will be removed...
if Assigned(FOnMarkToText) then if Assigned(FOnMarkToText) then
for i := 0 to High(FMarkValues) do for i := 0 to High(FMarkValues) do
FOnMarkToText(FMarkValues[i].FText, FMarkValues[i].FValue); FOnMarkToText(FMarkValues[i].FText, FMarkValues[i].FValue);
@ -1015,6 +1025,13 @@ begin
StyleChanged(Self); StyleChanged(Self);
end; end;
procedure TChartAxis.SetOnGetMarkText(AValue: TChartGetAxisMarkTextEvent);
begin
if TMethod(FOnGetMarkText) = TMethod(AValue) then exit;
FOnGetMarkText := AValue;
StyleChanged(Self);
end;
procedure TChartAxis.SetOnMarkToText(AValue: TChartAxisMarkToTextEvent); procedure TChartAxis.SetOnMarkToText(AValue: TChartAxisMarkToTextEvent);
begin begin
if TMethod(FOnMarkToText) = TMethod(AValue) then exit; if TMethod(FOnMarkToText) = TMethod(AValue) then exit;

3
components/tachart/tachartaxisutils.pas
View File

@ -23,6 +23,7 @@ const
type type
TChartAxisBrush = TClearBrush; TChartAxisBrush = TClearBrush;
TChartBasicAxis = class;
TChartAxisFramePen = class(TChartPen) TChartAxisFramePen = class(TChartPen)
published published
@ -71,6 +72,8 @@ type
TChartAxisMargins = array [TChartAxisAlignment] of Integer; TChartAxisMargins = array [TChartAxisAlignment] of Integer;
TChartAxisMarkToTextEvent = TChartAxisMarkToTextEvent =
procedure (var AText: String; AMark: Double) of object; procedure (var AText: String; AMark: Double) of object;
TChartGetAxisMarkTextEvent =
procedure (Sender: TObject; var AText: String; AMark: Double) of object;
{$IFNDEF fpdoc} // Workaround for issue #18549. {$IFNDEF fpdoc} // Workaround for issue #18549.
TBasicChartAxisMarks = TBasicChartAxisMarks =