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

TAChart: Fix not being able to show persistently FitSeries pointer. Turn off pointers by default.

Browse Source 
git-svn-id: trunk@58605 -
This commit is contained in:
wp 2018-07-23 22:44:10 +00:00
parent 9bfe23796d
commit 2b595ec973
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/tachart/tafuncseries.pas
View File

@ -1544,7 +1544,7 @@ begin
FFitRange := TFitSeriesRange.Create(Self); FFitRange := TFitSeriesRange.Create(Self);
FDrawFitRangeOnly := true; FDrawFitRangeOnly := true;
FPointer := TSeriesPointer.Create(ParentChart); FPointer := TSeriesPointer.Create(ParentChart);
FPointer.Visible := false; // FPointer.Visible := false;
FPen := TChartPen.Create; FPen := TChartPen.Create;
FPen.OnChange := @StyleChanged; FPen.OnChange := @StyleChanged;
FStep := DEF_FIT_STEP; FStep := DEF_FIT_STEP;

15
components/tachart/taseries.pas
View File

@ -200,11 +200,11 @@ type
FLinePen: TPen; FLinePen: TPen;
FLineType: TLineType; FLineType: TLineType;
FOnDrawPointer: TSeriesPointerDrawEvent; FOnDrawPointer: TSeriesPointerDrawEvent;
FShowPoints: Boolean;
FColorEach: TColorEachMode; FColorEach: TColorEachMode;
procedure DrawSingleLineInStack(ADrawer: IChartDrawer; AIndex: Integer); procedure DrawSingleLineInStack(ADrawer: IChartDrawer; AIndex: Integer);
function GetShowLines: Boolean; function GetShowLines: Boolean;
function GetShowPoints: Boolean;
procedure SetColorEach(AValue: TColorEachMode); procedure SetColorEach(AValue: TColorEachMode);
procedure SetLinePen(AValue: TPen); procedure SetLinePen(AValue: TPen);
procedure SetLineType(AValue: TLineType); procedure SetLineType(AValue: TLineType);
@ -237,7 +237,7 @@ type
property ShowLines: Boolean property ShowLines: Boolean
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 GetShowPoints write SetShowPoints default false;
property Stacked default false; property Stacked default false;
property Source; property Source;
property Styles; property Styles;
@ -387,7 +387,6 @@ begin
Self.LinePen := FLinePen; Self.LinePen := FLinePen;
Self.FLineType := FLineType; Self.FLineType := FLineType;
Self.FOnDrawPointer := FOnDrawPointer; Self.FOnDrawPointer := FOnDrawPointer;
Self.FShowPoints := FShowPoints;
Self.FColorEach := FColorEach; Self.FColorEach := FColorEach;
end; end;
inherited Assign(ASource); inherited Assign(ASource);
@ -396,12 +395,11 @@ end;
constructor TLineSeries.Create(AOwner: TComponent); constructor TLineSeries.Create(AOwner: TComponent);
begin begin
inherited Create(AOwner); inherited Create(AOwner);
FColorEach := cePoint; FColorEach := cePoint;
FLinePen := TPen.Create; FLinePen := TPen.Create;
FLinePen.OnChange := @StyleChanged; FLinePen.OnChange := @StyleChanged;
FPointer := TSeriesPointer.Create(FChart); FPointer := TSeriesPointer.Create(FChart);
SetPropDefaults(Self, ['LineType', 'ShowPoints', 'UseReticule']); SetPropDefaults(Self, ['LineType', 'UseReticule']);
end; end;
destructor TLineSeries.Destroy; destructor TLineSeries.Destroy;
@ -722,6 +720,11 @@ begin
Result := FLineType <> ltNone; Result := FLineType <> ltNone;
end; end;
function TLineSeries.GetShowPoints: Boolean;
begin
Result := FPointer.Visible;
end;
procedure TLineSeries.SetColorEach(AValue: TColorEachMode); procedure TLineSeries.SetColorEach(AValue: TColorEachMode);
begin begin
if FColorEach = AValue then exit; if FColorEach = AValue then exit;
@ -759,7 +762,7 @@ end;
procedure TLineSeries.SetShowPoints(AValue: Boolean); procedure TLineSeries.SetShowPoints(AValue: Boolean);
begin begin
if ShowPoints = AValue then exit; if ShowPoints = AValue then exit;
FShowPoints := AValue; FPointer.Visible := AValue;
UpdateParentChart; UpdateParentChart;
end; end;

8
components/tachart/tatypes.pas
View File

@ -122,7 +122,6 @@ type
destructor Destroy; override; destructor Destroy; override;
public public
procedure Assign(Source: TPersistent); override; procedure Assign(Source: TPersistent); override;
procedure Draw(ADrawer: IChartDrawer; ACenter: TPoint; AColor: TColor; procedure Draw(ADrawer: IChartDrawer; ACenter: TPoint; AColor: TColor;
ABrushAlreadySet: Boolean = false); ABrushAlreadySet: Boolean = false);
procedure DrawSize(ADrawer: IChartDrawer; ACenter, ASize: TPoint; procedure DrawSize(ADrawer: IChartDrawer; ACenter, ASize: TPoint;
@ -135,7 +134,7 @@ type
property Pen: TChartPen read FPen write SetPen; property Pen: TChartPen read FPen write SetPen;
property Style: TSeriesPointerStyle read FStyle write SetStyle default psRectangle; property Style: TSeriesPointerStyle read FStyle write SetStyle default psRectangle;
property VertSize: Integer read FVertSize write SetVertSize default DEF_POINTER_SIZE; property VertSize: Integer read FVertSize write SetVertSize default DEF_POINTER_SIZE;
property Visible default true; property Visible default false;
end; end;
EExtentError = class(EChartError); EExtentError = class(EChartError);
@ -395,8 +394,8 @@ begin
FHorizSize := DEF_POINTER_SIZE; FHorizSize := DEF_POINTER_SIZE;
SetPropDefaults(Self, ['OverrideColor', 'Style']); SetPropDefaults(Self, ['OverrideColor', 'Style']);
FVertSize := DEF_POINTER_SIZE; FVertSize := DEF_POINTER_SIZE;
FVisible := true; FVisible := false;
end; end;
destructor TSeriesPointer.Destroy; destructor TSeriesPointer.Destroy;
@ -566,6 +565,7 @@ begin
StyleChanged(Self); StyleChanged(Self);
end; end;
{ TChartRange } { TChartRange }
procedure TChartRange.Assign(ASource: TPersistent); procedure TChartRange.Assign(ASource: TPersistent);