LazStats: Refactor PartialsUnit. Add pdf help text to chm help.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7401 8e941d3f-bd1b-0410-a28a-d453659cc2b4

applications/lazstats/source/forms/analysis/correlation/partialsunit.lfm

@@ -1,12 +1,12 @@
 object PartialsFrm: TPartialsFrm
-  Left = 637
+  Left = 593
-  Height = 460
+  Height = 398
-  Top = 307
+  Top = 175
-  Width = 412
+  Width = 361
   AutoSize = True
   Caption = 'Partial Correlation'
-  ClientHeight = 460
+  ClientHeight = 398
-  ClientWidth = 412
+  ClientWidth = 361
   OnActivate = FormActivate
   OnCreate = FormCreate
   OnShow = FormShow
@@ -28,7 +28,7 @@ object PartialsFrm: TPartialsFrm
     AnchorSideLeft.Control = DepVar
     AnchorSideTop.Control = DepInBtn
     AnchorSideBottom.Control = DepVar
-    Left = 228
+    Left = 202
     Height = 15
     Top = 25
     Width = 152
@@ -37,10 +37,13 @@ object PartialsFrm: TPartialsFrm
   end
   object Label3: TLabel
     AnchorSideLeft.Control = PredList
-    Left = 229
+    AnchorSideTop.Control = DepOutBtn
+    AnchorSideTop.Side = asrBottom
+    Left = 203
     Height = 15
-    Top = 120
+    Top = 93
     Width = 144
+    BorderSpacing.Top = 8
     Caption = 'Selected Predictor Variables'
     ParentColor = False
   end
@@ -48,11 +51,13 @@ object PartialsFrm: TPartialsFrm
     AnchorSideLeft.Control = PartList
     AnchorSideTop.Control = PartInBtn
     AnchorSideTop.Side = asrBottom
+    AnchorSideBottom.Control = PartList
     Left = 8
     Height = 15
-    Top = 289
+    Top = 239
     Width = 121
     BorderSpacing.Top = 8
+    BorderSpacing.Bottom = 2
     Caption = 'Variables Partialed Out:'
     ParentColor = False
   end
@@ -61,25 +66,25 @@ object PartialsFrm: TPartialsFrm
     AnchorSideTop.Control = Label1
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = DepInBtn
+    AnchorSideBottom.Control = Bevel3
     Left = 8
-    Height = 220
+    Height = 170
     Top = 25
-    Width = 176
+    Width = 150
-    Anchors = [akTop, akLeft, akRight]
+    Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Left = 8
     BorderSpacing.Top = 2
     BorderSpacing.Right = 8
-    Constraints.MinHeight = 220
-    Constraints.MinWidth = 175
     ItemHeight = 0
     MultiSelect = True
+    OnSelectionChange = VarListSelectionChange
     TabOrder = 0
   end
   object DepInBtn: TBitBtn
     AnchorSideLeft.Control = Owner
     AnchorSideLeft.Side = asrCenter
     AnchorSideTop.Control = VarList
-    Left = 192
+    Left = 166
     Height = 28
     Top = 25
     Width = 28
@@ -130,7 +135,7 @@ object PartialsFrm: TPartialsFrm
     AnchorSideLeft.Side = asrCenter
     AnchorSideTop.Control = DepInBtn
     AnchorSideTop.Side = asrBottom
-    Left = 192
+    Left = 166
     Height = 28
     Top = 57
     Width = 28
@@ -180,13 +185,14 @@ object PartialsFrm: TPartialsFrm
   object PredInBtn: TBitBtn
     AnchorSideLeft.Control = Owner
     AnchorSideLeft.Side = asrCenter
-    AnchorSideBottom.Control = PredOutBtn
+    AnchorSideTop.Control = DepOutBtn
-    Left = 192
+    AnchorSideTop.Side = asrBottom
+    AnchorSideBottom.Control = Bevel4
+    Left = 166
     Height = 28
-    Top = 185
+    Top = 122
     Width = 28
     Anchors = [akLeft, akBottom]
