LazStats: Rearrange Analysis > Descriptive menu. Check whether the Close button is working for non-modal forms. Add build and release modes to project.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7718 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-09-29 10:36:56 +00:00
parent 37374ab05d
commit 3e74301fa1
15 changed files with 158 additions and 55 deletions

View File

@ -13,8 +13,80 @@
</XPManifest>
<Icon Value="0"/>
</General>
<BuildModes Count="1">
<BuildModes Count="3">
<Item1 Name="default" Default="True"/>
<Item2 Name="Debug">
<CompilerOptions>
<Version Value="11"/>
<PathDelim Value="\"/>
<Target>
<Filename Value="..\LazStats"/>
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<OtherUnitFiles Value="forms;forms\analysis;forms\analysis\cross-classification;forms\analysis\financial;forms\analysis\descriptive;forms\analysis\one_sample_tests;forms\analysis\comparisons;forms\analysis\correlation;forms\analysis\matrix_manipulation;forms\analysis\measurement_programs;forms\analysis\measurement_programs\item_banking;forms\analysis\multiple_regression;forms\analysis\multivariate;forms\analysis\nonparametric;forms\analysis\statistical_process_control;forms\help;forms\options;forms\misc;forms\simulations;forms\tools;forms\variables;units;frames"/>
<UnitOutputDirectory Value="..\ppu\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
<IncludeAssertionCode Value="True"/>
</SyntaxOptions>
</Parsing>
<CodeGeneration>
<Checks>
<IOChecks Value="True"/>
<RangeChecks Value="True"/>
<OverflowChecks Value="True"/>
<StackChecks Value="True"/>
</Checks>
<VerifyObjMethodCallValidity Value="True"/>
</CodeGeneration>
<Linking>
<Debugging>
<DebugInfoType Value="dsDwarf2Set"/>
<UseHeaptrc Value="True"/>
<TrashVariables Value="True"/>
<UseExternalDbgSyms Value="True"/>
</Debugging>
<Options>
<Win32>
<GraphicApplication Value="True"/>
</Win32>
</Options>
</Linking>
</CompilerOptions>
</Item2>
<Item3 Name="Release">
<CompilerOptions>
<Version Value="11"/>
<PathDelim Value="\"/>
<Target>
<Filename Value="..\LazStats"/>
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<OtherUnitFiles Value="forms;forms\analysis;forms\analysis\cross-classification;forms\analysis\financial;forms\analysis\descriptive;forms\analysis\one_sample_tests;forms\analysis\comparisons;forms\analysis\correlation;forms\analysis\matrix_manipulation;forms\analysis\measurement_programs;forms\analysis\measurement_programs\item_banking;forms\analysis\multiple_regression;forms\analysis\multivariate;forms\analysis\nonparametric;forms\analysis\statistical_process_control;forms\help;forms\options;forms\misc;forms\simulations;forms\tools;forms\variables;units;frames"/>
<UnitOutputDirectory Value="..\ppu\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<CodeGeneration>
<SmartLinkUnit Value="True"/>
<Optimizations>
<OptimizationLevel Value="3"/>
</Optimizations>
</CodeGeneration>
<Linking>
<Debugging>
<GenerateDebugInfo Value="False"/>
</Debugging>
<LinkSmart Value="True"/>
<Options>
<Win32>
<GraphicApplication Value="True"/>
</Win32>
</Options>
</Linking>
</CompilerOptions>
</Item3>
</BuildModes>
<PublishOptions>
<Version Value="2"/>
@ -1441,20 +1513,8 @@
<OtherUnitFiles Value="forms;forms\analysis;forms\analysis\cross-classification;forms\analysis\financial;forms\analysis\descriptive;forms\analysis\one_sample_tests;forms\analysis\comparisons;forms\analysis\correlation;forms\analysis\matrix_manipulation;forms\analysis\measurement_programs;forms\analysis\measurement_programs\item_banking;forms\analysis\multiple_regression;forms\analysis\multivariate;forms\analysis\nonparametric;forms\analysis\statistical_process_control;forms\help;forms\options;forms\misc;forms\simulations;forms\tools;forms\variables;units;frames"/>
<UnitOutputDirectory Value="..\ppu\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
<IncludeAssertionCode Value="True"/>
</SyntaxOptions>
</Parsing>
<CodeGeneration>
<SmartLinkUnit Value="True"/>
<Checks>
<IOChecks Value="True"/>
<RangeChecks Value="True"/>
<OverflowChecks Value="True"/>
<StackChecks Value="True"/>
</Checks>
<VerifyObjMethodCallValidity Value="True"/>
<Optimizations>
<OptimizationLevel Value="2"/>
</Optimizations>
@ -1464,6 +1524,11 @@
<DebugInfoType Value="dsDwarf2"/>
</Debugging>
<LinkSmart Value="True"/>
<Options>
<Win32>
<GraphicApplication Value="True"/>
</Win32>
</Options>
</Linking>
</CompilerOptions>
<Debugging>

