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

Merged revision(s) 48473 #44f9503627 from trunk:

Browse Source 
TAChart: Fix axis labels reaching beyond data limits in paned charts
........

git-svn-id: branches/fixes_1_4@48494 -
This commit is contained in:
maxim 2015-03-24 21:48:33 +00:00
parent 412a1218ee
commit 74520abea8
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/tachart/tachartaxis.pas
View File

@ -586,6 +586,8 @@ begin
with FHelper do begin
FValueMin := GetTransform.AxisToGraph(axisMin);
FValueMax := GetTransform.AxisToGraph(axisMax);
FMinForMarks := GetTransform.AxisToGraph(d.FMin);
FMaxForMarks := GetTransform.AxisToGraph(d.FMax);
end;
if Inverted and (Length(FMarkValues) > 0) then
for i := 0 to High(FMarkValues) div 2 do begin

5
components/tachart/tachartaxisutils.pas
View File

@ -219,6 +219,8 @@ type
FTransf: ICoordTransformer;
FValueMax: Double;
FValueMin: Double;
FMaxForMarks: Double;
FMinForMarks: Double;
FZOffset: TPoint;
procedure BeginDrawing; virtual;
@ -328,7 +330,8 @@ begin
if
not IsInClipRange(coord) or
((FValueMax >= FValueMin) and not InRangeUlps(AMark, FValueMin, FValueMax, 2)) or
((FValueMax < FValueMin) and not InRangeUlps(AMark, FValueMax, FValueMin, 2))
((FValueMax < FValueMin) and not InRangeUlps(AMark, FValueMax, FValueMin, 2)) or
(not inRangeUlps(AMark, FMinForMarks, FMaxForMarks, 2))
then exit;
if FAxis.Grid.Visible then begin