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

TAChart: Remove MirrorX property. Add ClearSeries procedure.

Browse Source 
* Independent changes extracted from patch by Andrei Kupreitchik (issue #13832)

git-svn-id: trunk@20230 -
This commit is contained in:
ask 2009-05-26 10:18:45 +00:00
parent ab33d673e4
commit e2b7a80b5e
1 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
components/tachart/tagraph.pas
View File

@ -140,7 +140,6 @@ type
FLeftAxis: TChartAxis;
FLegend: TChartLegend;
FMargins: TChartMargins;
FMirrorX: Boolean; // From right to left ?
FOnDrawReticule: TDrawReticuleEvent;
FSeries: TChartSeriesList;
FTitle: TChartTitle;
@ -179,7 +178,6 @@ type
procedure SetLeftAxis(Value: TChartAxis);
procedure SetLegend(Value: TChartLegend);
procedure SetMargins(AValue: TChartMargins);
procedure SetMirrorX(AValue: Boolean);
procedure SetReticuleMode(const AValue: TReticuleMode);
procedure SetTitle(Value: TChartTitle);
@ -219,6 +217,7 @@ type
public
procedure AddSeries(ASeries: TBasicChartSeries);
procedure ClearSeries;
procedure CopyToClipboardBitmap;
procedure DeleteSeries(ASeries: TBasicChartSeries);
procedure DrawLineHoriz(ACanvas: TCanvas; AY: Integer);
@ -264,7 +263,6 @@ type
property LeftAxis: TChartAxis read FLeftAxis write SetLeftAxis;
property Legend: TChartLegend read FLegend write SetLegend;
property Margins: TChartMargins read FMargins write SetMargins;
property MirrorX: Boolean read FMirrorX write SetMirrorX default false;
property ReticuleMode: TReticuleMode
read FReticuleMode write SetReticuleMode default rmNone;
property Series: TChartSeriesList read FSeries;
@ -359,7 +357,6 @@ begin
FCurrentExtent := EmptyDoubleRect;
MirrorX := false;
FIsZoomed := false;
FGraphBrush := TBrush.Create;
@ -512,6 +509,12 @@ begin
ACanvas.Rectangle(ARect);
end;
procedure TChart.ClearSeries;
begin
FSeries.FList.Clear;
Invalidate;
end;
procedure TChart.DrawTitleFoot(ACanvas: TCanvas);
function AlignedTextPos(AAlign: TAlignment; const AText: String): TSize;
@ -586,14 +589,8 @@ var
s := FLeftAxis.Title.Caption;
if FLeftAxis.Visible and (s <> '') then begin
w := ACanvas.TextHeight(FLeftAxis.Title.Caption);
if FMirrorX then begin
x := FClipRect.Right - w;
FClipRect.Right := x - 4;
end
else begin
x := FClipRect.Left;
leftOffset := w + 4;
end;
x := FClipRect.Left;
leftOffset := w + 4;
ACanvas.Font.Orientation := FLeftAxis.Title.Angle * DEGREES_TO_ORIENT;
ACanvas.TextOut(x, c.Y - w div 2, s);
end;
@ -658,10 +655,7 @@ var
markText := MarkToText(AMark);
w := ACanvas.TextWidth(markText);
h := ACanvas.TextHeight(markText) div 2;
if FMirrorX then
x := FClipRect.Right + 5
else
x := FClipRect.Left - 5 - w;
x := FClipRect.Left - 5 - w;
ACanvas.TextOut(x, y - h, markText);
end;
@ -713,10 +707,7 @@ begin
// requiring another call to CalculateTransformationCoeffs...
// So punt for now and just reserve space for extra digit unconditionally.
leftAxisWidth += ACanvas.TextWidth('0');
if FMirrorX then
FClipRect.Right -= leftAxisWidth
else
leftOffset += leftAxisWidth;
leftOffset += leftAxisWidth;
end;
if FBottomAxis.Visible then
@ -840,13 +831,6 @@ begin
ACanvas.Line(AX, FClipRect.Top, AX, FClipRect.Bottom);
end;
procedure TChart.SetMirrorX(AValue: Boolean);
begin
if AValue = FMirrorX then exit;
FMirrorX := AValue;
Invalidate;
end;
procedure TChart.SetReticuleMode(const AValue: TReticuleMode);
begin
if FReticuleMode = AValue then exit;
@ -1501,12 +1485,14 @@ end;
procedure SkipObsoleteChartProperties;
const
MIRRORX_NOTE = 'Obsolete, use BottomAxis.Invert instead';
NOTE = 'Obsolete, use Extent instead';
NAMES: array [1..4] of String = (
'XGraph', 'YGraph', 'AutoUpdateX', 'AutoUpdateY');
var
i: Integer;
begin
RegisterPropertyToSkip(TChart, 'MirrorX', MIRRORX_NOTE, '');
for i := 1 to High(NAMES) do begin
RegisterPropertyToSkip(TChart, NAMES[i] + 'Min', NOTE, '');
RegisterPropertyToSkip(TChart, NAMES[i] + 'Max', NOTE, '');