LazStats: More refactoring of BlkAnovaUnit; clean-up.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7855 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-11-10 16:46:13 +00:00
parent 43496a10e8
commit 5dba503a4b
2 changed files with 1562 additions and 1883 deletions

View File

@ -1,37 +1,37 @@
inherited BlksAnovaForm: TBlksAnovaForm inherited BlksAnovaForm: TBlksAnovaForm
Left = 971 Left = 236
Height = 553 Height = 577
Top = 314 Top = 121
Width = 914 Width = 914
HelpType = htKeyword HelpType = htKeyword
HelpKeyword = 'html/OneTwoorThreeWayAnalysesofVarian.htm' HelpKeyword = 'html/OneTwoorThreeWayAnalysesofVarian.htm'
Caption = 'One, Two or Three Way Analysis of Variance' Caption = 'One, Two or Three Way Analysis of Variance'
ClientHeight = 553 ClientHeight = 577
ClientWidth = 914 ClientWidth = 914
inherited ParamsPanel: TPanel inherited ParamsPanel: TPanel
Height = 537 Height = 561
Width = 400 Width = 400
ClientHeight = 537 ClientHeight = 561
ClientWidth = 400 ClientWidth = 400
inherited CloseBtn: TButton inherited CloseBtn: TButton
Left = 345 Left = 345
Top = 512 Top = 536
end end
inherited ComputeBtn: TButton inherited ComputeBtn: TButton
Left = 261 Left = 261
Top = 512 Top = 536
end end
inherited ResetBtn: TButton inherited ResetBtn: TButton
Left = 199 Left = 199
Top = 512 Top = 536
end end
inherited HelpBtn: TButton inherited HelpBtn: TButton
Tag = 107 Tag = 107
Left = 140 Left = 140
Top = 512 Top = 536
end end
inherited ButtonBevel: TBevel inherited ButtonBevel: TBevel
Top = 496 Top = 520
Width = 400 Width = 400
end end
object Label1: TLabel[5] object Label1: TLabel[5]
@ -51,7 +51,7 @@ inherited BlksAnovaForm: TBlksAnovaForm
AnchorSideRight.Control = DepIn AnchorSideRight.Control = DepIn
AnchorSideBottom.Control = PosthocGroup AnchorSideBottom.Control = PosthocGroup
Left = 0 Left = 0
Height = 302 Height = 310
Top = 17 Top = 17
Width = 181 Width = 181
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
@ -198,10 +198,10 @@ inherited BlksAnovaForm: TBlksAnovaForm
Left = 221 Left = 221
Height = 16 Height = 16
Top = 89 Top = 89
Width = 87 Width = 121
AutoSize = True AutoSize = True
BorderSpacing.Bottom = 2 BorderSpacing.Bottom = 2
Caption = 'Factor 1 Variable' Caption = 'Factor 1 Variable (Row)'
TabOrder = 13 TabOrder = 13
end end
object Factor1Edit: TEdit[16] object Factor1Edit: TEdit[16]
@ -284,11 +284,11 @@ inherited BlksAnovaForm: TBlksAnovaForm
Left = 221 Left = 221
Height = 16 Height = 16
Top = 173 Top = 173
Width = 87 Width = 141
AutoSize = True AutoSize = True
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Bottom = 2 BorderSpacing.Bottom = 2
Caption = 'Factor 2 Variable' Caption = 'Factor 2 Variable (Column)'
TabOrder = 17 TabOrder = 17
end end
object Factor2Edit: TEdit[21] object Factor2Edit: TEdit[21]
@ -369,11 +369,11 @@ inherited BlksAnovaForm: TBlksAnovaForm
Left = 221 Left = 221
Height = 16 Height = 16
Top = 257 Top = 257
Width = 72 Width = 107
AutoSize = True AutoSize = True
BorderSpacing.Left = 8 BorderSpacing.Left = 8
BorderSpacing.Bottom = 2 BorderSpacing.Bottom = 2
Caption = 'Factor 3 Clark' Caption = 'Factor 3 Clark (Slice)'
TabOrder = 21 TabOrder = 21
end end
object Factor3Edit: TEdit[26] object Factor3Edit: TEdit[26]
@ -431,15 +431,17 @@ inherited BlksAnovaForm: TBlksAnovaForm
TabOrder = 23 TabOrder = 23
Text = 'Fixed' Text = 'Fixed'
end end
object GroupBox3: TGroupBox[29] object CorrectionsGroup: TGroupBox[29]
AnchorSideLeft.Control = Bevel1 AnchorSideLeft.Control = Bevel1
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = PosthocGroup AnchorSideBottom.Control = AlphaGroup
Left = 207 Left = 207
Height = 66 Height = 66
Top = 331 Top = 339
Width = 196 Width = 196
Anchors = [akLeft, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Bottom = 8
Caption = 'Corrections for unequal variances' Caption = 'Corrections for unequal variances'
ChildSizing.LeftRightSpacing = 12 ChildSizing.LeftRightSpacing = 12
ChildSizing.TopBottomSpacing = 2 ChildSizing.TopBottomSpacing = 2
@ -468,21 +470,23 @@ inherited BlksAnovaForm: TBlksAnovaForm
end end
object PosthocGroup: TGroupBox[30] object PosthocGroup: TGroupBox[30]
AnchorSideLeft.Control = ParamsPanel AnchorSideLeft.Control = ParamsPanel
AnchorSideTop.Control = CorrectionsGroup
AnchorSideRight.Control = Bevel1 AnchorSideRight.Control = Bevel1
AnchorSideBottom.Control = ButtonBevel AnchorSideBottom.Control = ButtonBevel
Left = 0 Left = 0
Height = 165 Height = 181
Top = 331 Top = 339
Width = 186 Width = 186
Anchors = [akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Right = 8 BorderSpacing.Right = 8
Caption = 'Post-Hoc Comparisons:' Caption = 'Post-Hoc Comparisons:'
ChildSizing.LeftRightSpacing = 12 ChildSizing.LeftRightSpacing = 12
ChildSizing.TopBottomSpacing = 6 ChildSizing.TopBottomSpacing = 6
ChildSizing.VerticalSpacing = 2
ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 1 ChildSizing.ControlsPerLine = 1
ClientHeight = 145 ClientHeight = 161
ClientWidth = 182 ClientWidth = 182
TabOrder = 25 TabOrder = 25
object ScheffeChk: TCheckBox object ScheffeChk: TCheckBox
@ -496,7 +500,7 @@ inherited BlksAnovaForm: TBlksAnovaForm
object TukeyHSDChk: TCheckBox object TukeyHSDChk: TCheckBox
Left = 12 Left = 12
Height = 19 Height = 19
Top = 25 Top = 27
Width = 138 Width = 138
Caption = 'Tukey HSD (= n''s)' Caption = 'Tukey HSD (= n''s)'
TabOrder = 1 TabOrder = 1
@ -504,7 +508,7 @@ inherited BlksAnovaForm: TBlksAnovaForm
object TukeyBChk: TCheckBox object TukeyBChk: TCheckBox
Left = 12 Left = 12
Height = 19 Height = 19
Top = 44 Top = 48
Width = 138 Width = 138
Caption = 'Tukey B (= n''s)' Caption = 'Tukey B (= n''s)'
TabOrder = 2 TabOrder = 2
@ -512,7 +516,7 @@ inherited BlksAnovaForm: TBlksAnovaForm
object TukeyKramerChk: TCheckBox object TukeyKramerChk: TCheckBox
Left = 12 Left = 12
Height = 19 Height = 19
Top = 63 Top = 69
Width = 138 Width = 138
Caption = 'Tukey-Kramer' Caption = 'Tukey-Kramer'
TabOrder = 3 TabOrder = 3
@ -520,7 +524,7 @@ inherited BlksAnovaForm: TBlksAnovaForm
object NewmanKeulsChk: TCheckBox object NewmanKeulsChk: TCheckBox
Left = 12 Left = 12
Height = 19 Height = 19
Top = 82 Top = 90
Width = 138 Width = 138
Caption = 'Newman-Keuls (= n''s)' Caption = 'Newman-Keuls (= n''s)'
TabOrder = 4 TabOrder = 4
@ -528,7 +532,7 @@ inherited BlksAnovaForm: TBlksAnovaForm
object BonferroniChk: TCheckBox object BonferroniChk: TCheckBox
Left = 12 Left = 12
Height = 19 Height = 19
Top = 101 Top = 111
Width = 138 Width = 138
Caption = 'Bonferroni' Caption = 'Bonferroni'
TabOrder = 5 TabOrder = 5
@ -536,20 +540,22 @@ inherited BlksAnovaForm: TBlksAnovaForm
object OrthoContrastsChk: TCheckBox object OrthoContrastsChk: TCheckBox
Left = 12 Left = 12
Height = 19 Height = 19
Top = 120 Top = 132
Width = 138 Width = 138
Caption = 'Orthogonal Contrasts' Caption = 'Orthogonal Contrasts'
TabOrder = 6 TabOrder = 6
end end
end end
object GroupBox1: TGroupBox[31] object AlphaGroup: TGroupBox[31]
AnchorSideLeft.Control = GroupBox3 AnchorSideLeft.Control = CorrectionsGroup
AnchorSideRight.Control = GroupBox3 AnchorSideTop.Control = CorrectionsGroup
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = CorrectionsGroup
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = ButtonBevel AnchorSideBottom.Control = ShowPlotsChk
Left = 207 Left = 207
Height = 80 Height = 80
Top = 416 Top = 413
Width = 196 Width = 196
Anchors = [akLeft, akRight, akBottom] Anchors = [akLeft, akRight, akBottom]
AutoSize = True AutoSize = True
@ -574,8 +580,8 @@ inherited BlksAnovaForm: TBlksAnovaForm
end end
object OverallAlphaEdit: TEdit object OverallAlphaEdit: TEdit
AnchorSideLeft.Control = PostAlphaEdit AnchorSideLeft.Control = PostAlphaEdit
AnchorSideTop.Control = GroupBox1 AnchorSideTop.Control = AlphaGroup
AnchorSideRight.Control = GroupBox1 AnchorSideRight.Control = AlphaGroup
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 113 Left = 113
Height = 23 Height = 23
@ -589,7 +595,7 @@ inherited BlksAnovaForm: TBlksAnovaForm
Text = 'OverallAlphaEdit' Text = 'OverallAlphaEdit'
end end
object Label4: TLabel object Label4: TLabel
AnchorSideLeft.Control = GroupBox1 AnchorSideLeft.Control = AlphaGroup
AnchorSideTop.Control = PostAlphaEdit AnchorSideTop.Control = PostAlphaEdit
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 24 Left = 24
@ -627,30 +633,59 @@ inherited BlksAnovaForm: TBlksAnovaForm
AnchorSideTop.Control = PosthocGroup AnchorSideTop.Control = PosthocGroup
Left = 194 Left = 194
Height = 42 Height = 42
Top = 331 Top = 339
Width = 13 Width = 13
Shape = bsSpacer Shape = bsSpacer
end end
object ShowPlotsChk: TCheckBox[33]
AnchorSideLeft.Control = AlphaGroup
AnchorSideTop.Control = AlphaGroup
AnchorSideTop.Side = asrBottom
AnchorSideBottom.Control = ButtonBevel
Left = 207
Height = 19
Top = 501
Width = 79
Anchors = [akLeft, akBottom]
BorderSpacing.Top = 8
Caption = 'Plot Means'
Checked = True
OnChange = ShowPlotsChkChange
State = cbChecked
TabOrder = 27
end
object Plot3dChk: TCheckBox[34]
AnchorSideLeft.Control = ShowPlotsChk
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = ShowPlotsChk
Left = 302
Height = 19
Top = 501
Width = 34
BorderSpacing.Left = 16
Caption = '3D'
OnChange = Plot3dChkChange
TabOrder = 28
end
end end
inherited ParamsSplitter: TSplitter inherited ParamsSplitter: TSplitter
Left = 412 Left = 412
Height = 553 Height = 577
end end
inherited PageControl: TPageControl inherited PageControl: TPageControl
Left = 421 Left = 421
Height = 537 Height = 561
Width = 485 Width = 485
ActivePage = PosthocPage ActivePage = PosthocPage
TabIndex = 2
inherited ReportPage: TTabSheet inherited ReportPage: TTabSheet
Caption = 'ANOVA Results' Caption = 'ANOVA Results'
end end
inherited ChartPage: TTabSheet object PosthocPage: TTabSheet[1]
Caption = 'Plots'
end
object PosthocPage: TTabSheet[2]
Caption = 'Post-Hoc' Caption = 'Post-Hoc'
TabVisible = False TabVisible = False
end end
inherited ChartPage: TTabSheet[2]
Caption = 'Plots'
end
end end
end end