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

TAChart: Deprecate TDataPointDrawTool.OnShow by and replace by TDataPointDrawTool.OnCustomDraw.

Browse Source 
git-svn-id: trunk@60984 -
This commit is contained in:
wp 2019-04-15 19:40:19 +00:00
parent c17a8a1444
commit 78857f4559
5 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/tachart/demo/distance/distancedemo.lpi
View File

@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions BuildModesCount="1">
<ProjectOptions>
<Version Value="12"/>
<PathDelim Value="\"/>
<General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/>
<Title Value="distancedemo"/>
<Scaled Value="True"/>
@ -16,8 +19,8 @@
<i18n>
<EnableI18N LFM="False"/>
</i18n>
<BuildModes>
<Item1 Name="Default" Default="True"/>
<BuildModes Count="1">
<Item1 Name="default" Default="True"/>
</BuildModes>
<PublishOptions>
<Version Value="2"/>

2
components/tachart/demo/tools/main.lfm
View File

@ -237,7 +237,7 @@ object Form1: TForm1
Shift = [ssCtrl]
OnAfterKeyUp = ChartToolset1DataPointCrosshairTool1AfterKeyUp
GrabRadius = 200
OnDraw = ChartToolset1DataPointCrosshairTool1Draw
OnCustomDraw = ChartToolset1DataPointCrosshairTool1CustomDraw
end
end
object RandomChartSource1: TRandomChartSource

11
components/tachart/demo/tools/main.pas
View File

@ -6,7 +6,8 @@ interface
uses
Classes, ExtCtrls, StdCtrls, SysUtils, FileUtil, LResources, Forms, Controls,
Graphics, Dialogs, Types, TAFuncSeries, TAGraph, TASeries, TASources, TATools;
Graphics, Dialogs, Types,
TAFuncSeries, TAGraph, TASeries, TASources, TATools, TADrawUtils;
type
@ -42,8 +43,8 @@ type
procedure Chart1FuncSeries1Calculate(const AX: Double; out AY: Double);
procedure ChartToolset1DataPointCrosshairTool1AfterKeyUp(ATool: TChartTool;
APoint: TPoint);
procedure ChartToolset1DataPointCrosshairTool1Draw(
ASender: TDataPointCrosshairTool);
procedure ChartToolset1DataPointCrosshairTool1CustomDraw(
ASender: TDataPointCrosshairTool; ADrawer: IChartDrawer);
procedure ChartToolset1DataPointDragTool1BeforeMouseMove(ATool: TChartTool;
APoint: TPoint);
procedure rgPanClick(Sender: TObject);
@ -92,8 +93,8 @@ begin
ChartToolset1DataPointCrosshairTool1.Hide;
end;
procedure TForm1.ChartToolset1DataPointCrosshairTool1Draw(
ASender: TDataPointCrosshairTool);
procedure TForm1.ChartToolset1DataPointCrosshairTool1CustomDraw(
ASender: TDataPointCrosshairTool; ADrawer: IChartDrawer);
const
R = 20;
begin

10
components/tachart/demo/tools/toolsdemo.lpi
View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="11"/>
<Version Value="12"/>
<PathDelim Value="\"/>
<General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<ResourceType Value="res"/>
<UseXPManifest Value="True"/>
</General>
@ -21,13 +23,13 @@
</PublishOptions>
<RunParams>
<local>
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local>
<FormatVersion Value="2"/>
<Modes Count="1">
<Mode0 Name="default">
<local>
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local>
</Mode0>
</Modes>

30
components/tachart/tatools.pas
View File

@ -544,17 +544,24 @@ type
TDataPointDrawTool = class;
TChartDataPointDrawEvent = procedure (ASender: TDataPointDrawTool;
ADrawer: IChartDrawer) of object;
TChartDataPointCustomDrawEvent = procedure (
ASender: TDataPointDrawTool; ADrawer: IChartDrawer) of object;
TChartDataPointDrawEvent = procedure (
ASender: TDataPointDrawTool) of object;
TDataPointDrawTool = class(TDataPointTool)
strict private
FOnCustomDraw: TChartDataPointCustomDrawEvent;
FOnDraw: TChartDataPointDrawEvent;
strict protected
FPen: TChartPen;
procedure DoDraw(ADrawer: IChartDrawer); virtual;
procedure DoHide(ADrawer: IChartDrawer); virtual;
procedure SetPen(AValue: TChartPen);
// deprecated
procedure DoDraw; virtual; deprecated;
procedure DoHide; virtual; deprecated;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
@ -563,7 +570,10 @@ type
published
property DrawingMode;
property GrabRadius default 20;
property OnDraw: TChartDataPointDrawEvent read FOnDraw write FOnDraw;
property OnCustomDraw: TChartDataPointCustomDrawEvent
read FOnCustomDraw write FOnCustomDraw;
property OnDraw: TChartDataPointDrawEvent
read FOnDraw write FOnDraw; deprecated 'Use OnCustomDraw';
property MouseInsideOnly;
end;
@ -1990,10 +2000,22 @@ begin
inherited;
end;
procedure TDataPointDrawTool.DoDraw;
begin
DoDraw(GetCurrentDrawer);
end;
procedure TDataPointDrawTool.DoDraw(ADrawer: IChartDrawer);
begin
if Assigned(OnCustomDraw) then
OnCustomDraw(Self, ADrawer);
if Assigned(OnDraw) then
OnDraw(Self, ADrawer);
OnDraw(Self);
end;
procedure TDataPointDrawTool.DoHide;
begin
DoHide(GetCurrentDrawer);
end;
procedure TDataPointDrawTool.DoHide(ADrawer: IChartDrawer);