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

TAChart: Fix fitdemo crashing with power-function under certain circumstances (issue #37354, message 0124197).

Browse Source 
git-svn-id: trunk@63614 -
This commit is contained in:
wp 2020-07-21 14:07:20 +00:00
parent 818b9a1eed
commit 5697f99288
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
components/tachart/tafuncseries.pas
View File

@ -1664,10 +1664,11 @@ begin
feExp:
Result := Param[0] * Exp(Param[1] * AX);
fePower:
if AX < 0 then
Result := SafeNaN
else
begin
if (abs(Param[1]) < 1) and (AX < 0) then
exit;
Result := Param[0] * Power(AX, Param[1]);
end;
feCustom:
begin
Result := 0;
@ -1994,7 +1995,9 @@ begin
offs := IfThen(IsPrediction, 1, 0);
with FitStatistics do begin
x := TransformX(AX);
if IsNaN(x) then exit;
y := Calculate(AX);
if IsNaN(y) then exit;
y := TransformY(y);
dy := tValue * ResidualStdError * sqrt(offs + 1/N + sqr(x - xBar) / SSx);
if IsUpper then
@ -2377,19 +2380,28 @@ end;
function TFitSeries.TransformX(AX: Double): Extended;
begin
if FitEquation in [fePower] then
Result := ln(AX)
else
begin
if AX > 0 then
Result := ln(AX)
else
Result := SafeNaN;
end else
Result := AX;
end;
function TFitSeries.TransformY(AY: Double): Extended;
begin
if FitEquation in [feExp, fePower] then
Result := ln(AY)
else
begin
if AY > 0 then
Result := ln(AY)
else
Result := SafeNaN;
end else
Result := AY;
end;
{ TCustomColorMapSeries }
procedure TCustomColorMapSeries.Assign(ASource: TPersistent);