paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-02 19:18:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: Improved determination of series marks direction. Issue #35025. Modified patch by Marcin Wiazowski.

Browse Source 
git-svn-id: branches/fixes_2_0@60387 -
This commit is contained in:
mattias 2019-02-09 08:48:34 +00:00
parent 7b22ce1935
commit 621e9c876f
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
components/tachart/tacustomseries.pas
View File

@ -1417,6 +1417,16 @@ begin
end;
function TBasicPointSeries.GetLabelDirection(AIndex: Integer): TLabelDirection;
function CenterLevel: Double;
begin
with Extent do
if IsRotated then
Result := (b.x + a.x) * 0.5
else
Result := (b.y + a.y) * 0.5;
end;
const
DIR: array [Boolean, Boolean] of TLabelDirection =
((ldTop, ldBottom), (ldRight, ldLeft));
@ -1424,19 +1434,26 @@ var
isNeg: Boolean;
ref: Double;
begin
if FSupportsZeroLevel then
ref := GetZeroLevel
else
with Extent do
if IsRotated then
ref := (b.x + a.x) / 2
else
ref := (b.y + a.y) / 2;
case MarkPositions of
lmpOutside: isNeg := Source[AIndex]^.Y < ref;
lmpPositive: isNeg := false;
lmpNegative: isNeg := true;
lmpInside: isNeg := Source[AIndex]^.Y >= ref;
lmpOutside,
lmpInside :
begin
ref := IfThen(FSupportsZeroLevel, GetZeroLevel, CenterLevel);
if Source[AIndex]^.Y < ref then
isNeg := true
else
if Source[AIndex]^.Y > ref then
isNeg := false
else
if not FSupportsZeroLevel then
isNeg := false
else
isNeg := Source[AIndex]^.Y < CenterLevel;
if MarkPositions = lmpInside then
isNeg := not isNeg;
end;
end;
if Assigned(GetAxisY) then
if (IsRotated and ParentChart.IsRightToLeft) xor GetAxisY.Inverted then