diff --git a/applications/lazstats/docs/HelpNDoc/LazStats.hnd b/applications/lazstats/docs/HelpNDoc/LazStats.hnd index ca333f878..acf66974d 100644 Binary files a/applications/lazstats/docs/HelpNDoc/LazStats.hnd and b/applications/lazstats/docs/HelpNDoc/LazStats.hnd differ diff --git a/applications/lazstats/docs/chm/LazStats.chm b/applications/lazstats/docs/chm/LazStats.chm index d5f45b97c..b9f6a8e32 100644 Binary files a/applications/lazstats/docs/chm/LazStats.chm and b/applications/lazstats/docs/chm/LazStats.chm differ diff --git a/applications/lazstats/source/forms/analysis/measurement_programs/guttmanunit.lfm b/applications/lazstats/source/forms/analysis/measurement_programs/guttmanunit.lfm index a55eb79c4..5dc413dc2 100644 --- a/applications/lazstats/source/forms/analysis/measurement_programs/guttmanunit.lfm +++ b/applications/lazstats/source/forms/analysis/measurement_programs/guttmanunit.lfm @@ -118,7 +118,7 @@ object GuttmanFrm: TGuttmanFrm AnchorSideRight.Control = ComputeBtn AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom - Left = 163 + Left = 169 Height = 25 Top = 274 Width = 54 @@ -133,10 +133,10 @@ object GuttmanFrm: TGuttmanFrm TabOrder = 5 end object ComputeBtn: TButton - AnchorSideRight.Control = ReturnBtn + AnchorSideRight.Control = CloseBtn AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom - Left = 225 + Left = 231 Height = 25 Top = 274 Width = 76 @@ -150,30 +150,30 @@ object GuttmanFrm: TGuttmanFrm OnClick = ComputeBtnClick TabOrder = 6 end - object ReturnBtn: TButton + object CloseBtn: TButton AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom - Left = 309 + Left = 315 Height = 25 Top = 274 - Width = 61 + Width = 55 Anchors = [akRight, akBottom] AutoSize = True BorderSpacing.Left = 8 BorderSpacing.Top = 8 BorderSpacing.Right = 12 BorderSpacing.Bottom = 8 - Caption = 'Return' - ModalResult = 1 + Caption = 'Close' + ModalResult = 11 TabOrder = 7 end object Bevel1: TBevel AnchorSideLeft.Control = Owner AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom - AnchorSideBottom.Control = ReturnBtn + AnchorSideBottom.Control = CloseBtn Left = 0 Height = 8 Top = 258 diff --git a/applications/lazstats/source/forms/analysis/measurement_programs/guttmanunit.pas b/applications/lazstats/source/forms/analysis/measurement_programs/guttmanunit.pas index 2b481be52..04275c9dc 100644 --- a/applications/lazstats/source/forms/analysis/measurement_programs/guttmanunit.pas +++ b/applications/lazstats/source/forms/analysis/measurement_programs/guttmanunit.pas @@ -20,7 +20,7 @@ type AllBtn: TBitBtn; ResetBtn: TButton; ComputeBtn: TButton; - ReturnBtn: TButton; + CloseBtn: TButton; Label1: TLabel; Label2: TLabel; ItemList: TListBox; @@ -48,7 +48,7 @@ var implementation uses - Math; + Math, Utils; { TGuttmanFrm } @@ -75,10 +75,10 @@ begin if FAutoSized then exit; - w := MaxValue([ResetBtn.Width, ComputeBtn.Width, ReturnBtn.Width]); + w := MaxValue([ResetBtn.Width, ComputeBtn.Width, CloseBtn.Width]); ResetBtn.Constraints.MinWidth := w; ComputeBtn.Constraints.MinWidth := w; - ReturnBtn.Constraints.MinWidth := w; + CloseBtn.Constraints.MinWidth := w; Constraints.MinWidth := Width + w; // make form a bit wider... Constraints.MinHeight := Height; @@ -484,9 +484,11 @@ begin end; lReport.Add(''); - lReport.Add('No. of Cases := %3d. No. of items := %3d',[NoCases,NoSelected]); + lReport.Add('No. of Cases: %3d', [NoCases]); + lReport.Add('No. of items: %3d', [NoSelected]); lReport.Add(''); lReport.Add('RESPONSE MATRIX'); + lReport.Add(''); first := 1; last := first + 5; // column (item) index if (last > NoSelected) then last := NoSelected; @@ -547,7 +549,7 @@ begin end; lReport.Add(''); CoefRepro := 1.0 - (totalerrors / (NoCases * NoSelected)); - lReport.Add('Coefficient of Reproducibility := %6.3f', [CoefRepro]); + lReport.Add('Coefficient of Reproducibility: %6.3f', [CoefRepro]); for j := 1 to NoSelected do if (ColProps[j-1] > (1.0 - ColProps[j-1])) then @@ -556,7 +558,7 @@ begin Min_Coeff := Min_Coeff + (1.0 - ColProps[j-1]); Min_Coeff := Min_coeff / NoSelected; - lReport.Add('Minimal Marginal Reproducibility := %6.3f', [Min_Coeff]); + lReport.Add('Minimal Marginal Reproducibility: %6.3f', [Min_Coeff]); DisplayReport(lReport); finally @@ -618,28 +620,9 @@ begin end; procedure TGuttmanFrm.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 ItemList.Items.Count-1 do - if ItemList.Selected[i] then - begin - lSelected := true; - break; - end; - OutBtn.Enabled := lSelected; - + InBtn.Enabled := AnySelected(Varlist); + OutBtn.Enabled := AnySelected(Itemlist); AllBtn.Enabled := VarList.Items.Count > 0; end;