From 23f5a73834945c45c3706527324952d6fe27123c Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Fri, 18 Oct 2024 11:24:34 +0300 Subject: [PATCH 01/20] changes --- instat/dlgDescribeTwoVariable.vb | 37 +++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 7c0bf0f82d..51766a79a6 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -201,7 +201,6 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.SetDataFrameSelector(ucrSelectorDescribeTwoVar.ucrAvailableDataFrames) ucrSaveTable.SetIsTextBox() - rdoThreeVariable.Enabled = False ucrReorderSummary.bDataIsSummaries = True AddRemoveTotalParm() End Sub @@ -652,7 +651,7 @@ Public Class dlgDescribeTwoVariable ucrReorderSummary.Visible = False cmdSummaries.Visible = False End If - ucrChkSwapXYVar.Visible = IsNumericByNumericByNumeric() OrElse IsNumericByNumericByFactor() + 'ucrChkSwapXYVar.Visible = IsNumericByNumericByNumeric() OrElse IsNumericByNumericByFactor() ucrChkSummariesRowCol.Visible = IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() ucrChkOmitMissing.Visible = IsFactorByNumericByNumeric() OrElse IsNumericByNumericByFactor() End If @@ -708,6 +707,10 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True + ucrChkTotal.Location = New Point(310, 189) + ucrChkLevSig.Location = New Point(397, 186) + ucrChkMeans.Location = New Point(310, 208) + ElseIf IsNumericByFactor() Then ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ucrChkMeans.Visible = True @@ -715,6 +718,8 @@ Public Class dlgDescribeTwoVariable ucrChkTotal.Visible = True ucrSaveTable.Visible = True ucrSaveTable.Location = New Point(23, 450) + ucrChkTotal.Location = New Point(310, 189) + ucrChkMeans.Location = New Point(310, 208) clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) ucrSaveTable.SetPrefix("summary_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) @@ -752,6 +757,10 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True + ucrChkTotal.Location = New Point(310, 189) + ucrChkLevSig.Location = New Point(397, 186) + ucrChkMeans.Location = New Point(310, 208) + Else clsDummyFunction.AddParameter("var", "False", iPosition:=5) ucrSaveTable.Visible = True @@ -814,6 +823,10 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True + ucrChkTotal.Location = New Point(310, 230) + ucrChkLevSig.Location = New Point(397, 230) + ucrChkMeans.Location = New Point(310, 245) + If ucrChkSwapXYVar.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsMapping2Function) clsDummyFunction.AddParameter("var", "True", iPosition:=5) @@ -824,14 +837,32 @@ Public Class dlgDescribeTwoVariable ElseIf IsNumericByNumericByNumeric() Then cmdFormatTable.Visible = False ucrSaveTable.Visible = False + ucrChkMeans.Visible = True + ucrChkLevSig.Visible = True + ucrChkTotal.Visible = True + ucrChkTotal.Location = New Point(310, 230) + ucrChkLevSig.Location = New Point(397, 230) + ucrChkMeans.Location = New Point(310, 300) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsNumericByFactorByFactor() Then cmdFormatTable.Visible = False ucrSaveTable.Visible = False + ucrChkMeans.Visible = True + ucrChkLevSig.Visible = True + ucrChkTotal.Visible = True + ucrChkTotal.Location = New Point(310, 229) + ucrChkLevSig.Location = New Point(397, 229) + ucrChkMeans.Location = New Point(310, 234) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsNumericByFactorByNumeric() Then cmdFormatTable.Visible = False ucrSaveTable.Visible = False + ucrChkMeans.Visible = True + ucrChkLevSig.Visible = True + ucrChkTotal.Visible = True + ucrChkTotal.Location = New Point(310, 230) + ucrChkLevSig.Location = New Point(397, 230) + ucrChkMeans.Location = New Point(310, 234) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsFactorByNumericByFactor() OrElse IsFactorByFactorByNumeric() Then ucrSaveTable.SetPrefix("summary_table") @@ -962,7 +993,7 @@ Public Class dlgDescribeTwoVariable If IsNumericByNumericByFactor() OrElse IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then ucrBase.Location = New Point(iUcrBaseXLocation, 353) - ucrChkSwapXYVar.Location = New Point(300, 320) + 'ucrChkSwapXYVar.Location = New Point(300, 320) Me.Size = New Point(iDialogueXsize, 450) ElseIf IsFactorByFactorByFactor() Then ucrBase.Location = New Point(iUcrBaseXLocation, 370) From 303f48967349e2d43e4ba2d02d7483a9eeb35fd7 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 21 Oct 2024 14:25:51 +0300 Subject: [PATCH 02/20] changes --- instat/dlgDescribeTwoVariable.vb | 56 +++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 51766a79a6..0c4dc75792 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -504,6 +504,7 @@ Public Class dlgDescribeTwoVariable ucrChkLevSig.AddAdditionalCodeParameterPair(clsRAnovaSwapTable2Funtion, New RParameter("sign_level", iNewPosition:=4), iAdditionalPairNo:=1) ucrChkDisplayMargins.AddAdditionalCodeParameterPair(clsCombineFrequencyColParametersFunction, New RParameter("include_margins", iNewPosition:=5), iAdditionalPairNo:=1) ucrChkDisplayAsPercentage.AddAdditionalCodeParameterPair(clsCombineFrequencyColParametersFunction, New RParameter("percentage_type", iNewPosition:=1), iAdditionalPairNo:=1) + ucrChkDisplayMargins.AddAdditionalCodeParameterPair(clsThreeVariableCombineFrequencyParametersFunction, New RParameter("include_margins", iNewPosition:=5), iAdditionalPairNo:=2) ucrSelectorDescribeTwoVar.AddAdditionalCodeParameterPair(clsSummaryTableFunction, ucrSelectorDescribeTwoVar.GetParameter(), iAdditionalPairNo:=1) ucrSaveTable.AddAdditionalRCode(clsJoiningPipeOperator, iAdditionalPairNo:=1) @@ -627,10 +628,11 @@ Public Class dlgDescribeTwoVariable Private Sub ManageControlsVisibility() grpSummaries.Visible = rdoThreeVariable.Checked OrElse rdoTwoVariable.Checked ucrChkDisplayMargins.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() + 'ucrChkDisplayMargins.Visible = rdoThreeVariable.Checked AndAlso IsFactorByFactorByFactor() ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactor() grpDisplay.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() ucrReceiverPercentages.Visible = ucrChkDisplayAsPercentage.Checked AndAlso rdoORow.Checked AndAlso IsFactorByFactor() - ucrpnlPercent.Visible = IsFactorByFactor() AndAlso ucrChkDisplayAsPercentage.Checked + ucrpnlPercent.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() AndAlso ucrChkDisplayAsPercentage.Checked ucrReceiverColumns.Visible = ucrChkDisplayAsPercentage.Checked AndAlso IsFactorByFactor() AndAlso rdoOCol.Checked ucrChkCorrelations.Visible = False ucrChkSwapXYVar.Visible = False @@ -823,9 +825,9 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True - ucrChkTotal.Location = New Point(310, 230) - ucrChkLevSig.Location = New Point(397, 230) - ucrChkMeans.Location = New Point(310, 245) + ucrChkTotal.Location = New Point(310, 250) + ucrChkLevSig.Location = New Point(397, 250) + ucrChkMeans.Location = New Point(310, 275) If ucrChkSwapXYVar.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsMapping2Function) @@ -840,9 +842,9 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True - ucrChkTotal.Location = New Point(310, 230) - ucrChkLevSig.Location = New Point(397, 230) - ucrChkMeans.Location = New Point(310, 300) + ucrChkTotal.Location = New Point(310, 250) + ucrChkLevSig.Location = New Point(397, 250) + ucrChkMeans.Location = New Point(310, 275) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsNumericByFactorByFactor() Then cmdFormatTable.Visible = False @@ -850,9 +852,9 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True - ucrChkTotal.Location = New Point(310, 229) - ucrChkLevSig.Location = New Point(397, 229) - ucrChkMeans.Location = New Point(310, 234) + ucrChkTotal.Location = New Point(310, 250) + ucrChkLevSig.Location = New Point(397, 250) + ucrChkMeans.Location = New Point(310, 275) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsNumericByFactorByNumeric() Then cmdFormatTable.Visible = False @@ -860,9 +862,9 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True - ucrChkTotal.Location = New Point(310, 230) - ucrChkLevSig.Location = New Point(397, 230) - ucrChkMeans.Location = New Point(310, 234) + ucrChkTotal.Location = New Point(310, 250) + ucrChkLevSig.Location = New Point(397, 250) + ucrChkMeans.Location = New Point(310, 275) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsFactorByNumericByFactor() OrElse IsFactorByFactorByNumeric() Then ucrSaveTable.SetPrefix("summary_table") @@ -1009,8 +1011,8 @@ Public Class dlgDescribeTwoVariable End If Else - ucrBase.Location = New Point(iUcrBaseXLocation, 328) - Me.Size = New Point(iDialogueXsize, 425) + ucrBase.Location = New Point(iUcrBaseXLocation, 333) + Me.Size = New Point(iDialogueXsize, 430) End If End Sub @@ -1293,6 +1295,21 @@ Public Class dlgDescribeTwoVariable End If Next End If + ElseIf rdoThreeVariable.Checked Then + + For Each clsParameter In clsTempFrequency.clsParameters + If IsFactorByFactorByFactor() Then + clsSummaryTableFunction.AddParameter(clsParameter) + Else + If IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() Then + Select Case clsParameter.strArgumentName + Case "signif_fig", "include_margins", "margin_name" + clsSummaryTableFunction.AddParameter(clsParameter) + End Select + End If + End If + Next + End If End Sub @@ -1334,7 +1351,16 @@ Public Class dlgDescribeTwoVariable clsCombineFrequencyColParametersFunction.RemoveParameterByName("margin_name") clsCombineFrequencyParametersFunction.RemoveParameterByName("margin_name") End If + If rdoThreeVariable.Checked AndAlso IsFactorByFactorByFactor() Then + If ucrChkDisplayMargins.Checked Then + ucrInputMarginName.Visible = True + clsThreeVariableCombineFrequencyParametersFunction.AddParameter("margin_name", Chr(34) & ucrInputMarginName.GetText & Chr(34), iPosition:=6) + Else + ucrInputMarginName.Visible = False + clsThreeVariableCombineFrequencyParametersFunction.RemoveParameterByName("margin_name") + End If + End If FactorColumns() AddRemoveFrequencyParameters() AddingColumnFactor() From 2946b0117e11559337bd21f9a4011e521ac689b3 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 22 Oct 2024 09:47:34 +0300 Subject: [PATCH 03/20] changes --- instat/static/InstatObject/R/data_object_R6.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 6997617836..b25e7696ff 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4548,7 +4548,7 @@ DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total cat("\n") # Optionally print means if (means) { - if (class(mod$model[[x_col_names]]) %in% c("numeric", "integer")){ + if (class(mod$model[[x_col_names[[1]]]]) %in% c("numeric", "integer")){ cat("Model coefficients:\n") print(mod$coefficients) cat("\n") From a5e0907c8fe5ec89b4d73f4e37877c7815c2e462 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 22 Oct 2024 18:07:42 +0300 Subject: [PATCH 04/20] changes to the code --- instat/dlgDescribeTwoVariable.Designer.vb | 311 +++++++++--------- instat/dlgDescribeTwoVariable.vb | 66 +++- instat/static/InstatObject/R/data_object_R6.R | 12 +- .../static/InstatObject/R/instat_object_R6.R | 4 +- 4 files changed, 218 insertions(+), 175 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index fe9da77487..584ff76778 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -60,6 +60,8 @@ Partial Class dlgDescribeTwoVariable Me.cmdSummaries = New System.Windows.Forms.Button() Me.lblMarginName = New System.Windows.Forms.Label() Me.grpDisplay = New System.Windows.Forms.GroupBox() + Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() + Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() Me.rdoOCol = New System.Windows.Forms.RadioButton() Me.rdoOCell = New System.Windows.Forms.RadioButton() Me.rdoORow = New System.Windows.Forms.RadioButton() @@ -70,8 +72,6 @@ Partial Class dlgDescribeTwoVariable Me.ucrReceiverSecondTwoVariableFactor = New instat.ucrReceiverSingle() Me.ucrReceiverFirstVars = New instat.ucrReceiverMultiple() Me.ucrSaveTable = New instat.ucrSave() - Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() - Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() Me.ucrInputMarginName = New instat.ucrInputTextBox() Me.ucrReorderSummary = New instat.ucrReorder() Me.ucrBase = New instat.ucrButtons() @@ -87,6 +87,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkCorrelations = New instat.ucrCheck() Me.ucrChkSwapXYVar = New instat.ucrCheck() Me.ucrChkOmitMissing = New instat.ucrCheck() + Me.ucrChkInteraction = New instat.ucrCheck() Me.grpSummaries.SuspendLayout() Me.grpDisplay.SuspendLayout() Me.SuspendLayout() @@ -99,10 +100,9 @@ Partial Class dlgDescribeTwoVariable Me.rdoThreeVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoThreeVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoThreeVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoThreeVariable.Location = New System.Drawing.Point(432, 12) - Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4) + Me.rdoThreeVariable.Location = New System.Drawing.Point(288, 8) Me.rdoThreeVariable.Name = "rdoThreeVariable" - Me.rdoThreeVariable.Size = New System.Drawing.Size(150, 42) + Me.rdoThreeVariable.Size = New System.Drawing.Size(100, 28) Me.rdoThreeVariable.TabIndex = 3 Me.rdoThreeVariable.Text = "Three Variables" Me.rdoThreeVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -112,10 +112,9 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdFormatTable.Enabled = False Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFormatTable.Location = New System.Drawing.Point(489, 645) - Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFormatTable.Location = New System.Drawing.Point(326, 430) Me.cmdFormatTable.Name = "cmdFormatTable" - Me.cmdFormatTable.Size = New System.Drawing.Size(156, 34) + Me.cmdFormatTable.Size = New System.Drawing.Size(104, 23) Me.cmdFormatTable.TabIndex = 23 Me.cmdFormatTable.Text = "Format Table..." Me.cmdFormatTable.UseVisualStyleBackColor = True @@ -123,10 +122,9 @@ Partial Class dlgDescribeTwoVariable 'lblThreeVariableSecondFactor ' Me.lblThreeVariableSecondFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(472, 225) - Me.lblThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(315, 150) Me.lblThreeVariableSecondFactor.Name = "lblThreeVariableSecondFactor" - Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(150, 22) + Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(100, 15) Me.lblThreeVariableSecondFactor.TabIndex = 10 Me.lblThreeVariableSecondFactor.Tag = "" Me.lblThreeVariableSecondFactor.Text = "Second Variable :" @@ -134,10 +132,9 @@ Partial Class dlgDescribeTwoVariable 'cmdMissingOptions ' Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMissingOptions.Location = New System.Drawing.Point(538, 440) - Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMissingOptions.Location = New System.Drawing.Point(359, 293) Me.cmdMissingOptions.Name = "cmdMissingOptions" - Me.cmdMissingOptions.Size = New System.Drawing.Size(158, 34) + Me.cmdMissingOptions.Size = New System.Drawing.Size(105, 23) Me.cmdMissingOptions.TabIndex = 21 Me.cmdMissingOptions.Text = "Missing Options..." Me.cmdMissingOptions.UseVisualStyleBackColor = True @@ -145,10 +142,9 @@ Partial Class dlgDescribeTwoVariable 'lbSecondVariable ' Me.lbSecondVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lbSecondVariable.Location = New System.Drawing.Point(465, 225) - Me.lbSecondVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lbSecondVariable.Location = New System.Drawing.Point(310, 150) Me.lbSecondVariable.Name = "lbSecondVariable" - Me.lbSecondVariable.Size = New System.Drawing.Size(150, 22) + Me.lbSecondVariable.Size = New System.Drawing.Size(100, 15) Me.lbSecondVariable.TabIndex = 9 Me.lbSecondVariable.Tag = "" Me.lbSecondVariable.Text = "Second Variable:" @@ -157,10 +153,9 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstVariable.AutoSize = True Me.lblFirstVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstVariable.Location = New System.Drawing.Point(465, 74) - Me.lblFirstVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFirstVariable.Location = New System.Drawing.Point(310, 49) Me.lblFirstVariable.Name = "lblFirstVariable" - Me.lblFirstVariable.Size = New System.Drawing.Size(114, 20) + Me.lblFirstVariable.Size = New System.Drawing.Size(75, 13) Me.lblFirstVariable.TabIndex = 5 Me.lblFirstVariable.Tag = "" Me.lblFirstVariable.Text = "First Variables:" @@ -174,11 +169,9 @@ Partial Class dlgDescribeTwoVariable Me.grpSummaries.Controls.Add(Me.lblSummary) Me.grpSummaries.Controls.Add(Me.lblBy) Me.grpSummaries.Controls.Add(Me.lblSecondType) - Me.grpSummaries.Location = New System.Drawing.Point(16, 328) - Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4) + Me.grpSummaries.Location = New System.Drawing.Point(11, 219) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4) - Me.grpSummaries.Size = New System.Drawing.Size(315, 108) + Me.grpSummaries.Size = New System.Drawing.Size(210, 72) Me.grpSummaries.TabIndex = 17 Me.grpSummaries.TabStop = False ' @@ -186,20 +179,18 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstType.AutoSize = True Me.lblFirstType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstType.Location = New System.Drawing.Point(18, 27) - Me.lblFirstType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFirstType.Location = New System.Drawing.Point(12, 18) Me.lblFirstType.Name = "lblFirstType" - Me.lblFirstType.Size = New System.Drawing.Size(0, 20) + Me.lblFirstType.Size = New System.Drawing.Size(0, 13) Me.lblFirstType.TabIndex = 0 ' 'lblSecondBy ' Me.lblSecondBy.AutoSize = True Me.lblSecondBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondBy.Location = New System.Drawing.Point(270, 24) - Me.lblSecondBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSecondBy.Location = New System.Drawing.Point(180, 16) Me.lblSecondBy.Name = "lblSecondBy" - Me.lblSecondBy.Size = New System.Drawing.Size(25, 20) + Me.lblSecondBy.Size = New System.Drawing.Size(18, 13) Me.lblSecondBy.TabIndex = 6 Me.lblSecondBy.Text = "by" ' @@ -207,10 +198,9 @@ Partial Class dlgDescribeTwoVariable ' Me.lblThreeVariableCategorical.AutoSize = True Me.lblThreeVariableCategorical.ForeColor = System.Drawing.SystemColors.Highlight - Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(18, 50) - Me.lblThreeVariableCategorical.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(12, 33) Me.lblThreeVariableCategorical.Name = "lblThreeVariableCategorical" - Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(86, 20) + Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(59, 13) Me.lblThreeVariableCategorical.TabIndex = 1 Me.lblThreeVariableCategorical.Text = "categorical" ' @@ -218,20 +208,18 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSummaryName.AutoSize = True Me.lblSummaryName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummaryName.Location = New System.Drawing.Point(105, 76) - Me.lblSummaryName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSummaryName.Location = New System.Drawing.Point(70, 51) Me.lblSummaryName.Name = "lblSummaryName" - Me.lblSummaryName.Size = New System.Drawing.Size(0, 20) + Me.lblSummaryName.Size = New System.Drawing.Size(0, 13) Me.lblSummaryName.TabIndex = 3 ' 'lblSummary ' Me.lblSummary.AutoSize = True Me.lblSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummary.Location = New System.Drawing.Point(18, 76) - Me.lblSummary.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSummary.Location = New System.Drawing.Point(12, 51) Me.lblSummary.Name = "lblSummary" - Me.lblSummary.Size = New System.Drawing.Size(80, 20) + Me.lblSummary.Size = New System.Drawing.Size(53, 13) Me.lblSummary.TabIndex = 2 Me.lblSummary.Text = "Summary:" ' @@ -239,10 +227,9 @@ Partial Class dlgDescribeTwoVariable ' Me.lblBy.AutoSize = True Me.lblBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblBy.Location = New System.Drawing.Point(123, 24) - Me.lblBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblBy.Location = New System.Drawing.Point(82, 16) Me.lblBy.Name = "lblBy" - Me.lblBy.Size = New System.Drawing.Size(25, 20) + Me.lblBy.Size = New System.Drawing.Size(18, 13) Me.lblBy.TabIndex = 4 Me.lblBy.Text = "by" ' @@ -250,19 +237,17 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSecondType.AutoSize = True Me.lblSecondType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondType.Location = New System.Drawing.Point(159, 27) - Me.lblSecondType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSecondType.Location = New System.Drawing.Point(106, 18) Me.lblSecondType.Name = "lblSecondType" - Me.lblSecondType.Size = New System.Drawing.Size(0, 20) + Me.lblSecondType.Size = New System.Drawing.Size(0, 13) Me.lblSecondType.TabIndex = 5 ' 'lblFirstGroupByFactor ' Me.lblFirstGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(472, 224) - Me.lblFirstGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(315, 149) Me.lblFirstGroupByFactor.Name = "lblFirstGroupByFactor" - Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(150, 22) + Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(100, 15) Me.lblFirstGroupByFactor.TabIndex = 7 Me.lblFirstGroupByFactor.Tag = "" Me.lblFirstGroupByFactor.Text = "Factor (Optional) :" @@ -275,10 +260,9 @@ Partial Class dlgDescribeTwoVariable Me.rdoSkim.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSkim.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSkim.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSkim.Location = New System.Drawing.Point(142, 12) - Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4) + Me.rdoSkim.Location = New System.Drawing.Point(95, 8) Me.rdoSkim.Name = "rdoSkim" - Me.rdoSkim.Size = New System.Drawing.Size(150, 42) + Me.rdoSkim.Size = New System.Drawing.Size(100, 28) Me.rdoSkim.TabIndex = 1 Me.rdoSkim.Text = "Skim" Me.rdoSkim.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -287,10 +271,9 @@ Partial Class dlgDescribeTwoVariable 'lblThirdVariable ' Me.lblThirdVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThirdVariable.Location = New System.Drawing.Point(465, 286) - Me.lblThirdVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblThirdVariable.Location = New System.Drawing.Point(310, 191) Me.lblThirdVariable.Name = "lblThirdVariable" - Me.lblThirdVariable.Size = New System.Drawing.Size(231, 22) + Me.lblThirdVariable.Size = New System.Drawing.Size(154, 15) Me.lblThirdVariable.TabIndex = 13 Me.lblThirdVariable.Tag = "" Me.lblThirdVariable.Text = "Third Variable :" @@ -298,10 +281,9 @@ Partial Class dlgDescribeTwoVariable 'lblSecondGroupByFactor ' Me.lblSecondGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(472, 286) - Me.lblSecondGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(315, 191) Me.lblSecondGroupByFactor.Name = "lblSecondGroupByFactor" - Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(206, 22) + Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(137, 15) Me.lblSecondGroupByFactor.TabIndex = 33 Me.lblSecondGroupByFactor.Tag = "" Me.lblSecondGroupByFactor.Text = "Second Factor (Optional) :" @@ -314,10 +296,9 @@ Partial Class dlgDescribeTwoVariable Me.rdoTwoVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoTwoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTwoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoTwoVariable.Location = New System.Drawing.Point(286, 12) - Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4) + Me.rdoTwoVariable.Location = New System.Drawing.Point(191, 8) Me.rdoTwoVariable.Name = "rdoTwoVariable" - Me.rdoTwoVariable.Size = New System.Drawing.Size(150, 42) + Me.rdoTwoVariable.Size = New System.Drawing.Size(100, 28) Me.rdoTwoVariable.TabIndex = 2 Me.rdoTwoVariable.Text = "Two Variables" Me.rdoTwoVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -326,10 +307,9 @@ Partial Class dlgDescribeTwoVariable 'cmdSummaries ' Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSummaries.Location = New System.Drawing.Point(465, 372) - Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSummaries.Location = New System.Drawing.Point(310, 248) Me.cmdSummaries.Name = "cmdSummaries" - Me.cmdSummaries.Size = New System.Drawing.Size(180, 34) + Me.cmdSummaries.Size = New System.Drawing.Size(120, 23) Me.cmdSummaries.TabIndex = 1 Me.cmdSummaries.Tag = "Summaries" Me.cmdSummaries.Text = "Choose Summaries..." @@ -338,10 +318,9 @@ Partial Class dlgDescribeTwoVariable 'lblMarginName ' Me.lblMarginName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMarginName.Location = New System.Drawing.Point(22, 480) - Me.lblMarginName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMarginName.Location = New System.Drawing.Point(15, 320) Me.lblMarginName.Name = "lblMarginName" - Me.lblMarginName.Size = New System.Drawing.Size(140, 22) + Me.lblMarginName.Size = New System.Drawing.Size(93, 15) Me.lblMarginName.TabIndex = 19 Me.lblMarginName.Tag = "" Me.lblMarginName.Text = "Margin Name:" @@ -350,21 +329,43 @@ Partial Class dlgDescribeTwoVariable ' Me.grpDisplay.Controls.Add(Me.ucrReceiverColumns) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) - Me.grpDisplay.Location = New System.Drawing.Point(414, 278) - Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4) + Me.grpDisplay.Location = New System.Drawing.Point(276, 185) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4) - Me.grpDisplay.Size = New System.Drawing.Size(291, 219) + Me.grpDisplay.Size = New System.Drawing.Size(194, 146) Me.grpDisplay.TabIndex = 15 Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" ' + 'ucrReceiverColumns + ' + Me.ucrReceiverColumns.AutoSize = True + Me.ucrReceiverColumns.frmParent = Me + Me.ucrReceiverColumns.Location = New System.Drawing.Point(13, 61) + Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverColumns.Name = "ucrReceiverColumns" + Me.ucrReceiverColumns.Selector = Nothing + Me.ucrReceiverColumns.Size = New System.Drawing.Size(120, 81) + Me.ucrReceiverColumns.strNcFilePath = "" + Me.ucrReceiverColumns.TabIndex = 55 + Me.ucrReceiverColumns.ucrSelector = Nothing + ' + 'ucrChkDisplayAsPercentage + ' + Me.ucrChkDisplayAsPercentage.AutoSize = True + Me.ucrChkDisplayAsPercentage.Checked = False + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(9, 15) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(4) + Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(114, 34) + Me.ucrChkDisplayAsPercentage.TabIndex = 54 + ' 'rdoOCol ' Me.rdoOCol.AutoSize = True - Me.rdoOCol.Location = New System.Drawing.Point(432, 336) + Me.rdoOCol.Location = New System.Drawing.Point(288, 224) + Me.rdoOCol.Margin = New System.Windows.Forms.Padding(2) Me.rdoOCol.Name = "rdoOCol" - Me.rdoOCol.Size = New System.Drawing.Size(81, 24) + Me.rdoOCol.Size = New System.Drawing.Size(54, 17) Me.rdoOCol.TabIndex = 40 Me.rdoOCol.TabStop = True Me.rdoOCol.Text = "Col(%)" @@ -373,9 +374,10 @@ Partial Class dlgDescribeTwoVariable 'rdoOCell ' Me.rdoOCell.AutoSize = True - Me.rdoOCell.Location = New System.Drawing.Point(612, 334) + Me.rdoOCell.Location = New System.Drawing.Point(408, 223) + Me.rdoOCell.Margin = New System.Windows.Forms.Padding(2) Me.rdoOCell.Name = "rdoOCell" - Me.rdoOCell.Size = New System.Drawing.Size(84, 24) + Me.rdoOCell.Size = New System.Drawing.Size(56, 17) Me.rdoOCell.TabIndex = 41 Me.rdoOCell.TabStop = True Me.rdoOCell.Text = "Cell(%)" @@ -384,9 +386,10 @@ Partial Class dlgDescribeTwoVariable 'rdoORow ' Me.rdoORow.AutoSize = True - Me.rdoORow.Location = New System.Drawing.Point(518, 336) + Me.rdoORow.Location = New System.Drawing.Point(345, 224) + Me.rdoORow.Margin = New System.Windows.Forms.Padding(2) Me.rdoORow.Name = "rdoORow" - Me.rdoORow.Size = New System.Drawing.Size(90, 24) + Me.rdoORow.Size = New System.Drawing.Size(61, 17) Me.rdoORow.TabIndex = 42 Me.rdoORow.TabStop = True Me.rdoORow.Text = "Row(%)" @@ -396,11 +399,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me - Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 314) + Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(310, 209) Me.ucrReceiverThreeVariableThirdVariable.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableThirdVariable.Name = "ucrReceiverThreeVariableThirdVariable" Me.ucrReceiverThreeVariableThirdVariable.Selector = Nothing - Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverThreeVariableThirdVariable.strNcFilePath = "" Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 14 Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing @@ -409,11 +412,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverPercentages.AutoSize = True Me.ucrReceiverPercentages.frmParent = Me - Me.ucrReceiverPercentages.Location = New System.Drawing.Point(430, 369) + Me.ucrReceiverPercentages.Location = New System.Drawing.Point(287, 246) Me.ucrReceiverPercentages.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPercentages.Name = "ucrReceiverPercentages" Me.ucrReceiverPercentages.Selector = Nothing - Me.ucrReceiverPercentages.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverPercentages.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverPercentages.strNcFilePath = "" Me.ucrReceiverPercentages.TabIndex = 39 Me.ucrReceiverPercentages.ucrSelector = Nothing @@ -421,21 +424,21 @@ Partial Class dlgDescribeTwoVariable 'ucrpnlPercent ' Me.ucrpnlPercent.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrpnlPercent.Location = New System.Drawing.Point(424, 332) - Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrpnlPercent.Location = New System.Drawing.Point(283, 221) + Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(4) Me.ucrpnlPercent.Name = "ucrpnlPercent" - Me.ucrpnlPercent.Size = New System.Drawing.Size(270, 38) + Me.ucrpnlPercent.Size = New System.Drawing.Size(180, 25) Me.ucrpnlPercent.TabIndex = 43 ' 'ucrReceiverThreeVariableSecondFactor ' Me.ucrReceiverThreeVariableSecondFactor.AutoSize = True Me.ucrReceiverThreeVariableSecondFactor.frmParent = Me - Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(465, 246) + Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(310, 164) Me.ucrReceiverThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableSecondFactor.Name = "ucrReceiverThreeVariableSecondFactor" Me.ucrReceiverThreeVariableSecondFactor.Selector = Nothing - Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverThreeVariableSecondFactor.strNcFilePath = "" Me.ucrReceiverThreeVariableSecondFactor.TabIndex = 12 Me.ucrReceiverThreeVariableSecondFactor.ucrSelector = Nothing @@ -444,11 +447,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverSecondTwoVariableFactor.AutoSize = True Me.ucrReceiverSecondTwoVariableFactor.frmParent = Me - Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(465, 246) + Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(310, 164) Me.ucrReceiverSecondTwoVariableFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondTwoVariableFactor.Name = "ucrReceiverSecondTwoVariableFactor" Me.ucrReceiverSecondTwoVariableFactor.Selector = Nothing - Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverSecondTwoVariableFactor.strNcFilePath = "" Me.ucrReceiverSecondTwoVariableFactor.TabIndex = 1 Me.ucrReceiverSecondTwoVariableFactor.ucrSelector = Nothing @@ -457,11 +460,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverFirstVars.AutoSize = True Me.ucrReceiverFirstVars.frmParent = Me - Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(465, 96) + Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(310, 64) Me.ucrReceiverFirstVars.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFirstVars.Name = "ucrReceiverFirstVars" Me.ucrReceiverFirstVars.Selector = Nothing - Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(180, 118) + Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(120, 79) Me.ucrReceiverFirstVars.strNcFilePath = "" Me.ucrReceiverFirstVars.TabIndex = 6 Me.ucrReceiverFirstVars.ucrSelector = Nothing @@ -469,53 +472,30 @@ Partial Class dlgDescribeTwoVariable 'ucrSaveTable ' Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTable.Location = New System.Drawing.Point(22, 676) - Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSaveTable.Location = New System.Drawing.Point(15, 451) + Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTable.Name = "ucrSaveTable" - Me.ucrSaveTable.Size = New System.Drawing.Size(459, 36) + Me.ucrSaveTable.Size = New System.Drawing.Size(306, 24) Me.ucrSaveTable.TabIndex = 24 ' - 'ucrReceiverColumns - ' - Me.ucrReceiverColumns.AutoSize = True - Me.ucrReceiverColumns.frmParent = Nothing - Me.ucrReceiverColumns.Location = New System.Drawing.Point(20, 92) - Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverColumns.Name = "ucrReceiverColumns" - Me.ucrReceiverColumns.Selector = Nothing - Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 122) - Me.ucrReceiverColumns.strNcFilePath = "" - Me.ucrReceiverColumns.TabIndex = 55 - Me.ucrReceiverColumns.ucrSelector = Nothing - ' - 'ucrChkDisplayAsPercentage - ' - Me.ucrChkDisplayAsPercentage.AutoSize = True - Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 51) - Me.ucrChkDisplayAsPercentage.TabIndex = 54 - ' 'ucrInputMarginName ' Me.ucrInputMarginName.AddQuotesIfUnrecognised = True Me.ucrInputMarginName.AutoSize = True Me.ucrInputMarginName.IsMultiline = False Me.ucrInputMarginName.IsReadOnly = False - Me.ucrInputMarginName.Location = New System.Drawing.Point(171, 477) - Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputMarginName.Location = New System.Drawing.Point(114, 318) + Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputMarginName.Name = "ucrInputMarginName" - Me.ucrInputMarginName.Size = New System.Drawing.Size(206, 32) + Me.ucrInputMarginName.Size = New System.Drawing.Size(137, 21) Me.ucrInputMarginName.TabIndex = 22 ' 'ucrReorderSummary ' - Me.ucrReorderSummary.Location = New System.Drawing.Point(412, 409) - Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9) + Me.ucrReorderSummary.Location = New System.Drawing.Point(275, 273) + Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(6) Me.ucrReorderSummary.Name = "ucrReorderSummary" - Me.ucrReorderSummary.Size = New System.Drawing.Size(291, 234) + Me.ucrReorderSummary.Size = New System.Drawing.Size(194, 156) Me.ucrReorderSummary.TabIndex = 16 Me.ucrReorderSummary.ucrDataFrameList = Nothing Me.ucrReorderSummary.ucrReceiver = Nothing @@ -524,21 +504,21 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(22, 734) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Location = New System.Drawing.Point(15, 489) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 25 ' 'ucrReceiverSecondSkimrGroupByFactor ' Me.ucrReceiverSecondSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSecondSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(465, 306) + Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(310, 204) Me.ucrReceiverSecondSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondSkimrGroupByFactor.Name = "ucrReceiverSecondSkimrGroupByFactor" Me.ucrReceiverSecondSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverSecondSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSecondSkimrGroupByFactor.TabIndex = 34 Me.ucrReceiverSecondSkimrGroupByFactor.ucrSelector = Nothing @@ -549,30 +529,30 @@ Partial Class dlgDescribeTwoVariable Me.ucrSelectorDescribeTwoVar.bDropUnusedFilterLevels = False Me.ucrSelectorDescribeTwoVar.bShowHiddenColumns = False Me.ucrSelectorDescribeTwoVar.bUseCurrentFilter = True - Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(16, 54) + Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(11, 36) Me.ucrSelectorDescribeTwoVar.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorDescribeTwoVar.Name = "ucrSelectorDescribeTwoVar" - Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorDescribeTwoVar.TabIndex = 4 ' 'ucrPnlDescribe ' Me.ucrPnlDescribe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlDescribe.Location = New System.Drawing.Point(138, 4) - Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlDescribe.Location = New System.Drawing.Point(92, 3) + Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlDescribe.Name = "ucrPnlDescribe" - Me.ucrPnlDescribe.Size = New System.Drawing.Size(476, 51) + Me.ucrPnlDescribe.Size = New System.Drawing.Size(317, 34) Me.ucrPnlDescribe.TabIndex = 0 ' 'ucrReceiverSkimrGroupByFactor ' Me.ucrReceiverSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(465, 246) + Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(310, 164) Me.ucrReceiverSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSkimrGroupByFactor.Name = "ucrReceiverSkimrGroupByFactor" Me.ucrReceiverSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSkimrGroupByFactor.TabIndex = 2 Me.ucrReceiverSkimrGroupByFactor.ucrSelector = Nothing @@ -581,88 +561,98 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkDisplayMargins.AutoSize = True Me.ucrChkDisplayMargins.Checked = False - Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(26, 444) - Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(17, 296) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" - Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) + Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(143, 23) Me.ucrChkDisplayMargins.TabIndex = 18 ' 'ucrChkSummariesRowCol ' Me.ucrChkSummariesRowCol.AutoSize = True Me.ucrChkSummariesRowCol.Checked = False - Me.ucrChkSummariesRowCol.Location = New System.Drawing.Point(22, 507) - Me.ucrChkSummariesRowCol.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkSummariesRowCol.Location = New System.Drawing.Point(15, 338) + Me.ucrChkSummariesRowCol.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkSummariesRowCol.Name = "ucrChkSummariesRowCol" - Me.ucrChkSummariesRowCol.Size = New System.Drawing.Size(270, 34) + Me.ucrChkSummariesRowCol.Size = New System.Drawing.Size(180, 23) Me.ucrChkSummariesRowCol.TabIndex = 20 ' 'ucrChkLevSig ' Me.ucrChkLevSig.AutoSize = True Me.ucrChkLevSig.Checked = False - Me.ucrChkLevSig.Location = New System.Drawing.Point(596, 279) - Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkLevSig.Location = New System.Drawing.Point(397, 186) + Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkLevSig.Name = "ucrChkLevSig" - Me.ucrChkLevSig.Size = New System.Drawing.Size(129, 34) + Me.ucrChkLevSig.Size = New System.Drawing.Size(86, 23) Me.ucrChkLevSig.TabIndex = 38 ' 'ucrChkTotal ' Me.ucrChkTotal.AutoSize = True Me.ucrChkTotal.Checked = False - Me.ucrChkTotal.Location = New System.Drawing.Point(465, 279) - Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkTotal.Location = New System.Drawing.Point(310, 186) + Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkTotal.Name = "ucrChkTotal" - Me.ucrChkTotal.Size = New System.Drawing.Size(146, 34) + Me.ucrChkTotal.Size = New System.Drawing.Size(97, 23) Me.ucrChkTotal.TabIndex = 44 ' 'ucrChkMeans ' Me.ucrChkMeans.AutoSize = True Me.ucrChkMeans.Checked = False - Me.ucrChkMeans.Location = New System.Drawing.Point(465, 312) - Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkMeans.Location = New System.Drawing.Point(310, 208) + Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkMeans.Name = "ucrChkMeans" - Me.ucrChkMeans.Size = New System.Drawing.Size(146, 34) + Me.ucrChkMeans.Size = New System.Drawing.Size(97, 23) Me.ucrChkMeans.TabIndex = 37 ' 'ucrChkCorrelations ' Me.ucrChkCorrelations.AutoSize = True Me.ucrChkCorrelations.Checked = False - Me.ucrChkCorrelations.Location = New System.Drawing.Point(465, 381) - Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkCorrelations.Location = New System.Drawing.Point(310, 254) + Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkCorrelations.Name = "ucrChkCorrelations" - Me.ucrChkCorrelations.Size = New System.Drawing.Size(224, 34) + Me.ucrChkCorrelations.Size = New System.Drawing.Size(149, 23) Me.ucrChkCorrelations.TabIndex = 35 ' 'ucrChkSwapXYVar ' Me.ucrChkSwapXYVar.AutoSize = True Me.ucrChkSwapXYVar.Checked = False - Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(465, 347) - Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(310, 231) + Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkSwapXYVar.Name = "ucrChkSwapXYVar" - Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(236, 34) + Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(157, 23) Me.ucrChkSwapXYVar.TabIndex = 36 ' 'ucrChkOmitMissing ' Me.ucrChkOmitMissing.AutoSize = True Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(465, 416) - Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(310, 277) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" - Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) + Me.ucrChkOmitMissing.Size = New System.Drawing.Size(143, 23) Me.ucrChkOmitMissing.TabIndex = 0 ' + 'ucrChkInteraction + ' + Me.ucrChkInteraction.AutoSize = True + Me.ucrChkInteraction.Checked = False + Me.ucrChkInteraction.Location = New System.Drawing.Point(310, 300) + Me.ucrChkInteraction.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkInteraction.Name = "ucrChkInteraction" + Me.ucrChkInteraction.Size = New System.Drawing.Size(143, 23) + Me.ucrChkInteraction.TabIndex = 45 + ' 'dlgDescribeTwoVariable ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ClientSize = New System.Drawing.Size(723, 700) + Me.ClientSize = New System.Drawing.Size(482, 467) Me.Controls.Add(Me.cmdSummaries) Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) Me.Controls.Add(Me.ucrReceiverPercentages) @@ -703,8 +693,8 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.ucrChkSwapXYVar) Me.Controls.Add(Me.ucrChkMeans) Me.Controls.Add(Me.ucrChkOmitMissing) + Me.Controls.Add(Me.ucrChkInteraction) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDescribeTwoVariable" @@ -768,4 +758,5 @@ Partial Class dlgDescribeTwoVariable Friend WithEvents ucrpnlPercent As UcrPanel Friend WithEvents ucrReceiverColumns As ucrReceiverMultiple Friend WithEvents ucrChkTotal As ucrCheck + Friend WithEvents ucrChkInteraction As ucrCheck End Class diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 0c4dc75792..9e968efce7 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -164,10 +164,15 @@ Public Class dlgDescribeTwoVariable ucrChkLevSig.SetRDefault("FALSE") ucrChkTotal.SetText("Total") - ucrChkTotal.SetParameter(New RParameter("total", 5)) + ucrChkTotal.SetParameter(New RParameter("total", 6)) ucrChkTotal.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkTotal.SetRDefault("FALSE") + ucrChkInteraction.SetText("Interaction") + ucrChkInteraction.SetParameter(New RParameter("interaction", 5)) + ucrChkInteraction.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkInteraction.SetRDefault("FALSE") + ucrChkSwapXYVar.SetText("Swap First/Second Variables") ucrChkSwapXYVar.AddParameterValuesCondition(True, "var", "True") ucrChkSwapXYVar.AddParameterValuesCondition(False, "var", "False") @@ -187,7 +192,7 @@ Public Class dlgDescribeTwoVariable ucrpnlPercent.AddParameterValuesCondition(rdoOCell, "percent", "cell") ucrPnlDescribe.AddToLinkedControls({ucrReceiverSkimrGroupByFactor, ucrReceiverSecondSkimrGroupByFactor}, {rdoSkim}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlDescribe.AddToLinkedControls({ucrReceiverThreeVariableThirdVariable}, {rdoThreeVariable}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlDescribe.AddToLinkedControls({ucrReceiverThreeVariableThirdVariable}, {rdoThreeVariable}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True) ucrPnlDescribe.AddToLinkedControls({ucrReceiverSecondTwoVariableFactor}, {rdoTwoVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlDescribe.AddToLinkedControls({ucrReceiverThreeVariableSecondFactor}, {rdoThreeVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -203,6 +208,7 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.SetIsTextBox() ucrReorderSummary.bDataIsSummaries = True AddRemoveTotalParm() + AddInteraction() End Sub Private Sub SetDefaults() @@ -505,6 +511,7 @@ Public Class dlgDescribeTwoVariable ucrChkDisplayMargins.AddAdditionalCodeParameterPair(clsCombineFrequencyColParametersFunction, New RParameter("include_margins", iNewPosition:=5), iAdditionalPairNo:=1) ucrChkDisplayAsPercentage.AddAdditionalCodeParameterPair(clsCombineFrequencyColParametersFunction, New RParameter("percentage_type", iNewPosition:=1), iAdditionalPairNo:=1) ucrChkDisplayMargins.AddAdditionalCodeParameterPair(clsThreeVariableCombineFrequencyParametersFunction, New RParameter("include_margins", iNewPosition:=5), iAdditionalPairNo:=2) + ucrChkInteraction.AddAdditionalCodeParameterPair(clsRAnovaSwapTable2Funtion, New RParameter("interaction", iNewPosition:=7), iAdditionalPairNo:=1) ucrSelectorDescribeTwoVar.AddAdditionalCodeParameterPair(clsSummaryTableFunction, ucrSelectorDescribeTwoVar.GetParameter(), iAdditionalPairNo:=1) ucrSaveTable.AddAdditionalRCode(clsJoiningPipeOperator, iAdditionalPairNo:=1) @@ -526,6 +533,7 @@ Public Class dlgDescribeTwoVariable ucrChkSwapXYVar.SetRCode(clsDummyFunction, bReset) ucrChkMeans.SetRCode(clsRAnovaTable2Function, bReset) ucrChkLevSig.SetRCode(clsRAnovaTable2Function, bReset) + ucrChkInteraction.SetRCode(clsRAnovaTable2Function, bReset) ucrReceiverThreeVariableSecondFactor.SetRCode(clsSummaryTableCombineFactorsFunction, bReset) ucrReceiverThreeVariableThirdVariable.SetRCode(clsSummaryTableCombineFactorsFunction, bReset) ucrChkDisplayMargins.SetRCode(clsCombineFrequencyParametersFunction, bReset) @@ -534,6 +542,8 @@ Public Class dlgDescribeTwoVariable FillListView() AddRemoveTotalParm() + AddInteraction() + ChangeBaseRCode() End Sub Public Sub TestOKEnabled() @@ -628,7 +638,7 @@ Public Class dlgDescribeTwoVariable Private Sub ManageControlsVisibility() grpSummaries.Visible = rdoThreeVariable.Checked OrElse rdoTwoVariable.Checked ucrChkDisplayMargins.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() - 'ucrChkDisplayMargins.Visible = rdoThreeVariable.Checked AndAlso IsFactorByFactorByFactor() + ucrChkDisplayMargins.Visible = rdoThreeVariable.Checked AndAlso IsFactorByFactorByFactor() ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactor() grpDisplay.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() ucrReceiverPercentages.Visible = ucrChkDisplayAsPercentage.Checked AndAlso rdoORow.Checked AndAlso IsFactorByFactor() @@ -655,7 +665,7 @@ Public Class dlgDescribeTwoVariable End If 'ucrChkSwapXYVar.Visible = IsNumericByNumericByNumeric() OrElse IsNumericByNumericByFactor() ucrChkSummariesRowCol.Visible = IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() - ucrChkOmitMissing.Visible = IsFactorByNumericByNumeric() OrElse IsNumericByNumericByFactor() + ucrChkOmitMissing.Visible = IsFactorByNumericByNumeric() End If End Sub @@ -668,6 +678,7 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = False ucrChkLevSig.Visible = False ucrChkTotal.Visible = False + ucrChkInteraction.Visible = False cmdMissingOptions.Visible = False If rdoSkim.Checked Then clsDummyFunction.AddParameter("checked", "skim", iPosition:=0) @@ -691,7 +702,6 @@ Public Class dlgDescribeTwoVariable If ucrChkSwapXYVar.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsMapping2Function) clsDummyFunction.AddParameter("var", "True", iPosition:=5) - Else ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) clsDummyFunction.AddParameter("var", "False", iPosition:=5) @@ -706,22 +716,25 @@ Public Class dlgDescribeTwoVariable End If ucrSaveTable.Visible = False cmdFormatTable.Visible = False + ucrChkInteraction.Visible = False ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True ucrChkTotal.Location = New Point(310, 189) ucrChkLevSig.Location = New Point(397, 186) - ucrChkMeans.Location = New Point(310, 208) + ucrChkMeans.Location = New Point(310, 210) ElseIf IsNumericByFactor() Then ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) + ucrChkInteraction.Visible = False ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True ucrSaveTable.Visible = True ucrSaveTable.Location = New Point(23, 450) ucrChkTotal.Location = New Point(310, 189) - ucrChkMeans.Location = New Point(310, 208) + ucrChkMeans.Location = New Point(310, 210) + ucrChkLevSig.Location = New Point(397, 186) clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) ucrSaveTable.SetPrefix("summary_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) @@ -734,6 +747,7 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = False ucrChkLevSig.Visible = False ucrChkTotal.Visible = False + ucrChkInteraction.Visible = False ucrSaveTable.Location = New Point(23, 351) clsDummyFunction.AddParameter("factor_cols", "FactorVar", iPosition:=1) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) @@ -756,13 +770,13 @@ Public Class dlgDescribeTwoVariable cmdSummaries.Visible = False ucrChkSummariesRowCol.Visible = False cmdFormatTable.Visible = False + ucrChkInteraction.Visible = False ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True ucrChkTotal.Location = New Point(310, 189) ucrChkLevSig.Location = New Point(397, 186) - ucrChkMeans.Location = New Point(310, 208) - + ucrChkMeans.Location = New Point(310, 210) Else clsDummyFunction.AddParameter("var", "False", iPosition:=5) ucrSaveTable.Visible = True @@ -773,6 +787,7 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = False ucrChkLevSig.Visible = False ucrChkTotal.Visible = False + ucrChkInteraction.Visible = False ucrSaveTable.Location = New Point(23, 450) clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) @@ -825,10 +840,10 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True + ucrChkInteraction.Visible = True ucrChkTotal.Location = New Point(310, 250) ucrChkLevSig.Location = New Point(397, 250) ucrChkMeans.Location = New Point(310, 275) - If ucrChkSwapXYVar.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsMapping2Function) clsDummyFunction.AddParameter("var", "True", iPosition:=5) @@ -842,6 +857,7 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True + ucrChkInteraction.Visible = True ucrChkTotal.Location = New Point(310, 250) ucrChkLevSig.Location = New Point(397, 250) ucrChkMeans.Location = New Point(310, 275) @@ -852,6 +868,7 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True + ucrChkInteraction.Visible = True ucrChkTotal.Location = New Point(310, 250) ucrChkLevSig.Location = New Point(397, 250) ucrChkMeans.Location = New Point(310, 275) @@ -862,6 +879,7 @@ Public Class dlgDescribeTwoVariable ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True + ucrChkInteraction.Visible = True ucrChkTotal.Location = New Point(310, 250) ucrChkLevSig.Location = New Point(397, 250) ucrChkMeans.Location = New Point(310, 275) @@ -885,6 +903,8 @@ Public Class dlgDescribeTwoVariable End If End If FactorColumns() + AddInteraction() + AddRemoveSecondAnovaParam() End Sub Private Sub UpdateCombineFactorParameterFunction() @@ -932,6 +952,9 @@ Public Class dlgDescribeTwoVariable Private Sub ucrPnlDescribe_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlDescribe.ControlValueChanged ucrReceiverFirstVars.Clear() + ucrReceiverThreeVariableSecondFactor.Clear() + ucrReceiverThreeVariableThirdVariable.Clear() + ucrReceiverSecondTwoVariableFactor.Clear() ucrReceiverFirstVars.SetMeAsReceiver() If rdoSkim.Checked Then @@ -1168,6 +1191,8 @@ Public Class dlgDescribeTwoVariable End Sub Private Sub AddRemoveSecondAnovaParam() + clsCombineSwapAnova2Table.RemoveParameterByName("x") + clsCombineAnova2Function.RemoveParameterByName("x") If rdoThreeVariable.Checked Then If Not ucrReceiverThreeVariableSecondFactor.IsEmpty Then If IsNumericByNumericByFactor() Then @@ -1249,6 +1274,8 @@ Public Class dlgDescribeTwoVariable Else clsCombineAnova2Function.RemoveParameterByName("y") End If + Else + clsCombineAnova2Function.RemoveParameterByName("y") End If End Sub @@ -1506,6 +1533,7 @@ Public Class dlgDescribeTwoVariable AddRemoveFirstAnova2Param() AddRemoveSecondAnovaParam() AddingColumnFactor() + AddRemoveThirdAnovaParam() End Sub Private Sub ChangeFirstTypeLabel() @@ -1724,6 +1752,11 @@ Public Class dlgDescribeTwoVariable Private Sub ucrChkCorrelations_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkCorrelations.ControlValueChanged ChangeBaseRCode() + If ucrChkCorrelations.Checked AndAlso Not ucrReceiverFirstVars.IsEmpty Then + clsRCorrelationFunction.AddParameter("x_col_names", ucrReceiverFirstVars.GetVariableNames) + Else + clsRCorrelationFunction.RemoveParameterByName("x_col_names") + End If End Sub Private Sub ucrChkSwapXYVar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSwapXYVar.ControlValueChanged @@ -1791,6 +1824,19 @@ Public Class dlgDescribeTwoVariable Private Sub AddRemoveTotalParm() clsRAnovaTable2Function.AddParameter("total", If(ucrChkTotal.Checked, "TRUE", "FALSE"), iPosition:=6) clsRAnovaSwapTable2Funtion.AddParameter("total", If(ucrChkTotal.Checked AndAlso ucrChkSwapXYVar.Checked, "TRUE", "FALSE"), iPosition:=6) + End Sub + Private Sub ucrChkInteraction_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkInteraction.ControlValueChanged + AddInteraction() + End Sub + + Private Sub AddInteraction() + If rdoThreeVariable.Checked AndAlso ucrChkInteraction.Checked Then + clsRAnovaTable2Function.AddParameter("interaction", "TRUE", iPosition:=7) + clsRAnovaSwapTable2Funtion.AddParameter("interaction", "TRUE", iPosition:=7) + Else + clsRAnovaTable2Function.RemoveParameterByName("interaction") + clsRAnovaSwapTable2Funtion.RemoveParameterByName("interaction") + End If End Sub End Class diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index b25e7696ff..04440a9dfe 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4523,16 +4523,20 @@ DataSheet$set("public", "has_labels", function(col_names) { } ) -DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total = FALSE, signif.stars = FALSE, sign_level = FALSE, means = FALSE) { +DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total = FALSE, signif.stars = FALSE, sign_level = FALSE, means = FALSE, interaction = FALSE) { if (missing(x_col_names) || missing(y_col_name)) stop("Both x_col_names and y_col_names are required") if (sign_level || signif.stars) message("This is no longer descriptive") if (sign_level) end_col = 5 else end_col = 4 - # Construct the formula + # Construct the formula with interaction if required if (length(x_col_names) == 1) { formula_str <- paste0(as.name(y_col_name), "~ ", as.name(x_col_names)) } else if (length(x_col_names) > 1) { - formula_str <- paste0(as.name(y_col_name), "~ ", as.name(paste(x_col_names, collapse = " + "))) + if (interaction) { + formula_str <- paste0(as.name(y_col_name), "~ (", as.name(paste(x_col_names, collapse = " * ")), ")") + } else { + formula_str <- paste0(as.name(y_col_name), "~ ", as.name(paste(x_col_names, collapse = " + "))) + } } # Fit the model @@ -4543,9 +4547,11 @@ DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total if (total) anova_mod <- anova_mod %>% tibble::add_row(` ` = "Total", dplyr::summarise(., across(where(is.numeric), sum))) anova_mod$`F value` <- round(anova_mod$`F value`, 4) if (sign_level) anova_mod$`Pr(>F)` <- format.pval(anova_mod$`Pr(>F)`, digits = 4, eps = 0.001) + cat(paste0("ANOVA of ", formula_str, ":\n")) print(anova_mod) cat("\n") + # Optionally print means if (means) { if (class(mod$model[[x_col_names[[1]]]]) %in% c("numeric", "integer")){ diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index d62df55288..8c9163de4f 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -3010,7 +3010,7 @@ DataBook$set("public","wrap_or_unwrap_data", function(data_name, col_name, colum } ) -DataBook$set("public", "anova_tables2", function(data_name, x_col_names, y_col_name, total = TRUE, signif.stars = FALSE, sign_level = FALSE, means = FALSE) { - self$get_data_objects(data_name)$anova_tables2(x_col_names = x_col_names, y_col_name = y_col_name, total = total, signif.stars = signif.stars, sign_level = sign_level, means = means) +DataBook$set("public", "anova_tables2", function(data_name, x_col_names, y_col_name, total = TRUE, signif.stars = FALSE, sign_level = FALSE, means = FALSE, interaction=FALSE) { + self$get_data_objects(data_name)$anova_tables2(x_col_names = x_col_names, y_col_name = y_col_name, total = total, signif.stars = signif.stars, sign_level = sign_level, means = means, interaction=interaction) } ) From 52b52af666e7515401e6fbdac126e7e7c6ce8a16 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 23 Oct 2024 14:30:23 +0300 Subject: [PATCH 05/20] changes to the code --- instat/dlgDescribeTwoVariable.vb | 34 ++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 9e968efce7..f6e67b7d5a 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -73,6 +73,7 @@ Public Class dlgDescribeTwoVariable SetHelpOptions() bReset = False TestOKEnabled() + ManageControlsVisibility() autoTranslate(Me) End Sub @@ -209,6 +210,7 @@ Public Class dlgDescribeTwoVariable ucrReorderSummary.bDataIsSummaries = True AddRemoveTotalParm() AddInteraction() + ManageControlsVisibility() End Sub Private Sub SetDefaults() @@ -650,10 +652,11 @@ Public Class dlgDescribeTwoVariable cmdMissingOptions.Visible = False If rdoTwoVariable.Checked Then - ucrChkOmitMissing.Visible = IsNumericByNumeric() OrElse IsNumericByFactor() + ucrChkOmitMissing.Visible = False + ucrChkOmitMissing.Visible = Not ucrChkSwapXYVar.Checked AndAlso IsFactorByNumeric() ucrChkSwapXYVar.Visible = IsNumericByNumeric() OrElse IsFactorByNumeric() ucrChkCorrelations.Visible = IsNumericByNumeric() - cmdMissingOptions.Visible = ucrChkOmitMissing.Checked + cmdMissingOptions.Visible = ucrChkOmitMissing.Checked AndAlso ucrChkOmitMissing.Visible End If If rdoThreeVariable.Checked Then If IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() Then @@ -663,9 +666,9 @@ Public Class dlgDescribeTwoVariable ucrReorderSummary.Visible = False cmdSummaries.Visible = False End If - 'ucrChkSwapXYVar.Visible = IsNumericByNumericByNumeric() OrElse IsNumericByNumericByFactor() ucrChkSummariesRowCol.Visible = IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() - ucrChkOmitMissing.Visible = IsFactorByNumericByNumeric() + ucrChkOmitMissing.Visible = IsFactorByNumericByFactor() OrElse IsFactorByFactorByNumeric() + cmdMissingOptions.Visible = ucrChkOmitMissing.Checked End If End Sub @@ -680,6 +683,7 @@ Public Class dlgDescribeTwoVariable ucrChkTotal.Visible = False ucrChkInteraction.Visible = False cmdMissingOptions.Visible = False + ucrChkOmitMissing.Visible = False If rdoSkim.Checked Then clsDummyFunction.AddParameter("checked", "skim", iPosition:=0) cmdFormatTable.Visible = False @@ -697,6 +701,7 @@ Public Class dlgDescribeTwoVariable strObjectName:="last_summary") ElseIf rdoTwoVariable.Checked Then + ucrChkOmitMissing.Visible = False clsDummyFunction.AddParameter("checked", "customize", iPosition:=0) If IsNumericByNumeric() Then If ucrChkSwapXYVar.Checked Then @@ -748,7 +753,7 @@ Public Class dlgDescribeTwoVariable ucrChkLevSig.Visible = False ucrChkTotal.Visible = False ucrChkInteraction.Visible = False - ucrSaveTable.Location = New Point(23, 351) + ucrSaveTable.Location = New Point(23, 385) clsDummyFunction.AddParameter("factor_cols", "FactorVar", iPosition:=1) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) ucrSaveTable.SetPrefix("frequency_table") @@ -771,6 +776,8 @@ Public Class dlgDescribeTwoVariable ucrChkSummariesRowCol.Visible = False cmdFormatTable.Visible = False ucrChkInteraction.Visible = False + ucrChkOmitMissing.Visible = False + cmdMissingOptions.Visible = False ucrChkMeans.Visible = True ucrChkLevSig.Visible = True ucrChkTotal.Visible = True @@ -784,11 +791,14 @@ Public Class dlgDescribeTwoVariable cmdSummaries.Visible = True ucrChkSummariesRowCol.Visible = True cmdFormatTable.Visible = True + ucrChkOmitMissing.Visible = True ucrChkMeans.Visible = False ucrChkLevSig.Visible = False ucrChkTotal.Visible = False ucrChkInteraction.Visible = False ucrSaveTable.Location = New Point(23, 450) + ucrChkOmitMissing.Location = New Point(15, 365) + cmdMissingOptions.Location = New Point(17, 385) clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) ucrSaveTable.SetPrefix("summary_table") @@ -898,8 +908,11 @@ Public Class dlgDescribeTwoVariable ucrReorderSummary.Visible = True cmdSummaries.Visible = True ucrSaveTable.Visible = True + ucrChkOmitMissing.Visible = True ucrChkSummariesRowCol.Visible = True ucrSaveTable.Location = New Point(23, 440) + ucrChkOmitMissing.Location = New Point(15, 360) + cmdMissingOptions.Location = New Point(17, 380) End If End If FactorColumns() @@ -917,11 +930,11 @@ Public Class dlgDescribeTwoVariable clsSummaryTableFunction.RemoveParameterByName("na.rm") If ucrChkOmitMissing.Checked Then If rdoTwoVariable.Checked Then - If IsNumericByFactor() Then + If Not ucrChkSwapXYVar.Checked AndAlso IsFactorByNumeric() Then clsSummaryTableFunction.AddParameter("na.rm", "TRUE", iPosition:=5) End If ElseIf rdoThreeVariable.Checked Then - If IsNumericByFactor() OrElse IsFactorByNumeric() Then + If IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() Then clsSummaryTableFunction.AddParameter("na.rm", "TRUE", iPosition:=5) End If End If @@ -947,7 +960,8 @@ Public Class dlgDescribeTwoVariable clsSummaryTableFunction.AddParameter("na_type", clsRFunctionParameter:=clsCombineFunction, iPosition:=9) End If cmdMissingOptions.Visible = ucrChkOmitMissing.Checked - + ManageControlsVisibility() + ChangeBaseRCode() End Sub Private Sub ucrPnlDescribe_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlDescribe.ControlValueChanged @@ -1007,8 +1021,8 @@ Public Class dlgDescribeTwoVariable ucrBase.Location = New Point(iUcrBaseXLocation, 319) Me.Size = New Point(iDialogueXsize, 415) ElseIf IsFactorByFactor() Then - ucrBase.Location = New Point(iUcrBaseXLocation, 372) - Me.Size = New Point(iDialogueXsize, 465) + ucrBase.Location = New Point(iUcrBaseXLocation, 392) + Me.Size = New Point(iDialogueXsize, 485) cmdFormatTable.Location = New Point(326, 330) Else ucrBase.Location = New Point(iUcrBaseXLocation, 328) From 82a1c90fa852ae0ae1a20f7326d17e7694ad5f7e Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Fri, 25 Oct 2024 02:31:05 +0300 Subject: [PATCH 06/20] changes --- instat/static/InstatObject/R/data_object_R6.R | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 04440a9dfe..1161bab273 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4552,16 +4552,27 @@ DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total print(anova_mod) cat("\n") - # Optionally print means + # Optionally print means or model coefficients if (means) { - if (class(mod$model[[x_col_names[[1]]]]) %in% c("numeric", "integer")){ + has_numeric <- any(sapply(x_col_names, function(x) class(mod$model[[x]]) %in% c("numeric", "integer"))) + has_factor <- any(sapply(x_col_names, function(x) class(mod$model[[x]]) == "factor")) + + # If both numeric and factor are present, print the model coefficients + if (has_numeric && has_factor) { cat("Model coefficients:\n") print(mod$coefficients) cat("\n") } else { - cat(paste0("Means table of ", y_col_name, ":\n")) - print(model.tables(aov(mod), type = "means")) - cat("\n") + # Handle the original case when only numeric or factor is present + if (class(mod$model[[x_col_names[[1]]]]) %in% c("numeric", "integer")) { + cat("Model coefficients:\n") + print(mod$coefficients) + cat("\n") + } else { + cat(paste0("Means table of ", y_col_name, ":\n")) + print(model.tables(aov(mod), type = "means")) + cat("\n") + } } } } From 45ea01d21a1dcdc5c6d719912915712b7b077b94 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 5 Nov 2024 09:26:13 +0300 Subject: [PATCH 07/20] changes --- instat/dlgDescribeTwoVariable.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index f6e67b7d5a..63655ff6eb 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -1127,13 +1127,13 @@ Public Class dlgDescribeTwoVariable clsSummaryTableFunction.AddParameter("columns_to_summarise", ".x") clsPivotWiderFunction.AddParameter("names_from", "{{ .x }}", iPosition:=1) ElseIf IsFactorByFactorByNumeric() Then - clsMapSummaryFunction.AddParameter(".x", "c(" & ucrReceiverFirstVars.GetVariableNames.Replace("c(", "").Replace(")", "") & "," & ucrReceiverThreeVariableSecondFactor.GetVariableNames.Replace("c(", "").Replace(")", "") & ")") - clsSummaryTableFunction.AddParameter("factors", ".x") + clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames) + clsSummaryTableFunction.AddParameter("factors", "c(" & ".x" & "," & ucrReceiverThreeVariableSecondFactor.GetVariableNames & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableThirdVariable.GetVariableNames) SummariesInRowsOrCols() ElseIf IsFactorByNumericByFactor() Then - clsMapSummaryFunction.AddParameter(".x", "c(" & ucrReceiverFirstVars.GetVariableNames.Replace("c(", "").Replace(")", "") & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames.Replace("c(", "").Replace(")", "") & ")") - clsSummaryTableFunction.AddParameter("factors", ".x") + clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames) + clsSummaryTableFunction.AddParameter("factors", "c(" & ".x" & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableSecondFactor.GetVariableNames) SummariesInRowsOrCols() Else From 161f4e53e7e91276200bb5998ef5c6e371168741 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 11 Nov 2024 19:43:12 +0300 Subject: [PATCH 08/20] changes to the code --- instat/dlgDescribeTwoVariable.Designer.vb | 271 +++++++++++----------- instat/dlgDescribeTwoVariable.vb | 56 ++--- 2 files changed, 158 insertions(+), 169 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index 584ff76778..cc0f18193d 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -80,7 +80,6 @@ Partial Class dlgDescribeTwoVariable Me.ucrPnlDescribe = New instat.UcrPanel() Me.ucrReceiverSkimrGroupByFactor = New instat.ucrReceiverSingle() Me.ucrChkDisplayMargins = New instat.ucrCheck() - Me.ucrChkSummariesRowCol = New instat.ucrCheck() Me.ucrChkLevSig = New instat.ucrCheck() Me.ucrChkTotal = New instat.ucrCheck() Me.ucrChkMeans = New instat.ucrCheck() @@ -100,9 +99,10 @@ Partial Class dlgDescribeTwoVariable Me.rdoThreeVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoThreeVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoThreeVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoThreeVariable.Location = New System.Drawing.Point(288, 8) + Me.rdoThreeVariable.Location = New System.Drawing.Point(432, 12) + Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoThreeVariable.Name = "rdoThreeVariable" - Me.rdoThreeVariable.Size = New System.Drawing.Size(100, 28) + Me.rdoThreeVariable.Size = New System.Drawing.Size(150, 42) Me.rdoThreeVariable.TabIndex = 3 Me.rdoThreeVariable.Text = "Three Variables" Me.rdoThreeVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -112,9 +112,10 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdFormatTable.Enabled = False Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFormatTable.Location = New System.Drawing.Point(326, 430) + Me.cmdFormatTable.Location = New System.Drawing.Point(489, 645) + Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdFormatTable.Name = "cmdFormatTable" - Me.cmdFormatTable.Size = New System.Drawing.Size(104, 23) + Me.cmdFormatTable.Size = New System.Drawing.Size(156, 34) Me.cmdFormatTable.TabIndex = 23 Me.cmdFormatTable.Text = "Format Table..." Me.cmdFormatTable.UseVisualStyleBackColor = True @@ -122,9 +123,10 @@ Partial Class dlgDescribeTwoVariable 'lblThreeVariableSecondFactor ' Me.lblThreeVariableSecondFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(315, 150) + Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(472, 225) + Me.lblThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblThreeVariableSecondFactor.Name = "lblThreeVariableSecondFactor" - Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(100, 15) + Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(150, 22) Me.lblThreeVariableSecondFactor.TabIndex = 10 Me.lblThreeVariableSecondFactor.Tag = "" Me.lblThreeVariableSecondFactor.Text = "Second Variable :" @@ -132,9 +134,10 @@ Partial Class dlgDescribeTwoVariable 'cmdMissingOptions ' Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMissingOptions.Location = New System.Drawing.Point(359, 293) + Me.cmdMissingOptions.Location = New System.Drawing.Point(538, 440) + Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdMissingOptions.Name = "cmdMissingOptions" - Me.cmdMissingOptions.Size = New System.Drawing.Size(105, 23) + Me.cmdMissingOptions.Size = New System.Drawing.Size(158, 34) Me.cmdMissingOptions.TabIndex = 21 Me.cmdMissingOptions.Text = "Missing Options..." Me.cmdMissingOptions.UseVisualStyleBackColor = True @@ -142,9 +145,10 @@ Partial Class dlgDescribeTwoVariable 'lbSecondVariable ' Me.lbSecondVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lbSecondVariable.Location = New System.Drawing.Point(310, 150) + Me.lbSecondVariable.Location = New System.Drawing.Point(465, 225) + Me.lbSecondVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lbSecondVariable.Name = "lbSecondVariable" - Me.lbSecondVariable.Size = New System.Drawing.Size(100, 15) + Me.lbSecondVariable.Size = New System.Drawing.Size(150, 22) Me.lbSecondVariable.TabIndex = 9 Me.lbSecondVariable.Tag = "" Me.lbSecondVariable.Text = "Second Variable:" @@ -153,9 +157,10 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstVariable.AutoSize = True Me.lblFirstVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstVariable.Location = New System.Drawing.Point(310, 49) + Me.lblFirstVariable.Location = New System.Drawing.Point(465, 74) + Me.lblFirstVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFirstVariable.Name = "lblFirstVariable" - Me.lblFirstVariable.Size = New System.Drawing.Size(75, 13) + Me.lblFirstVariable.Size = New System.Drawing.Size(114, 20) Me.lblFirstVariable.TabIndex = 5 Me.lblFirstVariable.Tag = "" Me.lblFirstVariable.Text = "First Variables:" @@ -169,9 +174,11 @@ Partial Class dlgDescribeTwoVariable Me.grpSummaries.Controls.Add(Me.lblSummary) Me.grpSummaries.Controls.Add(Me.lblBy) Me.grpSummaries.Controls.Add(Me.lblSecondType) - Me.grpSummaries.Location = New System.Drawing.Point(11, 219) + Me.grpSummaries.Location = New System.Drawing.Point(16, 328) + Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Size = New System.Drawing.Size(210, 72) + Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Size = New System.Drawing.Size(315, 108) Me.grpSummaries.TabIndex = 17 Me.grpSummaries.TabStop = False ' @@ -179,18 +186,20 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstType.AutoSize = True Me.lblFirstType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstType.Location = New System.Drawing.Point(12, 18) + Me.lblFirstType.Location = New System.Drawing.Point(18, 27) + Me.lblFirstType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFirstType.Name = "lblFirstType" - Me.lblFirstType.Size = New System.Drawing.Size(0, 13) + Me.lblFirstType.Size = New System.Drawing.Size(0, 20) Me.lblFirstType.TabIndex = 0 ' 'lblSecondBy ' Me.lblSecondBy.AutoSize = True Me.lblSecondBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondBy.Location = New System.Drawing.Point(180, 16) + Me.lblSecondBy.Location = New System.Drawing.Point(270, 24) + Me.lblSecondBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSecondBy.Name = "lblSecondBy" - Me.lblSecondBy.Size = New System.Drawing.Size(18, 13) + Me.lblSecondBy.Size = New System.Drawing.Size(25, 20) Me.lblSecondBy.TabIndex = 6 Me.lblSecondBy.Text = "by" ' @@ -198,9 +207,10 @@ Partial Class dlgDescribeTwoVariable ' Me.lblThreeVariableCategorical.AutoSize = True Me.lblThreeVariableCategorical.ForeColor = System.Drawing.SystemColors.Highlight - Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(12, 33) + Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(18, 50) + Me.lblThreeVariableCategorical.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblThreeVariableCategorical.Name = "lblThreeVariableCategorical" - Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(59, 13) + Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(86, 20) Me.lblThreeVariableCategorical.TabIndex = 1 Me.lblThreeVariableCategorical.Text = "categorical" ' @@ -208,18 +218,20 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSummaryName.AutoSize = True Me.lblSummaryName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummaryName.Location = New System.Drawing.Point(70, 51) + Me.lblSummaryName.Location = New System.Drawing.Point(105, 76) + Me.lblSummaryName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSummaryName.Name = "lblSummaryName" - Me.lblSummaryName.Size = New System.Drawing.Size(0, 13) + Me.lblSummaryName.Size = New System.Drawing.Size(0, 20) Me.lblSummaryName.TabIndex = 3 ' 'lblSummary ' Me.lblSummary.AutoSize = True Me.lblSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummary.Location = New System.Drawing.Point(12, 51) + Me.lblSummary.Location = New System.Drawing.Point(18, 76) + Me.lblSummary.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSummary.Name = "lblSummary" - Me.lblSummary.Size = New System.Drawing.Size(53, 13) + Me.lblSummary.Size = New System.Drawing.Size(80, 20) Me.lblSummary.TabIndex = 2 Me.lblSummary.Text = "Summary:" ' @@ -227,9 +239,10 @@ Partial Class dlgDescribeTwoVariable ' Me.lblBy.AutoSize = True Me.lblBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblBy.Location = New System.Drawing.Point(82, 16) + Me.lblBy.Location = New System.Drawing.Point(123, 24) + Me.lblBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblBy.Name = "lblBy" - Me.lblBy.Size = New System.Drawing.Size(18, 13) + Me.lblBy.Size = New System.Drawing.Size(25, 20) Me.lblBy.TabIndex = 4 Me.lblBy.Text = "by" ' @@ -237,17 +250,19 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSecondType.AutoSize = True Me.lblSecondType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondType.Location = New System.Drawing.Point(106, 18) + Me.lblSecondType.Location = New System.Drawing.Point(159, 27) + Me.lblSecondType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSecondType.Name = "lblSecondType" - Me.lblSecondType.Size = New System.Drawing.Size(0, 13) + Me.lblSecondType.Size = New System.Drawing.Size(0, 20) Me.lblSecondType.TabIndex = 5 ' 'lblFirstGroupByFactor ' Me.lblFirstGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(315, 149) + Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(472, 224) + Me.lblFirstGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFirstGroupByFactor.Name = "lblFirstGroupByFactor" - Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(100, 15) + Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(150, 22) Me.lblFirstGroupByFactor.TabIndex = 7 Me.lblFirstGroupByFactor.Tag = "" Me.lblFirstGroupByFactor.Text = "Factor (Optional) :" @@ -260,9 +275,10 @@ Partial Class dlgDescribeTwoVariable Me.rdoSkim.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSkim.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSkim.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSkim.Location = New System.Drawing.Point(95, 8) + Me.rdoSkim.Location = New System.Drawing.Point(142, 12) + Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoSkim.Name = "rdoSkim" - Me.rdoSkim.Size = New System.Drawing.Size(100, 28) + Me.rdoSkim.Size = New System.Drawing.Size(150, 42) Me.rdoSkim.TabIndex = 1 Me.rdoSkim.Text = "Skim" Me.rdoSkim.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -271,9 +287,10 @@ Partial Class dlgDescribeTwoVariable 'lblThirdVariable ' Me.lblThirdVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThirdVariable.Location = New System.Drawing.Point(310, 191) + Me.lblThirdVariable.Location = New System.Drawing.Point(465, 286) + Me.lblThirdVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblThirdVariable.Name = "lblThirdVariable" - Me.lblThirdVariable.Size = New System.Drawing.Size(154, 15) + Me.lblThirdVariable.Size = New System.Drawing.Size(231, 22) Me.lblThirdVariable.TabIndex = 13 Me.lblThirdVariable.Tag = "" Me.lblThirdVariable.Text = "Third Variable :" @@ -281,9 +298,10 @@ Partial Class dlgDescribeTwoVariable 'lblSecondGroupByFactor ' Me.lblSecondGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(315, 191) + Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(472, 286) + Me.lblSecondGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSecondGroupByFactor.Name = "lblSecondGroupByFactor" - Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(137, 15) + Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(206, 22) Me.lblSecondGroupByFactor.TabIndex = 33 Me.lblSecondGroupByFactor.Tag = "" Me.lblSecondGroupByFactor.Text = "Second Factor (Optional) :" @@ -296,9 +314,10 @@ Partial Class dlgDescribeTwoVariable Me.rdoTwoVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoTwoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTwoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoTwoVariable.Location = New System.Drawing.Point(191, 8) + Me.rdoTwoVariable.Location = New System.Drawing.Point(286, 12) + Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoTwoVariable.Name = "rdoTwoVariable" - Me.rdoTwoVariable.Size = New System.Drawing.Size(100, 28) + Me.rdoTwoVariable.Size = New System.Drawing.Size(150, 42) Me.rdoTwoVariable.TabIndex = 2 Me.rdoTwoVariable.Text = "Two Variables" Me.rdoTwoVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -307,9 +326,10 @@ Partial Class dlgDescribeTwoVariable 'cmdSummaries ' Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSummaries.Location = New System.Drawing.Point(310, 248) + Me.cmdSummaries.Location = New System.Drawing.Point(465, 372) + Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdSummaries.Name = "cmdSummaries" - Me.cmdSummaries.Size = New System.Drawing.Size(120, 23) + Me.cmdSummaries.Size = New System.Drawing.Size(180, 34) Me.cmdSummaries.TabIndex = 1 Me.cmdSummaries.Tag = "Summaries" Me.cmdSummaries.Text = "Choose Summaries..." @@ -318,9 +338,10 @@ Partial Class dlgDescribeTwoVariable 'lblMarginName ' Me.lblMarginName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMarginName.Location = New System.Drawing.Point(15, 320) + Me.lblMarginName.Location = New System.Drawing.Point(22, 480) + Me.lblMarginName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMarginName.Name = "lblMarginName" - Me.lblMarginName.Size = New System.Drawing.Size(93, 15) + Me.lblMarginName.Size = New System.Drawing.Size(140, 22) Me.lblMarginName.TabIndex = 19 Me.lblMarginName.Tag = "" Me.lblMarginName.Text = "Margin Name:" @@ -329,9 +350,11 @@ Partial Class dlgDescribeTwoVariable ' Me.grpDisplay.Controls.Add(Me.ucrReceiverColumns) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) - Me.grpDisplay.Location = New System.Drawing.Point(276, 185) + Me.grpDisplay.Location = New System.Drawing.Point(414, 278) + Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Size = New System.Drawing.Size(194, 146) + Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDisplay.Size = New System.Drawing.Size(291, 219) Me.grpDisplay.TabIndex = 15 Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" @@ -340,11 +363,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverColumns.AutoSize = True Me.ucrReceiverColumns.frmParent = Me - Me.ucrReceiverColumns.Location = New System.Drawing.Point(13, 61) + Me.ucrReceiverColumns.Location = New System.Drawing.Point(20, 92) Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumns.Name = "ucrReceiverColumns" Me.ucrReceiverColumns.Selector = Nothing - Me.ucrReceiverColumns.Size = New System.Drawing.Size(120, 81) + Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 122) Me.ucrReceiverColumns.strNcFilePath = "" Me.ucrReceiverColumns.TabIndex = 55 Me.ucrReceiverColumns.ucrSelector = Nothing @@ -353,19 +376,18 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkDisplayAsPercentage.AutoSize = True Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(9, 15) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(4) + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(114, 34) + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 51) Me.ucrChkDisplayAsPercentage.TabIndex = 54 ' 'rdoOCol ' Me.rdoOCol.AutoSize = True - Me.rdoOCol.Location = New System.Drawing.Point(288, 224) - Me.rdoOCol.Margin = New System.Windows.Forms.Padding(2) + Me.rdoOCol.Location = New System.Drawing.Point(432, 336) Me.rdoOCol.Name = "rdoOCol" - Me.rdoOCol.Size = New System.Drawing.Size(54, 17) + Me.rdoOCol.Size = New System.Drawing.Size(81, 24) Me.rdoOCol.TabIndex = 40 Me.rdoOCol.TabStop = True Me.rdoOCol.Text = "Col(%)" @@ -374,10 +396,9 @@ Partial Class dlgDescribeTwoVariable 'rdoOCell ' Me.rdoOCell.AutoSize = True - Me.rdoOCell.Location = New System.Drawing.Point(408, 223) - Me.rdoOCell.Margin = New System.Windows.Forms.Padding(2) + Me.rdoOCell.Location = New System.Drawing.Point(612, 334) Me.rdoOCell.Name = "rdoOCell" - Me.rdoOCell.Size = New System.Drawing.Size(56, 17) + Me.rdoOCell.Size = New System.Drawing.Size(84, 24) Me.rdoOCell.TabIndex = 41 Me.rdoOCell.TabStop = True Me.rdoOCell.Text = "Cell(%)" @@ -386,10 +407,9 @@ Partial Class dlgDescribeTwoVariable 'rdoORow ' Me.rdoORow.AutoSize = True - Me.rdoORow.Location = New System.Drawing.Point(345, 224) - Me.rdoORow.Margin = New System.Windows.Forms.Padding(2) + Me.rdoORow.Location = New System.Drawing.Point(518, 336) Me.rdoORow.Name = "rdoORow" - Me.rdoORow.Size = New System.Drawing.Size(61, 17) + Me.rdoORow.Size = New System.Drawing.Size(90, 24) Me.rdoORow.TabIndex = 42 Me.rdoORow.TabStop = True Me.rdoORow.Text = "Row(%)" @@ -399,11 +419,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me - Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(310, 209) + Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 314) Me.ucrReceiverThreeVariableThirdVariable.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableThirdVariable.Name = "ucrReceiverThreeVariableThirdVariable" Me.ucrReceiverThreeVariableThirdVariable.Selector = Nothing - Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverThreeVariableThirdVariable.strNcFilePath = "" Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 14 Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing @@ -412,11 +432,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverPercentages.AutoSize = True Me.ucrReceiverPercentages.frmParent = Me - Me.ucrReceiverPercentages.Location = New System.Drawing.Point(287, 246) + Me.ucrReceiverPercentages.Location = New System.Drawing.Point(430, 369) Me.ucrReceiverPercentages.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPercentages.Name = "ucrReceiverPercentages" Me.ucrReceiverPercentages.Selector = Nothing - Me.ucrReceiverPercentages.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverPercentages.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverPercentages.strNcFilePath = "" Me.ucrReceiverPercentages.TabIndex = 39 Me.ucrReceiverPercentages.ucrSelector = Nothing @@ -424,21 +444,21 @@ Partial Class dlgDescribeTwoVariable 'ucrpnlPercent ' Me.ucrpnlPercent.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrpnlPercent.Location = New System.Drawing.Point(283, 221) - Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(4) + Me.ucrpnlPercent.Location = New System.Drawing.Point(424, 332) + Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrpnlPercent.Name = "ucrpnlPercent" - Me.ucrpnlPercent.Size = New System.Drawing.Size(180, 25) + Me.ucrpnlPercent.Size = New System.Drawing.Size(270, 38) Me.ucrpnlPercent.TabIndex = 43 ' 'ucrReceiverThreeVariableSecondFactor ' Me.ucrReceiverThreeVariableSecondFactor.AutoSize = True Me.ucrReceiverThreeVariableSecondFactor.frmParent = Me - Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(310, 164) + Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(465, 246) Me.ucrReceiverThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableSecondFactor.Name = "ucrReceiverThreeVariableSecondFactor" Me.ucrReceiverThreeVariableSecondFactor.Selector = Nothing - Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverThreeVariableSecondFactor.strNcFilePath = "" Me.ucrReceiverThreeVariableSecondFactor.TabIndex = 12 Me.ucrReceiverThreeVariableSecondFactor.ucrSelector = Nothing @@ -447,11 +467,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverSecondTwoVariableFactor.AutoSize = True Me.ucrReceiverSecondTwoVariableFactor.frmParent = Me - Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(310, 164) + Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(465, 246) Me.ucrReceiverSecondTwoVariableFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondTwoVariableFactor.Name = "ucrReceiverSecondTwoVariableFactor" Me.ucrReceiverSecondTwoVariableFactor.Selector = Nothing - Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSecondTwoVariableFactor.strNcFilePath = "" Me.ucrReceiverSecondTwoVariableFactor.TabIndex = 1 Me.ucrReceiverSecondTwoVariableFactor.ucrSelector = Nothing @@ -460,11 +480,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverFirstVars.AutoSize = True Me.ucrReceiverFirstVars.frmParent = Me - Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(310, 64) + Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(465, 96) Me.ucrReceiverFirstVars.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFirstVars.Name = "ucrReceiverFirstVars" Me.ucrReceiverFirstVars.Selector = Nothing - Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(120, 79) + Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(180, 118) Me.ucrReceiverFirstVars.strNcFilePath = "" Me.ucrReceiverFirstVars.TabIndex = 6 Me.ucrReceiverFirstVars.ucrSelector = Nothing @@ -472,10 +492,10 @@ Partial Class dlgDescribeTwoVariable 'ucrSaveTable ' Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTable.Location = New System.Drawing.Point(15, 451) - Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTable.Location = New System.Drawing.Point(22, 676) + Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveTable.Name = "ucrSaveTable" - Me.ucrSaveTable.Size = New System.Drawing.Size(306, 24) + Me.ucrSaveTable.Size = New System.Drawing.Size(459, 36) Me.ucrSaveTable.TabIndex = 24 ' 'ucrInputMarginName @@ -484,18 +504,18 @@ Partial Class dlgDescribeTwoVariable Me.ucrInputMarginName.AutoSize = True Me.ucrInputMarginName.IsMultiline = False Me.ucrInputMarginName.IsReadOnly = False - Me.ucrInputMarginName.Location = New System.Drawing.Point(114, 318) - Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputMarginName.Location = New System.Drawing.Point(171, 477) + Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) Me.ucrInputMarginName.Name = "ucrInputMarginName" - Me.ucrInputMarginName.Size = New System.Drawing.Size(137, 21) + Me.ucrInputMarginName.Size = New System.Drawing.Size(206, 32) Me.ucrInputMarginName.TabIndex = 22 ' 'ucrReorderSummary ' - Me.ucrReorderSummary.Location = New System.Drawing.Point(275, 273) - Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(6) + Me.ucrReorderSummary.Location = New System.Drawing.Point(412, 410) + Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrReorderSummary.Name = "ucrReorderSummary" - Me.ucrReorderSummary.Size = New System.Drawing.Size(194, 156) + Me.ucrReorderSummary.Size = New System.Drawing.Size(291, 234) Me.ucrReorderSummary.TabIndex = 16 Me.ucrReorderSummary.ucrDataFrameList = Nothing Me.ucrReorderSummary.ucrReceiver = Nothing @@ -504,21 +524,21 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(15, 489) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBase.Location = New System.Drawing.Point(22, 734) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 25 ' 'ucrReceiverSecondSkimrGroupByFactor ' Me.ucrReceiverSecondSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSecondSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(310, 204) + Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(465, 306) Me.ucrReceiverSecondSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondSkimrGroupByFactor.Name = "ucrReceiverSecondSkimrGroupByFactor" Me.ucrReceiverSecondSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSecondSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSecondSkimrGroupByFactor.TabIndex = 34 Me.ucrReceiverSecondSkimrGroupByFactor.ucrSelector = Nothing @@ -529,30 +549,30 @@ Partial Class dlgDescribeTwoVariable Me.ucrSelectorDescribeTwoVar.bDropUnusedFilterLevels = False Me.ucrSelectorDescribeTwoVar.bShowHiddenColumns = False Me.ucrSelectorDescribeTwoVar.bUseCurrentFilter = True - Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(11, 36) + Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(16, 54) Me.ucrSelectorDescribeTwoVar.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorDescribeTwoVar.Name = "ucrSelectorDescribeTwoVar" - Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(320, 274) Me.ucrSelectorDescribeTwoVar.TabIndex = 4 ' 'ucrPnlDescribe ' Me.ucrPnlDescribe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlDescribe.Location = New System.Drawing.Point(92, 3) - Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlDescribe.Location = New System.Drawing.Point(138, 4) + Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrPnlDescribe.Name = "ucrPnlDescribe" - Me.ucrPnlDescribe.Size = New System.Drawing.Size(317, 34) + Me.ucrPnlDescribe.Size = New System.Drawing.Size(476, 51) Me.ucrPnlDescribe.TabIndex = 0 ' 'ucrReceiverSkimrGroupByFactor ' Me.ucrReceiverSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(310, 164) + Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(465, 246) Me.ucrReceiverSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSkimrGroupByFactor.Name = "ucrReceiverSkimrGroupByFactor" Me.ucrReceiverSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSkimrGroupByFactor.TabIndex = 2 Me.ucrReceiverSkimrGroupByFactor.ucrSelector = Nothing @@ -561,98 +581,88 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkDisplayMargins.AutoSize = True Me.ucrChkDisplayMargins.Checked = False - Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(17, 296) - Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(26, 444) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" - Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(143, 23) + Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) Me.ucrChkDisplayMargins.TabIndex = 18 ' - 'ucrChkSummariesRowCol - ' - Me.ucrChkSummariesRowCol.AutoSize = True - Me.ucrChkSummariesRowCol.Checked = False - Me.ucrChkSummariesRowCol.Location = New System.Drawing.Point(15, 338) - Me.ucrChkSummariesRowCol.Margin = New System.Windows.Forms.Padding(6) - Me.ucrChkSummariesRowCol.Name = "ucrChkSummariesRowCol" - Me.ucrChkSummariesRowCol.Size = New System.Drawing.Size(180, 23) - Me.ucrChkSummariesRowCol.TabIndex = 20 - ' 'ucrChkLevSig ' Me.ucrChkLevSig.AutoSize = True Me.ucrChkLevSig.Checked = False - Me.ucrChkLevSig.Location = New System.Drawing.Point(397, 186) - Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkLevSig.Location = New System.Drawing.Point(596, 279) + Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkLevSig.Name = "ucrChkLevSig" - Me.ucrChkLevSig.Size = New System.Drawing.Size(86, 23) + Me.ucrChkLevSig.Size = New System.Drawing.Size(129, 34) Me.ucrChkLevSig.TabIndex = 38 ' 'ucrChkTotal ' Me.ucrChkTotal.AutoSize = True Me.ucrChkTotal.Checked = False - Me.ucrChkTotal.Location = New System.Drawing.Point(310, 186) - Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkTotal.Location = New System.Drawing.Point(465, 279) + Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkTotal.Name = "ucrChkTotal" - Me.ucrChkTotal.Size = New System.Drawing.Size(97, 23) + Me.ucrChkTotal.Size = New System.Drawing.Size(146, 34) Me.ucrChkTotal.TabIndex = 44 ' 'ucrChkMeans ' Me.ucrChkMeans.AutoSize = True Me.ucrChkMeans.Checked = False - Me.ucrChkMeans.Location = New System.Drawing.Point(310, 208) - Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkMeans.Location = New System.Drawing.Point(465, 312) + Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkMeans.Name = "ucrChkMeans" - Me.ucrChkMeans.Size = New System.Drawing.Size(97, 23) + Me.ucrChkMeans.Size = New System.Drawing.Size(146, 34) Me.ucrChkMeans.TabIndex = 37 ' 'ucrChkCorrelations ' Me.ucrChkCorrelations.AutoSize = True Me.ucrChkCorrelations.Checked = False - Me.ucrChkCorrelations.Location = New System.Drawing.Point(310, 254) - Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkCorrelations.Location = New System.Drawing.Point(465, 381) + Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkCorrelations.Name = "ucrChkCorrelations" - Me.ucrChkCorrelations.Size = New System.Drawing.Size(149, 23) + Me.ucrChkCorrelations.Size = New System.Drawing.Size(224, 34) Me.ucrChkCorrelations.TabIndex = 35 ' 'ucrChkSwapXYVar ' Me.ucrChkSwapXYVar.AutoSize = True Me.ucrChkSwapXYVar.Checked = False - Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(310, 231) - Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(465, 346) + Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkSwapXYVar.Name = "ucrChkSwapXYVar" - Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(157, 23) + Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(236, 34) Me.ucrChkSwapXYVar.TabIndex = 36 ' 'ucrChkOmitMissing ' Me.ucrChkOmitMissing.AutoSize = True Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(310, 277) - Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(465, 416) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" - Me.ucrChkOmitMissing.Size = New System.Drawing.Size(143, 23) + Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) Me.ucrChkOmitMissing.TabIndex = 0 ' 'ucrChkInteraction ' Me.ucrChkInteraction.AutoSize = True Me.ucrChkInteraction.Checked = False - Me.ucrChkInteraction.Location = New System.Drawing.Point(310, 300) - Me.ucrChkInteraction.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkInteraction.Location = New System.Drawing.Point(465, 450) + Me.ucrChkInteraction.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkInteraction.Name = "ucrChkInteraction" - Me.ucrChkInteraction.Size = New System.Drawing.Size(143, 23) + Me.ucrChkInteraction.Size = New System.Drawing.Size(214, 34) Me.ucrChkInteraction.TabIndex = 45 ' 'dlgDescribeTwoVariable ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ClientSize = New System.Drawing.Size(482, 467) + Me.ClientSize = New System.Drawing.Size(723, 700) Me.Controls.Add(Me.cmdSummaries) Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) Me.Controls.Add(Me.ucrReceiverPercentages) @@ -685,7 +695,6 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.lblThreeVariableSecondFactor) Me.Controls.Add(Me.ucrChkDisplayMargins) Me.Controls.Add(Me.cmdMissingOptions) - Me.Controls.Add(Me.ucrChkSummariesRowCol) Me.Controls.Add(Me.lblThirdVariable) Me.Controls.Add(Me.ucrChkLevSig) Me.Controls.Add(Me.ucrChkTotal) @@ -695,6 +704,7 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.ucrChkOmitMissing) Me.Controls.Add(Me.ucrChkInteraction) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDescribeTwoVariable" @@ -746,7 +756,6 @@ Partial Class dlgDescribeTwoVariable Friend WithEvents ucrChkDisplayAsPercentage As ucrCheck Friend WithEvents ucrSaveTable As ucrSave Friend WithEvents ucrReceiverFirstVars As ucrReceiverMultiple - Friend WithEvents ucrChkSummariesRowCol As ucrCheck Friend WithEvents ucrChkCorrelations As ucrCheck Friend WithEvents ucrChkSwapXYVar As ucrCheck Friend WithEvents ucrChkMeans As ucrCheck diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 63655ff6eb..0c596bd1a0 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -146,10 +146,6 @@ Public Class dlgDescribeTwoVariable ucrChkDisplayAsPercentage.AddToLinkedControls(ucrReceiverPercentages, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedUpdateFunction:=True) ucrChkDisplayAsPercentage.AddToLinkedControls(ucrpnlPercent, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkSummariesRowCol.SetText("Summaries in Rows") - ucrChkSummariesRowCol.AddParameterValuesCondition(True, "row_sum", "True") - ucrChkSummariesRowCol.AddParameterValuesCondition(False, "row_sum", "False") - ucrChkCorrelations.SetText("Correlations") ucrChkCorrelations.AddParameterValuesCondition(True, "corr", "True") ucrChkCorrelations.AddParameterValuesCondition(False, "corr", "False") @@ -530,7 +526,6 @@ Public Class dlgDescribeTwoVariable ucrReceiverColumns.SetRCode(clsCombineFrequencyColParametersFunction, bReset) ucrPnlDescribe.SetRCode(clsDummyFunction, bReset) ucrpnlPercent.SetRCode(clsDummyFunction, bReset) - ucrChkSummariesRowCol.SetRCode(clsDummyFunction, bReset) ucrChkCorrelations.SetRCode(clsDummyFunction, bReset) ucrChkSwapXYVar.SetRCode(clsDummyFunction, bReset) ucrChkMeans.SetRCode(clsRAnovaTable2Function, bReset) @@ -640,7 +635,7 @@ Public Class dlgDescribeTwoVariable Private Sub ManageControlsVisibility() grpSummaries.Visible = rdoThreeVariable.Checked OrElse rdoTwoVariable.Checked ucrChkDisplayMargins.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() - ucrChkDisplayMargins.Visible = rdoThreeVariable.Checked AndAlso IsFactorByFactorByFactor() + ucrChkDisplayMargins.Visible = rdoThreeVariable.Checked AndAlso IsFactorByFactorByFactor() OrElse IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactor() grpDisplay.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() ucrReceiverPercentages.Visible = ucrChkDisplayAsPercentage.Checked AndAlso rdoORow.Checked AndAlso IsFactorByFactor() @@ -666,7 +661,7 @@ Public Class dlgDescribeTwoVariable ucrReorderSummary.Visible = False cmdSummaries.Visible = False End If - ucrChkSummariesRowCol.Visible = IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() + 'ucrChkSummariesRowCol.Visible = IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() ucrChkOmitMissing.Visible = IsFactorByNumericByFactor() OrElse IsFactorByFactorByNumeric() cmdMissingOptions.Visible = ucrChkOmitMissing.Checked End If @@ -676,7 +671,6 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.Visible = False ucrReorderSummary.Visible = False cmdSummaries.Visible = False - ucrChkSummariesRowCol.Visible = False cmdFormatTable.Visible = False ucrChkMeans.Visible = False ucrChkLevSig.Visible = False @@ -773,7 +767,6 @@ Public Class dlgDescribeTwoVariable clsDummyFunction.AddParameter("var", "True", iPosition:=5) ucrReorderSummary.Visible = False cmdSummaries.Visible = False - ucrChkSummariesRowCol.Visible = False cmdFormatTable.Visible = False ucrChkInteraction.Visible = False ucrChkOmitMissing.Visible = False @@ -789,7 +782,6 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.Visible = True ucrReorderSummary.Visible = True cmdSummaries.Visible = True - ucrChkSummariesRowCol.Visible = True cmdFormatTable.Visible = True ucrChkOmitMissing.Visible = True ucrChkMeans.Visible = False @@ -838,12 +830,13 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") ucrSaveTable.SetCheckBoxText("Store Cor") - ucrBase.clsRsyntax.SetBaseROperator(clsGroupByPipeOperator4) - clsGroupByPipeOperator4.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) + clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, strRObjectFormatToAssignTo:=RObjectFormat.Html, strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, strObjectName:="last_table") + ElseIf IsNumericByNumericByFactor() Then cmdFormatTable.Visible = False ucrSaveTable.Visible = False @@ -909,7 +902,6 @@ Public Class dlgDescribeTwoVariable cmdSummaries.Visible = True ucrSaveTable.Visible = True ucrChkOmitMissing.Visible = True - ucrChkSummariesRowCol.Visible = True ucrSaveTable.Location = New Point(23, 440) ucrChkOmitMissing.Location = New Point(15, 360) cmdMissingOptions.Location = New Point(17, 380) @@ -918,6 +910,7 @@ Public Class dlgDescribeTwoVariable FactorColumns() AddInteraction() AddRemoveSecondAnovaParam() + AddRemoveThirdCorrParam() End Sub Private Sub UpdateCombineFactorParameterFunction() @@ -1093,10 +1086,12 @@ Public Class dlgDescribeTwoVariable If rdoThreeVariable.Checked Then If IsFactorByNumericByNumeric() Then If ucrReceiverThreeVariableThirdVariable.IsEmpty Then - clsCorrFunction.RemoveParameterByName("y") + clsSummaryTableFunction.RemoveParameterByName("y") Else - clsCorrFunction.AddParameter("y", ucrReceiverThreeVariableThirdVariable.GetVariableNames(False), iPosition:=2, bIncludeArgumentName:=False) + clsSummaryTableFunction.AddParameter("y", ucrReceiverThreeVariableThirdVariable.GetVariableNames) End If + Else + clsSummaryTableFunction.RemoveParameterByName("y") End If End If End Sub @@ -1112,12 +1107,10 @@ Public Class dlgDescribeTwoVariable clsPivotWiderFunction.AddParameter("names_from", "{{ .x }}", iPosition:=1) clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverSecondTwoVariableFactor.GetVariableNames) clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames, iPosition:=3) - SummariesInRowsOrCols() Else clsSummaryTableFunction.AddParameter("factors", ucrReceiverSecondTwoVariableFactor.GetVariableNames) clsPivotWiderFunction.AddParameter("names_from", Chr(39) & "summary-variable" & Chr(39), iPosition:=1) clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverFirstVars.GetVariableNames) - SummariesInRowsOrCols() End If End If If rdoThreeVariable.Checked Then @@ -1130,16 +1123,19 @@ Public Class dlgDescribeTwoVariable clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames) clsSummaryTableFunction.AddParameter("factors", "c(" & ".x" & "," & ucrReceiverThreeVariableSecondFactor.GetVariableNames & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableThirdVariable.GetVariableNames) - SummariesInRowsOrCols() ElseIf IsFactorByNumericByFactor() Then clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames) clsSummaryTableFunction.AddParameter("factors", "c(" & ".x" & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableSecondFactor.GetVariableNames) - SummariesInRowsOrCols() + ElseIf IsFactorByNumericByNumeric Then + clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames) + clsPivotWiderFunction.AddParameter("names_from", Chr(39) & "summary-variable" & Chr(39), iPosition:=0) + clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableSecondFactor.GetVariableNames) + clsSummaryTableFunction.AddParameter("summaries", Chr(34) & "summary_cor" & Chr(34), iPosition:=0) + clsSummaryTableFunction.AddParameter("factors", ".x") Else clsPivotWiderFunction.AddParameter("names_from", Chr(39) & "summary-variable" & Chr(39), iPosition:=0) clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverFirstVars.GetVariableNames) - SummariesInRowsOrCols() End If End If End Sub @@ -1392,7 +1388,7 @@ Public Class dlgDescribeTwoVariable clsCombineFrequencyColParametersFunction.RemoveParameterByName("margin_name") clsCombineFrequencyParametersFunction.RemoveParameterByName("margin_name") End If - If rdoThreeVariable.Checked AndAlso IsFactorByFactorByFactor() Then + If rdoThreeVariable.Checked AndAlso IsFactorByFactorByFactor() OrElse IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() Then If ucrChkDisplayMargins.Checked Then ucrInputMarginName.Visible = True clsThreeVariableCombineFrequencyParametersFunction.AddParameter("margin_name", Chr(34) & ucrInputMarginName.GetText & Chr(34), iPosition:=6) @@ -1524,17 +1520,6 @@ Public Class dlgDescribeTwoVariable ManageControlsVisibility() End Sub - Private Sub SummariesInRowsOrCols() - If ucrChkSummariesRowCol.Checked Then - clsPivotWiderFunction.AddParameter("names_from", "{{ .x }}", iPosition:=1) - clsDummyFunction.AddParameter("row_sum", "True", iPosition:=3) - Else - clsPivotWiderFunction.AddParameter("names_from", Chr(39) & "summary-variable" & Chr(39), iPosition:=1) - clsDummyFunction.AddParameter("row_sum", "False", iPosition:=3) - End If - ManageControlsVisibility() - End Sub - Private Sub ucrReceiverSecondTwoVariableFactor_ValueAndContentChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSecondTwoVariableFactor.ControlValueChanged, ucrReceiverSecondTwoVariableFactor.ControlContentsChanged AssignSecondVariableType() @@ -1632,6 +1617,7 @@ Public Class dlgDescribeTwoVariable AddRemoveSecondCorrParam() AddRemoveSecondAnovaParam() AddRemoveFirstAnova2Param() + UpdateSummaryTableFunction() FactorColumns() ChangeLocations() ChangeSumaryLabelText() @@ -1758,12 +1744,6 @@ Public Class dlgDescribeTwoVariable Next End Sub - Private Sub ucrChkSummariesRowCol_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSummariesRowCol.ControlValueChanged - ManageControlsVisibility() - SummariesInRowsOrCols() - ChangeBaseRCode() - End Sub - Private Sub ucrChkCorrelations_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkCorrelations.ControlValueChanged ChangeBaseRCode() If ucrChkCorrelations.Checked AndAlso Not ucrReceiverFirstVars.IsEmpty Then From a0c8ec9c6a03e767c714e245b585a605483d9171 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Tue, 12 Nov 2024 11:54:49 +0000 Subject: [PATCH 09/20] Update summary_functions.R --- .../InstatObject/R/Backend_Components/summary_functions.R | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/Backend_Components/summary_functions.R b/instat/static/InstatObject/R/Backend_Components/summary_functions.R index 397a72b261..3b65addf8e 100644 --- a/instat/static/InstatObject/R/Backend_Components/summary_functions.R +++ b/instat/static/InstatObject/R/Backend_Components/summary_functions.R @@ -192,7 +192,10 @@ DataBook$set("public", "calculate_summary", function(data_name, columns_to_summa # function_exp <- paste0(function_exp, ", na.rm =", na.rm, ")") if(is.null(result_names)) { result_name = summaries_display[j] - if(include_columns_to_summarise) result_name = paste0(result_name, sep, column_names) + if(include_columns_to_summarise){ + if (!is.null(extra_args$y)) result_name <- paste0(result_name, sep, extra_args$y, sep, column_names) + else result_name <- paste0(result_name, sep, column_names) + } } #TODO result_names could be horizontal/vertical vector, matrix or single value else result_name <- result_names[i,j] From ea551584ebf6974eb7115b28e521197fcbe5e0d6 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 13 Nov 2024 14:56:16 +0300 Subject: [PATCH 10/20] changes to the code --- instat/dlgDescribeTwoVariable.vb | 106 ++++++++++++++++++++++++++++--- 1 file changed, 97 insertions(+), 9 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 0c596bd1a0..00e2569697 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -42,7 +42,7 @@ Public Class dlgDescribeTwoVariable clsTabFootnoteSubtitleFunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsTableTitleFunction, clsThemesTabOptionFunction, clsTabStyleCellTextFunction, clsTabStyleCellTitleFunction, clsTabStyleFunction, - clsTabStylePxFunction, clsgtExtrasThemesFuction As New RFunction + clsTabStylePxFunction, clsgtExtrasThemesFuction, clsCrossDfFunction, clsListFunction As New RFunction Private clsGroupByPipeOperator, clsSummaryOperator, clsGroupByPipeOperator2, clsGroupByPipeOperator3, clsGroupByPipeOperator4, clsGroupByPipeOperatorData As New ROperator @@ -50,14 +50,14 @@ Public Class dlgDescribeTwoVariable Private clsTildOperator, clsMapOperator, clsPivotOperator As New ROperator - Private clsgtFunction, clsMapSummaryFunction, clsMapGtFunction As New RFunction + Private clsgtFunction, clsMapSummaryFunction, clsMap2SummaryFunction, clsMapGtFunction As New RFunction 'Frequency Parameters Private lstFrequencyParameters As New List(Of String)({"percentage_type", "margin_name", "perc_total_factors", "perc_decimal", "signif_fig", "include_margins"}) 'Format Operators - Private clsPipeOperator, clsTabFootnoteOperator, + Private clsPipeOperator, clsFactorOperator, clsSummariesOperator, clsTabFootnoteOperator, clsJoiningPipeOperator, clsMutableOperator, clsAnovaSwapTable2Opeator, clsAnovaTable2Operator, clsYlist2Operator, clsYlistOperator As New ROperator Private iUcrBaseXLocation, iDialogueXsize As Integer @@ -267,11 +267,16 @@ Public Class dlgDescribeTwoVariable clsYlist2Operator = New ROperator clsRAnovaTable2Function = New RFunction clsRAnovaSwapTable2Funtion = New RFunction + clsCrossDfFunction = New RFunction + clsListFunction = New RFunction + clsMap2SummaryFunction = New RFunction clsTildOperator = New ROperator clsMapSummaryFunction = New RFunction clsMapGtFunction = New RFunction clsPivotOperator = New ROperator + clsFactorOperator = New ROperator + clsSummariesOperator = New ROperator ucrSelectorDescribeTwoVar.Reset() ucrReceiverFirstVars.SetMeAsReceiver() @@ -284,6 +289,25 @@ Public Class dlgDescribeTwoVariable clsCombineFunction.SetRCommand("c") + clsSummariesOperator.SetOperation("", bBracketsTemp:=False) + clsSummariesOperator.SetAssignTo("summaries") + + clsFactorOperator.SetOperation("", bBracketsTemp:=False) + clsFactorOperator.SetAssignTo("factors") + + clsListFunction.SetRCommand("list") + clsListFunction.AddParameter("factor", "factors", iPosition:=0) + clsListFunction.AddParameter("summary", "summaries", iPosition:=1) + + clsCrossDfFunction.SetRCommand("cross_df") + clsCrossDfFunction.AddParameter("list", clsRFunctionParameter:=clsListFunction, iPosition:=0, bIncludeArgumentName:=False) + clsCrossDfFunction.SetAssignTo("combinations") + + clsMap2SummaryFunction.SetPackageName("purrr") + clsMap2SummaryFunction.SetRCommand("map2") + clsMap2SummaryFunction.AddParameter(".x", "combinations$factor", iPosition:=0) + clsMap2SummaryFunction.AddParameter(".y", "combinations$summary", iPosition:=1) + clsDummyFunction.AddParameter("checked", "skim", iPosition:=0) clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) clsDummyFunction.AddParameter("theme", "select", iPosition:=2) @@ -429,7 +453,6 @@ Public Class dlgDescribeTwoVariable clsMapSummaryFunction.SetPackageName("purrr") clsMapSummaryFunction.SetRCommand("map") - clsMapSummaryFunction.AddParameter(".f", clsROperatorParameter:=clsMapOperator, iPosition:=1) clsMapGtFunction.SetPackageName("purrr") clsMapGtFunction.SetRCommand("map") @@ -440,7 +463,6 @@ Public Class dlgDescribeTwoVariable clsSummaryOperator.SetOperation("%>%") clsSummaryOperator.AddParameter("data", clsRFunctionParameter:=ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) - clsSummaryOperator.AddParameter("tableFun", clsRFunctionParameter:=clsMapSummaryFunction, iPosition:=1) clsPivotOperator.SetOperation("%>%") clsPivotOperator.AddParameter("left", clsRFunctionParameter:=clsPivotWiderFunction) @@ -495,6 +517,7 @@ Public Class dlgDescribeTwoVariable ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetBaseROperator(clsGroupByPipeOperator) + ThreeVarSummariesVar() bResetSubdialog = True End Sub @@ -541,6 +564,7 @@ Public Class dlgDescribeTwoVariable AddRemoveTotalParm() AddInteraction() ChangeBaseRCode() + ThreeVarSummariesVar() End Sub Public Sub TestOKEnabled() @@ -816,6 +840,9 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") ucrSaveTable.SetCheckBoxText("Store Table") + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, @@ -830,6 +857,9 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") ucrSaveTable.SetCheckBoxText("Store Cor") + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, @@ -848,10 +878,16 @@ Public Class dlgDescribeTwoVariable ucrChkLevSig.Location = New Point(397, 250) ucrChkMeans.Location = New Point(310, 275) If ucrChkSwapXYVar.Checked Then + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseRFunction(clsMapping2Function) clsDummyFunction.AddParameter("var", "True", iPosition:=5) Else clsDummyFunction.AddParameter("var", "False", iPosition:=5) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) End If ElseIf IsNumericByNumericByNumeric() Then @@ -864,6 +900,9 @@ Public Class dlgDescribeTwoVariable ucrChkTotal.Location = New Point(310, 250) ucrChkLevSig.Location = New Point(397, 250) ucrChkMeans.Location = New Point(310, 275) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsNumericByFactorByFactor() Then cmdFormatTable.Visible = False @@ -875,6 +914,9 @@ Public Class dlgDescribeTwoVariable ucrChkTotal.Location = New Point(310, 250) ucrChkLevSig.Location = New Point(397, 250) ucrChkMeans.Location = New Point(310, 275) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsNumericByFactorByNumeric() Then cmdFormatTable.Visible = False @@ -886,12 +928,18 @@ Public Class dlgDescribeTwoVariable ucrChkTotal.Location = New Point(310, 250) ucrChkLevSig.Location = New Point(397, 250) ucrChkMeans.Location = New Point(310, 275) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsFactorByNumericByFactor() OrElse IsFactorByFactorByNumeric() Then ucrSaveTable.SetPrefix("summary_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") ucrSaveTable.SetCheckBoxText("Save Table") + ucrBase.clsRsyntax.AddToBeforeCodes(clsSummariesOperator, 0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsFactorOperator, 1) + ucrBase.clsRsyntax.AddToBeforeCodes(clsCrossDfFunction, 2) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, @@ -911,6 +959,7 @@ Public Class dlgDescribeTwoVariable AddInteraction() AddRemoveSecondAnovaParam() AddRemoveThirdCorrParam() + ThreeVarSummariesVar() End Sub Private Sub UpdateCombineFactorParameterFunction() @@ -996,6 +1045,7 @@ Public Class dlgDescribeTwoVariable AddRemoveSecondAnovaParam() AddRemoveThirdAnovaParam() AddRemoveFirstAnova2Param() + ThreeVarSummariesVar() End Sub Private Sub ChangeLocations() @@ -1114,29 +1164,66 @@ Public Class dlgDescribeTwoVariable End If End If If rdoThreeVariable.Checked Then - clsSummaryOperator.AddParameter("col_factor", clsRFunctionParameter:=clsPivotWiderFunction, iPosition:=1) If IsFactorByFactorByFactor() Then clsSummaryTableFunction.AddParameter("factors", "c(" & ucrReceiverThreeVariableSecondFactor.GetVariableNames & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & "," & ".x" & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ".x") clsPivotWiderFunction.AddParameter("names_from", "{{ .x }}", iPosition:=1) + clsSummaryOperator.AddParameter("col_factor", clsRFunctionParameter:=clsPivotWiderFunction, iPosition:=1) ElseIf IsFactorByFactorByNumeric() Then - clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames) + 'clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames) clsSummaryTableFunction.AddParameter("factors", "c(" & ".x" & "," & ucrReceiverThreeVariableSecondFactor.GetVariableNames & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableThirdVariable.GetVariableNames) + clsSummaryTableFunction.AddParameter("summaries", ".y", iPosition:=0) + clsSummaryOperator.RemoveParameterByName("col_factor") ElseIf IsFactorByNumericByFactor() Then - clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames) + 'clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames) clsSummaryTableFunction.AddParameter("factors", "c(" & ".x" & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableSecondFactor.GetVariableNames) - ElseIf IsFactorByNumericByNumeric Then + clsSummaryTableFunction.AddParameter("summaries", ".y", iPosition:=0) + clsSummaryOperator.RemoveParameterByName("col_factor") + ElseIf IsFactorByNumericByNumeric() Then clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames) clsPivotWiderFunction.AddParameter("names_from", Chr(39) & "summary-variable" & Chr(39), iPosition:=0) clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableSecondFactor.GetVariableNames) clsSummaryTableFunction.AddParameter("summaries", Chr(34) & "summary_cor" & Chr(34), iPosition:=0) clsSummaryTableFunction.AddParameter("factors", ".x") + clsSummaryOperator.AddParameter("col_factor", clsRFunctionParameter:=clsPivotWiderFunction, iPosition:=1) Else clsPivotWiderFunction.AddParameter("names_from", Chr(39) & "summary-variable" & Chr(39), iPosition:=0) clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverFirstVars.GetVariableNames) + clsSummaryOperator.AddParameter("col_factor", clsRFunctionParameter:=clsPivotWiderFunction, iPosition:=1) + End If + End If + ThreeVarSummariesVar() + End Sub + + Private Sub ThreeVarSummariesVar() + clsMap2SummaryFunction.RemoveParameterByName(".f") + clsMapSummaryFunction.RemoveParameterByName(".f") + clsSummaryOperator.RemoveParameterByName("right") + clsSummaryOperator.RemoveParameterByName("tableFun") + If rdoThreeVariable.Checked Then + If IsFactorByNumericByFactor() OrElse IsFactorByFactorByNumeric() Then + clsFactorOperator.AddParameter("factors", ucrReceiverFirstVars.GetVariableNames, iPosition:=0, bIncludeArgumentName:=False) + clsSummariesOperator.AddParameter("summary", clsRFunctionParameter:=clsSummariesListFunction, iPosition:=0, bIncludeArgumentName:=False) + clsMap2SummaryFunction.AddParameter(".f", clsROperatorParameter:=clsMapOperator, iPosition:=2) + clsSummaryOperator.AddParameter("right", clsRFunctionParameter:=clsMap2SummaryFunction, iPosition:=2) + + ElseIf IsFactorByNumericByNumeric() Then + clsMapSummaryFunction.AddParameter(".f", clsROperatorParameter:=clsMapOperator, iPosition:=1) + clsSummaryOperator.AddParameter("tableFun", clsRFunctionParameter:=clsMapSummaryFunction, iPosition:=2) + + ElseIf IsFactorByNumericByNumeric() Then + clsMapSummaryFunction.AddParameter(".f", clsROperatorParameter:=clsMapOperator, iPosition:=1) + clsSummaryOperator.AddParameter("tableFun", clsRFunctionParameter:=clsMapSummaryFunction, iPosition:=2) + + ElseIf IsFactorByFactorByFactor() Then + clsMapSummaryFunction.AddParameter(".f", clsROperatorParameter:=clsMapOperator, iPosition:=1) + clsSummaryOperator.AddParameter("tableFun", clsRFunctionParameter:=clsMapSummaryFunction, iPosition:=2) End If + ElseIf rdoTwoVariable.Checked Then + clsMapSummaryFunction.AddParameter(".f", clsROperatorParameter:=clsMapOperator, iPosition:=1) + clsSummaryOperator.AddParameter("tableFun", clsRFunctionParameter:=clsMapSummaryFunction, iPosition:=2) End If End Sub @@ -1608,6 +1695,7 @@ Public Class dlgDescribeTwoVariable AddRemoveThirdAnovaParam() AddRemoveFirstAnova2Param() AddingColumnFactor() + ThreeVarSummariesVar() End Sub Private Sub ucrReceiverThreeVariableSecondFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverThreeVariableSecondFactor.ControlValueChanged From 1eb87993576282485c8c75b3cd2adb16d315ea45 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 13 Nov 2024 14:57:42 +0300 Subject: [PATCH 11/20] changes --- instat/dlgDescribeTwoVariable.vb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 00e2569697..da77498a12 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -685,7 +685,6 @@ Public Class dlgDescribeTwoVariable ucrReorderSummary.Visible = False cmdSummaries.Visible = False End If - 'ucrChkSummariesRowCol.Visible = IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() ucrChkOmitMissing.Visible = IsFactorByNumericByFactor() OrElse IsFactorByFactorByNumeric() cmdMissingOptions.Visible = ucrChkOmitMissing.Checked End If @@ -1075,7 +1074,6 @@ Public Class dlgDescribeTwoVariable If IsNumericByNumericByFactor() OrElse IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then ucrBase.Location = New Point(iUcrBaseXLocation, 353) - 'ucrChkSwapXYVar.Location = New Point(300, 320) Me.Size = New Point(iDialogueXsize, 450) ElseIf IsFactorByFactorByFactor() Then ucrBase.Location = New Point(iUcrBaseXLocation, 370) @@ -1170,13 +1168,11 @@ Public Class dlgDescribeTwoVariable clsPivotWiderFunction.AddParameter("names_from", "{{ .x }}", iPosition:=1) clsSummaryOperator.AddParameter("col_factor", clsRFunctionParameter:=clsPivotWiderFunction, iPosition:=1) ElseIf IsFactorByFactorByNumeric() Then - 'clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames) clsSummaryTableFunction.AddParameter("factors", "c(" & ".x" & "," & ucrReceiverThreeVariableSecondFactor.GetVariableNames & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableThirdVariable.GetVariableNames) clsSummaryTableFunction.AddParameter("summaries", ".y", iPosition:=0) clsSummaryOperator.RemoveParameterByName("col_factor") ElseIf IsFactorByNumericByFactor() Then - 'clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames) clsSummaryTableFunction.AddParameter("factors", "c(" & ".x" & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableSecondFactor.GetVariableNames) clsSummaryTableFunction.AddParameter("summaries", ".y", iPosition:=0) From 24efb050f7c298dcf7735732507d474c9b8db3dd Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 13 Nov 2024 20:58:43 +0300 Subject: [PATCH 12/20] changes made --- instat/dlgDescribeTwoVariable.vb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index da77498a12..41067cc609 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -659,8 +659,9 @@ Public Class dlgDescribeTwoVariable Private Sub ManageControlsVisibility() grpSummaries.Visible = rdoThreeVariable.Checked OrElse rdoTwoVariable.Checked ucrChkDisplayMargins.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() - ucrChkDisplayMargins.Visible = rdoThreeVariable.Checked AndAlso IsFactorByFactorByFactor() OrElse IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() - ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactor() + ucrChkDisplayMargins.Visible = rdoThreeVariable.Checked AndAlso IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() + ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso (IsFactorByFactor() OrElse IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor()) + ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() grpDisplay.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() ucrReceiverPercentages.Visible = ucrChkDisplayAsPercentage.Checked AndAlso rdoORow.Checked AndAlso IsFactorByFactor() ucrpnlPercent.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() AndAlso ucrChkDisplayAsPercentage.Checked @@ -1165,18 +1166,21 @@ Public Class dlgDescribeTwoVariable If IsFactorByFactorByFactor() Then clsSummaryTableFunction.AddParameter("factors", "c(" & ucrReceiverThreeVariableSecondFactor.GetVariableNames & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & "," & ".x" & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ".x") - clsPivotWiderFunction.AddParameter("names_from", "{{ .x }}", iPosition:=1) + clsPivotWiderFunction.AddParameter("names_from", ucrReceiverThreeVariableThirdVariable.GetVariableNames(False), iPosition:=0) clsSummaryOperator.AddParameter("col_factor", clsRFunctionParameter:=clsPivotWiderFunction, iPosition:=1) ElseIf IsFactorByFactorByNumeric() Then clsSummaryTableFunction.AddParameter("factors", "c(" & ".x" & "," & ucrReceiverThreeVariableSecondFactor.GetVariableNames & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableThirdVariable.GetVariableNames) clsSummaryTableFunction.AddParameter("summaries", ".y", iPosition:=0) + clsPivotWiderFunction.AddParameter("names_from", ucrReceiverThreeVariableSecondFactor.GetVariableNames(False), iPosition:=0) clsSummaryOperator.RemoveParameterByName("col_factor") ElseIf IsFactorByNumericByFactor() Then clsSummaryTableFunction.AddParameter("factors", "c(" & ".x" & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableSecondFactor.GetVariableNames) clsSummaryTableFunction.AddParameter("summaries", ".y", iPosition:=0) clsSummaryOperator.RemoveParameterByName("col_factor") + clsPivotWiderFunction.AddParameter("names_from", ucrReceiverThreeVariableThirdVariable.GetVariableNames(False), iPosition:=0) + ElseIf IsFactorByNumericByNumeric() Then clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames) clsPivotWiderFunction.AddParameter("names_from", Chr(39) & "summary-variable" & Chr(39), iPosition:=0) From 98833d78f730860d5bf9c809bbd8222139d69abf Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 14 Nov 2024 16:51:37 +0300 Subject: [PATCH 13/20] changes --- instat/dlgDescribeTwoVariable.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 41067cc609..57cc5ed7db 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -659,9 +659,9 @@ Public Class dlgDescribeTwoVariable Private Sub ManageControlsVisibility() grpSummaries.Visible = rdoThreeVariable.Checked OrElse rdoTwoVariable.Checked ucrChkDisplayMargins.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() - ucrChkDisplayMargins.Visible = rdoThreeVariable.Checked AndAlso IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() + ucrChkDisplayMargins.Visible = rdoThreeVariable.Checked AndAlso IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() OrElse IsFactorByFactorByFactor() ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso (IsFactorByFactor() OrElse IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor()) - ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() + ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() OrElse IsFactorByFactorByFactor() grpDisplay.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() ucrReceiverPercentages.Visible = ucrChkDisplayAsPercentage.Checked AndAlso rdoORow.Checked AndAlso IsFactorByFactor() ucrpnlPercent.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() AndAlso ucrChkDisplayAsPercentage.Checked From d71a1c49052ff5aed8519f0e0c29c64a86b67d65 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 18 Nov 2024 18:51:58 +0300 Subject: [PATCH 14/20] changes to the code --- instat/static/InstatObject/R/data_object_R6.R | 156 ++++++++++++------ 1 file changed, 104 insertions(+), 52 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 4432f8e8bd..35c771e3cb 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4655,56 +4655,108 @@ DataSheet$set("public", "has_labels", function(col_names) { ) DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total = FALSE, signif.stars = FALSE, sign_level = FALSE, means = FALSE, interaction = FALSE) { - if (missing(x_col_names) || missing(y_col_name)) stop("Both x_col_names and y_col_names are required") - if (sign_level || signif.stars) message("This is no longer descriptive") - if (sign_level) end_col = 5 else end_col = 4 - - # Construct the formula with interaction if required - if (length(x_col_names) == 1) { - formula_str <- paste0(as.name(y_col_name), "~ ", as.name(x_col_names)) - } else if (length(x_col_names) > 1) { - if (interaction) { - formula_str <- paste0(as.name(y_col_name), "~ (", as.name(paste(x_col_names, collapse = " * ")), ")") - } else { - formula_str <- paste0(as.name(y_col_name), "~ ", as.name(paste(x_col_names, collapse = " + "))) - } - } - - # Fit the model - mod <- lm(formula = as.formula(formula_str), data = self$get_data_frame()) - anova_mod <- anova(mod)[1:end_col] %>% tibble::as_tibble(rownames = " ") - - # Add the total row if requested - if (total) anova_mod <- anova_mod %>% tibble::add_row(` ` = "Total", dplyr::summarise(., across(where(is.numeric), sum))) - anova_mod$`F value` <- round(anova_mod$`F value`, 4) - if (sign_level) anova_mod$`Pr(>F)` <- format.pval(anova_mod$`Pr(>F)`, digits = 4, eps = 0.001) - - cat(paste0("ANOVA of ", formula_str, ":\n")) - print(anova_mod) - cat("\n") - - # Optionally print means or model coefficients - if (means) { - has_numeric <- any(sapply(x_col_names, function(x) class(mod$model[[x]]) %in% c("numeric", "integer"))) - has_factor <- any(sapply(x_col_names, function(x) class(mod$model[[x]]) == "factor")) - - # If both numeric and factor are present, print the model coefficients - if (has_numeric && has_factor) { - cat("Model coefficients:\n") - print(mod$coefficients) - cat("\n") - } else { - # Handle the original case when only numeric or factor is present - if (class(mod$model[[x_col_names[[1]]]]) %in% c("numeric", "integer")) { - cat("Model coefficients:\n") - print(mod$coefficients) - cat("\n") - } else { - cat(paste0("Means table of ", y_col_name, ":\n")) - print(model.tables(aov(mod), type = "means")) - cat("\n") - } - } - } -} + # Check if required columns are provided + if (missing(x_col_names) || missing(y_col_name)) stop("Both x_col_names and y_col_names are required") + if (sign_level || signif.stars) message("This is no longer descriptive") + + # Determine the column to end the ANOVA table at + if (sign_level) end_col = 5 else end_col = 4 + + # Construct the formula for ANOVA and choosing whether you want an interaction or not + if (length(x_col_names) == 1) { + formula_str <- paste0(as.name(y_col_name), "~ ", as.name(x_col_names)) + } else if (interaction && length(x_col_names) > 1) { + formula_str <- paste0(as.name(y_col_name), " ~ ", as.name(paste(x_col_names, collapse = " * "))) + } else { + formula_str <- paste0(as.name(y_col_name), " ~ ", as.name(paste(x_col_names, collapse = " + "))) + } + + # Fit the model + mod <- lm(formula = as.formula(formula_str), data = self$get_data_frame()) + + # Start ANOVA table generation + anova_mod <- anova(mod)[1:end_col] + + # Rounding values in the ANOVA table + anova_mod1 <- anova_mod %>% + dplyr::mutate( + `Sum Sq` = signif(`Sum Sq`, 3), + `Mean Sq` = signif(`Mean Sq`, 3), + `F value` = ifelse(`F value` < 100, round(`F value`, 1), round(`F value`)) + ) + + + # Convert `F value` and ` then replace NA with "--" + anova_mod1 <- anova_mod1 %>% + dplyr::mutate(`F value` = as.character(`F value`)) %>% # Convert columns, `F value` & `Pr(>F)` to character + dplyr::mutate(across(`F value`, ~ tidyr::replace_na(., "--"))) %>% # Replace NAs with "--" + tibble::as_tibble(rownames = " ") # Convert to tibble with rownames + anova_mod2 <- anova_mod1 %>% + knitr::kable(format = "simple") %>% # Pipe format for viewer display. You can make format = "Simple" for it to appear in the console rather than the viewer. + kableExtra::kable_styling(full_width = FALSE) # Apply kable styling + #print(anova_mod1) + + # Add the total row if requested + if (total) { + anova_mod2 <- anova_mod1 %>% + tibble::add_row(` ` = "Total", dplyr::summarise(., across(where(is.numeric), sum))) %>% + dplyr::mutate(`F value` = as.character(`F value`)) %>% # Convert columns, `F value` & `Pr(>F)` to character + dplyr::mutate(across(`F value`, ~ tidyr::replace_na(., "--"))) %>% # Replace NAs with "--" + knitr::kable(format = "simple")%>% # make format = "simple" for it to appear in the console rather than the viewer. + kableExtra::kable_styling(full_width = FALSE) + } + + print(anova_mod2) + + + # Display the ANOVA table with Pr(>F) column + if (sign_level) { + cat(paste0("ANOVA of ", formula_str, ":\n")) + anova_mod <- anova_mod %>% + dplyr::mutate( + `Sum Sq` = signif(`Sum Sq`, 3), + `Mean Sq` = signif(`Mean Sq`, 3), + `F value` = ifelse(`F value` < 100, round(`F value`, 1), round(`F value`)), + `Pr(>F)` = ifelse( + is.na(`Pr(>F)`) | !is.numeric(`Pr(>F)`), "--", # Handle NA or non-numeric cases + ifelse(`Pr(>F)` < 0.001, "<0.001", formatC(`Pr(>F)`, format = "f", digits = 3)) + ) + ) + anova_mod3 <- anova_mod %>% + dplyr::mutate( + `F value` = as.character(`F value`), + `Pr(>F)` = as.character(`Pr(>F)`) + ) %>% + dplyr::mutate(across(c(`F value`, `Pr(>F)`), ~ tidyr::replace_na(., "--"))) %>% + tibble::as_tibble(rownames = " ") %>% + knitr::kable(format = "simple")%>% # make format = "simple" for it to appear in the console rather than the viewer. + kableExtra::kable_styling(full_width = FALSE) + #print(anova_mod3) + cat("\n") + } + + # Optionally print means or model coefficients + if (means) { + has_numeric <- any(sapply(x_col_names, function(x) class(mod$model[[x]]) %in% c("numeric", "integer"))) + has_factor <- any(sapply(x_col_names, function(x) class(mod$model[[x]]) == "factor")) + + # If both numeric and factor are present, print the model coefficients + if (has_numeric && has_factor) { + cat("Model coefficients:\n") + print(mod$coefficients) + cat("\n") + } else { + # Handle the original case when only numeric or factor is present + if (class(mod$model[[x_col_names[[1]]]]) %in% c("numeric", "integer")) { + cat("Model coefficients:\n") + print(mod$coefficients) + cat("\n") + } else { + cat(paste0("Means table of ", y_col_name, ":\n")) + print(model.tables(aov(mod), type = "means")) + cat("\n") + } + } + } + } ) From 153fec3f64352ab2cfb1b0df5d3f30f6219a4da3 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 19 Nov 2024 21:39:10 +0300 Subject: [PATCH 15/20] changes to the code --- instat/static/InstatObject/R/data_object_R6.R | 183 ++++++++---------- 1 file changed, 79 insertions(+), 104 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 35c771e3cb..952e6876dd 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4655,108 +4655,83 @@ DataSheet$set("public", "has_labels", function(col_names) { ) DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total = FALSE, signif.stars = FALSE, sign_level = FALSE, means = FALSE, interaction = FALSE) { - # Check if required columns are provided - if (missing(x_col_names) || missing(y_col_name)) stop("Both x_col_names and y_col_names are required") - if (sign_level || signif.stars) message("This is no longer descriptive") - - # Determine the column to end the ANOVA table at - if (sign_level) end_col = 5 else end_col = 4 - - # Construct the formula for ANOVA and choosing whether you want an interaction or not - if (length(x_col_names) == 1) { - formula_str <- paste0(as.name(y_col_name), "~ ", as.name(x_col_names)) - } else if (interaction && length(x_col_names) > 1) { - formula_str <- paste0(as.name(y_col_name), " ~ ", as.name(paste(x_col_names, collapse = " * "))) - } else { - formula_str <- paste0(as.name(y_col_name), " ~ ", as.name(paste(x_col_names, collapse = " + "))) - } - - # Fit the model - mod <- lm(formula = as.formula(formula_str), data = self$get_data_frame()) - - # Start ANOVA table generation - anova_mod <- anova(mod)[1:end_col] - - # Rounding values in the ANOVA table - anova_mod1 <- anova_mod %>% - dplyr::mutate( - `Sum Sq` = signif(`Sum Sq`, 3), - `Mean Sq` = signif(`Mean Sq`, 3), - `F value` = ifelse(`F value` < 100, round(`F value`, 1), round(`F value`)) - ) - - - # Convert `F value` and ` then replace NA with "--" - anova_mod1 <- anova_mod1 %>% - dplyr::mutate(`F value` = as.character(`F value`)) %>% # Convert columns, `F value` & `Pr(>F)` to character - dplyr::mutate(across(`F value`, ~ tidyr::replace_na(., "--"))) %>% # Replace NAs with "--" - tibble::as_tibble(rownames = " ") # Convert to tibble with rownames - anova_mod2 <- anova_mod1 %>% - knitr::kable(format = "simple") %>% # Pipe format for viewer display. You can make format = "Simple" for it to appear in the console rather than the viewer. - kableExtra::kable_styling(full_width = FALSE) # Apply kable styling - #print(anova_mod1) - - # Add the total row if requested - if (total) { - anova_mod2 <- anova_mod1 %>% - tibble::add_row(` ` = "Total", dplyr::summarise(., across(where(is.numeric), sum))) %>% - dplyr::mutate(`F value` = as.character(`F value`)) %>% # Convert columns, `F value` & `Pr(>F)` to character - dplyr::mutate(across(`F value`, ~ tidyr::replace_na(., "--"))) %>% # Replace NAs with "--" - knitr::kable(format = "simple")%>% # make format = "simple" for it to appear in the console rather than the viewer. - kableExtra::kable_styling(full_width = FALSE) - } - - print(anova_mod2) - - - # Display the ANOVA table with Pr(>F) column - if (sign_level) { - cat(paste0("ANOVA of ", formula_str, ":\n")) - anova_mod <- anova_mod %>% - dplyr::mutate( - `Sum Sq` = signif(`Sum Sq`, 3), - `Mean Sq` = signif(`Mean Sq`, 3), - `F value` = ifelse(`F value` < 100, round(`F value`, 1), round(`F value`)), - `Pr(>F)` = ifelse( - is.na(`Pr(>F)`) | !is.numeric(`Pr(>F)`), "--", # Handle NA or non-numeric cases - ifelse(`Pr(>F)` < 0.001, "<0.001", formatC(`Pr(>F)`, format = "f", digits = 3)) - ) - ) - anova_mod3 <- anova_mod %>% - dplyr::mutate( - `F value` = as.character(`F value`), - `Pr(>F)` = as.character(`Pr(>F)`) - ) %>% - dplyr::mutate(across(c(`F value`, `Pr(>F)`), ~ tidyr::replace_na(., "--"))) %>% - tibble::as_tibble(rownames = " ") %>% - knitr::kable(format = "simple")%>% # make format = "simple" for it to appear in the console rather than the viewer. - kableExtra::kable_styling(full_width = FALSE) - #print(anova_mod3) - cat("\n") - } - - # Optionally print means or model coefficients - if (means) { - has_numeric <- any(sapply(x_col_names, function(x) class(mod$model[[x]]) %in% c("numeric", "integer"))) - has_factor <- any(sapply(x_col_names, function(x) class(mod$model[[x]]) == "factor")) - - # If both numeric and factor are present, print the model coefficients - if (has_numeric && has_factor) { - cat("Model coefficients:\n") - print(mod$coefficients) - cat("\n") - } else { - # Handle the original case when only numeric or factor is present - if (class(mod$model[[x_col_names[[1]]]]) %in% c("numeric", "integer")) { - cat("Model coefficients:\n") - print(mod$coefficients) - cat("\n") - } else { - cat(paste0("Means table of ", y_col_name, ":\n")) - print(model.tables(aov(mod), type = "means")) - cat("\n") - } - } - } - } + if (missing(x_col_names) || missing(y_col_name)) stop("Both x_col_names and y_col_names are required") + if (sign_level || signif.stars) message("This is no longer descriptive") + + end_col <- if (sign_level) 5 else 4 + + # Construct the formula + if (length(x_col_names) == 1) { + formula_str <- paste0(as.name(y_col_name), " ~ ", as.name(x_col_names)) + } else if (interaction && length(x_col_names) > 1) { + formula_str <- paste0(as.name(y_col_name), " ~ ", as.name(paste(x_col_names, collapse = " * "))) + } else { + formula_str <- paste0(as.name(y_col_name), " ~ ", as.name(paste(x_col_names, collapse = " + "))) + } + + mod <- lm(formula = as.formula(formula_str), data = self$get_data_frame()) + anova_mod <- anova(mod)[1:end_col] + + # Process ANOVA table + anova_mod <- anova_mod %>% + dplyr::mutate( + `Sum Sq` = signif(`Sum Sq`, 3), + `Mean Sq` = signif(`Mean Sq`, 3), + `F value` = ifelse(`F value` < 100, round(`F value`, 1), round(`F value`)) + ) %>% + dplyr::mutate(`F value` = as.character(`F value`)) %>% + dplyr::mutate(across(`F value`, ~ tidyr::replace_na(., "--"))) %>% + tibble::as_tibble(rownames = " ") + + # Add the total row if requested + if (total) { + anova_mod <- anova_mod %>% + tibble::add_row(` ` = "Total", dplyr::summarise(., across(where(is.numeric), sum))) + } + + # Handle significance levels + if (sign_level) { + anova_mod <- anova_mod %>% + dplyr::mutate( + `Pr(>F)` = ifelse( + is.na(`Pr(>F)`) | !is.numeric(`Pr(>F)`), "--", + ifelse(`Pr(>F)` < 0.001, "<0.001", formatC(`Pr(>F)`, format = "f", digits = 3)) + ) + ) + } + + # Generate the table with a title + title <- paste0("ANOVA of ", formula_str) + formatted_table <- anova_mod %>% + knitr::kable(format = "simple", caption = title) %>% + kableExtra::kable_styling(full_width = FALSE) + + print(formatted_table) + + # Optionally print means or model coefficients + if (means) { + has_numeric <- any(sapply(x_col_names, function(x) class(mod$model[[x]]) %in% c("numeric", "integer"))) + has_factor <- any(sapply(x_col_names, function(x) class(mod$model[[x]]) == "factor")) + + if (has_numeric && has_factor) { + cat("Model coefficients:\n") + print(mod$coefficients) + } else if (class(mod$model[[x_col_names[[1]]]]) %in% c("numeric", "integer")) { + cat("Model coefficients:\n") + print(mod$coefficients) + } else { + # Custom title instead of "Tables of Means" + cat(paste0("Means tables of ", y_col_name, ":\n")) + + # Extract the means table but avoid its default print title + means_table <- capture.output(model.tables(aov(mod), type = "means")) + + # Remove the "Tables of Means" line from the output + means_table <- means_table[-1] # Remove the first line, which is "Tables of Means" + + # Print the remaining content of the means table + cat(paste(means_table, collapse = "\n")) + } +} +} ) From f2af4e8754dc246b756affcab9105ff83d904fa7 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 25 Nov 2024 10:50:24 +0300 Subject: [PATCH 16/20] changes --- instat/static/InstatObject/R/data_object_R6.R | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 952e6876dd..f7e023808a 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4655,7 +4655,7 @@ DataSheet$set("public", "has_labels", function(col_names) { ) DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total = FALSE, signif.stars = FALSE, sign_level = FALSE, means = FALSE, interaction = FALSE) { - if (missing(x_col_names) || missing(y_col_name)) stop("Both x_col_names and y_col_names are required") + if (missing(x_col_names) || missing(y_col_name)) stop("Both x_col_names and y_col_name are required") if (sign_level || signif.stars) message("This is no longer descriptive") end_col <- if (sign_level) 5 else 4 @@ -4686,7 +4686,8 @@ DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total # Add the total row if requested if (total) { anova_mod <- anova_mod %>% - tibble::add_row(` ` = "Total", dplyr::summarise(., across(where(is.numeric), sum))) + tibble::add_row(` ` = "Total", dplyr::summarise(., across(where(is.numeric), sum))) %>% + dplyr::mutate(`F value` = ifelse(` ` == "Total", "--", `F value`)) # Replace NA with "--" for Total row } # Handle significance levels @@ -4702,12 +4703,17 @@ DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total # Generate the table with a title title <- paste0("ANOVA of ", formula_str) - formatted_table <- anova_mod %>% - knitr::kable(format = "simple", caption = title) %>% - kableExtra::kable_styling(full_width = FALSE) - + formatted_table <- anova_mod %>% + knitr::kable(format = "simple", caption = title) %>% # Use "html" for better control over styling + kableExtra::kable_styling(full_width = FALSE, position = "center") %>% + kableExtra::row_spec(nrow(anova_mod) - 2, hline_after = TRUE) %>% # Add underline after Residuals row + kableExtra::row_spec(nrow(anova_mod), extra_css = "border-top: double;") # Add double border before Total row + print(formatted_table) + # Add line break before means section + cat("\n") + # Optionally print means or model coefficients if (means) { has_numeric <- any(sapply(x_col_names, function(x) class(mod$model[[x]]) %in% c("numeric", "integer"))) @@ -4720,18 +4726,11 @@ DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total cat("Model coefficients:\n") print(mod$coefficients) } else { - # Custom title instead of "Tables of Means" cat(paste0("Means tables of ", y_col_name, ":\n")) - - # Extract the means table but avoid its default print title means_table <- capture.output(model.tables(aov(mod), type = "means")) - - # Remove the "Tables of Means" line from the output - means_table <- means_table[-1] # Remove the first line, which is "Tables of Means" - - # Print the remaining content of the means table + means_table <- means_table[-1] cat(paste(means_table, collapse = "\n")) } -} + } } ) From 2e1d1708e303da297b82d5197f558ed5b1adfe2b Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 25 Nov 2024 14:34:33 +0300 Subject: [PATCH 17/20] changes to the code --- instat/static/InstatObject/R/data_object_R6.R | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index f7e023808a..644bd96c18 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4704,10 +4704,7 @@ DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total # Generate the table with a title title <- paste0("ANOVA of ", formula_str) formatted_table <- anova_mod %>% - knitr::kable(format = "simple", caption = title) %>% # Use "html" for better control over styling - kableExtra::kable_styling(full_width = FALSE, position = "center") %>% - kableExtra::row_spec(nrow(anova_mod) - 2, hline_after = TRUE) %>% # Add underline after Residuals row - kableExtra::row_spec(nrow(anova_mod), extra_css = "border-top: double;") # Add double border before Total row + knitr::kable(format = "simple", caption = title) print(formatted_table) From 1a39a2986a3b61c3cb7de08d40f51cdb0f4a8bb5 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 26 Nov 2024 12:54:10 +0300 Subject: [PATCH 18/20] changes --- instat/dlgDescribeTwoVariable.Designer.vb | 260 ++++++++++------------ instat/dlgDescribeTwoVariable.vb | 12 +- 2 files changed, 127 insertions(+), 145 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index cc0f18193d..40af76b0cc 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -99,10 +99,9 @@ Partial Class dlgDescribeTwoVariable Me.rdoThreeVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoThreeVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoThreeVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoThreeVariable.Location = New System.Drawing.Point(432, 12) - Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoThreeVariable.Location = New System.Drawing.Point(288, 8) Me.rdoThreeVariable.Name = "rdoThreeVariable" - Me.rdoThreeVariable.Size = New System.Drawing.Size(150, 42) + Me.rdoThreeVariable.Size = New System.Drawing.Size(100, 28) Me.rdoThreeVariable.TabIndex = 3 Me.rdoThreeVariable.Text = "Three Variables" Me.rdoThreeVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -112,10 +111,9 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdFormatTable.Enabled = False Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFormatTable.Location = New System.Drawing.Point(489, 645) - Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdFormatTable.Location = New System.Drawing.Point(326, 430) Me.cmdFormatTable.Name = "cmdFormatTable" - Me.cmdFormatTable.Size = New System.Drawing.Size(156, 34) + Me.cmdFormatTable.Size = New System.Drawing.Size(104, 23) Me.cmdFormatTable.TabIndex = 23 Me.cmdFormatTable.Text = "Format Table..." Me.cmdFormatTable.UseVisualStyleBackColor = True @@ -123,10 +121,9 @@ Partial Class dlgDescribeTwoVariable 'lblThreeVariableSecondFactor ' Me.lblThreeVariableSecondFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(472, 225) - Me.lblThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(315, 150) Me.lblThreeVariableSecondFactor.Name = "lblThreeVariableSecondFactor" - Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(150, 22) + Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(100, 15) Me.lblThreeVariableSecondFactor.TabIndex = 10 Me.lblThreeVariableSecondFactor.Tag = "" Me.lblThreeVariableSecondFactor.Text = "Second Variable :" @@ -134,10 +131,9 @@ Partial Class dlgDescribeTwoVariable 'cmdMissingOptions ' Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMissingOptions.Location = New System.Drawing.Point(538, 440) - Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdMissingOptions.Location = New System.Drawing.Point(359, 293) Me.cmdMissingOptions.Name = "cmdMissingOptions" - Me.cmdMissingOptions.Size = New System.Drawing.Size(158, 34) + Me.cmdMissingOptions.Size = New System.Drawing.Size(105, 23) Me.cmdMissingOptions.TabIndex = 21 Me.cmdMissingOptions.Text = "Missing Options..." Me.cmdMissingOptions.UseVisualStyleBackColor = True @@ -145,10 +141,9 @@ Partial Class dlgDescribeTwoVariable 'lbSecondVariable ' Me.lbSecondVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lbSecondVariable.Location = New System.Drawing.Point(465, 225) - Me.lbSecondVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lbSecondVariable.Location = New System.Drawing.Point(310, 150) Me.lbSecondVariable.Name = "lbSecondVariable" - Me.lbSecondVariable.Size = New System.Drawing.Size(150, 22) + Me.lbSecondVariable.Size = New System.Drawing.Size(100, 15) Me.lbSecondVariable.TabIndex = 9 Me.lbSecondVariable.Tag = "" Me.lbSecondVariable.Text = "Second Variable:" @@ -157,10 +152,9 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstVariable.AutoSize = True Me.lblFirstVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstVariable.Location = New System.Drawing.Point(465, 74) - Me.lblFirstVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFirstVariable.Location = New System.Drawing.Point(310, 49) Me.lblFirstVariable.Name = "lblFirstVariable" - Me.lblFirstVariable.Size = New System.Drawing.Size(114, 20) + Me.lblFirstVariable.Size = New System.Drawing.Size(75, 13) Me.lblFirstVariable.TabIndex = 5 Me.lblFirstVariable.Tag = "" Me.lblFirstVariable.Text = "First Variables:" @@ -174,11 +168,9 @@ Partial Class dlgDescribeTwoVariable Me.grpSummaries.Controls.Add(Me.lblSummary) Me.grpSummaries.Controls.Add(Me.lblBy) Me.grpSummaries.Controls.Add(Me.lblSecondType) - Me.grpSummaries.Location = New System.Drawing.Point(16, 328) - Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Location = New System.Drawing.Point(11, 219) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.grpSummaries.Size = New System.Drawing.Size(315, 108) + Me.grpSummaries.Size = New System.Drawing.Size(210, 72) Me.grpSummaries.TabIndex = 17 Me.grpSummaries.TabStop = False ' @@ -186,20 +178,18 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstType.AutoSize = True Me.lblFirstType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstType.Location = New System.Drawing.Point(18, 27) - Me.lblFirstType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFirstType.Location = New System.Drawing.Point(12, 18) Me.lblFirstType.Name = "lblFirstType" - Me.lblFirstType.Size = New System.Drawing.Size(0, 20) + Me.lblFirstType.Size = New System.Drawing.Size(0, 13) Me.lblFirstType.TabIndex = 0 ' 'lblSecondBy ' Me.lblSecondBy.AutoSize = True Me.lblSecondBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondBy.Location = New System.Drawing.Point(270, 24) - Me.lblSecondBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSecondBy.Location = New System.Drawing.Point(180, 16) Me.lblSecondBy.Name = "lblSecondBy" - Me.lblSecondBy.Size = New System.Drawing.Size(25, 20) + Me.lblSecondBy.Size = New System.Drawing.Size(18, 13) Me.lblSecondBy.TabIndex = 6 Me.lblSecondBy.Text = "by" ' @@ -207,10 +197,9 @@ Partial Class dlgDescribeTwoVariable ' Me.lblThreeVariableCategorical.AutoSize = True Me.lblThreeVariableCategorical.ForeColor = System.Drawing.SystemColors.Highlight - Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(18, 50) - Me.lblThreeVariableCategorical.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(12, 33) Me.lblThreeVariableCategorical.Name = "lblThreeVariableCategorical" - Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(86, 20) + Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(59, 13) Me.lblThreeVariableCategorical.TabIndex = 1 Me.lblThreeVariableCategorical.Text = "categorical" ' @@ -218,20 +207,18 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSummaryName.AutoSize = True Me.lblSummaryName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummaryName.Location = New System.Drawing.Point(105, 76) - Me.lblSummaryName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSummaryName.Location = New System.Drawing.Point(70, 51) Me.lblSummaryName.Name = "lblSummaryName" - Me.lblSummaryName.Size = New System.Drawing.Size(0, 20) + Me.lblSummaryName.Size = New System.Drawing.Size(0, 13) Me.lblSummaryName.TabIndex = 3 ' 'lblSummary ' Me.lblSummary.AutoSize = True Me.lblSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummary.Location = New System.Drawing.Point(18, 76) - Me.lblSummary.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSummary.Location = New System.Drawing.Point(12, 51) Me.lblSummary.Name = "lblSummary" - Me.lblSummary.Size = New System.Drawing.Size(80, 20) + Me.lblSummary.Size = New System.Drawing.Size(53, 13) Me.lblSummary.TabIndex = 2 Me.lblSummary.Text = "Summary:" ' @@ -239,10 +226,9 @@ Partial Class dlgDescribeTwoVariable ' Me.lblBy.AutoSize = True Me.lblBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblBy.Location = New System.Drawing.Point(123, 24) - Me.lblBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblBy.Location = New System.Drawing.Point(82, 16) Me.lblBy.Name = "lblBy" - Me.lblBy.Size = New System.Drawing.Size(25, 20) + Me.lblBy.Size = New System.Drawing.Size(18, 13) Me.lblBy.TabIndex = 4 Me.lblBy.Text = "by" ' @@ -250,19 +236,17 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSecondType.AutoSize = True Me.lblSecondType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondType.Location = New System.Drawing.Point(159, 27) - Me.lblSecondType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSecondType.Location = New System.Drawing.Point(106, 18) Me.lblSecondType.Name = "lblSecondType" - Me.lblSecondType.Size = New System.Drawing.Size(0, 20) + Me.lblSecondType.Size = New System.Drawing.Size(0, 13) Me.lblSecondType.TabIndex = 5 ' 'lblFirstGroupByFactor ' Me.lblFirstGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(472, 224) - Me.lblFirstGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(315, 149) Me.lblFirstGroupByFactor.Name = "lblFirstGroupByFactor" - Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(150, 22) + Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(100, 15) Me.lblFirstGroupByFactor.TabIndex = 7 Me.lblFirstGroupByFactor.Tag = "" Me.lblFirstGroupByFactor.Text = "Factor (Optional) :" @@ -275,10 +259,9 @@ Partial Class dlgDescribeTwoVariable Me.rdoSkim.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSkim.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSkim.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSkim.Location = New System.Drawing.Point(142, 12) - Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoSkim.Location = New System.Drawing.Point(95, 8) Me.rdoSkim.Name = "rdoSkim" - Me.rdoSkim.Size = New System.Drawing.Size(150, 42) + Me.rdoSkim.Size = New System.Drawing.Size(100, 28) Me.rdoSkim.TabIndex = 1 Me.rdoSkim.Text = "Skim" Me.rdoSkim.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -287,10 +270,9 @@ Partial Class dlgDescribeTwoVariable 'lblThirdVariable ' Me.lblThirdVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThirdVariable.Location = New System.Drawing.Point(465, 286) - Me.lblThirdVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblThirdVariable.Location = New System.Drawing.Point(310, 191) Me.lblThirdVariable.Name = "lblThirdVariable" - Me.lblThirdVariable.Size = New System.Drawing.Size(231, 22) + Me.lblThirdVariable.Size = New System.Drawing.Size(154, 15) Me.lblThirdVariable.TabIndex = 13 Me.lblThirdVariable.Tag = "" Me.lblThirdVariable.Text = "Third Variable :" @@ -298,10 +280,9 @@ Partial Class dlgDescribeTwoVariable 'lblSecondGroupByFactor ' Me.lblSecondGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(472, 286) - Me.lblSecondGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(315, 191) Me.lblSecondGroupByFactor.Name = "lblSecondGroupByFactor" - Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(206, 22) + Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(137, 15) Me.lblSecondGroupByFactor.TabIndex = 33 Me.lblSecondGroupByFactor.Tag = "" Me.lblSecondGroupByFactor.Text = "Second Factor (Optional) :" @@ -314,10 +295,9 @@ Partial Class dlgDescribeTwoVariable Me.rdoTwoVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoTwoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTwoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoTwoVariable.Location = New System.Drawing.Point(286, 12) - Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoTwoVariable.Location = New System.Drawing.Point(191, 8) Me.rdoTwoVariable.Name = "rdoTwoVariable" - Me.rdoTwoVariable.Size = New System.Drawing.Size(150, 42) + Me.rdoTwoVariable.Size = New System.Drawing.Size(100, 28) Me.rdoTwoVariable.TabIndex = 2 Me.rdoTwoVariable.Text = "Two Variables" Me.rdoTwoVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -326,10 +306,9 @@ Partial Class dlgDescribeTwoVariable 'cmdSummaries ' Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSummaries.Location = New System.Drawing.Point(465, 372) - Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdSummaries.Location = New System.Drawing.Point(310, 248) Me.cmdSummaries.Name = "cmdSummaries" - Me.cmdSummaries.Size = New System.Drawing.Size(180, 34) + Me.cmdSummaries.Size = New System.Drawing.Size(120, 23) Me.cmdSummaries.TabIndex = 1 Me.cmdSummaries.Tag = "Summaries" Me.cmdSummaries.Text = "Choose Summaries..." @@ -338,10 +317,9 @@ Partial Class dlgDescribeTwoVariable 'lblMarginName ' Me.lblMarginName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMarginName.Location = New System.Drawing.Point(22, 480) - Me.lblMarginName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMarginName.Location = New System.Drawing.Point(15, 320) Me.lblMarginName.Name = "lblMarginName" - Me.lblMarginName.Size = New System.Drawing.Size(140, 22) + Me.lblMarginName.Size = New System.Drawing.Size(93, 15) Me.lblMarginName.TabIndex = 19 Me.lblMarginName.Tag = "" Me.lblMarginName.Text = "Margin Name:" @@ -350,11 +328,9 @@ Partial Class dlgDescribeTwoVariable ' Me.grpDisplay.Controls.Add(Me.ucrReceiverColumns) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) - Me.grpDisplay.Location = New System.Drawing.Point(414, 278) - Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDisplay.Location = New System.Drawing.Point(276, 185) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.grpDisplay.Size = New System.Drawing.Size(291, 219) + Me.grpDisplay.Size = New System.Drawing.Size(194, 146) Me.grpDisplay.TabIndex = 15 Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" @@ -363,11 +339,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverColumns.AutoSize = True Me.ucrReceiverColumns.frmParent = Me - Me.ucrReceiverColumns.Location = New System.Drawing.Point(20, 92) + Me.ucrReceiverColumns.Location = New System.Drawing.Point(13, 61) Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumns.Name = "ucrReceiverColumns" Me.ucrReceiverColumns.Selector = Nothing - Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 122) + Me.ucrReceiverColumns.Size = New System.Drawing.Size(120, 81) Me.ucrReceiverColumns.strNcFilePath = "" Me.ucrReceiverColumns.TabIndex = 55 Me.ucrReceiverColumns.ucrSelector = Nothing @@ -376,18 +352,19 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkDisplayAsPercentage.AutoSize = True Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(9, 15) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(4) Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 51) + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(114, 34) Me.ucrChkDisplayAsPercentage.TabIndex = 54 ' 'rdoOCol ' Me.rdoOCol.AutoSize = True - Me.rdoOCol.Location = New System.Drawing.Point(432, 336) + Me.rdoOCol.Location = New System.Drawing.Point(288, 224) + Me.rdoOCol.Margin = New System.Windows.Forms.Padding(2) Me.rdoOCol.Name = "rdoOCol" - Me.rdoOCol.Size = New System.Drawing.Size(81, 24) + Me.rdoOCol.Size = New System.Drawing.Size(54, 17) Me.rdoOCol.TabIndex = 40 Me.rdoOCol.TabStop = True Me.rdoOCol.Text = "Col(%)" @@ -396,9 +373,10 @@ Partial Class dlgDescribeTwoVariable 'rdoOCell ' Me.rdoOCell.AutoSize = True - Me.rdoOCell.Location = New System.Drawing.Point(612, 334) + Me.rdoOCell.Location = New System.Drawing.Point(408, 223) + Me.rdoOCell.Margin = New System.Windows.Forms.Padding(2) Me.rdoOCell.Name = "rdoOCell" - Me.rdoOCell.Size = New System.Drawing.Size(84, 24) + Me.rdoOCell.Size = New System.Drawing.Size(56, 17) Me.rdoOCell.TabIndex = 41 Me.rdoOCell.TabStop = True Me.rdoOCell.Text = "Cell(%)" @@ -407,9 +385,10 @@ Partial Class dlgDescribeTwoVariable 'rdoORow ' Me.rdoORow.AutoSize = True - Me.rdoORow.Location = New System.Drawing.Point(518, 336) + Me.rdoORow.Location = New System.Drawing.Point(345, 224) + Me.rdoORow.Margin = New System.Windows.Forms.Padding(2) Me.rdoORow.Name = "rdoORow" - Me.rdoORow.Size = New System.Drawing.Size(90, 24) + Me.rdoORow.Size = New System.Drawing.Size(61, 17) Me.rdoORow.TabIndex = 42 Me.rdoORow.TabStop = True Me.rdoORow.Text = "Row(%)" @@ -419,11 +398,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me - Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 314) + Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(310, 209) Me.ucrReceiverThreeVariableThirdVariable.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableThirdVariable.Name = "ucrReceiverThreeVariableThirdVariable" Me.ucrReceiverThreeVariableThirdVariable.Selector = Nothing - Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverThreeVariableThirdVariable.strNcFilePath = "" Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 14 Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing @@ -432,11 +411,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverPercentages.AutoSize = True Me.ucrReceiverPercentages.frmParent = Me - Me.ucrReceiverPercentages.Location = New System.Drawing.Point(430, 369) + Me.ucrReceiverPercentages.Location = New System.Drawing.Point(287, 246) Me.ucrReceiverPercentages.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPercentages.Name = "ucrReceiverPercentages" Me.ucrReceiverPercentages.Selector = Nothing - Me.ucrReceiverPercentages.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverPercentages.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverPercentages.strNcFilePath = "" Me.ucrReceiverPercentages.TabIndex = 39 Me.ucrReceiverPercentages.ucrSelector = Nothing @@ -444,21 +423,21 @@ Partial Class dlgDescribeTwoVariable 'ucrpnlPercent ' Me.ucrpnlPercent.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrpnlPercent.Location = New System.Drawing.Point(424, 332) - Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrpnlPercent.Location = New System.Drawing.Point(283, 221) + Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(4) Me.ucrpnlPercent.Name = "ucrpnlPercent" - Me.ucrpnlPercent.Size = New System.Drawing.Size(270, 38) + Me.ucrpnlPercent.Size = New System.Drawing.Size(180, 25) Me.ucrpnlPercent.TabIndex = 43 ' 'ucrReceiverThreeVariableSecondFactor ' Me.ucrReceiverThreeVariableSecondFactor.AutoSize = True Me.ucrReceiverThreeVariableSecondFactor.frmParent = Me - Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(465, 246) + Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(310, 164) Me.ucrReceiverThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableSecondFactor.Name = "ucrReceiverThreeVariableSecondFactor" Me.ucrReceiverThreeVariableSecondFactor.Selector = Nothing - Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverThreeVariableSecondFactor.strNcFilePath = "" Me.ucrReceiverThreeVariableSecondFactor.TabIndex = 12 Me.ucrReceiverThreeVariableSecondFactor.ucrSelector = Nothing @@ -467,11 +446,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverSecondTwoVariableFactor.AutoSize = True Me.ucrReceiverSecondTwoVariableFactor.frmParent = Me - Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(465, 246) + Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(310, 164) Me.ucrReceiverSecondTwoVariableFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondTwoVariableFactor.Name = "ucrReceiverSecondTwoVariableFactor" Me.ucrReceiverSecondTwoVariableFactor.Selector = Nothing - Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverSecondTwoVariableFactor.strNcFilePath = "" Me.ucrReceiverSecondTwoVariableFactor.TabIndex = 1 Me.ucrReceiverSecondTwoVariableFactor.ucrSelector = Nothing @@ -480,11 +459,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverFirstVars.AutoSize = True Me.ucrReceiverFirstVars.frmParent = Me - Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(465, 96) + Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(310, 64) Me.ucrReceiverFirstVars.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFirstVars.Name = "ucrReceiverFirstVars" Me.ucrReceiverFirstVars.Selector = Nothing - Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(180, 118) + Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(120, 79) Me.ucrReceiverFirstVars.strNcFilePath = "" Me.ucrReceiverFirstVars.TabIndex = 6 Me.ucrReceiverFirstVars.ucrSelector = Nothing @@ -492,10 +471,10 @@ Partial Class dlgDescribeTwoVariable 'ucrSaveTable ' Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTable.Location = New System.Drawing.Point(22, 676) - Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSaveTable.Location = New System.Drawing.Point(15, 451) + Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTable.Name = "ucrSaveTable" - Me.ucrSaveTable.Size = New System.Drawing.Size(459, 36) + Me.ucrSaveTable.Size = New System.Drawing.Size(306, 24) Me.ucrSaveTable.TabIndex = 24 ' 'ucrInputMarginName @@ -504,18 +483,18 @@ Partial Class dlgDescribeTwoVariable Me.ucrInputMarginName.AutoSize = True Me.ucrInputMarginName.IsMultiline = False Me.ucrInputMarginName.IsReadOnly = False - Me.ucrInputMarginName.Location = New System.Drawing.Point(171, 477) - Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) + Me.ucrInputMarginName.Location = New System.Drawing.Point(114, 318) + Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputMarginName.Name = "ucrInputMarginName" - Me.ucrInputMarginName.Size = New System.Drawing.Size(206, 32) + Me.ucrInputMarginName.Size = New System.Drawing.Size(137, 21) Me.ucrInputMarginName.TabIndex = 22 ' 'ucrReorderSummary ' - Me.ucrReorderSummary.Location = New System.Drawing.Point(412, 410) - Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrReorderSummary.Location = New System.Drawing.Point(275, 273) + Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(6) Me.ucrReorderSummary.Name = "ucrReorderSummary" - Me.ucrReorderSummary.Size = New System.Drawing.Size(291, 234) + Me.ucrReorderSummary.Size = New System.Drawing.Size(194, 156) Me.ucrReorderSummary.TabIndex = 16 Me.ucrReorderSummary.ucrDataFrameList = Nothing Me.ucrReorderSummary.ucrReceiver = Nothing @@ -524,21 +503,21 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(22, 734) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrBase.Location = New System.Drawing.Point(15, 489) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 25 ' 'ucrReceiverSecondSkimrGroupByFactor ' Me.ucrReceiverSecondSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSecondSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(465, 306) + Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(310, 204) Me.ucrReceiverSecondSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondSkimrGroupByFactor.Name = "ucrReceiverSecondSkimrGroupByFactor" Me.ucrReceiverSecondSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverSecondSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSecondSkimrGroupByFactor.TabIndex = 34 Me.ucrReceiverSecondSkimrGroupByFactor.ucrSelector = Nothing @@ -549,30 +528,30 @@ Partial Class dlgDescribeTwoVariable Me.ucrSelectorDescribeTwoVar.bDropUnusedFilterLevels = False Me.ucrSelectorDescribeTwoVar.bShowHiddenColumns = False Me.ucrSelectorDescribeTwoVar.bUseCurrentFilter = True - Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(16, 54) + Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(11, 36) Me.ucrSelectorDescribeTwoVar.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorDescribeTwoVar.Name = "ucrSelectorDescribeTwoVar" - Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorDescribeTwoVar.TabIndex = 4 ' 'ucrPnlDescribe ' Me.ucrPnlDescribe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlDescribe.Location = New System.Drawing.Point(138, 4) - Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrPnlDescribe.Location = New System.Drawing.Point(92, 3) + Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlDescribe.Name = "ucrPnlDescribe" - Me.ucrPnlDescribe.Size = New System.Drawing.Size(476, 51) + Me.ucrPnlDescribe.Size = New System.Drawing.Size(317, 34) Me.ucrPnlDescribe.TabIndex = 0 ' 'ucrReceiverSkimrGroupByFactor ' Me.ucrReceiverSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(465, 246) + Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(310, 164) Me.ucrReceiverSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSkimrGroupByFactor.Name = "ucrReceiverSkimrGroupByFactor" Me.ucrReceiverSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSkimrGroupByFactor.TabIndex = 2 Me.ucrReceiverSkimrGroupByFactor.ucrSelector = Nothing @@ -581,88 +560,89 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkDisplayMargins.AutoSize = True Me.ucrChkDisplayMargins.Checked = False - Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(26, 444) - Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(17, 296) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" - Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) + Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(143, 23) Me.ucrChkDisplayMargins.TabIndex = 18 ' 'ucrChkLevSig ' Me.ucrChkLevSig.AutoSize = True Me.ucrChkLevSig.Checked = False - Me.ucrChkLevSig.Location = New System.Drawing.Point(596, 279) - Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkLevSig.Location = New System.Drawing.Point(397, 186) + Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkLevSig.Name = "ucrChkLevSig" - Me.ucrChkLevSig.Size = New System.Drawing.Size(129, 34) + Me.ucrChkLevSig.Size = New System.Drawing.Size(86, 23) Me.ucrChkLevSig.TabIndex = 38 ' 'ucrChkTotal ' Me.ucrChkTotal.AutoSize = True Me.ucrChkTotal.Checked = False - Me.ucrChkTotal.Location = New System.Drawing.Point(465, 279) - Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkTotal.Location = New System.Drawing.Point(310, 186) + Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkTotal.Name = "ucrChkTotal" - Me.ucrChkTotal.Size = New System.Drawing.Size(146, 34) + Me.ucrChkTotal.Size = New System.Drawing.Size(97, 23) Me.ucrChkTotal.TabIndex = 44 ' 'ucrChkMeans ' Me.ucrChkMeans.AutoSize = True Me.ucrChkMeans.Checked = False - Me.ucrChkMeans.Location = New System.Drawing.Point(465, 312) - Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkMeans.Location = New System.Drawing.Point(310, 208) + Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkMeans.Name = "ucrChkMeans" - Me.ucrChkMeans.Size = New System.Drawing.Size(146, 34) + Me.ucrChkMeans.Size = New System.Drawing.Size(97, 23) Me.ucrChkMeans.TabIndex = 37 ' 'ucrChkCorrelations ' Me.ucrChkCorrelations.AutoSize = True Me.ucrChkCorrelations.Checked = False - Me.ucrChkCorrelations.Location = New System.Drawing.Point(465, 381) - Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkCorrelations.Location = New System.Drawing.Point(310, 254) + Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkCorrelations.Name = "ucrChkCorrelations" - Me.ucrChkCorrelations.Size = New System.Drawing.Size(224, 34) + Me.ucrChkCorrelations.Size = New System.Drawing.Size(149, 23) Me.ucrChkCorrelations.TabIndex = 35 ' 'ucrChkSwapXYVar ' Me.ucrChkSwapXYVar.AutoSize = True Me.ucrChkSwapXYVar.Checked = False - Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(465, 346) - Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(310, 231) + Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkSwapXYVar.Name = "ucrChkSwapXYVar" - Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(236, 34) + Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(157, 23) Me.ucrChkSwapXYVar.TabIndex = 36 ' 'ucrChkOmitMissing ' Me.ucrChkOmitMissing.AutoSize = True Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(465, 416) - Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(310, 277) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" - Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) + Me.ucrChkOmitMissing.Size = New System.Drawing.Size(143, 23) Me.ucrChkOmitMissing.TabIndex = 0 ' 'ucrChkInteraction ' Me.ucrChkInteraction.AutoSize = True Me.ucrChkInteraction.Checked = False - Me.ucrChkInteraction.Location = New System.Drawing.Point(465, 450) - Me.ucrChkInteraction.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkInteraction.Location = New System.Drawing.Point(310, 253) + Me.ucrChkInteraction.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkInteraction.Name = "ucrChkInteraction" - Me.ucrChkInteraction.Size = New System.Drawing.Size(214, 34) + Me.ucrChkInteraction.Size = New System.Drawing.Size(143, 23) Me.ucrChkInteraction.TabIndex = 45 ' 'dlgDescribeTwoVariable ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ClientSize = New System.Drawing.Size(723, 700) + Me.ClientSize = New System.Drawing.Size(482, 467) + Me.Controls.Add(Me.ucrChkInteraction) Me.Controls.Add(Me.cmdSummaries) Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) Me.Controls.Add(Me.ucrReceiverPercentages) @@ -702,9 +682,7 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.ucrChkSwapXYVar) Me.Controls.Add(Me.ucrChkMeans) Me.Controls.Add(Me.ucrChkOmitMissing) - Me.Controls.Add(Me.ucrChkInteraction) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDescribeTwoVariable" diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 57cc5ed7db..e8ad795509 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -876,7 +876,8 @@ Public Class dlgDescribeTwoVariable ucrChkInteraction.Visible = True ucrChkTotal.Location = New Point(310, 250) ucrChkLevSig.Location = New Point(397, 250) - ucrChkMeans.Location = New Point(310, 275) + ucrChkInteraction.Location = New Point(310, 275) + ucrChkMeans.Location = New Point(310, 300) If ucrChkSwapXYVar.Checked Then ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) @@ -899,7 +900,8 @@ Public Class dlgDescribeTwoVariable ucrChkInteraction.Visible = True ucrChkTotal.Location = New Point(310, 250) ucrChkLevSig.Location = New Point(397, 250) - ucrChkMeans.Location = New Point(310, 275) + ucrChkInteraction.Location = New Point(310, 275) + ucrChkMeans.Location = New Point(310, 300) ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) @@ -913,7 +915,8 @@ Public Class dlgDescribeTwoVariable ucrChkInteraction.Visible = True ucrChkTotal.Location = New Point(310, 250) ucrChkLevSig.Location = New Point(397, 250) - ucrChkMeans.Location = New Point(310, 275) + ucrChkInteraction.Location = New Point(310, 275) + ucrChkMeans.Location = New Point(310, 300) ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) @@ -927,7 +930,8 @@ Public Class dlgDescribeTwoVariable ucrChkInteraction.Visible = True ucrChkTotal.Location = New Point(310, 250) ucrChkLevSig.Location = New Point(397, 250) - ucrChkMeans.Location = New Point(310, 275) + ucrChkInteraction.Location = New Point(310, 275) + ucrChkMeans.Location = New Point(310, 300) ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) From 6d8f1cdd905e4fa85a9cf0ab2d82ba40d030de64 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 27 Nov 2024 11:47:13 +0300 Subject: [PATCH 19/20] changes to the code --- instat/dlgDescribeTwoVariable.Designer.vb | 271 ++++++++++++---------- instat/dlgDescribeTwoVariable.vb | 25 +- 2 files changed, 145 insertions(+), 151 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index ed39c467fc..16e31a8d4f 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -99,9 +99,10 @@ Partial Class dlgDescribeTwoVariable Me.rdoThreeVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoThreeVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoThreeVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoThreeVariable.Location = New System.Drawing.Point(288, 8) + Me.rdoThreeVariable.Location = New System.Drawing.Point(432, 12) + Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoThreeVariable.Name = "rdoThreeVariable" - Me.rdoThreeVariable.Size = New System.Drawing.Size(100, 28) + Me.rdoThreeVariable.Size = New System.Drawing.Size(150, 42) Me.rdoThreeVariable.TabIndex = 3 Me.rdoThreeVariable.Text = "Three Variables" Me.rdoThreeVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -111,9 +112,10 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdFormatTable.Enabled = False Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFormatTable.Location = New System.Drawing.Point(326, 430) + Me.cmdFormatTable.Location = New System.Drawing.Point(489, 645) + Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdFormatTable.Name = "cmdFormatTable" - Me.cmdFormatTable.Size = New System.Drawing.Size(104, 23) + Me.cmdFormatTable.Size = New System.Drawing.Size(156, 34) Me.cmdFormatTable.TabIndex = 23 Me.cmdFormatTable.Text = "Format Table..." Me.cmdFormatTable.UseVisualStyleBackColor = True @@ -121,9 +123,10 @@ Partial Class dlgDescribeTwoVariable 'lblThreeVariableSecondFactor ' Me.lblThreeVariableSecondFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(315, 150) + Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(472, 225) + Me.lblThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblThreeVariableSecondFactor.Name = "lblThreeVariableSecondFactor" - Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(100, 15) + Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(150, 22) Me.lblThreeVariableSecondFactor.TabIndex = 10 Me.lblThreeVariableSecondFactor.Tag = "" Me.lblThreeVariableSecondFactor.Text = "Second Variable :" @@ -131,9 +134,10 @@ Partial Class dlgDescribeTwoVariable 'cmdMissingOptions ' Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMissingOptions.Location = New System.Drawing.Point(359, 293) + Me.cmdMissingOptions.Location = New System.Drawing.Point(538, 440) + Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdMissingOptions.Name = "cmdMissingOptions" - Me.cmdMissingOptions.Size = New System.Drawing.Size(105, 23) + Me.cmdMissingOptions.Size = New System.Drawing.Size(158, 34) Me.cmdMissingOptions.TabIndex = 21 Me.cmdMissingOptions.Text = "Missing Options..." Me.cmdMissingOptions.UseVisualStyleBackColor = True @@ -141,9 +145,10 @@ Partial Class dlgDescribeTwoVariable 'lbSecondVariable ' Me.lbSecondVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lbSecondVariable.Location = New System.Drawing.Point(310, 150) + Me.lbSecondVariable.Location = New System.Drawing.Point(465, 225) + Me.lbSecondVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lbSecondVariable.Name = "lbSecondVariable" - Me.lbSecondVariable.Size = New System.Drawing.Size(100, 15) + Me.lbSecondVariable.Size = New System.Drawing.Size(150, 22) Me.lbSecondVariable.TabIndex = 9 Me.lbSecondVariable.Tag = "" Me.lbSecondVariable.Text = "Second Variable:" @@ -152,9 +157,10 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstVariable.AutoSize = True Me.lblFirstVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstVariable.Location = New System.Drawing.Point(310, 49) + Me.lblFirstVariable.Location = New System.Drawing.Point(465, 74) + Me.lblFirstVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFirstVariable.Name = "lblFirstVariable" - Me.lblFirstVariable.Size = New System.Drawing.Size(75, 13) + Me.lblFirstVariable.Size = New System.Drawing.Size(114, 20) Me.lblFirstVariable.TabIndex = 5 Me.lblFirstVariable.Tag = "" Me.lblFirstVariable.Text = "First Variables:" @@ -168,9 +174,11 @@ Partial Class dlgDescribeTwoVariable Me.grpSummaries.Controls.Add(Me.lblSummary) Me.grpSummaries.Controls.Add(Me.lblBy) Me.grpSummaries.Controls.Add(Me.lblSecondType) - Me.grpSummaries.Location = New System.Drawing.Point(11, 219) + Me.grpSummaries.Location = New System.Drawing.Point(16, 328) + Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Size = New System.Drawing.Size(210, 72) + Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Size = New System.Drawing.Size(315, 108) Me.grpSummaries.TabIndex = 17 Me.grpSummaries.TabStop = False ' @@ -178,18 +186,20 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstType.AutoSize = True Me.lblFirstType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstType.Location = New System.Drawing.Point(12, 18) + Me.lblFirstType.Location = New System.Drawing.Point(18, 27) + Me.lblFirstType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFirstType.Name = "lblFirstType" - Me.lblFirstType.Size = New System.Drawing.Size(0, 13) + Me.lblFirstType.Size = New System.Drawing.Size(0, 20) Me.lblFirstType.TabIndex = 0 ' 'lblSecondBy ' Me.lblSecondBy.AutoSize = True Me.lblSecondBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondBy.Location = New System.Drawing.Point(180, 16) + Me.lblSecondBy.Location = New System.Drawing.Point(270, 24) + Me.lblSecondBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSecondBy.Name = "lblSecondBy" - Me.lblSecondBy.Size = New System.Drawing.Size(18, 13) + Me.lblSecondBy.Size = New System.Drawing.Size(25, 20) Me.lblSecondBy.TabIndex = 6 Me.lblSecondBy.Text = "by" ' @@ -197,9 +207,10 @@ Partial Class dlgDescribeTwoVariable ' Me.lblThreeVariableCategorical.AutoSize = True Me.lblThreeVariableCategorical.ForeColor = System.Drawing.SystemColors.Highlight - Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(12, 33) + Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(18, 50) + Me.lblThreeVariableCategorical.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblThreeVariableCategorical.Name = "lblThreeVariableCategorical" - Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(59, 13) + Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(86, 20) Me.lblThreeVariableCategorical.TabIndex = 1 Me.lblThreeVariableCategorical.Text = "categorical" ' @@ -207,18 +218,20 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSummaryName.AutoSize = True Me.lblSummaryName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummaryName.Location = New System.Drawing.Point(70, 51) + Me.lblSummaryName.Location = New System.Drawing.Point(105, 76) + Me.lblSummaryName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSummaryName.Name = "lblSummaryName" - Me.lblSummaryName.Size = New System.Drawing.Size(0, 13) + Me.lblSummaryName.Size = New System.Drawing.Size(0, 20) Me.lblSummaryName.TabIndex = 3 ' 'lblSummary ' Me.lblSummary.AutoSize = True Me.lblSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummary.Location = New System.Drawing.Point(12, 51) + Me.lblSummary.Location = New System.Drawing.Point(18, 76) + Me.lblSummary.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSummary.Name = "lblSummary" - Me.lblSummary.Size = New System.Drawing.Size(53, 13) + Me.lblSummary.Size = New System.Drawing.Size(80, 20) Me.lblSummary.TabIndex = 2 Me.lblSummary.Text = "Summary:" ' @@ -226,9 +239,10 @@ Partial Class dlgDescribeTwoVariable ' Me.lblBy.AutoSize = True Me.lblBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblBy.Location = New System.Drawing.Point(82, 16) + Me.lblBy.Location = New System.Drawing.Point(123, 24) + Me.lblBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblBy.Name = "lblBy" - Me.lblBy.Size = New System.Drawing.Size(18, 13) + Me.lblBy.Size = New System.Drawing.Size(25, 20) Me.lblBy.TabIndex = 4 Me.lblBy.Text = "by" ' @@ -236,17 +250,19 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSecondType.AutoSize = True Me.lblSecondType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondType.Location = New System.Drawing.Point(106, 18) + Me.lblSecondType.Location = New System.Drawing.Point(159, 27) + Me.lblSecondType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSecondType.Name = "lblSecondType" - Me.lblSecondType.Size = New System.Drawing.Size(0, 13) + Me.lblSecondType.Size = New System.Drawing.Size(0, 20) Me.lblSecondType.TabIndex = 5 ' 'lblFirstGroupByFactor ' Me.lblFirstGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(315, 149) + Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(472, 224) + Me.lblFirstGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFirstGroupByFactor.Name = "lblFirstGroupByFactor" - Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(100, 15) + Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(150, 22) Me.lblFirstGroupByFactor.TabIndex = 7 Me.lblFirstGroupByFactor.Tag = "" Me.lblFirstGroupByFactor.Text = "Factor (Optional) :" @@ -259,9 +275,10 @@ Partial Class dlgDescribeTwoVariable Me.rdoSkim.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSkim.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSkim.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSkim.Location = New System.Drawing.Point(95, 8) + Me.rdoSkim.Location = New System.Drawing.Point(142, 12) + Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoSkim.Name = "rdoSkim" - Me.rdoSkim.Size = New System.Drawing.Size(100, 28) + Me.rdoSkim.Size = New System.Drawing.Size(150, 42) Me.rdoSkim.TabIndex = 1 Me.rdoSkim.Text = "Skim" Me.rdoSkim.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -270,9 +287,10 @@ Partial Class dlgDescribeTwoVariable 'lblThirdVariable ' Me.lblThirdVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThirdVariable.Location = New System.Drawing.Point(310, 191) + Me.lblThirdVariable.Location = New System.Drawing.Point(465, 286) + Me.lblThirdVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblThirdVariable.Name = "lblThirdVariable" - Me.lblThirdVariable.Size = New System.Drawing.Size(154, 15) + Me.lblThirdVariable.Size = New System.Drawing.Size(231, 22) Me.lblThirdVariable.TabIndex = 13 Me.lblThirdVariable.Tag = "" Me.lblThirdVariable.Text = "Third Variable :" @@ -280,9 +298,10 @@ Partial Class dlgDescribeTwoVariable 'lblSecondGroupByFactor ' Me.lblSecondGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(315, 191) + Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(472, 286) + Me.lblSecondGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSecondGroupByFactor.Name = "lblSecondGroupByFactor" - Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(137, 15) + Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(206, 22) Me.lblSecondGroupByFactor.TabIndex = 33 Me.lblSecondGroupByFactor.Tag = "" Me.lblSecondGroupByFactor.Text = "Second Factor (Optional) :" @@ -295,9 +314,10 @@ Partial Class dlgDescribeTwoVariable Me.rdoTwoVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoTwoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTwoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoTwoVariable.Location = New System.Drawing.Point(191, 8) + Me.rdoTwoVariable.Location = New System.Drawing.Point(286, 12) + Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoTwoVariable.Name = "rdoTwoVariable" - Me.rdoTwoVariable.Size = New System.Drawing.Size(100, 28) + Me.rdoTwoVariable.Size = New System.Drawing.Size(150, 42) Me.rdoTwoVariable.TabIndex = 2 Me.rdoTwoVariable.Text = "Two Variables" Me.rdoTwoVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -306,9 +326,10 @@ Partial Class dlgDescribeTwoVariable 'cmdSummaries ' Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSummaries.Location = New System.Drawing.Point(310, 248) + Me.cmdSummaries.Location = New System.Drawing.Point(465, 372) + Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdSummaries.Name = "cmdSummaries" - Me.cmdSummaries.Size = New System.Drawing.Size(120, 23) + Me.cmdSummaries.Size = New System.Drawing.Size(180, 34) Me.cmdSummaries.TabIndex = 1 Me.cmdSummaries.Tag = "Summaries" Me.cmdSummaries.Text = "Choose Summaries..." @@ -317,9 +338,10 @@ Partial Class dlgDescribeTwoVariable 'lblMarginName ' Me.lblMarginName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMarginName.Location = New System.Drawing.Point(15, 320) + Me.lblMarginName.Location = New System.Drawing.Point(22, 480) + Me.lblMarginName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMarginName.Name = "lblMarginName" - Me.lblMarginName.Size = New System.Drawing.Size(93, 15) + Me.lblMarginName.Size = New System.Drawing.Size(140, 22) Me.lblMarginName.TabIndex = 19 Me.lblMarginName.Tag = "" Me.lblMarginName.Text = "Margin Name:" @@ -328,9 +350,11 @@ Partial Class dlgDescribeTwoVariable ' Me.grpDisplay.Controls.Add(Me.ucrReceiverColumns) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) - Me.grpDisplay.Location = New System.Drawing.Point(276, 185) + Me.grpDisplay.Location = New System.Drawing.Point(414, 278) + Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Size = New System.Drawing.Size(194, 146) + Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDisplay.Size = New System.Drawing.Size(291, 219) Me.grpDisplay.TabIndex = 15 Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" @@ -339,16 +363,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverColumns.AutoSize = True Me.ucrReceiverColumns.frmParent = Me - Me.ucrReceiverColumns.Location = New System.Drawing.Point(13, 61) + Me.ucrReceiverColumns.Location = New System.Drawing.Point(30, 138) Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumns.Name = "ucrReceiverColumns" Me.ucrReceiverColumns.Selector = Nothing - Me.ucrReceiverColumns.Size = New System.Drawing.Size(120, 81) - Me.ucrReceiverColumns.Location = New System.Drawing.Point(20, 92) - Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverColumns.Name = "ucrReceiverColumns" - Me.ucrReceiverColumns.Selector = Nothing - Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 122) + Me.ucrReceiverColumns.Size = New System.Drawing.Size(270, 183) Me.ucrReceiverColumns.strNcFilePath = "" Me.ucrReceiverColumns.TabIndex = 55 Me.ucrReceiverColumns.ucrSelector = Nothing @@ -357,23 +376,18 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkDisplayAsPercentage.AutoSize = True Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(9, 15) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(4) - Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(114, 34) - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(21, 33) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 51) + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(256, 76) Me.ucrChkDisplayAsPercentage.TabIndex = 54 ' 'rdoOCol ' Me.rdoOCol.AutoSize = True - Me.rdoOCol.Location = New System.Drawing.Point(288, 224) - Me.rdoOCol.Margin = New System.Windows.Forms.Padding(2) + Me.rdoOCol.Location = New System.Drawing.Point(432, 336) Me.rdoOCol.Name = "rdoOCol" - Me.rdoOCol.Size = New System.Drawing.Size(54, 17) + Me.rdoOCol.Size = New System.Drawing.Size(81, 24) Me.rdoOCol.TabIndex = 40 Me.rdoOCol.TabStop = True Me.rdoOCol.Text = "Col(%)" @@ -382,10 +396,9 @@ Partial Class dlgDescribeTwoVariable 'rdoOCell ' Me.rdoOCell.AutoSize = True - Me.rdoOCell.Location = New System.Drawing.Point(408, 223) - Me.rdoOCell.Margin = New System.Windows.Forms.Padding(2) + Me.rdoOCell.Location = New System.Drawing.Point(612, 334) Me.rdoOCell.Name = "rdoOCell" - Me.rdoOCell.Size = New System.Drawing.Size(56, 17) + Me.rdoOCell.Size = New System.Drawing.Size(84, 24) Me.rdoOCell.TabIndex = 41 Me.rdoOCell.TabStop = True Me.rdoOCell.Text = "Cell(%)" @@ -394,10 +407,9 @@ Partial Class dlgDescribeTwoVariable 'rdoORow ' Me.rdoORow.AutoSize = True - Me.rdoORow.Location = New System.Drawing.Point(345, 224) - Me.rdoORow.Margin = New System.Windows.Forms.Padding(2) + Me.rdoORow.Location = New System.Drawing.Point(518, 336) Me.rdoORow.Name = "rdoORow" - Me.rdoORow.Size = New System.Drawing.Size(61, 17) + Me.rdoORow.Size = New System.Drawing.Size(90, 24) Me.rdoORow.TabIndex = 42 Me.rdoORow.TabStop = True Me.rdoORow.Text = "Row(%)" @@ -407,11 +419,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me - Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(310, 209) + Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 314) Me.ucrReceiverThreeVariableThirdVariable.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableThirdVariable.Name = "ucrReceiverThreeVariableThirdVariable" Me.ucrReceiverThreeVariableThirdVariable.Selector = Nothing - Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverThreeVariableThirdVariable.strNcFilePath = "" Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 14 Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing @@ -420,11 +432,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverPercentages.AutoSize = True Me.ucrReceiverPercentages.frmParent = Me - Me.ucrReceiverPercentages.Location = New System.Drawing.Point(287, 246) + Me.ucrReceiverPercentages.Location = New System.Drawing.Point(430, 369) Me.ucrReceiverPercentages.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPercentages.Name = "ucrReceiverPercentages" Me.ucrReceiverPercentages.Selector = Nothing - Me.ucrReceiverPercentages.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverPercentages.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverPercentages.strNcFilePath = "" Me.ucrReceiverPercentages.TabIndex = 39 Me.ucrReceiverPercentages.ucrSelector = Nothing @@ -432,21 +444,21 @@ Partial Class dlgDescribeTwoVariable 'ucrpnlPercent ' Me.ucrpnlPercent.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrpnlPercent.Location = New System.Drawing.Point(283, 221) - Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(4) + Me.ucrpnlPercent.Location = New System.Drawing.Point(424, 332) + Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrpnlPercent.Name = "ucrpnlPercent" - Me.ucrpnlPercent.Size = New System.Drawing.Size(180, 25) + Me.ucrpnlPercent.Size = New System.Drawing.Size(270, 38) Me.ucrpnlPercent.TabIndex = 43 ' 'ucrReceiverThreeVariableSecondFactor ' Me.ucrReceiverThreeVariableSecondFactor.AutoSize = True Me.ucrReceiverThreeVariableSecondFactor.frmParent = Me - Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(310, 164) + Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(465, 246) Me.ucrReceiverThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableSecondFactor.Name = "ucrReceiverThreeVariableSecondFactor" Me.ucrReceiverThreeVariableSecondFactor.Selector = Nothing - Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverThreeVariableSecondFactor.strNcFilePath = "" Me.ucrReceiverThreeVariableSecondFactor.TabIndex = 12 Me.ucrReceiverThreeVariableSecondFactor.ucrSelector = Nothing @@ -455,11 +467,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverSecondTwoVariableFactor.AutoSize = True Me.ucrReceiverSecondTwoVariableFactor.frmParent = Me - Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(310, 164) + Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(465, 246) Me.ucrReceiverSecondTwoVariableFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondTwoVariableFactor.Name = "ucrReceiverSecondTwoVariableFactor" Me.ucrReceiverSecondTwoVariableFactor.Selector = Nothing - Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSecondTwoVariableFactor.strNcFilePath = "" Me.ucrReceiverSecondTwoVariableFactor.TabIndex = 1 Me.ucrReceiverSecondTwoVariableFactor.ucrSelector = Nothing @@ -468,11 +480,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverFirstVars.AutoSize = True Me.ucrReceiverFirstVars.frmParent = Me - Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(310, 64) + Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(465, 96) Me.ucrReceiverFirstVars.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFirstVars.Name = "ucrReceiverFirstVars" Me.ucrReceiverFirstVars.Selector = Nothing - Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(120, 79) + Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(180, 118) Me.ucrReceiverFirstVars.strNcFilePath = "" Me.ucrReceiverFirstVars.TabIndex = 6 Me.ucrReceiverFirstVars.ucrSelector = Nothing @@ -480,10 +492,10 @@ Partial Class dlgDescribeTwoVariable 'ucrSaveTable ' Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTable.Location = New System.Drawing.Point(15, 451) - Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTable.Location = New System.Drawing.Point(22, 676) + Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveTable.Name = "ucrSaveTable" - Me.ucrSaveTable.Size = New System.Drawing.Size(306, 24) + Me.ucrSaveTable.Size = New System.Drawing.Size(459, 36) Me.ucrSaveTable.TabIndex = 24 ' 'ucrInputMarginName @@ -492,18 +504,18 @@ Partial Class dlgDescribeTwoVariable Me.ucrInputMarginName.AutoSize = True Me.ucrInputMarginName.IsMultiline = False Me.ucrInputMarginName.IsReadOnly = False - Me.ucrInputMarginName.Location = New System.Drawing.Point(114, 318) - Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputMarginName.Location = New System.Drawing.Point(171, 477) + Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) Me.ucrInputMarginName.Name = "ucrInputMarginName" - Me.ucrInputMarginName.Size = New System.Drawing.Size(137, 21) + Me.ucrInputMarginName.Size = New System.Drawing.Size(206, 32) Me.ucrInputMarginName.TabIndex = 22 ' 'ucrReorderSummary ' - Me.ucrReorderSummary.Location = New System.Drawing.Point(275, 273) - Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(6) + Me.ucrReorderSummary.Location = New System.Drawing.Point(412, 410) + Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrReorderSummary.Name = "ucrReorderSummary" - Me.ucrReorderSummary.Size = New System.Drawing.Size(194, 156) + Me.ucrReorderSummary.Size = New System.Drawing.Size(291, 234) Me.ucrReorderSummary.TabIndex = 16 Me.ucrReorderSummary.ucrDataFrameList = Nothing Me.ucrReorderSummary.ucrReceiver = Nothing @@ -512,21 +524,21 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(15, 489) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBase.Location = New System.Drawing.Point(22, 734) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 25 ' 'ucrReceiverSecondSkimrGroupByFactor ' Me.ucrReceiverSecondSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSecondSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(310, 204) + Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(465, 306) Me.ucrReceiverSecondSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondSkimrGroupByFactor.Name = "ucrReceiverSecondSkimrGroupByFactor" Me.ucrReceiverSecondSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSecondSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSecondSkimrGroupByFactor.TabIndex = 34 Me.ucrReceiverSecondSkimrGroupByFactor.ucrSelector = Nothing @@ -537,30 +549,30 @@ Partial Class dlgDescribeTwoVariable Me.ucrSelectorDescribeTwoVar.bDropUnusedFilterLevels = False Me.ucrSelectorDescribeTwoVar.bShowHiddenColumns = False Me.ucrSelectorDescribeTwoVar.bUseCurrentFilter = True - Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(11, 36) + Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(16, 54) Me.ucrSelectorDescribeTwoVar.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorDescribeTwoVar.Name = "ucrSelectorDescribeTwoVar" - Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(320, 274) Me.ucrSelectorDescribeTwoVar.TabIndex = 4 ' 'ucrPnlDescribe ' Me.ucrPnlDescribe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlDescribe.Location = New System.Drawing.Point(92, 3) - Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlDescribe.Location = New System.Drawing.Point(138, 4) + Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrPnlDescribe.Name = "ucrPnlDescribe" - Me.ucrPnlDescribe.Size = New System.Drawing.Size(317, 34) + Me.ucrPnlDescribe.Size = New System.Drawing.Size(476, 51) Me.ucrPnlDescribe.TabIndex = 0 ' 'ucrReceiverSkimrGroupByFactor ' Me.ucrReceiverSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(310, 164) + Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(465, 246) Me.ucrReceiverSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSkimrGroupByFactor.Name = "ucrReceiverSkimrGroupByFactor" Me.ucrReceiverSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSkimrGroupByFactor.TabIndex = 2 Me.ucrReceiverSkimrGroupByFactor.ucrSelector = Nothing @@ -569,90 +581,91 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkDisplayMargins.AutoSize = True Me.ucrChkDisplayMargins.Checked = False - Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(17, 296) - Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(26, 444) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" - Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(143, 23) + Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) Me.ucrChkDisplayMargins.TabIndex = 18 ' 'ucrChkLevSig ' Me.ucrChkLevSig.AutoSize = True Me.ucrChkLevSig.Checked = False - Me.ucrChkLevSig.Location = New System.Drawing.Point(397, 186) - Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkLevSig.Location = New System.Drawing.Point(596, 279) + Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkLevSig.Name = "ucrChkLevSig" - Me.ucrChkLevSig.Size = New System.Drawing.Size(86, 23) + Me.ucrChkLevSig.Size = New System.Drawing.Size(129, 34) Me.ucrChkLevSig.TabIndex = 38 ' 'ucrChkTotal ' Me.ucrChkTotal.AutoSize = True Me.ucrChkTotal.Checked = False - Me.ucrChkTotal.Location = New System.Drawing.Point(310, 186) - Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkTotal.Location = New System.Drawing.Point(465, 279) + Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkTotal.Name = "ucrChkTotal" - Me.ucrChkTotal.Size = New System.Drawing.Size(97, 23) + Me.ucrChkTotal.Size = New System.Drawing.Size(146, 34) Me.ucrChkTotal.TabIndex = 44 ' 'ucrChkMeans ' Me.ucrChkMeans.AutoSize = True Me.ucrChkMeans.Checked = False - Me.ucrChkMeans.Location = New System.Drawing.Point(310, 208) - Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkMeans.Location = New System.Drawing.Point(465, 312) + Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkMeans.Name = "ucrChkMeans" - Me.ucrChkMeans.Size = New System.Drawing.Size(97, 23) + Me.ucrChkMeans.Size = New System.Drawing.Size(146, 34) Me.ucrChkMeans.TabIndex = 37 ' 'ucrChkCorrelations ' Me.ucrChkCorrelations.AutoSize = True Me.ucrChkCorrelations.Checked = False - Me.ucrChkCorrelations.Location = New System.Drawing.Point(310, 254) - Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkCorrelations.Location = New System.Drawing.Point(465, 381) + Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkCorrelations.Name = "ucrChkCorrelations" - Me.ucrChkCorrelations.Size = New System.Drawing.Size(149, 23) + Me.ucrChkCorrelations.Size = New System.Drawing.Size(224, 34) Me.ucrChkCorrelations.TabIndex = 35 ' 'ucrChkSwapXYVar ' Me.ucrChkSwapXYVar.AutoSize = True Me.ucrChkSwapXYVar.Checked = False - Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(310, 231) - Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(465, 346) + Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkSwapXYVar.Name = "ucrChkSwapXYVar" - Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(157, 23) + Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(236, 34) Me.ucrChkSwapXYVar.TabIndex = 36 ' 'ucrChkOmitMissing ' Me.ucrChkOmitMissing.AutoSize = True Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(310, 277) - Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(465, 416) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" - Me.ucrChkOmitMissing.Size = New System.Drawing.Size(143, 23) + Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) Me.ucrChkOmitMissing.TabIndex = 0 ' 'ucrChkInteraction ' Me.ucrChkInteraction.AutoSize = True Me.ucrChkInteraction.Checked = False - Me.ucrChkInteraction.Location = New System.Drawing.Point(310, 253) - Me.ucrChkInteraction.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkInteraction.Location = New System.Drawing.Point(465, 380) + Me.ucrChkInteraction.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkInteraction.Name = "ucrChkInteraction" - Me.ucrChkInteraction.Size = New System.Drawing.Size(143, 23) + Me.ucrChkInteraction.Size = New System.Drawing.Size(214, 34) Me.ucrChkInteraction.TabIndex = 45 ' 'dlgDescribeTwoVariable ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ClientSize = New System.Drawing.Size(482, 467) - Me.Controls.Add(Me.ucrChkInteraction) + Me.ClientSize = New System.Drawing.Size(723, 700) + Me.Controls.Add(Me.ucrReorderSummary) Me.Controls.Add(Me.cmdSummaries) + Me.Controls.Add(Me.ucrChkInteraction) Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) Me.Controls.Add(Me.ucrReceiverPercentages) Me.Controls.Add(Me.rdoORow) @@ -665,7 +678,6 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.ucrSaveTable) Me.Controls.Add(Me.grpDisplay) Me.Controls.Add(Me.ucrInputMarginName) - Me.Controls.Add(Me.ucrReorderSummary) Me.Controls.Add(Me.lblMarginName) Me.Controls.Add(Me.cmdFormatTable) Me.Controls.Add(Me.ucrBase) @@ -692,6 +704,7 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.ucrChkMeans) Me.Controls.Add(Me.ucrChkOmitMissing) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDescribeTwoVariable" diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index e8ad795509..d6977a559b 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -831,7 +831,9 @@ Public Class dlgDescribeTwoVariable End If ElseIf rdoThreeVariable.Checked Then clsDummyFunction.AddParameter("checked", "three_variable", iPosition:=0) - + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) If IsFactorByFactorByFactor() Then cmdFormatTable.Visible = True ucrSaveTable.Location = New Point(23, 341) @@ -840,9 +842,6 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") ucrSaveTable.SetCheckBoxText("Store Table") - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, @@ -857,9 +856,6 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") ucrSaveTable.SetCheckBoxText("Store Cor") - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, @@ -879,16 +875,10 @@ Public Class dlgDescribeTwoVariable ucrChkInteraction.Location = New Point(310, 275) ucrChkMeans.Location = New Point(310, 300) If ucrChkSwapXYVar.Checked Then - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseRFunction(clsMapping2Function) clsDummyFunction.AddParameter("var", "True", iPosition:=5) Else clsDummyFunction.AddParameter("var", "False", iPosition:=5) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) End If ElseIf IsNumericByNumericByNumeric() Then @@ -902,9 +892,6 @@ Public Class dlgDescribeTwoVariable ucrChkLevSig.Location = New Point(397, 250) ucrChkInteraction.Location = New Point(310, 275) ucrChkMeans.Location = New Point(310, 300) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsNumericByFactorByFactor() Then cmdFormatTable.Visible = False @@ -917,9 +904,6 @@ Public Class dlgDescribeTwoVariable ucrChkLevSig.Location = New Point(397, 250) ucrChkInteraction.Location = New Point(310, 275) ucrChkMeans.Location = New Point(310, 300) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsNumericByFactorByNumeric() Then cmdFormatTable.Visible = False @@ -932,9 +916,6 @@ Public Class dlgDescribeTwoVariable ucrChkLevSig.Location = New Point(397, 250) ucrChkInteraction.Location = New Point(310, 275) ucrChkMeans.Location = New Point(310, 300) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSummariesOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFactorOperator) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCrossDfFunction) ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsFactorByNumericByFactor() OrElse IsFactorByFactorByNumeric() Then ucrSaveTable.SetPrefix("summary_table") From 39f452cd4ad85e9ea067c673f28e1e3a422110fb Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 28 Nov 2024 17:20:01 +0300 Subject: [PATCH 20/20] changes --- instat/dlgDescribeTwoVariable.Designer.vb | 78 +++++++++++------------ instat/dlgDescribeTwoVariable.vb | 4 +- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index 16e31a8d4f..5eb45c48ae 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -100,7 +100,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoThreeVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoThreeVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoThreeVariable.Location = New System.Drawing.Point(432, 12) - Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4) Me.rdoThreeVariable.Name = "rdoThreeVariable" Me.rdoThreeVariable.Size = New System.Drawing.Size(150, 42) Me.rdoThreeVariable.TabIndex = 3 @@ -113,7 +113,7 @@ Partial Class dlgDescribeTwoVariable Me.cmdFormatTable.Enabled = False Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdFormatTable.Location = New System.Drawing.Point(489, 645) - Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4) Me.cmdFormatTable.Name = "cmdFormatTable" Me.cmdFormatTable.Size = New System.Drawing.Size(156, 34) Me.cmdFormatTable.TabIndex = 23 @@ -135,7 +135,7 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdMissingOptions.Location = New System.Drawing.Point(538, 440) - Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4) Me.cmdMissingOptions.Name = "cmdMissingOptions" Me.cmdMissingOptions.Size = New System.Drawing.Size(158, 34) Me.cmdMissingOptions.TabIndex = 21 @@ -175,9 +175,9 @@ Partial Class dlgDescribeTwoVariable Me.grpSummaries.Controls.Add(Me.lblBy) Me.grpSummaries.Controls.Add(Me.lblSecondType) Me.grpSummaries.Location = New System.Drawing.Point(16, 328) - Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4) Me.grpSummaries.Size = New System.Drawing.Size(315, 108) Me.grpSummaries.TabIndex = 17 Me.grpSummaries.TabStop = False @@ -276,7 +276,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoSkim.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSkim.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoSkim.Location = New System.Drawing.Point(142, 12) - Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4) Me.rdoSkim.Name = "rdoSkim" Me.rdoSkim.Size = New System.Drawing.Size(150, 42) Me.rdoSkim.TabIndex = 1 @@ -315,7 +315,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoTwoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTwoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoTwoVariable.Location = New System.Drawing.Point(286, 12) - Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4) Me.rdoTwoVariable.Name = "rdoTwoVariable" Me.rdoTwoVariable.Size = New System.Drawing.Size(150, 42) Me.rdoTwoVariable.TabIndex = 2 @@ -327,7 +327,7 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdSummaries.Location = New System.Drawing.Point(465, 372) - Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4) Me.cmdSummaries.Name = "cmdSummaries" Me.cmdSummaries.Size = New System.Drawing.Size(180, 34) Me.cmdSummaries.TabIndex = 1 @@ -350,11 +350,11 @@ Partial Class dlgDescribeTwoVariable ' Me.grpDisplay.Controls.Add(Me.ucrReceiverColumns) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) - Me.grpDisplay.Location = New System.Drawing.Point(414, 278) - Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDisplay.Location = New System.Drawing.Point(414, 286) + Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.grpDisplay.Size = New System.Drawing.Size(291, 219) + Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4) + Me.grpDisplay.Size = New System.Drawing.Size(291, 265) Me.grpDisplay.TabIndex = 15 Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" @@ -363,29 +363,29 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverColumns.AutoSize = True Me.ucrReceiverColumns.frmParent = Me - Me.ucrReceiverColumns.Location = New System.Drawing.Point(30, 138) + Me.ucrReceiverColumns.Location = New System.Drawing.Point(40, 138) Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumns.Name = "ucrReceiverColumns" Me.ucrReceiverColumns.Selector = Nothing - Me.ucrReceiverColumns.Size = New System.Drawing.Size(270, 183) + Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 123) Me.ucrReceiverColumns.strNcFilePath = "" - Me.ucrReceiverColumns.TabIndex = 55 + Me.ucrReceiverColumns.TabIndex = 46 Me.ucrReceiverColumns.ucrSelector = Nothing ' 'ucrChkDisplayAsPercentage ' Me.ucrChkDisplayAsPercentage.AutoSize = True Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(21, 33) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(21, 32) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(256, 76) + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(256, 36) Me.ucrChkDisplayAsPercentage.TabIndex = 54 ' 'rdoOCol ' Me.rdoOCol.AutoSize = True - Me.rdoOCol.Location = New System.Drawing.Point(432, 336) + Me.rdoOCol.Location = New System.Drawing.Point(432, 357) Me.rdoOCol.Name = "rdoOCol" Me.rdoOCol.Size = New System.Drawing.Size(81, 24) Me.rdoOCol.TabIndex = 40 @@ -396,7 +396,7 @@ Partial Class dlgDescribeTwoVariable 'rdoOCell ' Me.rdoOCell.AutoSize = True - Me.rdoOCell.Location = New System.Drawing.Point(612, 334) + Me.rdoOCell.Location = New System.Drawing.Point(612, 355) Me.rdoOCell.Name = "rdoOCell" Me.rdoOCell.Size = New System.Drawing.Size(84, 24) Me.rdoOCell.TabIndex = 41 @@ -407,7 +407,7 @@ Partial Class dlgDescribeTwoVariable 'rdoORow ' Me.rdoORow.AutoSize = True - Me.rdoORow.Location = New System.Drawing.Point(518, 336) + Me.rdoORow.Location = New System.Drawing.Point(518, 357) Me.rdoORow.Name = "rdoORow" Me.rdoORow.Size = New System.Drawing.Size(90, 24) Me.rdoORow.TabIndex = 42 @@ -432,7 +432,7 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverPercentages.AutoSize = True Me.ucrReceiverPercentages.frmParent = Me - Me.ucrReceiverPercentages.Location = New System.Drawing.Point(430, 369) + Me.ucrReceiverPercentages.Location = New System.Drawing.Point(430, 390) Me.ucrReceiverPercentages.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPercentages.Name = "ucrReceiverPercentages" Me.ucrReceiverPercentages.Selector = Nothing @@ -444,7 +444,7 @@ Partial Class dlgDescribeTwoVariable 'ucrpnlPercent ' Me.ucrpnlPercent.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrpnlPercent.Location = New System.Drawing.Point(424, 332) + Me.ucrpnlPercent.Location = New System.Drawing.Point(424, 353) Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrpnlPercent.Name = "ucrpnlPercent" Me.ucrpnlPercent.Size = New System.Drawing.Size(270, 38) @@ -505,7 +505,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrInputMarginName.IsMultiline = False Me.ucrInputMarginName.IsReadOnly = False Me.ucrInputMarginName.Location = New System.Drawing.Point(171, 477) - Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) + Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputMarginName.Name = "ucrInputMarginName" Me.ucrInputMarginName.Size = New System.Drawing.Size(206, 32) Me.ucrInputMarginName.TabIndex = 22 @@ -513,7 +513,7 @@ Partial Class dlgDescribeTwoVariable 'ucrReorderSummary ' Me.ucrReorderSummary.Location = New System.Drawing.Point(412, 410) - Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9) Me.ucrReorderSummary.Name = "ucrReorderSummary" Me.ucrReorderSummary.Size = New System.Drawing.Size(291, 234) Me.ucrReorderSummary.TabIndex = 16 @@ -525,7 +525,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(22, 734) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 25 @@ -559,7 +559,7 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrPnlDescribe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlDescribe.Location = New System.Drawing.Point(138, 4) - Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlDescribe.Name = "ucrPnlDescribe" Me.ucrPnlDescribe.Size = New System.Drawing.Size(476, 51) Me.ucrPnlDescribe.TabIndex = 0 @@ -582,7 +582,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkDisplayMargins.AutoSize = True Me.ucrChkDisplayMargins.Checked = False Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(26, 444) - Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) Me.ucrChkDisplayMargins.TabIndex = 18 @@ -592,7 +592,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkLevSig.AutoSize = True Me.ucrChkLevSig.Checked = False Me.ucrChkLevSig.Location = New System.Drawing.Point(596, 279) - Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkLevSig.Name = "ucrChkLevSig" Me.ucrChkLevSig.Size = New System.Drawing.Size(129, 34) Me.ucrChkLevSig.TabIndex = 38 @@ -602,7 +602,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkTotal.AutoSize = True Me.ucrChkTotal.Checked = False Me.ucrChkTotal.Location = New System.Drawing.Point(465, 279) - Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkTotal.Name = "ucrChkTotal" Me.ucrChkTotal.Size = New System.Drawing.Size(146, 34) Me.ucrChkTotal.TabIndex = 44 @@ -612,7 +612,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkMeans.AutoSize = True Me.ucrChkMeans.Checked = False Me.ucrChkMeans.Location = New System.Drawing.Point(465, 312) - Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkMeans.Name = "ucrChkMeans" Me.ucrChkMeans.Size = New System.Drawing.Size(146, 34) Me.ucrChkMeans.TabIndex = 37 @@ -622,7 +622,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkCorrelations.AutoSize = True Me.ucrChkCorrelations.Checked = False Me.ucrChkCorrelations.Location = New System.Drawing.Point(465, 381) - Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkCorrelations.Name = "ucrChkCorrelations" Me.ucrChkCorrelations.Size = New System.Drawing.Size(224, 34) Me.ucrChkCorrelations.TabIndex = 35 @@ -632,7 +632,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkSwapXYVar.AutoSize = True Me.ucrChkSwapXYVar.Checked = False Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(465, 346) - Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkSwapXYVar.Name = "ucrChkSwapXYVar" Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(236, 34) Me.ucrChkSwapXYVar.TabIndex = 36 @@ -642,7 +642,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkOmitMissing.AutoSize = True Me.ucrChkOmitMissing.Checked = False Me.ucrChkOmitMissing.Location = New System.Drawing.Point(465, 416) - Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) Me.ucrChkOmitMissing.TabIndex = 0 @@ -652,7 +652,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkInteraction.AutoSize = True Me.ucrChkInteraction.Checked = False Me.ucrChkInteraction.Location = New System.Drawing.Point(465, 380) - Me.ucrChkInteraction.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkInteraction.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkInteraction.Name = "ucrChkInteraction" Me.ucrChkInteraction.Size = New System.Drawing.Size(214, 34) Me.ucrChkInteraction.TabIndex = 45 @@ -663,11 +663,11 @@ Partial Class dlgDescribeTwoVariable Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ClientSize = New System.Drawing.Size(723, 700) - Me.Controls.Add(Me.ucrReorderSummary) Me.Controls.Add(Me.cmdSummaries) + Me.Controls.Add(Me.ucrReceiverPercentages) + Me.Controls.Add(Me.ucrReorderSummary) Me.Controls.Add(Me.ucrChkInteraction) Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) - Me.Controls.Add(Me.ucrReceiverPercentages) Me.Controls.Add(Me.rdoORow) Me.Controls.Add(Me.rdoOCell) Me.Controls.Add(Me.rdoOCol) @@ -704,7 +704,7 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.ucrChkMeans) Me.Controls.Add(Me.ucrChkOmitMissing) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDescribeTwoVariable" @@ -765,7 +765,7 @@ Partial Class dlgDescribeTwoVariable Friend WithEvents rdoOCell As RadioButton Friend WithEvents rdoOCol As RadioButton Friend WithEvents ucrpnlPercent As UcrPanel - Friend WithEvents ucrReceiverColumns As ucrReceiverMultiple Friend WithEvents ucrChkTotal As ucrCheck Friend WithEvents ucrChkInteraction As ucrCheck + Friend WithEvents ucrReceiverColumns As ucrReceiverMultiple End Class diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index d6977a559b..0da50e2892 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -771,7 +771,7 @@ Public Class dlgDescribeTwoVariable ucrChkLevSig.Visible = False ucrChkTotal.Visible = False ucrChkInteraction.Visible = False - ucrSaveTable.Location = New Point(23, 385) + ucrSaveTable.Location = New Point(23, 370) clsDummyFunction.AddParameter("factor_cols", "FactorVar", iPosition:=1) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) ucrSaveTable.SetPrefix("frequency_table") @@ -1422,7 +1422,7 @@ Public Class dlgDescribeTwoVariable End If End Sub - Private Sub Frequencies_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverPercentages.ControlValueChanged, ucrReceiverColumns.ControlValueChanged, + Private Sub Frequencies_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverPercentages.ControlValueChanged, ucrChkDisplayAsPercentage.ControlValueChanged, ucrChkDisplayMargins.ControlValueChanged, ucrInputMarginName.ControlValueChanged, ucrpnlPercent.ControlValueChanged If rdoTwoVariable.Checked Then If ucrChkDisplayAsPercentage.Checked Then