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

TAChart: Move Active property to TBasicChartSeries class

Browse Source 
git-svn-id: trunk@19090 -
This commit is contained in:
ask 2009-03-24 11:19:03 +00:00
parent bd8923b25a
commit ce8f80bc53
2 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/tachart/tagraph.pas
View File

@ -51,6 +51,7 @@ type
protected
FTitle: String;
FChart: TChart;
FActive: Boolean;
procedure DrawLegend(ACanvas: TCanvas; const ARect: TRect); virtual; abstract;
function GetLegendCount: Integer; virtual; abstract;
@ -58,8 +59,7 @@ type
function IsInLegend: Boolean; virtual; abstract;
procedure UpdateMargins(ACanvas: TCanvas; var AMargins: TRect); virtual;
procedure UpdateBounds(
var ANumPoints: Integer; var AXMin, AYMin, AXMax, AYMax: Double);
virtual; abstract;
var AXMin, AYMin, AXMax, AYMax: Double); virtual; abstract;
procedure AfterAdd; virtual; abstract;
function GetNearestPoint(
ADistFunc: TPointDistFunc; const APoint: TPoint;
@ -67,6 +67,7 @@ type
virtual;
function GetSeriesColor: TColor; virtual; abstract;
procedure SetSeriesColor(const AValue: TColor); virtual; abstract;
procedure SetActive(AValue: Boolean); virtual; abstract;
procedure ReadState(Reader: TReader); override;
procedure SetParentComponent(AParent: TComponent); override;
@ -77,8 +78,9 @@ type
function HasParent: Boolean; override;
function Count: Integer; virtual; abstract;
procedure DrawIfActive(ACanvas: TCanvas); virtual; abstract;
procedure Draw(ACanvas: TCanvas); virtual; abstract;
property Active: Boolean read FActive write SetActive;
property ParentChart: TChart read FChart;
property SeriesColor: TColor
read GetSeriesColor write SetSeriesColor default clTAColor;
@ -894,7 +896,8 @@ var
begin
Result := Rect(0, 0, 0, 0);
for i := 0 to SeriesCount - 1 do
Series[i].UpdateMargins(ACanvas, Result);
if Series[i].Active then
Series[i].UpdateMargins(ACanvas, Result);
end;
procedure TChart.SetGraphBrush(Value: TBrush);
@ -947,8 +950,7 @@ end;
procedure TChart.Refresh(ACanvas: TCanvas; ARect: TRect);
var
Tolerance, Valeur: Double;
i: Integer;
NBPointsMax: Integer;
i, pointsTotal: Integer;
XMinSeries, XMaxSeries, YMinSeries, YMaxSeries: Double;
begin
DrawReticule(ACanvas);
@ -964,10 +966,13 @@ begin
XMaxSeries := MinDouble;
YMinSeries := MaxDouble;
YMaxSeries := MinDouble;
NBPointsMax := 0;
pointsTotal := 0;
for i := 0 to SeriesCount - 1 do
Series[i].UpdateBounds(
NBPointsMax, XMinSeries, YMinSeries, XMaxSeries, YMaxSeries);
with Series[i] do
if Active then begin
pointsTotal += Count;
UpdateBounds(XMinSeries, YMinSeries, XMaxSeries, YMaxSeries);
end;
if XMinSeries > MaxDouble / 10 then XMinSeries := 0;
if YMinSeries > MaxDouble / 10 then YMinSeries := 0;
if XMaxSeries < MinDouble / 10 then XMaxSeries := 0;
@ -989,7 +994,7 @@ begin
Tolerance := 0.001; //this should be cleaned eventually
// Tolerance := 0.1;
if NBPointsMax > 0 then begin
if pointsTotal > 0 then begin
// If several points : automatic +/-10% of interval
Valeur := Tolerance * (XMaxSeries - XMinSeries);
if Valeur <> 0 then begin
@ -1182,7 +1187,8 @@ begin
// Update all series
for i := 0 to SeriesCount - 1 do
Series[i].DrawIfActive(ACanvas);
if Series[i].Active then
Series[i].Draw(ACanvas);
//now disable clipping
SelectClipRgn(ACanvas.Handle, 0);

24
components/tachart/taseries.pas
View File

@ -43,14 +43,12 @@ type
FXGraphMin, FYGraphMin: Double; // Max Graph value of points
FXGraphMax, FYGraphMax: Double;
FCoordList: TList;
FActive: Boolean;
FMarks: TChartMarks;
FShowInLegend: Boolean;
FValuesTotal: Double;
FValuesTotalValid: Boolean;
function GetXMinVal: Integer;
procedure SetActive(Value: Boolean);
procedure SetMarks(const AValue: TChartMarks);
procedure SetShowInLegend(Value: Boolean);
procedure InitBounds(out XMin, YMin, XMax, YMax: Integer);
@ -62,12 +60,12 @@ type
function GetLegendWidth(ACanvas: TCanvas): Integer; override;
function GetLegendCount: Integer; override;
function IsInLegend: Boolean; override;
procedure UpdateBounds(
var ANumPoints: Integer; var AXMin, AYMin, AXMax, AYMax: Double); override;
procedure UpdateBounds(var AXMin, AYMin, AXMax, AYMax: Double); override;
procedure UpdateParentChart;
function GetValuesTotal: Double;
procedure GetCoords(AIndex: Integer; out AG: TDoublePoint; out AI: TPoint);
function ColorOrDefault(AColor: TColor; ADefault: TColor = clTAColor): TColor;
procedure SetActive(AValue: Boolean); override;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
@ -78,8 +76,6 @@ type
property YGraphMax: Double read FYGraphMax write FYGraphMax;
function Count: Integer; override;
procedure Draw(ACanvas: TCanvas); virtual; abstract;
procedure DrawIfActive(ACanvas: TCanvas); override;
function AddXY(X, Y: Double; XLabel: String; Color: TColor): Longint; virtual;
function Add(AValue: Double; XLabel: String; Color: TColor): Longint; virtual;
procedure Delete(AIndex: Integer); virtual;
@ -87,7 +83,7 @@ type
function FormattedMark(AIndex: integer): String;
published
property Active: Boolean read FActive write SetActive default true;
property Active default true;
property Marks: TChartMarks read FMarks write SetMarks;
property ShowInLegend: Boolean
read FShowInLegend write SetShowInLegend default true;
@ -327,12 +323,6 @@ begin
inherited Destroy;
end;
procedure TChartSeries.DrawIfActive(ACanvas: TCanvas);
begin
if Active then
Draw(ACanvas);
end;
procedure TChartSeries.DrawLegend(ACanvas: TCanvas; const ARect: TRect);
begin
ACanvas.TextOut(ARect.Right + 3, ARect.Top, Title);
@ -485,9 +475,9 @@ begin
Result := FCoordList.Count;
end;
procedure TChartSeries.SetActive(Value: Boolean);
procedure TChartSeries.SetActive(AValue: Boolean);
begin
FActive := Value;
FActive := AValue;
UpdateParentChart;
end;
@ -508,11 +498,9 @@ begin
UpdateParentChart;
end;
procedure TChartSeries.UpdateBounds(
var ANumPoints: Integer; var AXMin, AYMin, AXMax, AYMax: Double);
procedure TChartSeries.UpdateBounds(var AXMin, AYMin, AXMax, AYMax: Double);
begin
if not Active or (Count = 0) then exit;
ANumPoints += Count;
if XGraphMin < AXMin then AXMin := XGraphMin;
if YGraphMin < AYMin then AYMin := YGraphMin;
if XGraphMax > AXMax then AXMax := XGraphMax;