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

Merge branch 'Free_Coder-main-patch-51955' into 'main'

Browse Source 
TAMultiseries.pas fix for #39616 TBoxAndWhiskerSeries cannot use different...

See merge request freepascal.org/lazarus/lazarus!68
This commit is contained in:
Werner Pamler 2022-01-30 12:03:45 +00:00
commit 5b7387ddd5
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/tachart/tamultiseries.pas
View File

@ -1023,6 +1023,8 @@ begin
ww := w * WhiskersWidth;
ADrawer.Pen := WhiskersPen;
if (Source[i]^.Color <> clTAColor) and (WhiskersPen.Color = clTAColor) then
ADrawer.SetPenColor(Source[i]^.Color);
ADrawer.SetBrushParams(bsClear, clTAColor);
DoLine(x - ww, ymin, x + ww, ymin);
DoLine(x, ymin, x, yqmin);
@ -1030,11 +1032,17 @@ begin
DoLine(x, ymax, x, yqmax);
ADrawer.Pen := BoxPen;
if Source[i]^.Color <> clTAColor then
ADrawer.SetBrushParams(bsSolid, Source[i]^.Color)
begin
if BoxPen.Color = clTAColor then
ADrawer.SetPenColor(Source[i]^.Color);
ADrawer.SetBrushParams(bsSolid, Source[i]^.Color);
end
else
ADrawer.Brush := BoxBrush;
DoRect(x - wb, yqmin, x + wb, yqmax);
ADrawer.Pen := MedianPen;
if (Source[i]^.Color <> clTAColor) and (MedianPen.Color = clTAColor) then
ADrawer.SetPenColor(Source[i]^.Color);
ADrawer.SetBrushParams(bsClear, clTAColor);
DoLine(x - wb, ymed, x + wb, ymed);
end;