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

TAChart: Extract GetGraphPointX function

Browse Source 
git-svn-id: trunk@23207 -
This commit is contained in:
ask 2009-12-20 16:46:14 +00:00
parent 903b555e57
commit 28506dad55
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/tachart/tacustomseries.pas
View File

@ -65,6 +65,7 @@ type
procedure BeforeDraw; override;
function ColorOrDefault(AColor: TColor; ADefault: TColor = clTAColor): TColor;
function GetGraphPoint(AIndex: Integer): TDoublePoint;
function GetGraphPointX(AIndex: Integer): Double;
function GetSeriesColor: TColor; virtual;
function GetXMaxVal: Integer;
procedure UpdateBounds(var ABounds: TDoubleRect); override;
@ -313,6 +314,11 @@ begin
end;
end;
function TChartSeries.GetGraphPointX(AIndex: Integer): Double;
begin
Result := Source[AIndex]^.X;
end;
procedure TChartSeries.GetMax(out X, Y: Double);
begin
X := Source.XOfMax;

20
components/tachart/taseries.pas
View File

@ -640,11 +640,11 @@ function TBarSeries.CalcBarWidth(AX: Double; AIndex: Integer): Double;
begin
case CASE_OF_TWO[AIndex > 0, AIndex < Count - 1] of
cotNone: Result := 1.0;
cotFirst: Result := Abs(AX - Source[AIndex - 1]^.X);
cotSecond: Result := Abs(AX - Source[AIndex + 1]^.X);
cotFirst: Result := Abs(AX - GetGraphPointX(AIndex - 1));
cotSecond: Result := Abs(AX - GetGraphPointX(AIndex + 1));
cotBoth: Result := Min(
Abs(AX - Source[AIndex - 1]^.X),
Abs(AX - Source[AIndex + 1]^.X));
Abs(AX - GetGraphPointX(AIndex - 1)),
Abs(AX - GetGraphPointX(AIndex + 1)));
end;
Result *= FBarWidthPercent * PERCENT / 2;
end;
@ -725,7 +725,7 @@ begin
if Bottom = Top then Dec(Top);
if Left = Right then Inc(Right);
end;
ACanvas.Brush.Color := ColorOrDefault(Source[i]^.Color);
ACanvas.Brush.Color := GetColor(i);
DrawBar(imageBar);
end;
@ -738,15 +738,17 @@ begin
end;
function TBarSeries.Extent: TDoubleRect;
var
x: Double;
begin
Result := inherited Extent;
if IsEmpty then exit;
UpdateMinMax(0, Result.a.Y, Result.b.Y);
// Show first and last bars fully.
with Source[0]^ do
Result.a.X := Min(Result.a.X, X - CalcBarWidth(X, 0));
with Source[Count - 1]^ do
Result.b.X := Max(Result.b.X, X + CalcBarWidth(X, Count - 1));
x := GetGraphPointX(0);
Result.a.X := Min(Result.a.X, x - CalcBarWidth(x, 0));
x := GetGraphPointX(Count - 1);
Result.b.X := Max(Result.b.X, x + CalcBarWidth(x, Count - 1));
end;
procedure TBarSeries.GetLegendItems(AItems: TChartLegendItems);