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

TAChart: Fix incorrect scaling of TScaledCanvasDrawer

Browse Source 
git-svn-id: branches/fixes_2_0@60280 -
This commit is contained in:
mattias 2019-02-02 18:39:54 +00:00
parent 239b73fdac
commit 4b5c1dcce3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/tachart/tacustomseries.pas
View File

@ -1788,6 +1788,7 @@ var
dir: TLabelDirection; dir: TLabelDirection;
m: array [TLabelDirection] of Integer absolute AMargins; m: array [TLabelDirection] of Integer absolute AMargins;
gp: TDoublePoint; gp: TDoublePoint;
scMarksDistance: Integer;
begin begin
if not Marks.IsMarkLabelsVisible or not Marks.AutoMargins then exit; if not Marks.IsMarkLabelsVisible or not Marks.AutoMargins then exit;
if Count = 0 then exit; if Count = 0 then exit;
@ -1805,6 +1806,7 @@ begin
Count-1} Count-1}
FindExtentInterval(ParentChart.CurrentExtent, Source.IsSorted); FindExtentInterval(ParentChart.CurrentExtent, Source.IsSorted);
scMarksDistance := ADrawer.Scale(Marks.Distance);
for i := FLoBound to FUpBound do begin for i := FLoBound to FUpBound do begin
gp := GetGraphPoint(i); gp := GetGraphPoint(i);
if not ParentChart.IsPointInViewPort(gp) then continue; if not ParentChart.IsPointInViewPort(gp) then continue;
@ -1817,7 +1819,7 @@ begin
if Marks.DistanceToCenter then if Marks.DistanceToCenter then
dist := dist div 2; dist := dist div 2;
m[dir] := Max(m[dir], dist + Marks.Distance); m[dir] := Max(m[dir], dist + scMarksDistance);
end; end;
end; end;

3
components/tachart/tagraph.pas
View File

@ -599,7 +599,6 @@ begin
(AMargin.Top <> AChartMargins.Top) or (AMargin.Bottom <> AChartMargins.Bottom), (AMargin.Top <> AChartMargins.Top) or (AMargin.Bottom <> AChartMargins.Bottom),
true, @FCurrentExtent.a.Y, @FCurrentExtent.b.Y); true, @FCurrentExtent.a.Y, @FCurrentExtent.b.Y);
FScale.X := rX.CalcScale(1); FScale.X := rX.CalcScale(1);
FScale.Y := rY.CalcScale(-1); FScale.Y := rY.CalcScale(-1);
if Proportional then begin if Proportional then begin
@ -1251,7 +1250,7 @@ begin
if s.Active then if s.Active then
s.UpdateMargins(ADrawer, Result); s.UpdateMargins(ADrawer, Result);
for i := Low(a) to High(a) do for i := Low(a) to High(a) do
a[i] := ADrawer.Scale(a[i] + TRectArray(Margins.Data)[i]); a[i] := a[i] + ADrawer.Scale(TRectArray(Margins.Data)[i]);
end; end;
function TChart.GetRenderingParams: TChartRenderingParams; function TChart.GetRenderingParams: TChartRenderingParams;