diff --git a/applications/lazstats/LazStats.chm b/applications/lazstats/LazStats.chm index c08539114..71a432458 100644 Binary files a/applications/lazstats/LazStats.chm and b/applications/lazstats/LazStats.chm differ diff --git a/applications/lazstats/docs/HelpNDoc/LazStats.hnd b/applications/lazstats/docs/HelpNDoc/LazStats.hnd index e1453950b..4d69e8590 100644 Binary files a/applications/lazstats/docs/HelpNDoc/LazStats.hnd and b/applications/lazstats/docs/HelpNDoc/LazStats.hnd differ diff --git a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm index 9da819631..cac19fb98 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm +++ b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.lfm @@ -10,34 +10,35 @@ inherited DescriptiveFrm: TDescriptiveFrm ClientWidth = 900 inherited ParamsPanel: TPanel Height = 416 - Width = 322 + Width = 290 ClientHeight = 416 - ClientWidth = 322 + ClientWidth = 290 inherited CloseBtn: TButton - Left = 267 + Left = 235 Top = 391 TabOrder = 11 end inherited ComputeBtn: TButton AnchorSideBottom.Control = ParamsPanel AnchorSideBottom.Side = asrBottom - Left = 183 + Left = 151 Top = 391 TabOrder = 10 end inherited ResetBtn: TButton - Left = 121 + Left = 89 Top = 391 TabOrder = 9 end inherited HelpBtn: TButton - Left = 62 + Left = 30 Top = 391 TabOrder = 8 + Visible = False end inherited ButtonBevel: TBevel Top = 375 - Width = 322 + Width = 290 end object Label2: TLabel[5] AnchorSideLeft.Control = ParamsPanel @@ -58,7 +59,7 @@ inherited DescriptiveFrm: TDescriptiveFrm Left = 0 Height = 218 Top = 17 - Width = 130 + Width = 114 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 2 BorderSpacing.Right = 8 @@ -72,7 +73,7 @@ inherited DescriptiveFrm: TDescriptiveFrm object Label3: TLabel[7] AnchorSideLeft.Control = SelList AnchorSideTop.Control = ParamsPanel - Left = 192 + Left = 176 Height = 15 Top = 0 Width = 44 @@ -88,10 +89,10 @@ inherited DescriptiveFrm: TDescriptiveFrm AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = VarList AnchorSideBottom.Side = asrBottom - Left = 192 + Left = 176 Height = 218 Top = 17 - Width = 130 + Width = 114 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Left = 8 BorderSpacing.Top = 2 @@ -105,7 +106,7 @@ inherited DescriptiveFrm: TDescriptiveFrm AnchorSideLeft.Side = asrCenter AnchorSideTop.Control = VarList AnchorSideRight.Side = asrBottom - Left = 147 + Left = 131 Height = 28 Top = 17 Width = 28 @@ -121,7 +122,7 @@ inherited DescriptiveFrm: TDescriptiveFrm AnchorSideTop.Control = InBtn AnchorSideTop.Side = asrBottom AnchorSideRight.Side = asrBottom - Left = 147 + Left = 131 Height = 28 Top = 49 Width = 28 @@ -137,7 +138,7 @@ inherited DescriptiveFrm: TDescriptiveFrm AnchorSideLeft.Side = asrCenter AnchorSideTop.Control = OutBtn AnchorSideTop.Side = asrBottom - Left = 138 + Left = 122 Height = 25 Top = 109 Width = 46 @@ -273,14 +274,14 @@ inherited DescriptiveFrm: TDescriptiveFrm end end inherited ParamsSplitter: TSplitter - Left = 334 + Left = 302 Height = 432 end object PageControl: TPageControl[2] - Left = 343 + Left = 311 Height = 416 Top = 8 - Width = 549 + Width = 581 ActivePage = ReportPage Align = alClient BorderSpacing.Left = 4 diff --git a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.pas b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.pas index c923a65dd..d7a253fac 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/descriptiveunit.pas @@ -360,7 +360,7 @@ begin DecPlacesEdit.Height + DecPlacesEdit.BorderSpacing.Top; ParamsPanel.Constraints.MinWidth := Math.Max( - 4*CloseBtn.Width + 3*HelpBtn.BorderSpacing.Right, + 3*CloseBtn.Width + 2*CloseBtn.BorderSpacing.Left, OptionsGroup.Width ); end; @@ -603,14 +603,14 @@ var begin confLevel := StrToFloat(CIEdit.Text) / 100; decPlaces := DecPlacesEdit.Value; - w := 10 + decPlaces - 3; + w := 12 + decPlaces - 3; AReport.Clear; AReport.Add('DISTRIBUTION PARAMETER ESTIMATES'); AReport.Add(''); - AReport.Add('VARIABLE: %*s', [W, '"' + AVarName + '"']); + AReport.Add('VARIABLE: %*s', [W, AVarName]); AReport.Add(''); AReport.Add('Number of cases: %*d', [W, Stats.NumCases]); // AReport.Add('Sum: %*.*f', [W, decPlaces, Stats.Sum]); @@ -618,8 +618,8 @@ begin AReport.Add('Variance: %*.*f', [W, decPlaces, Stats.Variance]); AReport.Add('Std.Dev.: %*.*f', [W, decPlaces, Stats.StdDev]); AReport.Add('Std.Error of Mean %*.*f', [W, decPlaces, Stats.StdErrorMean]); - AReport.Add('%.2f%% Conf.Interval Mean: %.*f to %.*f', [ - confLevel*100.0, decPlaces, Stats.MeanLowerLimit[confLevel], decPlaces, Stats.MeanUpperLimit[confLevel] + AReport.Add('%.2f%% Conf.Interval Mean: %*.*f to %.*f', [ + confLevel*100.0, W, decPlaces, Stats.MeanLowerLimit[confLevel], decPlaces, Stats.MeanUpperLimit[confLevel] ]); AReport.Add(''); AReport.Add('Minimum: %*.*f', [W, decPlaces, Stats.Min]); diff --git a/applications/lazstats/source/forms/misc/basicstatsparamsformunit.pas b/applications/lazstats/source/forms/misc/basicstatsparamsformunit.pas index 894f205fc..c74e7b93b 100644 --- a/applications/lazstats/source/forms/misc/basicstatsparamsformunit.pas +++ b/applications/lazstats/source/forms/misc/basicstatsparamsformunit.pas @@ -78,7 +78,11 @@ begin if FAutoSized then exit; - w := MaxValue([HelpBtn.Width, ResetBtn.Width, ComputeBtn.Width, CloseBtn.Width]); + if HelpBtn.Visible then + w := MaxValue([HelpBtn.Width, ResetBtn.Width, ComputeBtn.Width, CloseBtn.Width]) + else + w := MaxValue([ResetBtn.Width, ComputeBtn.Width, CloseBtn.Width]); + HelpBtn.Constraints.MinWidth := w; ResetBtn.Constraints.MinWidth := w; ComputeBtn.Constraints.MinWidth := w;