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

TAChart: Add TBubbleSeries.OverrideColor property

Browse Source 
git-svn-id: trunk@39150 -
This commit is contained in:
ask 2012-10-23 12:04:03 +00:00
parent a6a22c7551
commit 763c21cad7
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/tachart/tamultiseries.pas
View File

@ -36,6 +36,8 @@ const
type
TBubbleRadiusTransform = (brtNone, brtX, brtY);
TBubbleOverrideColor = (bocBrush, bocPen);
TBubbleOverrideColors = set of TBubbleOverrideColor;
{ TBubbleSeries }
@ -43,8 +45,10 @@ type
private
FBubbleBrush: TBrush;
FBubblePen: TPen;
FOverrideColor: TBubbleOverrideColors;
procedure SetBubbleBrush(AValue: TBrush);
procedure SetBubblePen(AValue: TPen);
procedure SetOverrideColor(AValue: TBubbleOverrideColors);
protected
procedure GetLegendItems(AItems: TChartLegendItems); override;
function GetSeriesColor: TColor; override;
@ -60,6 +64,8 @@ type
property AxisIndexY;
property BubbleBrush: TBrush read FBubbleBrush write SetBubbleBrush;
property BubblePen: TPen read FBubblePen write SetBubblePen;
property OverrideColor: TBubbleOverrideColors
read FOverrideColor write SetOverrideColor default [];
property Source;
end;
@ -154,7 +160,7 @@ type
implementation
uses
Math, SysUtils, TAGeometry, TAGraph, TAMath;
Math, SysUtils, TACustomSource, TAGeometry, TAGraph, TAMath;
type
@ -213,6 +219,7 @@ var
i: Integer;
pt, d: TPoint;
r: Double;
pi: PChartDataItem;
begin
if Source.YCount < 2 then exit;
r := 0;
@ -224,9 +231,14 @@ begin
ADrawer.Brush := BubbleBrush;
for i := 0 to High(FGraphPoints) do begin
pt := ParentChart.GraphToImage(FGraphPoints[i]);
r := Source[i + FLoBound]^.YList[0];
pi := Source[i + FLoBound];
r := pi^.YList[0];
d.X := ParentChart.XGraphToImage(r) - ParentChart.XGraphToImage(0);
d.Y := ParentChart.YGraphToImage(r) - ParentChart.YGraphToImage(0);
if bocPen in OverrideColor then
ADrawer.SetPenParams(BubblePen.Style, ColorDef(pi^.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);
end;
DrawLabels(ADrawer);
@ -273,6 +285,13 @@ begin
UpdateParentChart;
end;
procedure TBubbleSeries.SetOverrideColor(AValue: TBubbleOverrideColors);
begin
if FOverrideColor = AValue then exit;
FOverrideColor := AValue;
UpdateParentChart;
end;
{ TBoxAndWhiskerSeries }
function TBoxAndWhiskerSeries.AddXY(