diff --git a/applications/lazstats/source/forms/analysis/comparisons/bnestaunit.pas b/applications/lazstats/source/forms/analysis/comparisons/bnestaunit.pas index 92b07dc19..c4dd56bfd 100644 --- a/applications/lazstats/source/forms/analysis/comparisons/bnestaunit.pas +++ b/applications/lazstats/source/forms/analysis/comparisons/bnestaunit.pas @@ -78,7 +78,7 @@ var implementation uses - Math; + Math, Utils; { TBNestedAForm } @@ -574,17 +574,9 @@ end; procedure TBNestedAForm.UpdateBtnStates; var - i: Integer; lSelected: Boolean; begin - lSelected := false; - for i := 0 to VarList.Items.Count-1 do - if VarList.Selected[i] then - begin - lSelected := true; - break; - end; - + lSelected := AnySelected(VarList); AInBtn.Enabled := lSelected and (ACodes.Text = ''); BInBtn.Enabled := lSelected and (BCodes.Text = ''); DepInBtn.Enabled := lSelected and (DepEdit.Text = ''); diff --git a/applications/lazstats/source/forms/analysis/multiple_regression/bestregunit.pas b/applications/lazstats/source/forms/analysis/multiple_regression/bestregunit.pas index 512b875e0..d5cd2c179 100644 --- a/applications/lazstats/source/forms/analysis/multiple_regression/bestregunit.pas +++ b/applications/lazstats/source/forms/analysis/multiple_regression/bestregunit.pas @@ -133,7 +133,7 @@ var implementation uses - Math; + Math, Utils; { TBestRegFrm } @@ -786,28 +786,9 @@ begin end; procedure TBestRegFrm.UpdateBtnStates; -var - i: Integer; - lSelected: Boolean; begin - lSelected := false; - for i:=0 to VarList.Items.Count - 1 do - if VarList.Selected[i] then - begin - lSelected := true; - break; - end; - InBtn.Enabled := lSelected; - - lSelected := false; - for i := 0 to BlockList.Items.Count-1 do - if BlockList.Selected[i] then - begin - lSelected := true; - break; - end; - OutBtn.Enabled := lSelected; - + InBtn.Enabled := AnySelected(VarList); + OutBtn.Enabled := AnySelected(BlockList); DepInBtn.Enabled := (VarList.ItemIndex > -1) and (DepVar.Text <= ''); DepOutBtn.Enabled := DepVar.Text <> ''; end; diff --git a/applications/lazstats/source/forms/analysis/multiple_regression/lsmrunit.pas b/applications/lazstats/source/forms/analysis/multiple_regression/lsmrunit.pas index 7e78d0783..33c9f5301 100644 --- a/applications/lazstats/source/forms/analysis/multiple_regression/lsmrunit.pas +++ b/applications/lazstats/source/forms/analysis/multiple_regression/lsmrunit.pas @@ -69,7 +69,8 @@ var implementation uses - Math; + Math, + Utils; procedure TLSMregForm.ResetBtnClick(Sender: TObject); var @@ -413,27 +414,13 @@ end; procedure TLSMregForm.UpdateBtnStates; var - i: Integer; lSelected: Boolean; begin - lSelected := false; - for i := 0 to VarList.Items.Count-1 do - if VarList.Selected[i] then - begin - lSelected := true; - break; - end; + lSelected := AnySelected(VarList); DepInBtn.Enabled := lSelected; InBtn.Enabled := lSelected; - lSelected := false; - for i := 0 to IndepVars.Items.Count-1 do - if IndepVars.Selected[i] then - begin - lSelected := true; - break; - end; - OutBtn.Enabled := lSelected; + OutBtn.Enabled := AnySelected(IndepVars); DepOutBtn.Enabled := DepVar.Text <> ''; AllBtn.Enabled := VarList.Items.Count > 0; end; diff --git a/applications/lazstats/source/forms/analysis/multiple_regression/simultregunit.pas b/applications/lazstats/source/forms/analysis/multiple_regression/simultregunit.pas index 6f77d3cde..bf151cde3 100644 --- a/applications/lazstats/source/forms/analysis/multiple_regression/simultregunit.pas +++ b/applications/lazstats/source/forms/analysis/multiple_regression/simultregunit.pas @@ -61,7 +61,7 @@ var implementation uses - Math; + Math, Utils; { TSimultFrm } @@ -427,28 +427,9 @@ begin end; procedure TSimultFrm.UpdateBtnStates; -var - i: Integer; - lSelected: Boolean; begin - lSelected := false; - for i := 0 to VarList.Items.Count-1 do - if VarList.Selected[i] then - begin - lSelected := true; - break; - end; - InBtn.Enabled := lSelected; - - lSelected := false; - for i := 0 to ListBox1.Items.Count-1 do - if ListBox1.Selected[i] then - begin - lSelected := true; - break; - end; - OutBtn.Enabled := lSelected; - + InBtn.Enabled := AnySelected(VarList); + OutBtn.Enabled := AnySelected(ListBox1); AllBtn.Enabled := VarList.Items.Count > 0; end; diff --git a/applications/lazstats/source/forms/analysis/nonparametric/cochranqunit.pas b/applications/lazstats/source/forms/analysis/nonparametric/cochranqunit.pas index cd7978465..a0ca2631d 100644 --- a/applications/lazstats/source/forms/analysis/nonparametric/cochranqunit.pas +++ b/applications/lazstats/source/forms/analysis/nonparametric/cochranqunit.pas @@ -50,7 +50,7 @@ var implementation uses - Math; + Math, Utils; { TCochranQFrm } @@ -233,28 +233,9 @@ begin end; procedure TCochranQFrm.UpdateBtnStates; -var - i: Integer; - lSelected: Boolean; begin - lSelected := false; - for i:=0 to VarList.Items.Count-1 do - if VarList.Selected[i] then - begin - lSelected := true; - break; - end; - InBtn.Enabled := lSelected; - - lSelected := false; - for i:=0 to SelList.Items.Count-1 do - if SelList.Selected[i] then - begin - lSelected := true; - break; - end; - OutBtn.Enabled := lSelected; - + InBtn.Enabled := AnySelected(VarList); + OutBtn.Enabled := AnySelected(SelList); AllBtn.Enabled := VarList.Items.Count > 0; end; diff --git a/applications/lazstats/source/forms/analysis/nonparametric/friedmanunit.pas b/applications/lazstats/source/forms/analysis/nonparametric/friedmanunit.pas index 9ccf3e1ef..79ac564f9 100644 --- a/applications/lazstats/source/forms/analysis/nonparametric/friedmanunit.pas +++ b/applications/lazstats/source/forms/analysis/nonparametric/friedmanunit.pas @@ -56,7 +56,7 @@ var implementation uses - Math; + Math, Utils; { TFriedmanFrm } @@ -401,29 +401,13 @@ end; procedure TFriedmanFrm.UpdateBtnStates; var - i: Integer; lSelected: Boolean; begin - lSelected := false; - for i:= 0 to VarList.Items.Count-1 do - if VarList.Selected[i] then - begin - lSelected := true; - break; - end; + lSelected := AnySelected(VarList); GrpIn.Enabled := lSelected and (GrpVar.Text = ''); TrtIn.Enabled := lSelected; - GrpOut.Enabled := GrpVar.Text <> ''; - - lSelected := false; - for i := 0 to TreatVars.Items.Count-1 do - if TreatVars.Selected[i] then - begin - lSelected := true; - break; - end; - TrtOut.Enabled := lSelected; + TrtOut.Enabled := AnySelected(TreatVars) end;