View File

@ -13,7 +13,7 @@ object CompareDistFrm: TCompareDistFrm
OnCreate = FormCreate
OnShow = FormShow
Position = poMainFormCenter
LCLVersion = '2.1.0.0'
LCLVersion = '2.0.10.0'
object CompareGroup: TRadioGroup
AnchorSideTop.Control = Owner
AnchorSideRight.Control = Owner
@ -134,6 +134,7 @@ object CompareDistFrm: TCompareDistFrm
BorderSpacing.Bottom = 8
Caption = 'Close'
ModalResult = 11
OnClick = CloseBtnClick
TabOrder = 7
end
object PlotTypeGrp: TGroupBox

View File

@ -39,6 +39,7 @@ type
Var2OutBtn: TBitBtn;
Label1: TLabel;
VarList: TListBox;
procedure CloseBtnClick(Sender: TObject);
procedure CompareGroupClick(Sender: TObject);
procedure ComputeBtnClick(Sender: TObject);
procedure DistGroupClick(Sender: TObject);
@ -113,6 +114,11 @@ begin
Var2OutBtn.Enabled := (compareTo = 1);
end;
procedure TCompareDistFrm.CloseBtnClick(Sender: TObject);
begin
Close;
end;
procedure TCompareDistFrm.ComputeBtnClick(Sender: TObject);
var
Var1Freq : IntDyneVec;

View File

@ -13,7 +13,7 @@ object GroupFreqForm: TGroupFreqForm
OnCreate = FormCreate
OnShow = ResetBtnClick
Position = poMainFormCenter
LCLVersion = '2.1.0.0'
LCLVersion = '2.0.10.0'
object Label1: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Memo1
@ -152,6 +152,7 @@ object GroupFreqForm: TGroupFreqForm
BorderSpacing.Bottom = 8
Caption = 'Close'
ModalResult = 11
OnClick = CloseBtnClick
TabOrder = 7
end
object PlotOptionsBox: TRadioGroup

View File

@ -26,6 +26,7 @@ type
ResetBtn: TButton;
CloseBtn: TButton;
VarList: TListBox;
procedure CloseBtnClick(Sender: TObject);
procedure ComputeBtnClick(Sender: TObject);
procedure FormActivate(Sender: TObject);
procedure FormCreate(Sender: TObject);
@ -179,6 +180,11 @@ begin
GraphFrm.Ypoints := nil;
end;
procedure TGroupFreqForm.CloseBtnClick(Sender: TObject);
begin
Close;
end;
procedure TGroupFreqForm.FormActivate(Sender: TObject);
var
w: Integer;

View File

@ -12,7 +12,7 @@ object ResistanceLineForm: TResistanceLineForm
OnCreate = FormCreate
OnShow = ResetBtnClick
Position = poMainFormCenter
LCLVersion = '2.1.0.0'
LCLVersion = '2.0.10.0'
object Label1: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = HorCenterBevel
@ -351,6 +351,7 @@ object ResistanceLineForm: TResistanceLineForm
BorderSpacing.Bottom = 8
Caption = 'Close'
ModalResult = 11
OnClick = CloseBtnClick
TabOrder = 13
end
object GroupBox1: TGroupBox

