TAChart: Cleanup

git-svn-id: trunk@54016 -
This commit is contained in:
wp 2017-01-27 22:48:09 +00:00
parent df344043fb
commit aec0265173

View File

@ -251,7 +251,7 @@ type
implementation implementation
uses uses
FPCanvas, Math, SysUtils, FPCanvas, Math, SysUtils, Types,
TAChartStrConsts, TAGeometry, TAGraph, TAMath; TAChartStrConsts, TAGeometry, TAGraph, TAMath;
type type
@ -486,6 +486,7 @@ var
item: PChartDataItem; item: PChartDataItem;
clipR: TRect; clipR: TRect;
irect: TRect; irect: TRect;
dummyR: TRect;
ext: TDoubleRect; ext: TDoubleRect;
begin begin
if Source.YCount < 2 then exit; if Source.YCount < 2 then exit;
@ -503,7 +504,8 @@ begin
item := Source[i]; item := Source[i];
if not GetBubbleRect(item, irect) then if not GetBubbleRect(item, irect) then
continue; continue;
if not RectIntersectsRectAlt(clipR, irect) then // if not RectIntersectsRectAlt(clipR, irect) then
if not IntersectRect(dummyR, clipR, irect) then
continue; continue;
if bocPen in OverrideColor then if bocPen in OverrideColor then
ADrawer.SetPenParams(BubblePen.Style, ColorDef(item^.Color, BubblePen.Color)); ADrawer.SetPenParams(BubblePen.Style, ColorDef(item^.Color, BubblePen.Color));
@ -671,6 +673,8 @@ var
inp: TPoint; // NewPos in image units inp: TPoint; // NewPos in image units
rvec: TDoublePoint; // Rotated radius vector rvec: TDoublePoint; // Rotated radius vector
begin begin
Unused(AXIndex);
ParentChart.DisableRedrawing; ParentChart.DisableRedrawing;
ListSource.BeginUpdate; ListSource.BeginUpdate;
try try