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

TAChart: Fix TBubbleSeries ignoring axis transformations and clipping

Browse Source 
git-svn-id: trunk@53965 -
This commit is contained in:
wp 2017-01-17 20:59:06 +00:00
parent 9d411abe20
commit afaf9da891
2 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/tachart/tageometry.pas
View File

@ -83,6 +83,7 @@ function ProjToRect(
const APt: TDoublePoint; const ARect: TDoubleRect): TDoublePoint;
function RectIntersectsRect(
var ARect: TDoubleRect; const AFixed: TDoubleRect): Boolean;
function RectIntersectsRectAlt(R1, R2: TDoubleRect): Boolean;
function RotatePoint(const APoint: TDoublePoint; AAngle: Double): TDoublePoint; overload;
function RotatePoint(const APoint: TPoint; AAngle: Double): TPoint; overload;
function RotatePointX(AX, AAngle: Double): TPoint;
@ -615,6 +616,11 @@ begin
RangesIntersect(a.Y, b.Y, AFixed.a.Y, AFixed.b.Y, a.Y, b.Y);
end;
function RectIntersectsRectAlt(R1, R2: TDoubleRect): Boolean;
begin
Result := RectIntersectsRect(R1, R2);
end;
function RotatePoint(const APoint: TDoublePoint; AAngle: Double): TDoublePoint;
var
sa, ca: Extended;

56
components/tachart/tamultiseries.pas
View File

@ -467,38 +467,48 @@ end;
procedure TBubbleSeries.Draw(ADrawer: IChartDrawer);
var
i: Integer;
pt, d: TPoint;
r: Double;
pi: PChartDataItem;
item: PChartDataItem;
pt1, pt2: TPoint;
gp, sp, sp1, sp2: TDoublePoint;
ext, gpR: TDoubleRect;
clipR: TRect;
begin
if Source.YCount < 2 then exit;
r := 0;
for i := 0 to Count - 1 do
if IsNaN(Source[i]^.YList[0]) then
continue
else
r := Max(Source[i]^.YList[0], r);
with ParentChart.CurrentExtent do
PrepareGraphPoints(DoubleRect(a.X - r, a.Y - r, b.X + r, b.Y + r), true);
ADrawer.Pen := BubblePen;
ADrawer.Brush := BubbleBrush;
for i := 0 to High(FGraphPoints) do begin
if IsNaN(FGraphPoints[i].X) or IsNaN(FGraphPoints[i].Y) then
Continue;
pt := ParentChart.GraphToImage(FGraphPoints[i]);
pi := Source[i + FLoBound];
r := pi^.YList[0];
if IsNaN(r) then
Continue;
d.X := ParentChart.XGraphToImage(r) - ParentChart.XGraphToImage(0);
d.Y := ParentChart.YGraphToImage(r) - ParentChart.YGraphToImage(0);
ext := ParentChart.CurrentExtent;
clipR.TopLeft := ParentChart.GraphToImage(ext.a);
clipR.BottomRight := ParentChart.GraphToImage(ext.b);
NormalizeRect(clipR);
ADrawer.ClippingStart(clipR);
for i := 0 to Count - 1 do begin
item := Source[i];
sp := item^.Point;
if TAChartUtils.IsNaN(sp) then
continue;
r := item^.YList[0];
if Math.IsNaN(r) then
continue;
sp1 := DoublePoint(sp.x - r, sp.y - r);
sp2 := DoublePoint(sp.x + r, sp.y + r);
gpR.a := AxisToGraph(sp1);
gpR.b := AxisToGraph(sp2);
if not RectIntersectsRectAlt(gpR, ext) then
continue;
pt1 := ParentChart.GraphToImage(gpR.a);
pt2 := ParentChart.GraphToImage(gpR.b);
if bocPen in OverrideColor then
ADrawer.SetPenParams(BubblePen.Style, ColorDef(pi^.Color, BubblePen.Color));
ADrawer.SetPenParams(BubblePen.Style, ColorDef(item^.Color, BubblePen.Color));
if bocBrush in OverrideColor then
ADrawer.SetBrushColor(ColorDef(pi^.Color, BubbleBrush.Color));
ADrawer.Ellipse(pt.X - d.X, pt.Y - d.Y, pt.X + d.X, pt.Y + d.Y);
ADrawer.SetBrushColor(ColorDef(item^.Color, BubbleBrush.Color));
ADrawer.Ellipse(pt1.x, pt1.y, pt2.x, pt2.y);
end;
DrawLabels(ADrawer);
ADrawer.ClippingStop;
end;
function TBubbleSeries.Extent: TDoubleRect;