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

TAChart: Rename internal TCustomChartSource variables FExtent and FExtentIsValid to FBasicExtent and FBasicExtentIsValid. Issue #35313, part of patch by Marcin Wiazowski.

Browse Source 
git-svn-id: trunk@60842 -
This commit is contained in:
wp 2019-04-05 09:57:55 +00:00
parent a1ad05f532
commit e7f8525318
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/tachart/tacustomsource.pas
View File

@ -187,8 +187,8 @@ type
procedure SortValuesInRange(
var AValues: TChartValueTextArray; AStart, AEnd: Integer);
strict protected
FExtent: TDoubleRect;
FExtentIsValid: Boolean;
FBasicExtent: TDoubleRect;
FBasicExtentIsValid: Boolean;
FValuesTotal: Double;
FValuesTotalIsValid: Boolean;
FXCount: Cardinal;
@ -784,35 +784,36 @@ var
i: Integer;
vhi, vlo: Double;
begin
if FExtentIsValid then exit(FExtent);
FExtent := EmptyExtent;
if FBasicExtentIsValid then
exit(FBasicExtent);
FBasicExtent := EmptyExtent;
if XCount > 0 then begin
if HasXErrorBars then
for i := 0 to Count - 1 do begin
GetXErrorBarLimits(i, vhi, vlo);
UpdateMinMax(vhi, FExtent.a.X, FExtent.b.X);
UpdateMinMax(vlo, FExtent.a.X, FExtent.b.X);
UpdateMinMax(vhi, FBasicExtent.a.X, FBasicExtent.b.X);
UpdateMinMax(vlo, FBasicExtent.a.X, FBasicExtent.b.X);
end
else
for i:=0 to Count - 1 do
UpdateMinMax(Item[i]^.X, FExtent.a.X, FExtent.b.X);
UpdateMinMax(Item[i]^.X, FBasicExtent.a.X, FBasicExtent.b.X);
end;
if YCount > 0 then begin
if HasYErrorBars then
for i := 0 to Count - 1 do begin
GetYErrorBarLimits(i, vhi, vlo);
UpdateMinMax(vhi, FExtent.a.Y, FExtent.b.Y);
UpdateMinMax(vlo, FExtent.a.Y, FExtent.b.Y);
UpdateMinMax(vhi, FBasicExtent.a.Y, FBasicExtent.b.Y);
UpdateMinMax(vlo, FBasicExtent.a.Y, FBasicExtent.b.Y);
end
else
for i:=0 to Count - 1 do
UpdateMinMax(Item[i]^.Y, FExtent.a.Y, FExtent.b.Y);
UpdateMinMax(Item[i]^.Y, FBasicExtent.a.Y, FBasicExtent.b.Y);
end;
FExtentIsValid := true;
Result := FExtent;
FBasicExtentIsValid := true;
Result := FBasicExtent;
end;
procedure TCustomChartSource.BeforeDraw;
@ -863,7 +864,6 @@ begin
end;
class procedure TCustomChartSource.CheckFormat(const AFormat: String);
begin
Format(AFormat, [0.0, 0.0, '', 0.0, 0.0]);
@ -1181,7 +1181,7 @@ end;
procedure TCustomChartSource.InvalidateCaches;
begin
FExtentIsValid := false;
FBasicExtentIsValid := false;
FValuesTotalIsValid := false;
end;

40
components/tachart/tasources.pas
View File

@ -553,8 +553,8 @@ end;
procedure TListChartSource.ClearCaches;
begin
FExtent := EmptyExtent;
FExtentIsValid := true;
FBasicExtent := EmptyExtent;
FBasicExtentIsValid := true;
FValuesTotal := 0;
FValuesTotalIsValid := true;
end;
@ -607,9 +607,9 @@ end;
procedure TListChartSource.Delete(AIndex: Integer);
begin
with Item[AIndex]^ do begin
FExtentIsValid := FExtentIsValid and
(((FExtent.a.X < X) and (X < FExtent.b.X)) or (XCount = 0)) and
(((FExtent.a.Y < Y) and (Y < FExtent.b.Y)) or (YCount = 0));
FBasicExtentIsValid := FBasicExtentIsValid and
(((FBasicExtent.a.X < X) and (X < FBasicExtent.b.X)) or (XCount = 0)) and
(((FBasicExtent.a.Y < Y) and (Y < FBasicExtent.b.Y)) or (YCount = 0));
if FValuesTotalIsValid then
FValuesTotal -= NumberOr(Y);
end;
@ -720,17 +720,17 @@ var
procedure UpdateExtent;
begin
if (not FExtentIsValid) or (XCount = 0) then exit;
if (not FBasicExtentIsValid) or (XCount = 0) then exit;
if not IsNan(AValue) then begin
if AValue < FExtent.a.X then
FExtent.a.X := AValue
else if AValue > FExtent.b.X then
FExtent.b.X := AValue;
if AValue < FBasicExtent.a.X then
FBasicExtent.a.X := AValue
else if AValue > FBasicExtent.b.X then
FBasicExtent.b.X := AValue;
end;
if not IsNan(oldX) then
FExtentIsValid := (oldX <> FExtent.a.X) and (oldX <> FExtent.b.X);
FBasicExtentIsValid := (oldX <> FBasicExtent.a.X) and (oldX <> FBasicExtent.b.X);
end;
begin
@ -785,17 +785,17 @@ var
procedure UpdateExtent;
begin
if (not FExtentIsValid) or (YCount = 0) then exit;
if (not FBasicExtentIsValid) or (YCount = 0) then exit;
if not IsNan(AValue) then begin
if AValue < FExtent.a.Y then
FExtent.a.Y := AValue
else if AValue > FExtent.b.Y then
FExtent.b.Y := AValue;
if AValue < FBasicExtent.a.Y then
FBasicExtent.a.Y := AValue
else if AValue > FBasicExtent.b.Y then
FBasicExtent.b.Y := AValue;
end;
if not IsNan(oldY) then
FExtentIsValid := (oldY <> FExtent.a.Y) and (oldY <> FExtent.b.Y);
FBasicExtentIsValid := (oldY <> FBasicExtent.a.Y) and (oldY <> FBasicExtent.b.Y);
end;
begin
@ -861,9 +861,9 @@ end;
procedure TListChartSource.UpdateCachesAfterAdd(AX, AY: Double);
begin
if FExtentIsValid then begin
if FXCount > 0 then UpdateMinMax(AX, FExtent.a.X, FExtent.b.X);
if FYCount > 0 then UpdateMinMax(AY, FExtent.a.Y, FExtent.b.Y);
if FBasicExtentIsValid then begin
if FXCount > 0 then UpdateMinMax(AX, FBasicExtent.a.X, FBasicExtent.b.X);
if FYCount > 0 then UpdateMinMax(AY, FBasicExtent.a.Y, FBasicExtent.b.Y);
end;
if FValuesTotalIsValid then
FValuesTotal += NumberOr(AY);