diff --git a/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.lfm index 10420878f..db36a93a1 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.lfm @@ -19,17 +19,17 @@ inherited BoxPlotFrm: TBoxPlotFrm TabOrder = 10 end inherited ComputeBtn: TButton - Left = 195 + Left = 194 Top = 459 TabOrder = 9 end inherited ResetBtn: TButton - Left = 133 + Left = 132 Top = 459 TabOrder = 8 end inherited HelpBtn: TButton - Left = 74 + Left = 73 Top = 459 TabOrder = 7 end diff --git a/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.pas b/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.pas index 4d9626cca..3cb1cf45d 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/boxplotunit.pas @@ -441,11 +441,6 @@ begin for i := 1 to NoVariables do VarList.Items.Add(OS3MainFrm.DataGrid.Cells[i,0]); UpdateBtnStates; - - if Assigned(FReportFrame) then - FReportFrame.Clear; - if Assigned(FChartFrame) then - FChartFrame.Clear; end; @@ -458,11 +453,6 @@ begin GrpinBtn.Enabled := (VarList.ItemIndex > -1) and (GroupEdit.Text = ''); grpoutBtn.Enabled := (GroupEdit.Text <> ''); - - if Assigned(FReportFrame) then - FReportFrame.UpdateBtnStates; - if Assigned(FChartFrame) then - FChartFrame.UpdateBtnStates; end; diff --git a/applications/lazstats/source/forms/analysis/descriptive/breakdownunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/breakdownunit.lfm index 75e3c898b..cd84d0f46 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/breakdownunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/breakdownunit.lfm @@ -19,17 +19,17 @@ inherited BreakDownFrm: TBreakDownFrm TabOrder = 11 end inherited ComputeBtn: TButton - Left = 206 + Left = 205 Top = 322 TabOrder = 10 end inherited ResetBtn: TButton - Left = 144 + Left = 143 Top = 322 TabOrder = 9 end inherited HelpBtn: TButton - Left = 85 + Left = 84 Top = 322 TabOrder = 8 end diff --git a/applications/lazstats/source/forms/analysis/descriptive/breakdownunit.pas b/applications/lazstats/source/forms/analysis/descriptive/breakdownunit.pas index 609cf0926..106d829a4 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/breakdownunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/breakdownunit.pas @@ -655,6 +655,8 @@ procedure TBreakDownFrm.Reset; var i: integer; begin + inherited; + VarList.Clear; SelList.Clear; DepVar.Text := ''; @@ -665,8 +667,6 @@ begin for i := 1 to NoVariables do VarList.Items.Add(OS3MainFrm.DataGrid.Cells[i,0]); - if FReportFrame <> nil then - FReportFrame.Clear; if FAnovaReportFrame <> nil then FAnovaReportFrame.Clear; @@ -745,8 +745,6 @@ begin SelVarInBtn.Enabled := (VarList.ItemIndex > -1) and (DepVar.Text = ''); SelVarOutBtn.Enabled := (DepVar.Text <> ''); - if FReportFrame <> nil then - FReportFrame.UpdateBtnStates; if FAnovaReportFrame <> nil then FAnovaReportFrame.UpdateBtnStates; end; diff --git a/applications/lazstats/source/forms/analysis/descriptive/bubbleplotunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/bubbleplotunit.lfm index 7fff22ffc..8983803f6 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/bubbleplotunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/bubbleplotunit.lfm @@ -19,17 +19,17 @@ inherited BubbleForm: TBubbleForm TabOrder = 8 end inherited ComputeBtn: TButton - Left = 238 + Left = 237 Top = 424 TabOrder = 7 end inherited ResetBtn: TButton - Left = 176 + Left = 175 Top = 424 TabOrder = 6 end inherited HelpBtn: TButton - Left = 117 + Left = 116 Top = 424 TabOrder = 5 end diff --git a/applications/lazstats/source/forms/analysis/descriptive/bubbleplotunit.pas b/applications/lazstats/source/forms/analysis/descriptive/bubbleplotunit.pas index c85592356..d91623bd0 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/bubbleplotunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/bubbleplotunit.pas @@ -490,11 +490,6 @@ begin for i := 1 to NoVariables do VarList.Items.Add(OS3MainFrm.DataGrid.Cells[i,0]); UpdateBtnStates; - - if Assigned(FReportFrame) then - FReportFrame.Clear; - if Assigned(FChartFrame) then - FChartFrame.Clear; end; @@ -569,11 +564,6 @@ begin XOutBtn.Enabled := XEdit.Text <> ''; YOutBtn.Enabled := YEdit.Text <> ''; SizeOutBtn.Enabled := SizeEdit.Text <> ''; - - if Assigned(FReportFrame) then - FReportFrame.UpdateBtnStates; - if Assigned(FChartFrame) then - FChartFrame.UpdateBtnStates; end; diff --git a/applications/lazstats/source/forms/analysis/descriptive/comparedistunit.pas b/applications/lazstats/source/forms/analysis/descriptive/comparedistunit.pas index d8d72d76f..a3aba3874 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/comparedistunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/comparedistunit.pas @@ -549,9 +549,8 @@ begin NormalDistChk.Checked := true; DistChange(nil); - if FReportFrame <> nil then FReportFrame.Clear; - if FChartFrame <> nil then FChartFrame.Clear; - if FFreqChartFrame <> nil then FFreqChartFrame.Clear; + if FFreqChartFrame <> nil then + FFreqChartFrame.Clear; FreqChartPage.TabVisible := false; end; @@ -559,14 +558,16 @@ end; procedure TCompareDistFrm.UpdateBtnStates; begin + inherited; + + if FFreqChartFrame <> nil then + FFreqChartFrame.UpdateBtnStates; + Var1InBtn.Enabled := (VarList.ItemIndex > -1) and (VarOneEdit.Text = ''); Var2InBtn.Enabled := (VarList.ItemIndex > -1) and (VarTwoEdit.Text = ''); Var1OutBtn.Enabled := VarOneEdit.Text <> ''; Var2OutBtn.Enabled := VarTwoEdit.Text <> ''; - if FReportFrame <> nil then FReportFrame.UpdateBtnStates; - if FChartFrame <> nil then FChartFrame.UpdateBtnStates; - if FFreqChartFrame <> nil then FFreqChartFrame.UpdateBtnStates; end; diff --git a/applications/lazstats/source/forms/analysis/descriptive/crosstabunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/crosstabunit.lfm index bfe94d3e4..8790071bc 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/crosstabunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/crosstabunit.lfm @@ -19,17 +19,17 @@ inherited CrossTabFrm: TCrossTabFrm TabOrder = 7 end inherited ComputeBtn: TButton - Left = 182 + Left = 181 Top = 317 TabOrder = 6 end inherited ResetBtn: TButton - Left = 120 + Left = 119 Top = 317 TabOrder = 5 end inherited HelpBtn: TButton - Left = 61 + Left = 60 Top = 317 TabOrder = 4 end diff --git a/applications/lazstats/source/forms/analysis/descriptive/crosstabunit.pas b/applications/lazstats/source/forms/analysis/descriptive/crosstabunit.pas index 11453f73f..d217c77e9 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/crosstabunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/crosstabunit.pas @@ -38,7 +38,6 @@ type procedure UpdateBtnStates; override; public - constructor Create(AOwner: TComponent); override; procedure Reset; override; end; @@ -302,30 +301,22 @@ end; { TCrossTabFrm } -constructor TCrossTabFrm.Create(AOwner: TComponent); -begin - inherited; -end; - - procedure TCrossTabFrm.AdjustConstraints; begin inherited; + ParamsPanel.Constraints.MinWidth := Max( 4*CloseBtn.Width + 3*CloseBtn.BorderSpacing.Left, Max(Label1.Width, Label2.Width) + InBtn.Width + VarList.BorderSpacing.Right * 2 ); ParamsPanel.Constraints.MinHeight := 200; - - Constraints.MinWidth := ParamsPanel.Constraints.MinWidth + 300;; - Constraints.MinHeight := ParamsPanel.Constraints.MinHeight + 2*ParamsPanel.BorderSpacing.Top; end; procedure TCrossTabFrm.Compute; var lReport: TStringList; - calculator: TCrossTabCalculator; + crossTab: TCrossTabCalculator; var_list: IntDyneVec = nil; colNoSelected: IntDyneVec = nil; begin @@ -344,13 +335,13 @@ begin lReport.Add('Analyzed data is from file ' + OS3MainFrm.FileNameEdit.Text); lReport.Add(''); - calculator := TCrossTabCalculator.Create; + crossTab := TCrossTabCalculator.Create; try Prepare(var_list, colNoSelected); - calculator.Execute(lReport, OS3MainFrm.DataGrid, var_list, colNoSelected); + crossTab.Execute(lReport, OS3MainFrm.DataGrid, var_list, colNoSelected); FReportFrame.DisplayReport(lReport); finally - calculator.Free; + crossTab.Free; end; finally lReport.Free; @@ -433,14 +424,13 @@ procedure TCrossTabFrm.Reset; var i: integer; begin + inherited; + VarList.Clear; SelList.Clear; for i := 1 to NoVariables do VarList.Items.Add(OS3MainFrm.DataGrid.Cells[i,0]); UpdateBtnStates; - - if FReportFrame <> nil then - FReportFrame.Clear; end; @@ -463,6 +453,8 @@ var lSelected: Boolean; i: Integer; begin + inherited; + lSelected := false; for i := 0 to VarList.Items.Count-1 do if VarList.Selected[i] then @@ -480,9 +472,6 @@ begin break; end; OutBtn.Enabled := lSelected; - - if FReportFrame <> nil then - FReportFrame.UpdateBtnStates; end; diff --git a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm index 2cd0c14e9..987456899 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm @@ -21,17 +21,17 @@ inherited DescriptiveFrm: TDescriptiveFrm inherited ComputeBtn: TButton AnchorSideBottom.Control = ParamsPanel AnchorSideBottom.Side = asrBottom - Left = 184 + Left = 183 Top = 391 TabOrder = 10 end inherited ResetBtn: TButton - Left = 122 + Left = 121 Top = 391 TabOrder = 9 end inherited HelpBtn: TButton - Left = 63 + Left = 62 Top = 391 TabOrder = 8 end diff --git a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.pas b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.pas index ab2aebc0b..5a8ed33b6 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.pas @@ -559,16 +559,6 @@ var F: TReportFrame; begin inherited; - (* - for i := PageControl.PageCount-1 downto 0 do - begin - if i > 0 then - PageControl.Pages[i].Free - else begin - F := GetReportFrame(i); - if Assigned(F) then F.Clear; - end; - end; *) lSelected := false; for i := 0 to VarList.Items.Count-1 do diff --git a/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.pas b/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.pas index 43867d843..2c2296605 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/groupfrequnit.pas @@ -256,6 +256,7 @@ end; procedure TGroupFreqForm.UpdateBtnStates; begin inherited; + GrpInBtn.Enabled := (VarList.ItemIndex > -1); GrpOutBtn.Enabled := (GrpVarEdit.Text <> ''); end; diff --git a/applications/lazstats/source/forms/analysis/descriptive/multxvsyunit.pas b/applications/lazstats/source/forms/analysis/descriptive/multxvsyunit.pas index e12ea42fe..6a56bd1e9 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/multxvsyunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/multxvsyunit.pas @@ -257,6 +257,7 @@ var i: integer; begin inherited; + VarList.Clear; for i := 1 to NoVariables do VarList.Items.Add(OS3MainFrm.DataGrid.Cells[i,0]); @@ -265,9 +266,6 @@ begin GroupEdit.Text := ''; LinesChk.Checked := false; - if FReportFrame <> nil then FReportFrame.Clear; - if FChartFrame <> nil then FChartFrame.Clear; - UpdateBtnStates; end; @@ -296,6 +294,8 @@ var lSelected: Boolean; i: Integer; begin + inherited; + lSelected := false; for i:=0 to VarList.Items.Count-1 do if VarList.Selected[i] then @@ -310,9 +310,6 @@ begin XOutBtn.Enabled := (XEdit.Text <> ''); YOutBtn.Enabled := (YEdit.Text <> ''); GroupOutBtn.Enabled := (GroupEdit.Text <> ''); - - if FReportFrame <> nil then FReportFrame.UpdateBtnStates; - if FChartFrame <> nil then FChartFrame.UpdateBtnStates; end; diff --git a/applications/lazstats/source/forms/analysis/descriptive/normalityunit.pas b/applications/lazstats/source/forms/analysis/descriptive/normalityunit.pas index 58114e0f7..b18bd5e8d 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/normalityunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/normalityunit.pas @@ -419,27 +419,24 @@ procedure TNormalityFrm.Reset; var i: integer; begin - TestVarEdit.Text := ''; + inherited; + + TestVarEdit.Clear; + VarList.Items.Clear; for i := 1 to NoVariables do VarList.Items.Add(OS3MainFrm.DataGrid.Cells[i,0]); - if Assigned(FReportFrame) then - FReportFrame.Clear; - if Assigned(FChartFrame) then - FChartFrame.Clear; UpdateBtnStates; end; procedure TNormalityFrm.UpdateBtnStates; begin + inherited; + VarInBtn.Enabled := (VarList.ItemIndex > -1) and (TestVarEdit.Text = ''); VarOutBtn.Enabled := (TestVarEdit.Text <> ''); - if Assigned(FReportFrame) then - FReportFrame.UpdateBtnStates; - if Assigned(FChartFrame) then - FChartFrame.UpdateBtnStates; end; diff --git a/applications/lazstats/source/forms/analysis/descriptive/resistancelineunit.pas b/applications/lazstats/source/forms/analysis/descriptive/resistancelineunit.pas index bbb59ca8b..05ee81a55 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/resistancelineunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/resistancelineunit.pas @@ -396,9 +396,6 @@ begin for i := 1 to NoVariables do VarList.Items.Add(OS3MainFrm.DataGrid.Cells[i,0]); UpdateBtnStates; - - if FReportFrame <> nil then FReportFrame.Clear; - if FChartFrame <> nil then FChartFrame.Clear; end; diff --git a/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.lfm index e80dc75ed..37170774f 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.lfm @@ -19,17 +19,17 @@ inherited XvsMultYForm: TXvsMultYForm TabOrder = 6 end inherited ComputeBtn: TButton - Left = 158 + Left = 157 Top = 459 TabOrder = 5 end inherited ResetBtn: TButton - Left = 96 + Left = 95 Top = 459 TabOrder = 4 end inherited HelpBtn: TButton - Left = 37 + Left = 36 Top = 459 end inherited ButtonBevel: TBevel diff --git a/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.pas b/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.pas index f2e76b7ee..5dbe11cd1 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/xvsmultyunit.pas @@ -189,20 +189,20 @@ procedure TXvsMultYForm.Reset; var i: integer; begin - VarList.Clear; + inherited; + YBox.Clear; XEdit.Clear; + PlotTitleEdit.Clear; + XInBtn.Enabled := true; XOutBtn.Enabled := false; YInBtn.Enabled := true; YOutBtn.Enabled := false; - PlotTitleEdit.Text := ''; + + VarList.Clear; for i := 1 to NoVariables do VarList.Items.Add(OS3MainFrm.DataGrid.Cells[i,0]); - if Assigned(FReportFrame) then - FReportFrame.Clear; - if Assigned(FChartFrame) then - FChartFrame.Clear; end; @@ -210,14 +210,13 @@ procedure TXvsMultYForm.UpdateBtnStates; var lSelected: Boolean; begin + inherited; + lSelected := AnySelected(VarList); XInBtn.Enabled := lSelected and (XEdit.Text = ''); YInBtn.Enabled := lSelected; xOutBtn.Enabled := (XEdit.Text <> ''); YOutBtn.Enabled := AnySelected(YBox); - - if Assigned(FReportFrame) then FReportFrame.UpdateBtnStates; - if Assigned(FChartFrame) then FChartFrame.UpdateBtnStates; end;