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

TAChart: New extent validation event for TChart. Deprecate OnExtentChanging event. Issue #35390, patch by Marcin Wiazowski.

Browse Source 
git-svn-id: trunk@61017 -
This commit is contained in:
wp 2019-04-18 14:11:22 +00:00
parent 81f4762dba
commit c0f90521ad
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
components/tachart/tagraph.pas
View File

@ -167,6 +167,8 @@ type
var ADoDefaultDrawing: Boolean) of object; var ADoDefaultDrawing: Boolean) of object;
TChartDrawEvent = procedure ( TChartDrawEvent = procedure (
ASender: TChart; ADrawer: IChartDrawer) of object; ASender: TChart; ADrawer: IChartDrawer) of object;
TChartExtentValidateEvent = procedure (
ASender: TChart; var ALogicalExtent: TDoubleRect; var AllowChange: Boolean) of object;
TChartRenderingParams = record TChartRenderingParams = record
FClipRect: TRect; FClipRect: TRect;
@ -213,6 +215,7 @@ type
FOnDrawLegend: TChartDrawLegendEvent; FOnDrawLegend: TChartDrawLegendEvent;
FProportional: Boolean; FProportional: Boolean;
FSeries: TChartSeriesList; FSeries: TChartSeriesList;
FSetLogicalExtentCounter: Integer;
FTitle: TChartTitle; FTitle: TChartTitle;
FToolset: TBasicChartToolset; FToolset: TBasicChartToolset;
@ -232,6 +235,7 @@ type
FOnAfterPaint: TChartEvent; FOnAfterPaint: TChartEvent;
FOnExtentChanged: TChartEvent; FOnExtentChanged: TChartEvent;
FOnExtentChanging: TChartEvent; FOnExtentChanging: TChartEvent;
FOnExtentValidate: TChartExtentValidateEvent;
FPrevLogicalExtent: TDoubleRect; FPrevLogicalExtent: TDoubleRect;
FScale: TDoublePoint; // Coordinates transformation FScale: TDoublePoint; // Coordinates transformation
FScalingValid: Boolean; FScalingValid: Boolean;
@ -263,7 +267,7 @@ type
procedure SetFrame(Value: TChartPen); procedure SetFrame(Value: TChartPen);
procedure SetGUIConnector(AValue: TChartGUIConnector); procedure SetGUIConnector(AValue: TChartGUIConnector);
procedure SetLegend(Value: TChartLegend); procedure SetLegend(Value: TChartLegend);
procedure SetLogicalExtent(const AValue: TDoubleRect); procedure SetLogicalExtent(AValue: TDoubleRect);
procedure SetMargins(AValue: TChartMargins); procedure SetMargins(AValue: TChartMargins);
procedure SetMarginsExternal(AValue: TChartMargins); procedure SetMarginsExternal(AValue: TChartMargins);
procedure SetMinDataSpace(const AValue: Integer); procedure SetMinDataSpace(const AValue: Integer);
@ -453,7 +457,9 @@ type
property OnExtentChanged: TChartEvent property OnExtentChanged: TChartEvent
read FOnExtentChanged write FOnExtentChanged; read FOnExtentChanged write FOnExtentChanged;
property OnExtentChanging: TChartEvent property OnExtentChanging: TChartEvent
read FOnExtentChanging write FOnExtentChanging; read FOnExtentChanging write FOnExtentChanging; deprecated 'Used OnExtentValidate instead';
property OnExtentValidate: TChartExtentValidateEvent
read FOnExtentValidate write FOnExtentValidate;
published published
property Align; property Align;
@ -505,6 +511,7 @@ uses
const const
SScalingNotInitialized = '[%s.%s]: Image-graph scaling not yet initialized.'; SScalingNotInitialized = '[%s.%s]: Image-graph scaling not yet initialized.';
SNestedSetLogicalExtentCall = '%s: Don''t set LogicalExtent in OnExtentValidation handler - modify %s parameter instead.';
function CompareZPosition(AItem1, AItem2: Pointer): Integer; function CompareZPosition(AItem1, AItem2: Pointer): Integer;
begin begin
@ -1675,10 +1682,24 @@ begin
StyleChanged(Self); StyleChanged(Self);
end; end;
procedure TChart.SetLogicalExtent(const AValue: TDoubleRect); procedure TChart.SetLogicalExtent(AValue: TDoubleRect);
var var
AllowChange: Boolean;
w, h: Double; w, h: Double;
begin begin
if FSetLogicalExtentCounter <> 0 then
raise EChartError.CreateFmt(SNestedSetLogicalExtentCall, [NameOrClassName(Self), 'ALogicalExtent']);
if Assigned(OnExtentValidate) then begin
AllowChange := true;
Inc(FSetLogicalExtentCounter);
try
OnExtentValidate(Self, AValue, AllowChange);
finally
Dec(FSetLogicalExtentCounter);
end;
if not AllowChange then exit;
end;
if FLogicalExtent = AValue then exit; if FLogicalExtent = AValue then exit;
w := Abs(AValue.a.X - AValue.b.X); w := Abs(AValue.a.X - AValue.b.X);
h := Abs(AValue.a.Y - AValue.b.Y); h := Abs(AValue.a.Y - AValue.b.Y);