-    BorderSpacing.Bottom = 4
     Glyph.Data = {
       36040000424D3604000000000000360000002800000010000000100000000100
       2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
@@ -232,13 +238,13 @@ object PartialsFrm: TPartialsFrm
   object PredOutBtn: TBitBtn
     AnchorSideLeft.Control = Owner
     AnchorSideLeft.Side = asrCenter
-    AnchorSideBottom.Control = VarList
+    AnchorSideTop.Control = Bevel4
+    AnchorSideTop.Side = asrBottom
     AnchorSideBottom.Side = asrBottom
-    Left = 192
+    Left = 166
     Height = 28
-    Top = 217
+    Top = 154
     Width = 28
-    Anchors = [akLeft, akBottom]
     Glyph.Data = {
       36040000424D3604000000000000360000002800000010000000100000000100
       2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
@@ -285,9 +291,10 @@ object PartialsFrm: TPartialsFrm
     AnchorSideTop.Control = VarList
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Bevel1
-    Left = 64
+    AnchorSideBottom.Control = Label4
+    Left = 51
     Height = 28
-    Top = 253
+    Top = 203
     Width = 28
     Anchors = [akTop, akRight]
     BorderSpacing.Top = 8
@@ -336,13 +343,11 @@ object PartialsFrm: TPartialsFrm
   object PartOutBtn: TBitBtn
     AnchorSideLeft.Control = Bevel1
     AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = VarList
+    AnchorSideTop.Control = PartInBtn
-    AnchorSideTop.Side = asrBottom
+    Left = 87
-    Left = 100
     Height = 28
-    Top = 253
+    Top = 203
     Width = 28
-    BorderSpacing.Top = 8
     Glyph.Data = {
       36040000424D3604000000000000360000002800000010000000100000000100
       2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
@@ -394,33 +399,37 @@ object PartialsFrm: TPartialsFrm
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = DepOutBtn
     AnchorSideBottom.Side = asrBottom
-    Left = 228
+    Left = 202
     Height = 23
     Top = 42
-    Width = 176
+    Width = 151
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 8
     BorderSpacing.Top = 2
     BorderSpacing.Right = 8
+    ReadOnly = True
     TabOrder = 3
     Text = 'DepVar'
   end
   object PredList: TListBox
     AnchorSideLeft.Control = PredInBtn
     AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = Label3
+    AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = PredOutBtn
+    AnchorSideBottom.Control = Bevel3
-    AnchorSideBottom.Side = asrBottom
+    Left = 203
-    Left = 229
+    Height = 85
-    Height = 109
+    Top = 110
-    Top = 136
+    Width = 150
-    Width = 175
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Left = 9
+    BorderSpacing.Top = 2
     BorderSpacing.Right = 8
-    Constraints.MinWidth = 175
     ItemHeight = 0
+    MultiSelect = True
+    OnSelectionChange = VarListSelectionChange
     TabOrder = 6
   end
   object PartList: TListBox
@@ -431,103 +440,86 @@ object PartialsFrm: TPartialsFrm
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Bevel2
     Left = 8
-    Height = 105
+    Height = 93
-    Top = 306
+    Top = 256
-    Width = 176
+    Width = 150
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Left = 8
     BorderSpacing.Top = 2
-    Constraints.MinHeight = 100
     ItemHeight = 0
+    MultiSelect = True
+    OnSelectionChange = VarListSelectionChange
     TabOrder = 9
   end
   object ResetBtn: TButton
-    AnchorSideRight.Control = CancelBtn
+    AnchorSideRight.Control = ComputeBtn
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 111
+    Left = 152
     Height = 25
-    Top = 427
+    Top = 365
     Width = 54
     Anchors = [akRight, akBottom]
     AutoSize = True
-    BorderSpacing.Left = 12
+    BorderSpacing.Left = 8
     BorderSpacing.Top = 8
-    BorderSpacing.Right = 12
+    BorderSpacing.Right = 8
     BorderSpacing.Bottom = 8
     Caption = 'Reset'
     OnClick = ResetBtnClick
     TabOrder = 11
   end
-  object CancelBtn: TButton
-    AnchorSideRight.Control = ComputeBtn
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 177
-    Height = 25
-    Top = 427
-    Width = 62
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Left = 12
-    BorderSpacing.Top = 8
-    BorderSpacing.Right = 12
-    BorderSpacing.Bottom = 8
-    Caption = 'Cancel'
-    ModalResult = 2
-    TabOrder = 12
-  end
   object ComputeBtn: TButton
-    AnchorSideRight.Control = ReturnBtn
+    AnchorSideRight.Control = CloseBtn
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 251
+    Left = 214
     Height = 25
-    Top = 427
+    Top = 365
     Width = 76
     Anchors = [akRight, akBottom]
     AutoSize = True
-    BorderSpacing.Left = 12
+    BorderSpacing.Left = 8
     BorderSpacing.Top = 8
-    BorderSpacing.Right = 12
+    BorderSpacing.Right = 8
     BorderSpacing.Bottom = 8
     Caption = 'Compute'
     OnClick = ComputeBtnClick
-    TabOrder = 13
+    TabOrder = 12
   end
-  object ReturnBtn: TButton
+  object CloseBtn: TButton
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 339
+    Left = 298
     Height = 25
-    Top = 427
+    Top = 365
-    Width = 61
+    Width = 55
     Anchors = [akRight, akBottom]
     AutoSize = True
-    BorderSpacing.Left = 12
+    BorderSpacing.Left = 8
     BorderSpacing.Top = 8
-    BorderSpacing.Right = 12
+    BorderSpacing.Right = 8
     BorderSpacing.Bottom = 8
-    Caption = 'Return'
+    Caption = 'Close'
-    ModalResult = 1
+    ModalResult = 11
-    TabOrder = 14
+    TabOrder = 13
   end
   object HelpBtn: TButton
     Tag = 136
     AnchorSideRight.Control = ResetBtn
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 48
+    Left = 93
     Height = 25
-    Top = 427
+    Top = 365
     Width = 51
     Anchors = [akRight, akBottom]
     AutoSize = True
-    BorderSpacing.Left = 12
+    BorderSpacing.Left = 8
     BorderSpacing.Top = 8
-    BorderSpacing.Right = 12
+    BorderSpacing.Right = 8
     BorderSpacing.Bottom = 8
     Caption = 'Help'
     OnClick = HelpBtnClick
@@ -538,9 +530,9 @@ object PartialsFrm: TPartialsFrm
     AnchorSideLeft.Side = asrCenter
     AnchorSideTop.Control = VarList
     AnchorSideTop.Side = asrBottom
-    Left = 92
+    Left = 79
     Height = 28
-    Top = 245
+    Top = 195
     Width = 8
     Shape = bsSpacer
   end
@@ -548,12 +540,32 @@ object PartialsFrm: TPartialsFrm
     AnchorSideLeft.Control = Owner
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = ReturnBtn
+    AnchorSideBottom.Control = CloseBtn
     Left = 0
     Height = 8
-    Top = 411
+    Top = 349
-    Width = 412
+    Width = 361
     Anchors = [akLeft, akRight, akBottom]
     Shape = bsBottomLine
   end
+  object Bevel3: TBevel
+    AnchorSideTop.Control = Owner
+    AnchorSideTop.Side = asrCenter
+    Left = 8
+    Height = 8
+    Top = 195
+    Width = 40
+    Shape = bsSpacer
+  end
+  object Bevel4: TBevel
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = PredList
+    AnchorSideTop.Side = asrCenter
+    Left = 160
+    Height = 4
+    Top = 150
+    Width = 40
+    Shape = bsSpacer
+  end
 end

applications/lazstats/source/forms/analysis/correlation/partialsunit.pas

@@ -1,3 +1,8 @@
+// File for testing: cansas.laz
+// - Selected dependent variable --> jumps
+// - Seleckted predictor variables --> weight
+// - variables partialed out --> waist, pulse
+
 unit PartialsUnit;
 
 {$mode objfpc}{$H+}
@@ -16,6 +21,8 @@ type
   TPartialsFrm = class(TForm)
     Bevel1: TBevel;
     Bevel2: TBevel;
+    Bevel3: TBevel;
+    Bevel4: TBevel;
     DepInBtn: TBitBtn;
     DepOutBtn: TBitBtn;
     HelpBtn: TButton;
@@ -24,9 +31,8 @@ type
     PartInBtn: TBitBtn;
     PartOutBtn: TBitBtn;
     ResetBtn: TButton;
-    CancelBtn: TButton;
     ComputeBtn: TButton;
-    ReturnBtn: TButton;
+    CloseBtn: TButton;
     DepVar: TEdit;
     Label1: TLabel;
     Label2: TLabel;
@@ -47,9 +53,11 @@ type
     procedure PredInBtnClick(Sender: TObject);
     procedure PredOutBtnClick(Sender: TObject);
     procedure ResetBtnClick(Sender: TObject);
+    procedure VarListSelectionChange(Sender: TObject; User: boolean);
   private
     { private declarations }
     FAutoSized: Boolean;
+    procedure UpdateBtnStates;
   public
     { public declarations }
   end; 
@@ -60,25 +68,21 @@ var
 implementation
 
 uses
-  Math;
+  Math, Utils;
 
 { TPartialsFrm }
 
 procedure TPartialsFrm.ResetBtnClick(Sender: TObject);
-VAR i : integer;
+var
+  i: integer;
 begin
   DepVar.Text := '';
   VarList.Clear;
   PartList.Clear;
   PredList.Clear;
-     DepInBtn.Enabled := true;
-     DepOutBtn.Enabled := false;
-     PredInBtn.Enabled := true;
-     PredOutBtn.Enabled := false;
-     PartInBtn.Enabled := true;
-     PartOutBtn.Enabled := false;
   for i := 1 to OS3MainFrm.DataGrid.ColCount - 1 do
     VarList.Items.Add(OS3MainFrm.DataGrid.Cells[i,0]);
+  UpdateBtnStates;
 end;
 
 procedure TPartialsFrm.FormActivate(Sender: TObject);
@@ -88,14 +92,14 @@ begin
   if FAutoSized then
     exit;
 
-  w := MaxValue([HelpBtn.Width, ResetBtn.Width, CancelBtn.Width, ComputeBtn.Width, ReturnBtn.Width]);
+  w := MaxValue([HelpBtn.Width, ResetBtn.Width, ComputeBtn.Width, CloseBtn.Width]);
   HelpBtn.Constraints.MinWidth := w;
   ResetBtn.Constraints.MinWidth := w;
-  CancelBtn.Constraints.MinWidth := w;
   ComputeBtn.Constraints.MinWidth := w;
-  ReturnBtn.Constraints.MinWidth := w;
+  CloseBtn.Constraints.MinWidth := w;
 
-  Constraints.MinWidth := Width;
+  w := 2 * Max(Label2.Width, Label3.Width) + DepInBtn.Width + 4 * VarList.BorderSpacing.Left;
+  Constraints.MinWidth := w; //Max(Width, w);
   Constraints.MinHeight := Height;
 
   FAutoSized := true;
@@ -104,7 +108,6 @@ end;
 procedure TPartialsFrm.FormCreate(Sender: TObject);
 begin
   Assert(OS3MainFrm <> nil);
-  if OutputFrm = nil then Application.CreateForm(TOutputFrm, OutputFrm);
 end;
 
 procedure TPartialsFrm.FormShow(Sender: TObject);
@@ -120,70 +123,98 @@ begin
 end;
 
 procedure TPartialsFrm.PartInBtnClick(Sender: TObject);
-VAR i, index : integer;
+var
+  i: integer;
 begin
-     index := VarList.Items.Count;
   i := 0;
-     while i < index do
+  while i < VarList.Items.Count do
   begin
-         if (VarList.Selected[i]) then
+    if VarList.Selected[i] then
     begin
-            PartList.Items.Add(VarList.Items.Strings[i]);
+      PartList.Items.Add(VarList.Items[i]);
       VarList.Items.Delete(i);
-            index := index - 1;
       i := 0;
-         end
+    end else
-         else i := i + 1;
+      i := i + 1;
   end;
-     PartOutBtn.Enabled := true;
+  UpdateBtnStates;
 end;
 
 procedure TPartialsFrm.PartOutBtnClick(Sender: TObject);
-VAR index : integer;
+var
+  i: integer;
 begin
-   index := PartList.ItemIndex;
+  i := 0;
-   VarList.Items.Add(PartList.Items.Strings[index]);
+  while i < PartList.Items.Count do
-   PartList.Items.Delete(index);
+  begin
-   if PartList.Items.Count = 0 then PartOutBtn.Enabled := false;
+    if PartList.Selected[i] then
+    begin
+      VarList.Items.Add(PartList.Items[i]);
+      PartList.Items.Delete(i);
+      i := 0;
+    end else
+      i := i + 1;
+  end;
+  UpdateBtnStates;
 end;
 
 procedure TPartialsFrm.PredInBtnClick(Sender: TObject);
-VAR i, index : integer;
+var
+  i: integer;
 begin
-     index := VarList.Items.Count;
   i := 0;
-     while i < index do
+  while i < VarList.Items.Count do
   begin
-         if (VarList.Selected[i]) then
+    if VarList.Selected[i] then
     begin
-            PredList.Items.Add(VarList.Items.Strings[i]);
+      PredList.Items.Add(VarList.Items[i]);
       VarList.Items.Delete(i);
-            index := index - 1;
       i := 0;
-         end
+    end else
-         else i := i + 1;
+      i := i + 1;
   end;
-     PredOutBtn.Enabled := true;
+  UpdateBtnStates;
 end;
 
 procedure TPartialsFrm.PredOutBtnClick(Sender: TObject);
-VAR index : integer;
+var
+  i: integer;
 begin
-   index := PredList.ItemIndex;
+  i := 0;
-   VarList.Items.Add(PredList.Items.Strings[index]);
+  while i < PredList.Items.Count do
-   PredList.Items.Delete(index);
+  begin
-   if PredList.Items.Count = 0 then PredOutBtn.Enabled := false;
+    if PredList.Selected[i] then
+    begin
+      VarList.Items.Add(PredList.Items[i]);
+      PredList.Items.Delete(i);
+      i := 0;
+    end else
+      i := i + 1;
+  end;
+  UpdateBtnStates;
 end;
 
 procedure TPartialsFrm.DepInBtnClick(Sender: TObject);
-VAR index : integer;
+var
+  index: integer;
 begin
   index := VarList.ItemIndex;
-     if index < 0 then exit;
+  if (index > -1) and (DepVar.Text = '') then
-     DepVar.Text := VarList.Items.Strings[index];
+  begin
+    DepVar.Text := VarList.Items[index];
     VarList.Items.Delete(index);
-     DepOutBtn.Enabled := true;
+    UpdateBtnStates;
-     DepInBtn.Enabled := false;
+  end;
+end;
+
+procedure TPartialsFrm.DepOutBtnClick(Sender: TObject);
+begin
+  if DepVar.Text <> '' then
+  begin
+    VarList.Items.Add(DepVar.Text);
+    DepVar.Text := '';
+    UpdateBtnStates;
+  end;
 end;
 
 procedure TPartialsFrm.ComputeBtnClick(Sender: TObject);
@@ -198,17 +229,24 @@ var
   i, j, K, L: integer;
   errorcode: boolean;
   vtimesw, W1, v: DblDyneMat;
+  lReport: TStrings;
 
 begin
   DepVarNo := 1;
   errorcode := false;
 
+  if DepVar.Text = '' then
+  begin
+    MessageDlg('No dependent variable selected.', mtError, [mbOK], 0);
+    exit;
+  end;
+
   // Get no. of predictor and control variables
   NoPredVars := PredList.Items.Count;
   NoCntrlVars := PartList.Items.Count;
   if (NoPredVars = 0) or (NoCntrlVars = 0) then
   begin
-        ShowMessage('You must select at least one predictor and one control variable!');
+    MessageDlg('You must select at least one predictor and one control variable.', mtError, [mbOK], 0);
     exit;
   end;
   TotNoVars := NoPredVars + NoCntrlVars + 1;
@@ -229,9 +267,10 @@ begin
   SetLength(Betas,NoVariables);
   SetLength(MatVars,NoVariables);
 
-    OutputFrm.RichEdit.Clear;
+  lReport := TStringList.Create;
-    OutputFrm.RichEdit.Lines.Add('Partial and Semi-Partial Correlation Analysis');
+  try
-    OutputFrm.RichEdit.Lines.Add('');
+    lReport.Add('PARTIAL AND SEMI-PARTIAL CORRELATION ANALYSIS');
+    lReport.Add('');
 
     // Get column numbers of dependent, predictor and control variables
     pcnt := 1;
@@ -264,34 +303,25 @@ begin
     for i := 1 to NoVariables do
       if varstring = OS3MainFrm.DataGrid.Cells[i,0] then DepVarNo := i;
 
-    outline := format('Dependent variable = %s',[OS3MainFrm.DataGrid.Cells[DepVarNo,0]]);
+    lReport.Add('Dependent variable: %s', [OS3MainFrm.DataGrid.Cells[DepVarNo, 0]]);
-    OutputFrm.RichEdit.Lines.Add(outline);
+    lReport.Add('');
-    OutputFrm.RichEdit.Lines.Add('');
+    lReport.Add('Predictor Variables:');
-    OutputFrm.RichEdit.Lines.Add('Predictor Variables:');
     for i := 1 to NoPredVars do
-    begin
+      lReport.Add('  Variable %d: %s', [i+1, OS3MainFrm.DataGrid.Cells[PredVars[i-1], 0]]);
-        outline := format('Variable %d = %s',[i+1,OS3MainFrm.DataGrid.Cells[PredVars[i-1],0]]);
+    lReport.Add('');
-        OutputFrm.RichEdit.Lines.Add(outline);
+    lReport.Add('Control Variables:');
-    end;
-    OutputFrm.RichEdit.Lines.Add('');
-    OutputFrm.RichEdit.Lines.Add('Control Variables:');
     for i := 1 to NoCntrlVars do
-    begin
+      lReport.Add('  Variable %d: %s', [i+1, OS3MainFrm.DataGrid.Cells[CntrlVars[i-1], 0]]);
-        outline := format('Variable %d = %s',[i+1,OS3MainFrm.DataGrid.Cells[CntrlVars[i-1],0]]);
+    lReport.Add('');
-        OutputFrm.RichEdit.Lines.Add(outline);
-    end;
-    OutputFrm.RichEdit.Lines.Add('');
     if NoPredVars > 1 then
     begin
-        outline := format('Higher order partialling at level = %d',[NoPredVars]);
+      lReport.Add('Higher order partialling at level: %d', [NoPredVars]);
-        OutputFrm.RichEdit.Lines.Add(outline);
+      lReport.Add('');
-        OutputFrm.RichEdit.Lines.Add('');
     end;
     if NoCntrlVars > 1 then
     begin
-        outline := format('Multiple partialling with %d variables.',[NoCntrlVars]);
+      lReport.Add('Multiple partialling with %d variables.', [NoCntrlVars]);
-        OutputFrm.RichEdit.Lines.Add(outline);
+      lReport.Add('');
-        OutputFrm.RichEdit.Lines.Add('');
     end;
 
     // Now, build the correlation matrix
@@ -306,24 +336,21 @@ begin
       for j := 2 to TotNoVars do
         workmat[i-2,j-2] := rmatrix[i-1,j-1];
 
-    matinv(workmat, vtimesw, v, W1, TotNoVars-1);
+    MatInv(workmat, vtimesw, v, W1, TotNoVars-1);
     R2Full := 0.0;
     for i := 1 to TotNoVars-1 do // rows
     begin
       W[i-1] := 0.0;
-        for j := 1 to TotNoVars - 1 do W[i-1] := W[i-1] + (workmat[i-1,j-1] * rmatrix[0,j]);
+      for j := 1 to TotNoVars - 1 do
+        W[i-1] := W[i-1] + (workmat[i-1,j-1] * rmatrix[0,j]);
       R2Full := R2Full + W[i-1] * rmatrix[0,i];
     end;
-    outline := format('Squared Multiple Correlation with all variables = %6.3f',[R2Full]);
+    lReport.Add('Squared Multiple Correlation with all variables:     %6.3f', [R2Full]);
-    OutputFrm.RichEdit.Lines.Add(outline);
+    lReport.Add('');
-    OutputFrm.RichEdit.Lines.Add('');
+    lReport.Add('Standardized Regression Coefficients:');
-    OutputFrm.RichEdit.Lines.Add('Standardized Regression Coefficients:');
     for i := 1 to TotNoVars - 1 do
-    begin
+      lReport.Add('%15s:  %6.3f', [OS3MainFrm.DataGrid.Cells[MatVars[i],0], W[i-1]]);
-        outline := format('%10s = %6.3f',[OS3MainFrm.DataGrid.Cells[MatVars[i],0],W[i-1]]);
+    lReport.Add('');
-        OutputFrm.RichEdit.Lines.Add(outline);
-    end;
-    OutputFrm.RichEdit.Lines.Add('');
 
     // Now do model for Partial and Semi-partial
     for i := 1 to NoCntrlVars do
@@ -335,7 +362,7 @@ begin
         workmat[i-1,j-1] := rmatrix[K-1,L-1];
       end;
     end;
-    matinv(workmat, vtimesw, v, W1, NoCntrlVars);
+    MatInv(workmat, vtimesw, v, W1, NoCntrlVars);
     R2Cntrl := 0.0;
     for i := 1 to NoCntrlVars do
     begin
@@ -348,16 +375,12 @@ begin
       end;
       R2Cntrl := R2Cntrl + W[i-1] * rmatrix[0,L-1];
     end;
-    outline := format('Squared Multiple Correlation with control variables = %6.3f',[R2Cntrl]);
+    lReport.Add('Squared Multiple Correlation with control variables: %6.3f', [R2Cntrl]);
-    OutputFrm.RichEdit.Lines.Add(outline);
+    lReport.Add('');
-    OutputFrm.RichEdit.Lines.Add('');
+    lReport.Add('Standardized Regression Coefficients:');
-    OutputFrm.RichEdit.Lines.Add('Standardized Regression Coefficients:');
     for i := 1 to NoCntrlVars do
-    begin
+      lReport.Add('%15s:  %6.3f', [OS3MainFrm.DataGrid.Cells[MatVars[i+NoPredVars],0], W[i-1]]);
-        outline := format('%10s = %6.3f',[OS3MainFrm.DataGrid.Cells[MatVars[i+NoPredVars],0],W[i-1]]);
+    lReport.Add('');
-        OutputFrm.RichEdit.Lines.Add(outline);
-    end;
-    OutputFrm.RichEdit.Lines.Add('');
 
     SemiPart := R2Full - R2Cntrl;
     Partial := SemiPart / (1.0 - R2Cntrl);
@@ -367,18 +390,20 @@ begin
     Prob := probf(F,df1,df2);
 
     // Report results
-    OutputFrm.RichEdit.Lines.Add('');
+    lReport.Add('');
-    outline := format('Partial Correlation = %6.3f',[sqrt(Partial)]);
+    lReport.Add('Partial Correlation:      %8.3f', [sqrt(Partial)]);
-    OutputFrm.RichEdit.Lines.Add(outline);
+    lReport.Add('');
-    OutputFrm.RichEdit.Lines.Add('');
+    lReport.Add('Semi-Partial Correlation: %8.3f', [sqrt(SemiPart)]);
-    outline := format('Semi-Partial Correlation = %6.3f',[sqrt(SemiPart)]);
+    lReport.Add('');
-    OutputFrm.RichEdit.Lines.Add(outline);
+    lReport.Add('F:                        %8.3f', [F]);
-    OutputFrm.RichEdit.Lines.Add('');
+    lReport.Add('   with probability       %8.4f', [Prob]);
-    outline := format('F = %8.3f with probability = %6.4f, D.F.1 = %3.0f and D.F.2 = %3.0f',[F,Prob,df1,df2]);
+    lReport.Add('   D.F.1                  %8.0f', [df1]);
-    OutputFrm.RichEdit.Lines.Add(outline);
+    lReport.Add('   D.F.2                  %8.0f', [df2]);
-    OutputFrm.ShowModal;
 
-    // clean up the heap
+    DisplayReport(lReport);
+
+  finally
+    lReport.Free;
     MatVars := nil;
     Betas := nil;
     W := nil;
@@ -393,13 +418,25 @@ begin
     W1 := nil;
     vtimesw := nil;
   end;
+end;
 
-procedure TPartialsFrm.DepOutBtnClick(Sender: TObject);
+procedure TPartialsFrm.UpdateBtnStates;
+var
+  lSelected: Boolean;
 begin
-     VarList.Items.Add(DepVar.Text);
+  lSelected := AnySelected(VarList);
-     DepVar.Text := '';
+  DepInBtn.Enabled := lSelected and (DepVar.Text = '');
-     DepInBtn.Enabled := true;
+  PredInBtn.Enabled := lSelected;
-     DepOutBtn.Enabled := false;
+  PartInBtn.Enabled := lSelected;
+
+  DepOutBtn.Enabled := DepVar.Text <> '';
+  PredOutBtn.Enabled := AnySelected(PredList);
+  PartOutBtn.Enabled := AnySelected(Partlist);
+end;
+
+procedure TPartialsFrm.VarListSelectionChange(Sender: TObject; User: boolean);
+begin
+  UpdateBtnStates;
 end;
 
 

applications/lazstats/source/forms/mainunit.pas

@@ -534,6 +534,7 @@ begin
   RMatFrm.ShowModal;
 end;
 
+// Menu "Correlation" > "Partial, Semipartial"
 procedure TOS3MainFrm.MenuItem72Click(Sender: TObject);
 begin
   if PartialsFrm = nil then