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

TAChart: Fix zooming on auto-scaled series

Browse Source 
git-svn-id: trunk@26940 -
This commit is contained in:
ask 2010-07-31 16:55:24 +00:00
parent b95e37f3d3
commit 325d098358
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/tachart/tagraph.pas
View File

@ -1046,6 +1046,11 @@ var
begin begin
Extent.CheckBoundsOrder; Extent.CheckBoundsOrder;
for i := 0 to AxisList.Count - 1 do
with AxisList[i] do
if Transformations <> nil then
Transformations.ClearBounds;
FLogicalExtent := EmptyExtent; FLogicalExtent := EmptyExtent;
for i := 0 to SeriesCount - 1 do begin for i := 0 to SeriesCount - 1 do begin
s := Series[i]; s := Series[i];

45
components/tachart/tatransformations.pas
View File

@ -47,8 +47,9 @@ type
procedure SetIndex(AValue: Integer); override; procedure SetIndex(AValue: Integer); override;
protected protected
FDrawData: TDrawDataItem; FDrawData: TDrawDataItem;
procedure ClearBounds; virtual;
function GetDrawDataClass: TDrawDataItemClass; virtual; function GetDrawDataClass: TDrawDataItemClass; virtual;
procedure SetChart(AChart: TObject); virtual; procedure SetChart(AChart: TObject);
procedure UpdateBounds(var AMin, AMax: Double); virtual; procedure UpdateBounds(var AMin, AMax: Double); virtual;
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
@ -86,6 +87,7 @@ type
procedure SetChildOrder(Child: TComponent; Order: Integer); override; procedure SetChildOrder(Child: TComponent; Order: Integer); override;
public public
function AxisToGraph(AX: Double): Double; function AxisToGraph(AX: Double): Double;
procedure ClearBounds;
function GraphToAxis(AX: Double): Double; function GraphToAxis(AX: Double): Double;
procedure SetChart(AChart: TObject); procedure SetChart(AChart: TObject);
procedure UpdateBounds(var AMin, AMax: Double); procedure UpdateBounds(var AMin, AMax: Double);
@ -128,8 +130,8 @@ type
procedure SetMaxValue(const AValue: Double); procedure SetMaxValue(const AValue: Double);
procedure SetMinValue(const AValue: Double); procedure SetMinValue(const AValue: Double);
protected protected
procedure ClearBounds; override;
function GetDrawDataClass: TDrawDataItemClass; override; function GetDrawDataClass: TDrawDataItemClass; override;
procedure SetChart(AChart: TObject); override;
procedure UpdateBounds(var AMin, AMax: Double); override; procedure UpdateBounds(var AMin, AMax: Double); override;
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
@ -326,6 +328,11 @@ begin
Transformations.Broadcaster.Broadcast(Self); Transformations.Broadcaster.Broadcast(Self);
end; end;
procedure TAxisTransform.ClearBounds;
begin
// empty
end;
constructor TAxisTransform.Create(AOwner: TComponent); constructor TAxisTransform.Create(AOwner: TComponent);
begin begin
FEnabled := true; FEnabled := true;
@ -433,6 +440,16 @@ begin
Result := AxisToGraph(Result); Result := AxisToGraph(Result);
end; end;
procedure TChartAxisTransformations.ClearBounds;
var
i: Integer;
begin
for i := List.Count - 1 downto 0 do
with TAxisTransform(List[i]) do
if Enabled then
ClearBounds;
end;
constructor TChartAxisTransformations.Create(AOwner: TComponent); constructor TChartAxisTransformations.Create(AOwner: TComponent);
begin begin
inherited Create(AOwner); inherited Create(AOwner);
@ -610,6 +627,18 @@ begin
Result := AX * FScale + FOffset; Result := AX * FScale + FOffset;
end; end;
procedure TAutoScaleAxisTransform.ClearBounds;
begin
inherited ClearBounds;
{$R-}{$Q-}
with TAutoScaleTransformData(FDrawData) do begin
FMin := Infinity;
FMax := NegInfinity;
FScale := 1.0;
end;
{$IFDEF OverflowChecking}{$Q+}{$ENDIF}{$IFDEF RangeChecking}{$R+}{$ENDIF}
end;
constructor TAutoScaleAxisTransform.Create(AOwner: TComponent); constructor TAutoScaleAxisTransform.Create(AOwner: TComponent);
begin begin
inherited Create(AOwner); inherited Create(AOwner);
@ -637,18 +666,6 @@ begin
Result := MinValue <> 0.0; Result := MinValue <> 0.0;
end; end;
procedure TAutoScaleAxisTransform.SetChart(AChart: TObject);
begin
inherited SetChart(AChart);
{$R-}{$Q-}
with TAutoScaleTransformData(FDrawData) do begin
FMin := Infinity;
FMax := NegInfinity;
FScale := 1.0;
end;
{$IFDEF OverflowChecking}{$Q+}{$ENDIF}{$IFDEF RangeChecking}{$R+}{$ENDIF}
end;
procedure TAutoScaleAxisTransform.SetMaxValue(const AValue: Double); procedure TAutoScaleAxisTransform.SetMaxValue(const AValue: Double);
begin begin
if FMaxValue = AValue then exit; if FMaxValue = AValue then exit;