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

TAChart: Move property Stacked from TAreaSeries/TLineSeries to tbeir ancestor TBasicPointSeries

Browse Source 
git-svn-id: trunk@53918 -
This commit is contained in:
wp 2017-01-10 22:53:36 +00:00
parent 0028c7e58f
commit bb5823ecc2
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/tachart/tacustomseries.pas
View File

@ -255,12 +255,14 @@ type
function GetLabelDirection(AIndex: Integer): TLabelDirection; function GetLabelDirection(AIndex: Integer): TLabelDirection;
procedure SetMarkPositions(AValue: TLinearMarkPositions); procedure SetMarkPositions(AValue: TLinearMarkPositions);
procedure SetPointer(AValue: TSeriesPointer); procedure SetPointer(AValue: TSeriesPointer);
procedure SetStacked(AValue: Boolean);
procedure SetUseReticule(AValue: Boolean); procedure SetUseReticule(AValue: Boolean);
strict protected strict protected
FGraphPoints: array of TDoublePoint; FGraphPoints: array of TDoublePoint;
FLoBound: Integer; FLoBound: Integer;
FMinXRange: Double; FMinXRange: Double;
FPointer: TSeriesPointer; FPointer: TSeriesPointer;
FStacked: Boolean;
FUpBound: Integer; FUpBound: Integer;
FUseReticule: Boolean; FUseReticule: Boolean;
@ -282,6 +284,7 @@ type
procedure UpdateMinXRange; procedure UpdateMinXRange;
property Pointer: TSeriesPointer read FPointer write SetPointer; property Pointer: TSeriesPointer read FPointer write SetPointer;
property Stacked: Boolean read FStacked write SetStacked;
protected protected
procedure AfterAdd; override; procedure AfterAdd; override;
procedure UpdateMargins(ADrawer: IChartDrawer; var AMargins: TRect); override; procedure UpdateMargins(ADrawer: IChartDrawer; var AMargins: TRect); override;
@ -1358,6 +1361,13 @@ begin
UpdateParentChart; UpdateParentChart;
end; end;
procedure TBasicPointSeries.SetStacked(AValue: Boolean);
begin
if FStacked = AValue then exit;
FStacked := AValue;
UpdateParentChart;
end;
procedure TBasicPointSeries.SetUseReticule(AValue: Boolean); procedure TBasicPointSeries.SetUseReticule(AValue: Boolean);
begin begin
if FUseReticule = AValue then exit; if FUseReticule = AValue then exit;

22
components/tachart/taseries.pas
View File

@ -137,7 +137,6 @@ type
FAreaContourPen: TPen; FAreaContourPen: TPen;
FAreaLinesPen: TPen; FAreaLinesPen: TPen;
FConnectType: TConnectType; FConnectType: TConnectType;
FStacked: Boolean;
FUseZeroLevel: Boolean; FUseZeroLevel: Boolean;
FZeroLevel: Double; FZeroLevel: Double;
@ -147,7 +146,6 @@ type
procedure SetAreaLinesPen(AValue: TPen); procedure SetAreaLinesPen(AValue: TPen);
procedure SetConnectType(AValue: TConnectType); procedure SetConnectType(AValue: TConnectType);
procedure SetSeriesColor(AValue: TColor); procedure SetSeriesColor(AValue: TColor);
procedure SetStacked(AValue: Boolean);
procedure SetUseZeroLevel(AValue: Boolean); procedure SetUseZeroLevel(AValue: Boolean);
procedure SetZeroLevel(AValue: Double); procedure SetZeroLevel(AValue: Double);
protected protected
@ -174,7 +172,7 @@ type
property SeriesColor: TColor property SeriesColor: TColor
read GetSeriesColor write SetSeriesColor stored false default clWhite; read GetSeriesColor write SetSeriesColor stored false default clWhite;
property Source; property Source;
property Stacked: Boolean read FStacked write SetStacked default true; property Stacked default true;
property Styles; property Styles;
property UseReticule; property UseReticule;
property UseZeroLevel: Boolean property UseZeroLevel: Boolean
@ -197,7 +195,6 @@ type
FLineType: TLineType; FLineType: TLineType;
FOnDrawPointer: TSeriesPointerDrawEvent; FOnDrawPointer: TSeriesPointerDrawEvent;
FShowPoints: Boolean; FShowPoints: Boolean;
FStacked: Boolean;
procedure DrawSingleLineInStack(ADrawer: IChartDrawer; AIndex: Integer); procedure DrawSingleLineInStack(ADrawer: IChartDrawer; AIndex: Integer);
function GetShowLines: Boolean; function GetShowLines: Boolean;
@ -206,7 +203,6 @@ type
procedure SetSeriesColor(AValue: TColor); procedure SetSeriesColor(AValue: TColor);
procedure SetShowLines(Value: Boolean); procedure SetShowLines(Value: Boolean);
procedure SetShowPoints(AValue: Boolean); procedure SetShowPoints(AValue: Boolean);
procedure SetStacked(AValue: Boolean);
protected protected
procedure AfterDrawPointer( procedure AfterDrawPointer(
ADrawer: IChartDrawer; AIndex: Integer; const APos: TPoint); override; ADrawer: IChartDrawer; AIndex: Integer; const APos: TPoint); override;
@ -236,8 +232,7 @@ type
read GetShowLines write SetShowLines stored false default true; read GetShowLines write SetShowLines stored false default true;
property ShowPoints: Boolean property ShowPoints: Boolean
read FShowPoints write SetShowPoints default false; read FShowPoints write SetShowPoints default false;
property Stacked: Boolean property Stacked default false;
read FStacked write SetStacked default false;
property Source; property Source;
property Styles; property Styles;
property UseReticule default true; property UseReticule default true;
@ -671,12 +666,6 @@ begin
UpdateParentChart; UpdateParentChart;
end; end;
procedure TLineSeries.SetStacked(AValue: Boolean);
begin
if FStacked = AValue then exit;
FStacked := AValue;
UpdateParentChart;
end;
{ TManhattanSeries } { TManhattanSeries }
@ -1524,13 +1513,6 @@ begin
FAreaBrush.Color := AValue; FAreaBrush.Color := AValue;
end; end;
procedure TAreaSeries.SetStacked(AValue: Boolean);
begin
if FStacked = AValue then exit;
FStacked := AValue;
UpdateParentChart;
end;
procedure TAreaSeries.SetUseZeroLevel(AValue: Boolean); procedure TAreaSeries.SetUseZeroLevel(AValue: Boolean);
begin begin
if FUseZeroLevel = AValue then exit; if FUseZeroLevel = AValue then exit;