View File

@ -46,6 +46,7 @@ type
Label2: TLabel;
Label3: TLabel;
Label4: TLabel;
procedure CloseBtnClick(Sender: TObject);
procedure ComputeBtnClick(Sender: TObject);
procedure FormActivate(Sender: TObject);
procedure FormCreate(Sender: TObject);
@ -60,8 +61,8 @@ type
{ private declarations }
FAutoSized: Boolean;
function Median(var X: DblDyneVec; ASize: integer): double;
procedure PlotXY(var Xpoints, YPoints, UpConf, LowConf: DblDyneVec;
ConfBand: double; Xmean, Ymean, R, Slope, Intercept: double;
procedure PlotXY(const Xpoints, YPoints, UpConf, LowConf: DblDyneVec;
ConfBand, Xmean, Ymean, R, Slope, Intercept: double;
Xmax, Xmin, Ymax, Ymin: double; N, PlotNo: integer);
procedure UpdateBtnStates;
@ -385,6 +386,11 @@ begin
end;
end;
procedure TResistanceLineForm.CloseBtnClick(Sender: TObject);
begin
Close;
end;
procedure TResistanceLineForm.FormActivate(Sender: TObject);
var
w: Integer;
@ -495,7 +501,7 @@ begin
Result := Median;
end;
procedure TResistanceLineForm.PlotXY(var Xpoints, Ypoints, UpConf, LowConf: DblDyneVec;
procedure TResistanceLineForm.PlotXY(const Xpoints, Ypoints, UpConf, LowConf: DblDyneVec;
ConfBand, XMean, YMean, R, Slope, Intercept: double;
Xmax, Xmin, Ymax, Ymin: double; N, PlotNo: integer);
var

View File

@ -13,7 +13,7 @@ object Rot3DFrm: TRot3DFrm
OnDestroy = FormDestroy
OnShow = FormShow
Position = poMainFormCenter
LCLVersion = '2.1.0.0'
LCLVersion = '2.0.10.0'
object Label1: TLabel
AnchorSideLeft.Control = VarList
AnchorSideLeft.Side = asrCenter
@ -405,6 +405,7 @@ object Rot3DFrm: TRot3DFrm
BorderSpacing.Bottom = 8
Caption = 'Close'
ModalResult = 11
OnClick = CloseBtnClick
TabOrder = 12
end
object PrintDialog: TPrintDialog

View File

@ -47,6 +47,7 @@ type
YDegEdit: TEdit;
ZDegEdit: TEdit;
procedure CancelBtnClick(Sender: TObject);
procedure CloseBtnClick(Sender: TObject);
procedure FormActivate(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
@ -320,6 +321,11 @@ begin
Close;
end;
procedure TRot3DFrm.CloseBtnClick(Sender: TObject);
begin
Close;
end;
procedure TRot3DFrm.Rotate(Sender: TObject);
var
p: POINT3D;

View File

@ -13,7 +13,7 @@ object DataSmoothingForm: TDataSmoothingForm
OnCreate = FormCreate
OnShow = ResetBtnClick
Position = poMainFormCenter
LCLVersion = '2.1.0.0'
LCLVersion = '2.0.10.0'
object Label1: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Memo1
@ -152,6 +152,7 @@ object DataSmoothingForm: TDataSmoothingForm
BorderSpacing.Bottom = 8
Caption = 'Close'
ModalResult = 11
OnClick = CloseBtnClick
TabOrder = 6
end
object RepeatChk: TCheckBox

View File

@ -28,6 +28,7 @@ type
VarOutBtn: TBitBtn;
Label1: TLabel;
VarList: TListBox;
procedure CloseBtnClick(Sender: TObject);
procedure ComputeBtnClick(Sender: TObject);
procedure FormActivate(Sender: TObject);
procedure FormCreate(Sender: TObject);
@ -129,6 +130,11 @@ begin
DataPts := nil;
end;
procedure TDataSmoothingForm.CloseBtnClick(Sender: TObject);
begin
Close;
end;
procedure TDataSmoothingForm.FormActivate(Sender: TObject);
var
w: Integer;

View File

@ -13,7 +13,7 @@ object StemLeafFrm: TStemLeafFrm
OnCreate = FormCreate
OnShow = FormShow
Position = poMainFormCenter
LCLVersion = '2.1.0.0'
LCLVersion = '2.0.10.0'
object TestChk: TCheckBox
AnchorSideLeft.Control = Owner
AnchorSideBottom.Control = Bevel1
@ -175,6 +175,7 @@ object StemLeafFrm: TStemLeafFrm
BorderSpacing.Bottom = 8
Caption = 'Close'
ModalResult = 11
OnClick = CloseBtnClick
TabOrder = 2
end
object ComputeBtn: TButton

View File

@ -29,6 +29,7 @@ type
VarList: TListBox;
SelectList: TListBox;
procedure AllBtnClick(Sender: TObject);
procedure CloseBtnClick(Sender: TObject);
procedure ComputeBtnClick(Sender: TObject);
procedure FormActivate(Sender: TObject);
procedure FormCreate(Sender: TObject);
@ -91,6 +92,11 @@ begin
UpdateBtnStates;
end;
procedure TStemLeafFrm.CloseBtnClick(Sender: TObject);
begin
Close;
end;
procedure TStemLeafFrm.ComputeBtnClick(Sender: TObject);
var
i, j, k, L, ncases, noselected, largest, smallest: integer;

View File

@ -19,7 +19,7 @@ object OS3MainFrm: TOS3MainFrm
OnCreate = FormCreate
OnDestroy = FormDestroy
OnShow = FormShow
LCLVersion = '2.1.0.0'
LCLVersion = '2.0.10.0'
object Panel1: TPanel
Left = 0
Height = 35
@ -471,7 +471,7 @@ object OS3MainFrm: TOS3MainFrm
OnClick = mnuAnalysisDescr_PlotXvsYClick
end
object mnuAnalysisDescr_XvsMultY: TMenuItem
Caption = 'Plot X versus Multiple Y'
Caption = 'Plot X vs Multiple Y'
OnClick = mnuAnalysisDescr_XvsMultYClick
end
object mnuAnalysisDescr_MultXvsY: TMenuItem
@ -500,34 +500,43 @@ object OS3MainFrm: TOS3MainFrm
Caption = 'Breakdown'
OnClick = mnuAnalysisDescr_BreakdownClick
end
object MenuItem13: TMenuItem
Caption = '-'
end
object mnuAnalysisDescr_Normality: TMenuItem
Caption = 'Normality Tests'
OnClick = mnuAnalysisDescr_NormalityClick
end
object mnuAnalysisDescr_ThreeDRotate: TMenuItem
Caption = '3-D Variable Rotation'
OnClick = mnuAnalysisDescr_ThreeDRotateClick
end
object mnuAnalysisDescr_StemLeaf: TMenuItem
Caption = 'Stem and Leaf Plot'
OnClick = mnuAnalysisDescr_StemLeafClick
end
object mnuAnalysisDescr_CompareDists: TMenuItem
Caption = 'Compare Distributions'
OnClick = mnuAnalysisDescr_CompareDistsClick
end
object MenuItem16: TMenuItem
Caption = '-'
end
object mnuAnalysisDescr_StemLeaf: TMenuItem
Caption = 'Stem and Leaf Plot'
OnClick = mnuAnalysisDescr_StemLeafClick
end
object mnuAnalysisDescr_ResistanceLine: TMenuItem
Caption = 'Resistant Line for Bivariate Data'
OnClick = mnuAnalysisDescr_ResistanceLineClick
end
object mnuAnalysisDescr_DataSmooth: TMenuItem
Caption = 'Data Smoothing'
OnClick = mnuAnalysisDescr_DataSmoothClick
end
object mnuAnalysisDescr_HomogeneityTest: TMenuItem
Caption = 'Brown-Forsythe Test for Homogeneity of Variance'
OnClick = mnuAnalysisDescr_HomogeneityTestClick
end
object MenuItem20: TMenuItem
Caption = '-'
end
object mnuAnalysisDescr_ThreeDRotate: TMenuItem
Caption = '3-D Variable Rotation'
OnClick = mnuAnalysisDescr_ThreeDRotateClick
end
object mnuAnalysisDescr_DataSmooth: TMenuItem
Caption = 'Data Smoothing'
OnClick = mnuAnalysisDescr_DataSmoothClick
end
end
object OneSampTests: TMenuItem
Caption = 'One Sample Tests'
@ -1081,10 +1090,6 @@ object OS3MainFrm: TOS3MainFrm
OnClick = mnuHelpUsingGridClick
end
end
object MenuItem2: TMenuItem
Caption = 'MenuItem2'
OnClick = MenuItem2Click
end
end
object OpenDialog: TOpenDialog
Left = 312

View File

@ -59,6 +59,9 @@ type
MenuItem113: TMenuItem;
MenuItem114: TMenuItem;
MenuItem115: TMenuItem;
MenuItem13: TMenuItem;
MenuItem16: TMenuItem;
MenuItem20: TMenuItem;
MenuItem3: TMenuItem;
MenuItem4: TMenuItem;
MenuItem5: TMenuItem;
@ -152,7 +155,6 @@ type
mnuVariablesTransform: TMenuItem;
MenuItem12: TMenuItem;
MenuItem2: TMenuItem;
MenuItem14: TMenuItem;
MenuItem15: TMenuItem;
MenuItem17: TMenuItem;
@ -292,8 +294,6 @@ type
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure MenuItem2Click(Sender: TObject);
// Menu "Analysis" / "Descriptive"
procedure mnuAnalysisDescr_BoxPlotClick(Sender: TObject);
procedure mnuAnalysisDescr_BreakdownClick(Sender: TObject);
@ -633,15 +633,6 @@ begin
end;
end;
procedure TOS3MainFrm.MenuItem2Click(Sender: TObject);
begin
{
if SChartForm = nil then
Application.CreateForm(TSChartForm, SChartForm);
SChartForm.ShowModal;
}
end;
// Menu "Analysis" > "Financial" > "Double Declining Value"
procedure TOS3MainFrm.MenuItem27Click(Sender: TObject);
begin
@ -2089,7 +2080,7 @@ procedure TOS3MainFrm.mnuAnalysisDescr_ResistanceLineClick(Sender: TObject);
begin
if ResistanceLineForm = nil then
Application.CreateForm(TResistanceLineForm, ResistanceLineForm);
ResistanceLineForm.ShowModal;
ResistanceLineForm.Show;
end;
// Menu "Analysis" > "Descriptive" > "Stem and Leaf Plot"
@ -2097,7 +2088,7 @@ procedure TOS3MainFrm.mnuAnalysisDescr_StemLeafClick(Sender: TObject);
begin
if StemLeafFrm = nil then
Application.CreateForm(TStemLeafFrm, StemLeafFrm);
StemLeafFrm.ShowModal;
StemLeafFrm.Show;
end;
// Menu "Analysis" > "Descriptive" > "3-D Variable Rotation"
@ -2105,7 +2096,7 @@ procedure TOS3MainFrm.mnuAnalysisDescr_ThreeDRotateClick(Sender: TObject);
begin
if Rot3DFrm = nil then
Application.CreateForm(TRot3DFrm, Rot3DFrm);
Rot3DFrm.ShowModal;
Rot3DFrm.Show;
end;
// Menu "Analysis" > "Descriptive" > "X versus Multiple Y Plot"