mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-19 10:09:29 +02:00
TAChart: Add TAGUIConnector unit and TChart.GUIConnector property
git-svn-id: trunk@40172 -
This commit is contained in:
ask
parent
a8e5453530
commit
b37b00794a
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -3158,6 +3158,7 @@ components/tachart/tafuncseries.pas svneol=native#text/pascal
|
||||
components/tachart/tageometry.pas svneol=native#text/pascal
|
||||
components/tachart/tagraph.lrs svneol=native#text/pascal
|
||||
components/tachart/tagraph.pas svneol=native#text/plain
|
||||
components/tachart/taguiconnector.pas svneol=native#text/pascal
|
||||
components/tachart/taintervalsources.pas svneol=native#text/pascal
|
||||
components/tachart/talegend.pas svneol=native#text/plain
|
||||
components/tachart/talegendpanel.pas svneol=native#text/pascal
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
for details about the copyright.
|
||||
"/>
|
||||
<Version Major="1"/>
|
||||
<Files Count="44">
|
||||
<Files Count="45">
|
||||
<Item1>
|
||||
<Filename Value="tagraph.pas"/>
|
||||
<HasRegisterProc Value="True"/>
|
||||
@ -230,6 +230,10 @@
|
||||
<Filename Value="tafitutils.pas"/>
|
||||
<UnitName Value="TAFitUtils"/>
|
||||
</Item44>
|
||||
<Item45>
|
||||
<Filename Value="taguiconnector.pas"/>
|
||||
<UnitName Value="TAGUIConnector"/>
|
||||
</Item45>
|
||||
</Files>
|
||||
<LazDoc Paths="$(LazarusDir)\components\tachart\fpdoc"/>
|
||||
<Type Value="RunAndDesignTime"/>
|
||||
|
||||
@ -15,7 +15,7 @@ uses
|
||||
TAChartListbox, TAEnumerators, TADataPointsEditor, TAChartExtentLink,
|
||||
TAToolEditors, TAMath, TAChartImageList, TADataTools, TAAnimatedSource,
|
||||
TATextElements, TAAxisSource, TASeriesPropEditors, TACustomFuncSeries,
|
||||
TAFitUtils, LazarusPackageIntf;
|
||||
TAFitUtils, TAGUIConnector, LazarusPackageIntf;
|
||||
|
||||
implementation
|
||||
|
||||
|
||||
@ -29,8 +29,8 @@ interface
|
||||
|
||||
uses
|
||||
Graphics, Classes, Controls, LCLType, SysUtils,
|
||||
TAChartAxis, TAChartAxisUtils, TAChartUtils, TADrawUtils, TALegend,
|
||||
TATextElements, TATypes;
|
||||
TAChartAxis, TAChartAxisUtils, TAChartUtils, TADrawUtils, TAGUIConnector,
|
||||
TALegend, TATextElements, TATypes;
|
||||
|
||||
type
|
||||
TChart = class;
|
||||
@ -174,12 +174,15 @@ type
|
||||
FAxisList: TChartAxisList;
|
||||
FAxisVisible: Boolean;
|
||||
FBackColor: TColor;
|
||||
FConnectorData: TChartGUIConnectorData;
|
||||
FDepth: TChartDistance;
|
||||
FDefaultGUIConnector: TChartGUIConnector;
|
||||
FExpandPercentage: Integer;
|
||||
FExtent: TChartExtent;
|
||||
FExtentSizeLimit: TChartExtent;
|
||||
FFoot: TChartTitle;
|
||||
FFrame: TChartPen;
|
||||
FGUIConnector: TChartGUIConnector;
|
||||
FLegend: TChartLegend;
|
||||
FLogicalExtent: TDoubleRect;
|
||||
FMargins: TChartMargins;
|
||||
@ -197,6 +200,7 @@ type
|
||||
FToolset: TBasicChartToolset;
|
||||
|
||||
function ClipRectWithoutFrame(AZPosition: TChartDistance): TRect;
|
||||
function EffectiveGUIConnector: TChartGUIConnector; inline;
|
||||
private
|
||||
FActiveToolIndex: Integer;
|
||||
FAutoFocus: Boolean;
|
||||
@ -205,7 +209,6 @@ type
|
||||
FClipRect: TRect;
|
||||
FCurrentExtent: TDoubleRect;
|
||||
FDisableRedrawingCounter: Integer;
|
||||
FDrawer: IChartDrawer;
|
||||
FExtentBroadcaster: TBroadcaster;
|
||||
FIsZoomed: Boolean;
|
||||
FOffset: TDoublePoint; // Coordinates transformation
|
||||
@ -239,6 +242,7 @@ type
|
||||
procedure SetExtentSizeLimit(AValue: TChartExtent);
|
||||
procedure SetFoot(Value: TChartTitle);
|
||||
procedure SetFrame(Value: TChartPen);
|
||||
procedure SetGUIConnector(AValue: TChartGUIConnector);
|
||||
procedure SetLegend(Value: TChartLegend);
|
||||
procedure SetLogicalExtent(const AValue: TDoubleRect);
|
||||
procedure SetMargins(AValue: TChartMargins);
|
||||
@ -320,7 +324,7 @@ type
|
||||
function SaveToImage(AClass: TRasterImageClass): TRasterImage;
|
||||
procedure StyleChanged(Sender: TObject); override;
|
||||
procedure ZoomFull(AImmediateRecalc: Boolean = false); override;
|
||||
property Drawer: IChartDrawer read FDrawer;
|
||||
property Drawer: IChartDrawer read FConnectorData.FDrawer;
|
||||
|
||||
public // Coordinate conversion
|
||||
function GraphToImage(const AGraphPoint: TDoublePoint): TPoint;
|
||||
@ -368,6 +372,8 @@ type
|
||||
property ExtentSizeLimit: TChartExtent read FExtentSizeLimit write SetExtentSizeLimit;
|
||||
property Foot: TChartTitle read FFoot write SetFoot;
|
||||
property Frame: TChartPen read FFrame write SetFrame;
|
||||
property GUIConnector: TChartGUIConnector
|
||||
read FGUIConnector write SetGUIConnector;
|
||||
property LeftAxis: TChartAxis index calLeft read GetAxisByAlign write SetAxisByAlign stored false;
|
||||
property Legend: TChartLegend read FLegend write SetLegend;
|
||||
property Margins: TChartMargins read FMargins write SetMargins;
|
||||
@ -598,7 +604,9 @@ begin
|
||||
FAllowZoom := true;
|
||||
FAntialiasingMode := amDontCare;
|
||||
FAxisVisible := true;
|
||||
FDrawer := TCanvasDrawer.Create(Canvas);
|
||||
FConnectorData.FCanvas := Canvas;
|
||||
FDefaultGUIConnector := TChartGUIConnectorCanvas.Create(Self);
|
||||
FDefaultGUIConnector.CreateDrawer(FConnectorData);
|
||||
FScale := DoublePoint(1, 1);
|
||||
|
||||
Width := DEFAULT_CHART_WIDTH;
|
||||
@ -671,6 +679,7 @@ begin
|
||||
FreeAndNil(FBuiltinToolset);
|
||||
FreeAndNil(FBroadcaster);
|
||||
FreeAndNil(FExtentBroadcaster);
|
||||
FreeAndNil(FDefaultGUIConnector);
|
||||
|
||||
DrawData.DeleteByChart(Self);
|
||||
inherited;
|
||||
@ -903,6 +912,12 @@ begin
|
||||
ADrawer.SetXor(false);
|
||||
end;
|
||||
|
||||
function TChart.EffectiveGUIConnector: TChartGUIConnector;
|
||||
begin
|
||||
Result := TChartGUIConnector(
|
||||
IfThen(FGUIConnector = nil, FDefaultGUIConnector, FGUIConnector));
|
||||
end;
|
||||
|
||||
procedure TChart.EnableRedrawing;
|
||||
begin
|
||||
FDisableRedrawingCounter -= 1;
|
||||
@ -1180,12 +1195,17 @@ procedure TChart.Paint;
|
||||
var
|
||||
defaultDrawing: Boolean = true;
|
||||
begin
|
||||
FConnectorData.FBounds := GetClientRect;
|
||||
{$WARNINGS OFF}
|
||||
if Assigned(OnChartPaint) then
|
||||
OnChartPaint(Self, GetClientRect, defaultDrawing);
|
||||
OnChartPaint(Self, FConnectorData.FBounds, defaultDrawing);
|
||||
{$WARNINGS ON}
|
||||
if defaultDrawing then
|
||||
Draw(FDrawer, GetClientRect);
|
||||
with EffectiveGUIConnector do begin
|
||||
SetBounds(FConnectorData);
|
||||
Draw(Drawer, FConnectorData.FDrawerBounds);
|
||||
EffectiveGUIConnector.Display(FConnectorData);
|
||||
end;
|
||||
if Assigned(OnAfterPaint) then
|
||||
OnAfterPaint(Self);
|
||||
end;
|
||||
@ -1394,6 +1414,14 @@ begin
|
||||
StyleChanged(Self);
|
||||
end;
|
||||
|
||||
procedure TChart.SetGUIConnector(AValue: TChartGUIConnector);
|
||||
begin
|
||||
if FGUIConnector = AValue then exit;
|
||||
FGUIConnector := AValue;
|
||||
EffectiveGUIConnector.CreateDrawer(FConnectorData);
|
||||
StyleChanged(Self);
|
||||
end;
|
||||
|
||||
procedure TChart.SetLegend(Value: TChartLegend);
|
||||
begin
|
||||
FLegend.Assign(Value);
|
||||
@ -1519,9 +1547,9 @@ end;
|
||||
procedure TChart.SetReticulePos(const AValue: TPoint);
|
||||
begin
|
||||
if FReticulePos = AValue then exit;
|
||||
DrawReticule(FDrawer);
|
||||
DrawReticule(Drawer);
|
||||
FReticulePos := AValue;
|
||||
DrawReticule(FDrawer);
|
||||
DrawReticule(Drawer);
|
||||
end;
|
||||
|
||||
procedure TChart.SetTitle(Value: TChartTitle);
|
||||
|
||||
72
components/tachart/taguiconnector.pas
Normal file
72
components/tachart/taguiconnector.pas
Normal file
@ -0,0 +1,72 @@
|
||||
{
|
||||
|
||||
*****************************************************************************
|
||||
* *
|
||||
* See the file COPYING.modifiedLGPL.txt, included in this distribution, *
|
||||
* for details about the copyright. *
|
||||
* *
|
||||
* This program is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
|
||||
* *
|
||||
*****************************************************************************
|
||||
|
||||
Authors: Alexander Klenin
|
||||
|
||||
}
|
||||
unit TAGUIConnector;
|
||||
|
||||
{$H+}
|
||||
|
||||
interface
|
||||
|
||||
uses
|
||||
Classes, Graphics,
|
||||
TADrawUtils, TADrawerCanvas;
|
||||
|
||||
type
|
||||
TChartGUIConnectorData = record
|
||||
FBounds: TRect;
|
||||
FCanvas: TCanvas;
|
||||
FDrawer: IChartDrawer;
|
||||
FDrawerBounds: TRect;
|
||||
end;
|
||||
|
||||
TChartGUIConnector = class(TComponent)
|
||||
public
|
||||
procedure CreateDrawer(var AData: TChartGUIConnectorData); virtual; abstract;
|
||||
procedure SetBounds(var AData: TChartGUIConnectorData); virtual; abstract;
|
||||
procedure Display(var AData: TChartGUIConnectorData); virtual; abstract;
|
||||
end;
|
||||
|
||||
TChartGUIConnectorCanvas = class(TChartGUIConnector)
|
||||
public
|
||||
procedure CreateDrawer(var AData: TChartGUIConnectorData); override;
|
||||
procedure SetBounds(var AData: TChartGUIConnectorData); override;
|
||||
procedure Display(var AData: TChartGUIConnectorData); override;
|
||||
end;
|
||||
|
||||
implementation
|
||||
|
||||
uses
|
||||
TAChartUtils;
|
||||
|
||||
{ TChartGUIConnectorCanvas }
|
||||
|
||||
procedure TChartGUIConnectorCanvas.CreateDrawer(
|
||||
var AData: TChartGUIConnectorData);
|
||||
begin
|
||||
AData.FDrawer := TCanvasDrawer.Create(AData.FCanvas);
|
||||
end;
|
||||
|
||||
procedure TChartGUIConnectorCanvas.Display(var AData: TChartGUIConnectorData);
|
||||
begin
|
||||
Unused(AData);
|
||||
end;
|
||||
|
||||
procedure TChartGUIConnectorCanvas.SetBounds(var AData: TChartGUIConnectorData);
|
||||
begin
|
||||
AData.FDrawerBounds := AData.FBounds;
|
||||
end;
|
||||
|
||||
end.
|
||||
Loading…
Reference in New Issue
Block a user