pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

LazStats: Cleanup in PlotXYUnit.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7679 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-09-20 21:56:53 +00:00
parent 352f651b2f
commit d36e545456
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
applications/lazstats/source/forms/analysis/descriptive/plotxyunit.pas
View File

@ -46,7 +46,7 @@ type
procedure FormActivate(Sender: TObject); procedure FormActivate(Sender: TObject);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure ResetBtnClick(Sender: TObject); procedure ResetBtnClick(Sender: TObject);
procedure VarListSelectionChange(Sender: TObject; User: boolean); procedure VarListSelectionChange(Sender: TObject; {%H-}User: boolean);
procedure XinBtnClick(Sender: TObject); procedure XinBtnClick(Sender: TObject);
procedure XOutBtnClick(Sender: TObject); procedure XOutBtnClick(Sender: TObject);
procedure YInBtnClick(Sender: TObject); procedure YInBtnClick(Sender: TObject);
@ -56,8 +56,8 @@ type
FAutoSized: Boolean; FAutoSized: Boolean;
FReportFrame: TReportFrame; FReportFrame: TReportFrame;
FChartFrame: TChartFrame; FChartFrame: TChartFrame;
function PlotXY(XPoints, YPoints, UpConf, LowConf: DblDyneVec; procedure PlotXY(XPoints, YPoints, UpConf, LowConf: DblDyneVec;
XMean, YMean, R, Slope, Intercept: Double): Boolean; XMean, YMean, R, Slope, Intercept: Double);
procedure UpdateBtnStates; procedure UpdateBtnStates;
function Validate(out AMsg: String; out AControl: TWinControl; function Validate(out AMsg: String; out AControl: TWinControl;
Xcol,Ycol: Integer): Boolean; Xcol,Ycol: Integer): Boolean;
@ -155,8 +155,8 @@ procedure TPlotXYFrm.ComputeBtnClick(Sender: TObject);
var var
Xmin, Xmax, Ymin, Ymax, SSx, SSY, t, DF: double; Xmin, Xmax, Ymin, Ymax, SSx, SSY, t, DF: double;
Xmean, Ymean, Xvariance, Yvariance, Xstddev, Ystddev, ConfBand: double; Xmean, Ymean, Xvariance, Yvariance, Xstddev, Ystddev, ConfBand: double;
X, Y, R, temp, SEPred, Slope, Intercept, predicted, sedata: double; X, Y, R, SEPred, Slope, Intercept, predicted, sedata: double;
i, j: integer; i: integer;
Xcol, Ycol, N, NoSelected: integer; Xcol, Ycol, N, NoSelected: integer;
Xpoints: DblDyneVec = nil; Xpoints: DblDyneVec = nil;
Ypoints: DblDyneVec = nil; Ypoints: DblDyneVec = nil;
@ -204,6 +204,8 @@ begin
Ymean := 0.0; Ymean := 0.0;
XVariance := 0.0; XVariance := 0.0;
YVariance := 0.0; YVariance := 0.0;
SSX := 0.0;
SSY := 0.0;
R := 0.0; R := 0.0;
N := 0; N := 0;
@ -384,8 +386,8 @@ begin
end; end;
function TPlotXYFrm.PlotXY(XPoints, YPoints, UpConf, LowConf: DblDyneVec; procedure TPlotXYFrm.PlotXY(XPoints, YPoints, UpConf, LowConf: DblDyneVec;
XMean, YMean, R, Slope, Intercept: Double): boolean; XMean, YMean, R, Slope, Intercept: Double);
var var
tmpX, tmpY: array[0..1] of Double; tmpX, tmpY: array[0..1] of Double;
xmin, xmax, ymin, ymax: Double; xmin, xmax, ymin, ymax: Double;
@ -397,7 +399,6 @@ begin
rightLabels.Clear; rightLabels.Clear;
topLabels := FChartFrame.Chart.AxisList[3].Marks.Source as TListChartSource; topLabels := FChartFrame.Chart.AxisList[3].Marks.Source as TListChartSource;
topLabels.Clear; topLabels.Clear;
FChartFrame.Clear; FChartFrame.Clear;
// Titles // Titles
@ -433,9 +434,9 @@ begin
if MeansChk.Checked then if MeansChk.Checked then
begin begin
FChartFrame.VertLine(XMean, clGreen, psDashDot, 'Mean ' + XEdit.Text); FChartFrame.VertLine(XMean, clGreen, psDashDot, 'Mean ' + XEdit.Text);
topLabels.Add(XMean, XMean, Format('Mean(%s)', [XEdit.Text])); topLabels.Add(XMean, XMean, 'Mean ' + XEdit.Text);
FChartFrame.HorLine(YMean, clGreen, psDash, 'Mean ' + YEdit.Text); FChartFrame.HorLine(YMean, clGreen, psDash, 'Mean ' + YEdit.Text);
rightLabels.Add(YMean, YMean, Format('Mean(%s)', [YEdit.Text])); rightLabels.Add(YMean, YMean, 'Mean ' + YEdit.Text);
end; end;
// Draw regression line // Draw regression line