paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-06 03:00:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: TOpenHighLowCloseSeries and TBoxAndWhiskerSeries accept XCount=0. Some missing fixes in the basic source classes for XCount=0.

Browse Source 
git-svn-id: trunk@61004 -
This commit is contained in:
wp 2019-04-17 21:37:21 +00:00
parent cc8c38611c
commit 72317a44ee
3 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/tachart/tacustomseries.pas
View File

@ -1684,11 +1684,14 @@ var
wl, wr: Double;
i: Integer;
begin
i := AIndex - 1;
wl := Abs(AX - NearestXNumber(i, -1));
i := AIndex + 1;
wr := Abs(AX - NearestXNumber(i, +1));
Result := NumberOr(SafeMin(wl, wr), 1.0);
if Source.XCount > 0 then begin
i := AIndex - 1;
wl := Abs(AX - NearestXNumber(i, -1));
i := AIndex + 1;
wr := Abs(AX - NearestXNumber(i, +1));
Result := NumberOr(SafeMin(wl, wr), 1.0);
end else
Result := 1.0;
end;
function TBasicPointSeries.GetZeroLevel: Double;
@ -2013,7 +2016,7 @@ var
x, prevX: Double;
i: Integer;
begin
if Count < 2 then begin
if (Count < 2) or (Source.XCount = 0) then begin
FMinXRange := 1.0;
exit;
end;

26
components/tachart/tacustomsource.pas
View File

@ -1071,6 +1071,10 @@ procedure TCustomChartSource.FindBounds(
begin
EnsureOrder(AXMin, AXMax);
if (XCount = 0) then begin
ALB := trunc(AXMin);
AUB := ceil(AXMax);
end else
if IsSortedByXAsc then begin
ALB := FindLB(AXMin, 0, Count - 1);
AUB := FindUB(AXMax, 0, Count - 1);
@ -1095,7 +1099,7 @@ function TCustomChartSource.FormatItem(
const AFormat: String; AIndex, AYIndex: Integer): String;
begin
with Item[AIndex]^ do
Result := FormatItemXYText(AFormat, X, GetY(AYIndex), Text);
Result := FormatItemXYText(AFormat, IfThen(XCount > 0, X, double(AIndex)), GetY(AYIndex), Text);
end;
function TCustomChartSource.FormatItemXYText(
@ -1137,7 +1141,7 @@ begin
ALowerDelta := 0;
if Which = 0 then
v := Item[APointIndex]^.X
v := IfThen(XCount > 0, Item[APointIndex]^.X, APointIndex)
else
v := Item[APointIndex]^.Y;
@ -1199,7 +1203,7 @@ var
v, dxp, dxn: Double;
begin
Result := GetErrorBarValues(APointIndex, 0, dxp, dxn);
v := Item[APointIndex]^.X;
v := IfThen(XCount > 0, Item[APointIndex]^.X, APointIndex);
if Result and not IsNaN(v) then begin
AUpperLimit := v + dxp;
ALowerLimit := v - dxn;
@ -1380,7 +1384,7 @@ procedure TCustomChartSource.ValuesInRange(
ADest.FValue := AValue;
with Item[AIndex]^ do begin
if AParams.FUseY then begin
nx := X;
nx := IfThen(XCount > 0, X, AIndex);
ny := AValue;
end
else begin
@ -1501,7 +1505,12 @@ var
begin
for i := 0 to Count - 1 do
with Item[i]^ do
if Y = Extent.b.Y then exit(GetX(AIndex));
if Y = Extent.b.Y then begin
if XCount > 0 then
exit(GetX(AIndex))
else
exit(i);
end;
Result := 0.0;
end;
@ -1511,7 +1520,12 @@ var
begin
for i := 0 to Count - 1 do
with Item[i]^ do
if Y = Extent.a.Y then exit(GetX(AIndex));
if Y = Extent.a.Y then begin
if XCount > 0 then
exit(GetX(AIndex))
else
exit(i);
end;
Result := 0.0;
end;

6
components/tachart/tamultiseries.pas
View File

@ -123,7 +123,7 @@ type
AXLabel: String = ''; AColor: TColor = clTAColor): Integer; overload;
procedure Assign(ASource: TPersistent); override;
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
destructor Destroy; override;
procedure Draw(ADrawer: IChartDrawer); override;
function Extent: TDoubleRect; override;
function GetNearestPoint(const AParams: TNearestPointParams;
@ -1153,7 +1153,7 @@ end;
class procedure TBoxAndWhiskerSeries.GetXYCountNeeded(out AXCount, AYCount: Cardinal);
begin
AXCount := 1;
AXCount := 0;
AYCount := 5;
end;
@ -1592,7 +1592,7 @@ end;
class procedure TOpenHighLowCloseSeries.GetXYCountNeeded(out AXCount, AYCount: Cardinal);
begin
AXCount := 1;
AXCount := 0;
AYCount := 4;
end;