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

TAChart: Fix vertical placement of series labels on stacked series with logarithmic axis (Issue #34861)

Browse Source 
git-svn-id: branches/fixes_2_0@60177 -
This commit is contained in:
mattias 2019-01-24 09:42:55 +00:00
parent 69854dd02a
commit a034b52e45
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
components/tachart/tacustomseries.pas
View File

@ -1242,12 +1242,13 @@ var
end;
var
y: Double;
g, gl: TDoublePoint;
y, ysum: Double;
g: TDoublePoint;
i, si: Integer;
ld: TLabelDirection;
style: TChartStyle;
lfont: TFont;
curr, prev: Double;
begin
if not Marks.IsMarkLabelsVisible then exit;
@ -1257,7 +1258,11 @@ begin
ParentChart.DisableRedrawing;
for i := FLoBound to FUpBound do begin
if IsNan(Source[i]^.Point) then continue;
if IsNan(Source[i]^.Point) then
continue;
y := Source[i]^.Y;
ysum := y;
prev := GetZeroLevel;
g := GetLabelDataPoint(i);
ld := GetLabelDirection(i);
for si := 0 to Source.YCount - 1 do begin
@ -1268,31 +1273,34 @@ begin
else
Marks.LabelFont.Assign(lfont);
end;
if not Stacked then
g := GetGraphPoint(i, 0, si)
if si > 0 then begin
y := NumberOr(Source[i]^.YList[si-1], 0);
if IsNaN(y) then Continue;
if Stacked then begin
if IsNaN(ysum) then ysum := y else ysum += y;
y := ysum;
end;
end;
if IsRotated then
g.X := AxisToGraphY(y) // GraphY is correct!
else
if si = 0 then
y := Source[i]^.y - GetZeroLevel
else begin
y := Source[i]^.YList[si-1];
g.Y := AxisToGraphY(y);
curr := TDoublePointBoolArr(g)[not IsRotated];
if MarkPositions = lmpInsideCenter then begin
if IsRotated then
g.X += AxisToGraphY(y)
g := DoublePoint((curr + prev) * 0.5, g.y)
else
g.Y += AxisToGraphY(y);
end;
gl := g;
if FMarkPositions = lmpInsideCenter then begin
if IsRotated then
gl.X -= AxisToGraphX(y)/2
else
gl.Y -= AxisToGraphY(y)/2;
g := DoublePoint(g.x, (curr + prev) * 0.5);
end;
prev := curr;
with ParentChart do
if
((Marks.YIndex = MARKS_YINDEX_ALL) or (Marks.YIndex = si)) and
IsPointInViewPort(gl)
IsPointInViewPort(g)
then
DrawLabel(FormattedMark(i, '', si), GraphToImage(gl), ld);
DrawLabel(FormattedMark(i, '', si), GraphToImage(g), ld);
end;
end;