From 23f5a73834945c45c3706527324952d6fe27123c Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Fri, 18 Oct 2024 11:24:34 +0300 Subject: [PATCH 01/37] 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/37] 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/37] 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/37] 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/37] 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/37] 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/37] 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/37] 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 a6781b73abe979e3d7226729aa0140eda690081a Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:36:44 +0100 Subject: [PATCH 09/37] Added a drop down and implemented the file option to the Help menu Icon --- instat/frmMain.Designer.vb | 74 ++++++++++++++++++++++++++++---------- instat/frmMain.vb | 16 +++++++-- 2 files changed, 69 insertions(+), 21 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index daae5be123..51e2ae14d7 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -426,7 +426,6 @@ Partial Class frmMain Me.ToolStripSeparator76 = New System.Windows.Forms.ToolStripSeparator() Me.mnuTbResetLayout = New System.Windows.Forms.ToolStripButton() Me.separator3 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuTbHelp = New System.Windows.Forms.ToolStripButton() Me.ToolStripSeparator77 = New System.Windows.Forms.ToolStripSeparator() Me.mnuTbLan = New System.Windows.Forms.ToolStripButton() Me.separator1 = New System.Windows.Forms.ToolStripSeparator() @@ -704,6 +703,11 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuTbHelp = New System.Windows.Forms.ToolStripSplitButton() + Me.mnuToolBarHelp = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDataWindowHelp = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuOutputHelp = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuLogScriptHelp = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3032,14 +3036,14 @@ Partial Class frmMain ' Me.mnuUndo.Name = "mnuUndo" Me.mnuUndo.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Z), System.Windows.Forms.Keys) - Me.mnuUndo.Size = New System.Drawing.Size(180, 22) + Me.mnuUndo.Size = New System.Drawing.Size(167, 22) Me.mnuUndo.Text = "Undo" ' 'mnuEditFind ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(180, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -3047,7 +3051,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(180, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -3055,27 +3059,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(180, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(180, 22) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) Me.mnuEditPasteNew.Text = "Paste New..." ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(180, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) Me.mnuEditWordwrap.Text = "Wordwrap..." ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(180, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -3356,16 +3360,6 @@ Partial Class frmMain Me.separator3.Name = "separator3" Me.separator3.Size = New System.Drawing.Size(6, 37) ' - 'mnuTbHelp - ' - Me.mnuTbHelp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.mnuTbHelp.Image = Global.instat.My.Resources.Resources.help2 - Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta - Me.mnuTbHelp.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) - Me.mnuTbHelp.Name = "mnuTbHelp" - Me.mnuTbHelp.Size = New System.Drawing.Size(34, 34) - Me.mnuTbHelp.Text = "He&lp" - ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" @@ -5256,6 +5250,44 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' + 'mnuTbHelp + ' + Me.mnuTbHelp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.mnuTbHelp.DropDownButtonWidth = 18 + Me.mnuTbHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolBarHelp, Me.mnuDataWindowHelp, Me.mnuOutputHelp, Me.mnuLogScriptHelp}) + Me.mnuTbHelp.Image = Global.instat.My.Resources.Resources.help2 + Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta + Me.mnuTbHelp.Name = "mnuTbHelp" + Me.mnuTbHelp.Size = New System.Drawing.Size(53, 34) + Me.mnuTbHelp.Text = "LogScript" + Me.mnuTbHelp.ToolTipText = "Help Window" + ' + 'mnuToolBarHelp + ' + Me.mnuToolBarHelp.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None + Me.mnuToolBarHelp.Name = "mnuToolBarHelp" + Me.mnuToolBarHelp.Size = New System.Drawing.Size(180, 22) + Me.mnuToolBarHelp.Text = "Toolbar Help" + ' + 'mnuDataWindowHelp + ' + Me.mnuDataWindowHelp.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None + Me.mnuDataWindowHelp.Name = "mnuDataWindowHelp" + Me.mnuDataWindowHelp.Size = New System.Drawing.Size(180, 22) + Me.mnuDataWindowHelp.Text = "Data Window Help" + ' + 'mnuOutputHelp + ' + Me.mnuOutputHelp.Name = "mnuOutputHelp" + Me.mnuOutputHelp.Size = New System.Drawing.Size(180, 22) + Me.mnuOutputHelp.Text = "Output Help" + ' + 'mnuLogScriptHelp + ' + Me.mnuLogScriptHelp.Name = "mnuLogScriptHelp" + Me.mnuLogScriptHelp.Size = New System.Drawing.Size(180, 22) + Me.mnuLogScriptHelp.Text = "Log Script Help" + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5343,7 +5375,6 @@ Partial Class frmMain Friend WithEvents toolStripSeparator As ToolStripSeparator Friend WithEvents separator1 As ToolStripSeparator Friend WithEvents separator2 As ToolStripSeparator - Friend WithEvents mnuTbHelp As ToolStripButton Private WithEvents mnuBar As MenuStrip Friend WithEvents mnuFile As ToolStripMenuItem Friend WithEvents mnuFileNewDataFrame As ToolStripMenuItem @@ -5981,4 +6012,9 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator15 As ToolStripSeparator Friend WithEvents mnuClimaticCheckDataDistances As ToolStripMenuItem Friend WithEvents mnuUndo As ToolStripMenuItem + Friend WithEvents mnuTbHelp As ToolStripSplitButton + Friend WithEvents mnuToolBarHelp As ToolStripMenuItem + Friend WithEvents mnuDataWindowHelp As ToolStripMenuItem + Friend WithEvents mnuOutputHelp As ToolStripMenuItem + Friend WithEvents mnuLogScriptHelp As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index de20ca5456..2d2a84e1ab 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -852,13 +852,25 @@ Public Class frmMain End Sub Private Sub mnuHelpHelp_Click(sender As Object, e As EventArgs) - Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TableOfContents, "") + Help.ShowHelp(Me, Me.strStaticPath & "/" & Me.strHelpFilePath, HelpNavigator.TopicId, "135") End Sub - Private Sub mnuTbHelp_Click(sender As Object, e As EventArgs) Handles mnuTbHelp.Click + Private Sub mnuTbHelp_Click(sender As Object, e As EventArgs) Handles mnuTbHelp.ButtonClick, mnuToolBarHelp.Click mnuHelpHelp_Click(sender, e) End Sub + Private Sub mnuDataWindowHelp_Click(sender As Object, e As EventArgs) Handles mnuDataWindowHelp.Click + Help.ShowHelp(Me, Me.strStaticPath & "/" & Me.strHelpFilePath, HelpNavigator.TopicId, "134") + End Sub + + Private Sub mnuOutputHelp_Click(sender As Object, e As EventArgs) Handles mnuOutputHelp.Click + Help.ShowHelp(Me, Me.strStaticPath & "/" & Me.strHelpFilePath, HelpNavigator.TopicId, "540") + End Sub + + Private Sub mnuLogScriptHelp_Click(sender As Object, e As EventArgs) Handles mnuLogScriptHelp.Click + Help.ShowHelp(Me, Me.strStaticPath & "/" & Me.strHelpFilePath, HelpNavigator.TopicId, "542") + End Sub + Private Sub mnuPrepareFactorRecode_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnFactorRecodeFactor.Click dlgRecodeFactor.ShowDialog() End Sub From 0d703819733d22761ff717b761f70e2daa8b866e Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 12 Nov 2024 12:29:13 +0300 Subject: [PATCH 10/37] Set No loaded data text correctly after auto saving --- instat/frmMain.vb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index de20ca5456..43b8517d4d 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1150,7 +1150,7 @@ Public Class frmMain strCurrentStatus = tstatus.Text If clsRLink.bInstatObjectExists Then - tstatus.Text = "Auto saving data..." + tstatus.Text = GetTranslation("Auto saving data...") Cursor = Cursors.WaitCursor If Not Directory.Exists(strAutoSaveDataFolderPath) Then Directory.CreateDirectory(strAutoSaveDataFolderPath) @@ -1168,11 +1168,16 @@ Public Class frmMain clsSaveRDS.AddParameter("object", clsRLink.strInstatDataObject) clsSaveRDS.AddParameter("file", Chr(34) & strCurrentAutoSaveDataFilePath.Replace("\", "/") & Chr(34)) clsRLink.RunInternalScript(clsSaveRDS.ToScript(), bSilent:=True, bShowWaitDialogOverride:=False) - tstatus.Text = strCurrentStatus + + If strCurrentStatus.Equals("No data loaded") Then + tstatus.Text = GetTranslation(strCurrentStatus) + Else + tstatus.Text = strCurrentStatus + End If + Cursor = Cursors.Default bFirstBackupDone = True End If - autoTranslate(Me) End Sub Public Sub DeleteAutoSaveFiles() From a0c8ec9c6a03e767c714e245b585a605483d9171 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Tue, 12 Nov 2024 11:54:49 +0000 Subject: [PATCH 11/37] 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 2965d1f33e9ef148572ebc685963a5bad897d39f Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Tue, 12 Nov 2024 12:56:31 +0100 Subject: [PATCH 12/37] Changes in the Summary dialogs --- instat/dlgClimaticSummary.vb | 3 +-- instat/dlgColumnStats.vb | 2 +- instat/dlgDisplayDailyData.vb | 2 +- instat/dlgExtremesClimatic.vb | 2 +- instat/dlgOneVariableSummarise.vb | 4 ++-- instat/sdgSummaries.vb | 6 +++--- .../R/BackendComponents/summary_functions.R | 2 +- .../R/Backend_Components/DisplayDaily.R | 6 +++--- .../R/Backend_Components/calculations.R | 4 ++-- .../R/Backend_Components/summary_functions.R | 20 +++++++++---------- instat/static/InstatObject/R/data_object_R6.R | 4 ++-- 11 files changed, 27 insertions(+), 28 deletions(-) diff --git a/instat/dlgClimaticSummary.vb b/instat/dlgClimaticSummary.vb index b91b6e6615..75753509a2 100644 --- a/instat/dlgClimaticSummary.vb +++ b/instat/dlgClimaticSummary.vb @@ -194,8 +194,7 @@ Public Class dlgClimaticSummary 'TODO: what defaults do we want? clsSummariesList.SetRCommand("c") - clsSummariesList.AddParameter("summary_count_non_missing", Chr(34) & "summary_count_non_missing" & Chr(34), bIncludeArgumentName:=False, iPosition:=1) - clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False, iPosition:=3) + clsSummariesList.AddParameter("summary_count_name", Chr(34) & "summary_count_name" & Chr(34), bIncludeArgumentName:=False, iPosition:=1) clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False, iPosition:=11) clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$calculate_summary") diff --git a/instat/dlgColumnStats.vb b/instat/dlgColumnStats.vb index 4a2e6621f6..7cf6ebacad 100644 --- a/instat/dlgColumnStats.vb +++ b/instat/dlgColumnStats.vb @@ -109,7 +109,7 @@ Public Class dlgColumnStats clsConcFunction.SetRCommand("c") clsSummariesList.SetRCommand("c") - clsSummariesList.AddParameter("summary_count_non_missing", Chr(34) & "summary_count_non_missing" & Chr(34), bIncludeArgumentName:=False, iPosition:=1) + clsSummariesList.AddParameter("summary_count_name", Chr(34) & "summary_count_name" & Chr(34), bIncludeArgumentName:=False, iPosition:=1) clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False, iPosition:=11) clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$calculate_summary") diff --git a/instat/dlgDisplayDailyData.vb b/instat/dlgDisplayDailyData.vb index c4cb6d9703..93808123a6 100644 --- a/instat/dlgDisplayDailyData.vb +++ b/instat/dlgDisplayDailyData.vb @@ -156,7 +156,7 @@ Public Class dlgDisplayDailyData ucrChkIQR.SetParameter(New RParameter("IQR", 5), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "IQR" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34)) ucrChkIQR.SetText("IQR") - ucrChkSumMissing.SetParameter(New RParameter("summary_count_missing", 6), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count_missing" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34)) + ucrChkSumMissing.SetParameter(New RParameter("summary_count_miss", 6), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count_miss" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34)) ucrChkSumMissing.SetText("N Missing") ucrNudNumberOfColumns.SetParameter(New RParameter("ncol", 1)) diff --git a/instat/dlgExtremesClimatic.vb b/instat/dlgExtremesClimatic.vb index 6c6052c193..06d745e640 100644 --- a/instat/dlgExtremesClimatic.vb +++ b/instat/dlgExtremesClimatic.vb @@ -447,7 +447,7 @@ Public Class dlgExtremesClimatic clsNSummary.AddParameter("save", "2", iPosition:=4) clsNSummary.SetAssignTo("n_dates_summary") - clsNFunction.SetRCommand("summary_count") + clsNFunction.SetRCommand("summary_count_all") clsNFunction.bToScriptAsRString = True clsFilterExtremeCalc.SetRCommand("instat_calculation$new") diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb index 1726ec1234..c5f9066229 100644 --- a/instat/dlgOneVariableSummarise.vb +++ b/instat/dlgOneVariableSummarise.vb @@ -248,8 +248,8 @@ Public Class dlgOneVariableSummarise strObjectName:="last_table") clsSummariesList.SetRCommand("c") - clsSummariesList.AddParameter("summary_count_non_missing", Chr(34) & "summary_count_non_missing" & Chr(34), bIncludeArgumentName:=False) - clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False) + clsSummariesList.AddParameter("summary_count_name", Chr(34) & "summary_count_name" & Chr(34), bIncludeArgumentName:=False) + clsSummariesList.AddParameter("summary_count_all", Chr(34) & "summary_count_all" & Chr(34), bIncludeArgumentName:=False) clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False) clsSummaryFunction.SetRCommand("summary") diff --git a/instat/sdgSummaries.vb b/instat/sdgSummaries.vb index 2398fc8111..d5b7fc37b6 100644 --- a/instat/sdgSummaries.vb +++ b/instat/sdgSummaries.vb @@ -45,13 +45,13 @@ Public Class sdgSummaries ucrPnlPosition.AddToLinkedControls({ucrChkFirst, ucrSelectorOrderBy, ucrReceiverOrderBy, ucrChkOrderBy, ucrChkLast, ucrChknth, ucrChkSample}, {rdoUsePositions}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlPosition.AddToLinkedControls({ucrChkWhichmin, ucrChkWhereMax, ucrChkWhereMin, ucrReceiverInclude, ucrSelectorInclude, ucrChkWhichmax}, {rdoDisplay}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkNonMissing.SetParameter(New RParameter("summary_count_non_missing", 1), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count_non_missing" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34)) + ucrChkNonMissing.SetParameter(New RParameter("summary_count_name", 1), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count_name" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34)) ucrChkNonMissing.SetText("N Non Missing") - ucrChkNMissing.SetParameter(New RParameter("summary_count_missing", 2), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count_missing" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34)) + ucrChkNMissing.SetParameter(New RParameter("summary_count_miss", 2), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count_miss" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34)) ucrChkNMissing.SetText("N Missing") - ucrChkNTotal.SetParameter(New RParameter("summary_count", 3), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34)) + ucrChkNTotal.SetParameter(New RParameter("summary_count_all", 3), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count_all" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34)) ucrChkNTotal.SetText("N Total") ucrChkMean.SetParameter(New RParameter("summary_mean", 4), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_mean" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34)) diff --git a/instat/static/ClimateObject/R/BackendComponents/summary_functions.R b/instat/static/ClimateObject/R/BackendComponents/summary_functions.R index dda6d82376..892a6f0f6e 100644 --- a/instat/static/ClimateObject/R/BackendComponents/summary_functions.R +++ b/instat/static/ClimateObject/R/BackendComponents/summary_functions.R @@ -1,7 +1,7 @@ # summary function labels sum_label="summary_sum" mode_label="summary_mode" -count_label="summary_count" +count_label="summary_count_all" count_over_threshold_label="summary_count_over_threshold" sd_label = "summary_sd" median_label = "summary_median" diff --git a/instat/static/InstatObject/R/Backend_Components/DisplayDaily.R b/instat/static/InstatObject/R/Backend_Components/DisplayDaily.R index 58a1eb7350..7d35d10709 100644 --- a/instat/static/InstatObject/R/Backend_Components/DisplayDaily.R +++ b/instat/static/InstatObject/R/Backend_Components/DisplayDaily.R @@ -221,9 +221,9 @@ DisplayDaily <- function(Datain,Stations,Variables,option=1,Years,Misscode,Trace outstats[st,(m+1)] <- gsub("\\s+","",outstats[st,(m+1)]) } } - # If all the data is NA, set the stats to NA (except summary_count_missing) + # If all the data is NA, set the stats to NA (except summary_count_miss) if(length(dat[,loc])==length(which(is.na(dat[,loc]==TRUE)))){ - outstats[which(monstats != "summary_count_missing"),(m+1)] <- "NA" + outstats[which(monstats != "summary_count_miss"),(m+1)] <- "NA" } # If there's no data, set all the stats to NA if(length(dat[,loc]) == 0) outstats[,(m+1)] <- "NA" @@ -278,7 +278,7 @@ DisplayDaily <- function(Datain,Stations,Variables,option=1,Years,Misscode,Trace out[dim(out)[1]+1,] <- "____" out[dim(out)[1],1] <- "STATS" # temp fix to shorten display name of summary function - outstats[,1][outstats[,1] == "summary_count_missing"] <- "n_miss" + outstats[,1][outstats[,1] == "summary_count_miss"] <- "n_miss" out <- rbind(out,outstats) #----------------------------------------------------------# diff --git a/instat/static/InstatObject/R/Backend_Components/calculations.R b/instat/static/InstatObject/R/Backend_Components/calculations.R index 2f3191c214..3b19592bbd 100644 --- a/instat/static/InstatObject/R/Backend_Components/calculations.R +++ b/instat/static/InstatObject/R/Backend_Components/calculations.R @@ -494,7 +494,7 @@ DataBook$set("public", "apply_instat_calculation", function(calc, curr_data_list # if it is a ordered factor... if (any(stringr::str_detect("ordered", col_data_type))){ # put in here the ones that DO work for ordered factor - if (any(grepl("summary_count_non_missing|summary_count_missing|summary_count|summary_min|summary_max|summary_range|summary_median|summary_quantile|p10|p20|p25|p30|p33|p40|p60|p67|p70|p75|p80|p90", formula_fn_exp))){ + if (any(grepl("summary_count_name|summary_count_miss|summary_count_all|summary_min|summary_max|summary_range|summary_median|summary_quantile|p10|p20|p25|p30|p33|p40|p60|p67|p70|p75|p80|p90", formula_fn_exp))){ curr_data_list[[c_data_label]] <- curr_data_list[[c_data_label]] %>% dplyr::summarise(!!calc$result_name := !!rlang::parse_expr(calc$function_exp)) } else { @@ -505,7 +505,7 @@ DataBook$set("public", "apply_instat_calculation", function(calc, curr_data_list # if it is a factor or character, do not work for anything except... } else if (any(stringr::str_detect("factor | character", col_data_type))){ # put in here the ones that DO work for factor or character - if (any(grepl("summary_count_non_missing|summary_count_missing|summary_count", formula_fn_exp))){ + if (any(grepl("summary_count_name|summary_count_miss|summary_count_all", formula_fn_exp))){ curr_data_list[[c_data_label]] <- curr_data_list[[c_data_label]] %>% dplyr::summarise(!!calc$result_name := !!rlang::parse_expr(calc$function_exp)) } else { diff --git a/instat/static/InstatObject/R/Backend_Components/summary_functions.R b/instat/static/InstatObject/R/Backend_Components/summary_functions.R index 397a72b261..7d15eb6a65 100644 --- a/instat/static/InstatObject/R/Backend_Components/summary_functions.R +++ b/instat/static/InstatObject/R/Backend_Components/summary_functions.R @@ -281,7 +281,7 @@ DataBook$set("public", "summary", function(data_name, columns_to_summarise, summ calculated_from[[1]] <- list(data_name = data_name, columns = columns_to_summarise) summaries <- unique(summaries) summaries <- summaries[order(match(summaries, all_summaries))] - summaries_count <- summaries[startsWith(summaries, "summary_count")] + summaries_count <- summaries[startsWith(summaries, "summary_count_all")] summaries_other <- setdiff(summaries, summaries_count) summaries <- c(summaries_count, summaries_other) count_summaries_max <- length(summaries_count) @@ -444,9 +444,9 @@ missing_values_check <- function(x) { # summary function labels sum_label <- "summary_sum" mode_label <- "summary_mode" -count_label <- "summary_count" -count_missing_label <- "summary_count_missing" -count_non_missing_label <- "summary_count_non_missing" +count_label <- "summary_count_all" +count_missing_label <- "summary_count_miss" +count_non_missing_label <- "summary_count_name" sd_label <- "summary_sd" var_label <- "summary_var" median_label <- "summary_median" @@ -575,13 +575,13 @@ na_check <- function(x, na_type = c(), na_consecutive_n = NULL, na_max_n = NULL, for (i in seq_along(na_type)) { type <- na_type[i] if (type %in% c("n","'n'")) { - res[i] <- summary_count_missing(x) <= na_max_n + res[i] <- summary_count_miss(x) <= na_max_n } else if (type %in% c("prop","'prop'")) { - res[i] <- (summary_count_missing(x) / summary_count(x)) <= na_max_prop / 100 + res[i] <- (summary_count_miss(x) / summary_count(x)) <= na_max_prop / 100 } else if (type %in% c("n_non_miss","'n_non_miss'")) { - res[i] <- summary_count_non_missing(x) >= na_min_n + res[i] <- summary_count_name(x) >= na_min_n } else if (type %in% c("FUN","'FUN'")) { res[i] <- na_FUN(x, ...) @@ -719,16 +719,16 @@ summary_sum <- function (x, weights = NULL, na.rm = FALSE, na_type = "", ...) { } -summary_count <- function(x, ...) { +summary_count_all <- function(x, ...) { return(length(x)) } -summary_count_missing <- function(x, ...) { +summary_count_miss <- function(x, ...) { return(sum(is.na(x))) } -summary_count_non_missing <- function(x, ...) { +summary_count_name <- function(x, ...) { return(sum(!is.na(x))) } diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 14171b6a9f..05d230eb34 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4458,8 +4458,8 @@ DataSheet$set("public", "patch_climate_element", function(date_col_name = "", va } if (length(col) == dim(curr_data)[[1]]) { self$add_columns_to_data(col_name = column_name, col_data = col) - gaps_remaining <- summary_count_missing(col) - gaps_filled <- (summary_count_missing(curr_data[, var]) - gaps_remaining) + gaps_remaining <- summary_count_miss(col) + gaps_filled <- (summary_count_miss(curr_data[, var]) - gaps_remaining) cat(gaps_filled, " gaps filled", gaps_remaining, " remaining.", "\n") } else if (gaps != 0) { cat(gaps, " rows for date gaps are missing, fill date gaps before proceeding.", "\n") From e3cf805a94664715193809765ae8ee55bc589341 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Tue, 12 Nov 2024 14:11:46 +0100 Subject: [PATCH 13/37] Code changes --- instat/dlgClimaticSummary.vb | 2 +- instat/dlgColumnStats.vb | 2 +- instat/dlgOneVariableSummarise.vb | 2 +- instat/sdgSummaries.vb | 2 +- .../static/InstatObject/R/Backend_Components/calculations.R | 4 ++-- .../InstatObject/R/Backend_Components/summary_functions.R | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/instat/dlgClimaticSummary.vb b/instat/dlgClimaticSummary.vb index 75753509a2..122ed4dfdc 100644 --- a/instat/dlgClimaticSummary.vb +++ b/instat/dlgClimaticSummary.vb @@ -194,7 +194,7 @@ Public Class dlgClimaticSummary 'TODO: what defaults do we want? clsSummariesList.SetRCommand("c") - clsSummariesList.AddParameter("summary_count_name", Chr(34) & "summary_count_name" & Chr(34), bIncludeArgumentName:=False, iPosition:=1) + clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False, iPosition:=1) clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False, iPosition:=11) clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$calculate_summary") diff --git a/instat/dlgColumnStats.vb b/instat/dlgColumnStats.vb index 7cf6ebacad..b67645c332 100644 --- a/instat/dlgColumnStats.vb +++ b/instat/dlgColumnStats.vb @@ -109,7 +109,7 @@ Public Class dlgColumnStats clsConcFunction.SetRCommand("c") clsSummariesList.SetRCommand("c") - clsSummariesList.AddParameter("summary_count_name", Chr(34) & "summary_count_name" & Chr(34), bIncludeArgumentName:=False, iPosition:=1) + clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False, iPosition:=1) clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False, iPosition:=11) clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$calculate_summary") diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb index c5f9066229..c973af6015 100644 --- a/instat/dlgOneVariableSummarise.vb +++ b/instat/dlgOneVariableSummarise.vb @@ -248,7 +248,7 @@ Public Class dlgOneVariableSummarise strObjectName:="last_table") clsSummariesList.SetRCommand("c") - clsSummariesList.AddParameter("summary_count_name", Chr(34) & "summary_count_name" & Chr(34), bIncludeArgumentName:=False) + clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False) clsSummariesList.AddParameter("summary_count_all", Chr(34) & "summary_count_all" & Chr(34), bIncludeArgumentName:=False) clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False) diff --git a/instat/sdgSummaries.vb b/instat/sdgSummaries.vb index d5b7fc37b6..f9dadb9333 100644 --- a/instat/sdgSummaries.vb +++ b/instat/sdgSummaries.vb @@ -45,7 +45,7 @@ Public Class sdgSummaries ucrPnlPosition.AddToLinkedControls({ucrChkFirst, ucrSelectorOrderBy, ucrReceiverOrderBy, ucrChkOrderBy, ucrChkLast, ucrChknth, ucrChkSample}, {rdoUsePositions}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlPosition.AddToLinkedControls({ucrChkWhichmin, ucrChkWhereMax, ucrChkWhereMin, ucrReceiverInclude, ucrSelectorInclude, ucrChkWhichmax}, {rdoDisplay}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkNonMissing.SetParameter(New RParameter("summary_count_name", 1), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count_name" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34)) + ucrChkNonMissing.SetParameter(New RParameter("summary_count", 1), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34)) ucrChkNonMissing.SetText("N Non Missing") ucrChkNMissing.SetParameter(New RParameter("summary_count_miss", 2), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=True, strNewValueIfChecked:=Chr(34) & "summary_count_miss" & Chr(34), strNewValueIfUnchecked:=Chr(34) & Chr(34)) diff --git a/instat/static/InstatObject/R/Backend_Components/calculations.R b/instat/static/InstatObject/R/Backend_Components/calculations.R index 3b19592bbd..62022de9be 100644 --- a/instat/static/InstatObject/R/Backend_Components/calculations.R +++ b/instat/static/InstatObject/R/Backend_Components/calculations.R @@ -494,7 +494,7 @@ DataBook$set("public", "apply_instat_calculation", function(calc, curr_data_list # if it is a ordered factor... if (any(stringr::str_detect("ordered", col_data_type))){ # put in here the ones that DO work for ordered factor - if (any(grepl("summary_count_name|summary_count_miss|summary_count_all|summary_min|summary_max|summary_range|summary_median|summary_quantile|p10|p20|p25|p30|p33|p40|p60|p67|p70|p75|p80|p90", formula_fn_exp))){ + if (any(grepl("summary_count|summary_count_miss|summary_count_all|summary_min|summary_max|summary_range|summary_median|summary_quantile|p10|p20|p25|p30|p33|p40|p60|p67|p70|p75|p80|p90", formula_fn_exp))){ curr_data_list[[c_data_label]] <- curr_data_list[[c_data_label]] %>% dplyr::summarise(!!calc$result_name := !!rlang::parse_expr(calc$function_exp)) } else { @@ -505,7 +505,7 @@ DataBook$set("public", "apply_instat_calculation", function(calc, curr_data_list # if it is a factor or character, do not work for anything except... } else if (any(stringr::str_detect("factor | character", col_data_type))){ # put in here the ones that DO work for factor or character - if (any(grepl("summary_count_name|summary_count_miss|summary_count_all", formula_fn_exp))){ + if (any(grepl("summary_count|summary_count_miss|summary_count_all", formula_fn_exp))){ curr_data_list[[c_data_label]] <- curr_data_list[[c_data_label]] %>% dplyr::summarise(!!calc$result_name := !!rlang::parse_expr(calc$function_exp)) } else { diff --git a/instat/static/InstatObject/R/Backend_Components/summary_functions.R b/instat/static/InstatObject/R/Backend_Components/summary_functions.R index 7d15eb6a65..e38e202c86 100644 --- a/instat/static/InstatObject/R/Backend_Components/summary_functions.R +++ b/instat/static/InstatObject/R/Backend_Components/summary_functions.R @@ -446,7 +446,7 @@ sum_label <- "summary_sum" mode_label <- "summary_mode" count_label <- "summary_count_all" count_missing_label <- "summary_count_miss" -count_non_missing_label <- "summary_count_name" +count_non_missing_label <- "summary_count" sd_label <- "summary_sd" var_label <- "summary_var" median_label <- "summary_median" @@ -581,7 +581,7 @@ na_check <- function(x, na_type = c(), na_consecutive_n = NULL, na_max_n = NULL, res[i] <- (summary_count_miss(x) / summary_count(x)) <= na_max_prop / 100 } else if (type %in% c("n_non_miss","'n_non_miss'")) { - res[i] <- summary_count_name(x) >= na_min_n + res[i] <- summary_count(x) >= na_min_n } else if (type %in% c("FUN","'FUN'")) { res[i] <- na_FUN(x, ...) @@ -728,7 +728,7 @@ summary_count_miss <- function(x, ...) { return(sum(is.na(x))) } -summary_count_name <- function(x, ...) { +summary_count <- function(x, ...) { return(sum(!is.na(x))) } From 09fad502cb7b4c75e6249c789a80cc793b227765 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 13 Nov 2024 11:52:34 +0300 Subject: [PATCH 14/37] minor code change --- instat/frmMain.vb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 43b8517d4d..6dffab81db 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1169,12 +1169,7 @@ Public Class frmMain clsSaveRDS.AddParameter("file", Chr(34) & strCurrentAutoSaveDataFilePath.Replace("\", "/") & Chr(34)) clsRLink.RunInternalScript(clsSaveRDS.ToScript(), bSilent:=True, bShowWaitDialogOverride:=False) - If strCurrentStatus.Equals("No data loaded") Then - tstatus.Text = GetTranslation(strCurrentStatus) - Else - tstatus.Text = strCurrentStatus - End If - + tstatus.Text = strCurrentStatus Cursor = Cursors.Default bFirstBackupDone = True End If From f9ae18bc83df1cdf28f56c35e742608ca4eb7506 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:06:56 +0100 Subject: [PATCH 15/37] Code changes --- instat/frmMain.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 2d2a84e1ab..c65a21370f 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -852,7 +852,7 @@ Public Class frmMain End Sub Private Sub mnuHelpHelp_Click(sender As Object, e As EventArgs) - Help.ShowHelp(Me, Me.strStaticPath & "/" & Me.strHelpFilePath, HelpNavigator.TopicId, "135") + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "135") End Sub Private Sub mnuTbHelp_Click(sender As Object, e As EventArgs) Handles mnuTbHelp.ButtonClick, mnuToolBarHelp.Click @@ -860,15 +860,15 @@ Public Class frmMain End Sub Private Sub mnuDataWindowHelp_Click(sender As Object, e As EventArgs) Handles mnuDataWindowHelp.Click - Help.ShowHelp(Me, Me.strStaticPath & "/" & Me.strHelpFilePath, HelpNavigator.TopicId, "134") + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "134") End Sub Private Sub mnuOutputHelp_Click(sender As Object, e As EventArgs) Handles mnuOutputHelp.Click - Help.ShowHelp(Me, Me.strStaticPath & "/" & Me.strHelpFilePath, HelpNavigator.TopicId, "540") + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "540") End Sub Private Sub mnuLogScriptHelp_Click(sender As Object, e As EventArgs) Handles mnuLogScriptHelp.Click - Help.ShowHelp(Me, Me.strStaticPath & "/" & Me.strHelpFilePath, HelpNavigator.TopicId, "542") + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "542") End Sub Private Sub mnuPrepareFactorRecode_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnFactorRecodeFactor.Click From 76523adada34034d1a0a4a1f12cecec51a0c7817 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:10:23 +0100 Subject: [PATCH 16/37] Created a dropdown for the Dataview button --- instat/frmMain.Designer.vb | 114 ++++++++++++++++++++++--------------- instat/frmMain.vb | 7 ++- 2 files changed, 71 insertions(+), 50 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 51e2ae14d7..1ace18cf46 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -405,7 +405,9 @@ Partial Class frmMain Me.toolStripSeparator = New System.Windows.Forms.ToolStripSeparator() Me.mnuTbLast10Dialogs = New System.Windows.Forms.ToolStripSplitButton() Me.separator2 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuTbDataView = New System.Windows.Forms.ToolStripButton() + Me.mnuTbDataView = New System.Windows.Forms.ToolStripSplitButton() + Me.mnuDataViewWindow = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuRDataViewerWindow = New System.Windows.Forms.ToolStripMenuItem() Me.mnuTbOutput = New System.Windows.Forms.ToolStripSplitButton() Me.mnuOutputWindow = New System.Windows.Forms.ToolStripMenuItem() Me.mnuShowRCommand = New System.Windows.Forms.ToolStripMenuItem() @@ -426,6 +428,11 @@ Partial Class frmMain Me.ToolStripSeparator76 = New System.Windows.Forms.ToolStripSeparator() Me.mnuTbResetLayout = New System.Windows.Forms.ToolStripButton() Me.separator3 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuTbHelp = New System.Windows.Forms.ToolStripSplitButton() + Me.mnuToolBarHelp = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDataWindowHelp = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuOutputHelp = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuLogScriptHelp = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator77 = New System.Windows.Forms.ToolStripSeparator() Me.mnuTbLan = New System.Windows.Forms.ToolStripButton() Me.separator1 = New System.Windows.Forms.ToolStripSeparator() @@ -703,11 +710,6 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuTbHelp = New System.Windows.Forms.ToolStripSplitButton() - Me.mnuToolBarHelp = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDataWindowHelp = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuOutputHelp = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuLogScriptHelp = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3199,15 +3201,31 @@ Partial Class frmMain ' 'mnuTbDataView ' - Me.mnuTbDataView.CheckOnClick = True Me.mnuTbDataView.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.mnuTbDataView.DropDownButtonWidth = 18 + Me.mnuTbDataView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDataViewWindow, Me.mnuRDataViewerWindow}) Me.mnuTbDataView.Image = Global.instat.My.Resources.Resources.dataframe2 Me.mnuTbDataView.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbDataView.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbDataView.Name = "mnuTbDataView" - Me.mnuTbDataView.Size = New System.Drawing.Size(34, 34) + Me.mnuTbDataView.Size = New System.Drawing.Size(53, 34) Me.mnuTbDataView.ToolTipText = "Toggle Data view open and closed" ' + 'mnuDataViewWindow + ' + Me.mnuDataViewWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None + Me.mnuDataViewWindow.Name = "mnuDataViewWindow" + Me.mnuDataViewWindow.Size = New System.Drawing.Size(180, 22) + Me.mnuDataViewWindow.Text = "Data View" + ' + 'mnuRDataViewerWindow + ' + Me.mnuRDataViewerWindow.Enabled = False + Me.mnuRDataViewerWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None + Me.mnuRDataViewerWindow.Name = "mnuRDataViewerWindow" + Me.mnuRDataViewerWindow.Size = New System.Drawing.Size(180, 22) + Me.mnuRDataViewerWindow.Text = "R-Data Viewer" + ' 'mnuTbOutput ' Me.mnuTbOutput.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image @@ -3360,6 +3378,44 @@ Partial Class frmMain Me.separator3.Name = "separator3" Me.separator3.Size = New System.Drawing.Size(6, 37) ' + 'mnuTbHelp + ' + Me.mnuTbHelp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.mnuTbHelp.DropDownButtonWidth = 18 + Me.mnuTbHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolBarHelp, Me.mnuDataWindowHelp, Me.mnuOutputHelp, Me.mnuLogScriptHelp}) + Me.mnuTbHelp.Image = Global.instat.My.Resources.Resources.help2 + Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta + Me.mnuTbHelp.Name = "mnuTbHelp" + Me.mnuTbHelp.Size = New System.Drawing.Size(53, 34) + Me.mnuTbHelp.Text = "LogScript" + Me.mnuTbHelp.ToolTipText = "Help Window" + ' + 'mnuToolBarHelp + ' + Me.mnuToolBarHelp.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None + Me.mnuToolBarHelp.Name = "mnuToolBarHelp" + Me.mnuToolBarHelp.Size = New System.Drawing.Size(173, 22) + Me.mnuToolBarHelp.Text = "Toolbar Help" + ' + 'mnuDataWindowHelp + ' + Me.mnuDataWindowHelp.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None + Me.mnuDataWindowHelp.Name = "mnuDataWindowHelp" + Me.mnuDataWindowHelp.Size = New System.Drawing.Size(173, 22) + Me.mnuDataWindowHelp.Text = "Data Window Help" + ' + 'mnuOutputHelp + ' + Me.mnuOutputHelp.Name = "mnuOutputHelp" + Me.mnuOutputHelp.Size = New System.Drawing.Size(173, 22) + Me.mnuOutputHelp.Text = "Output Help" + ' + 'mnuLogScriptHelp + ' + Me.mnuLogScriptHelp.Name = "mnuLogScriptHelp" + Me.mnuLogScriptHelp.Size = New System.Drawing.Size(173, 22) + Me.mnuLogScriptHelp.Text = "Log Script Help" + ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" @@ -5250,44 +5306,6 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'mnuTbHelp - ' - Me.mnuTbHelp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.mnuTbHelp.DropDownButtonWidth = 18 - Me.mnuTbHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolBarHelp, Me.mnuDataWindowHelp, Me.mnuOutputHelp, Me.mnuLogScriptHelp}) - Me.mnuTbHelp.Image = Global.instat.My.Resources.Resources.help2 - Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta - Me.mnuTbHelp.Name = "mnuTbHelp" - Me.mnuTbHelp.Size = New System.Drawing.Size(53, 34) - Me.mnuTbHelp.Text = "LogScript" - Me.mnuTbHelp.ToolTipText = "Help Window" - ' - 'mnuToolBarHelp - ' - Me.mnuToolBarHelp.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.mnuToolBarHelp.Name = "mnuToolBarHelp" - Me.mnuToolBarHelp.Size = New System.Drawing.Size(180, 22) - Me.mnuToolBarHelp.Text = "Toolbar Help" - ' - 'mnuDataWindowHelp - ' - Me.mnuDataWindowHelp.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.mnuDataWindowHelp.Name = "mnuDataWindowHelp" - Me.mnuDataWindowHelp.Size = New System.Drawing.Size(180, 22) - Me.mnuDataWindowHelp.Text = "Data Window Help" - ' - 'mnuOutputHelp - ' - Me.mnuOutputHelp.Name = "mnuOutputHelp" - Me.mnuOutputHelp.Size = New System.Drawing.Size(180, 22) - Me.mnuOutputHelp.Text = "Output Help" - ' - 'mnuLogScriptHelp - ' - Me.mnuLogScriptHelp.Name = "mnuLogScriptHelp" - Me.mnuLogScriptHelp.Size = New System.Drawing.Size(180, 22) - Me.mnuLogScriptHelp.Text = "Log Script Help" - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5687,7 +5705,6 @@ Partial Class frmMain Friend WithEvents mnuClimaticCMSAFPlotRegion As ToolStripMenuItem Friend WithEvents mnuPrepareColumnDateInfillMissingDates As ToolStripMenuItem Friend WithEvents mnuTbOpenFromLibrary As ToolStripButton - Friend WithEvents mnuTbDataView As ToolStripButton Friend WithEvents separator3 As ToolStripSeparator Friend WithEvents mnuTbResetLayout As ToolStripButton Friend WithEvents mnuTbOpen As ToolStripSplitButton @@ -6017,4 +6034,7 @@ Partial Class frmMain Friend WithEvents mnuDataWindowHelp As ToolStripMenuItem Friend WithEvents mnuOutputHelp As ToolStripMenuItem Friend WithEvents mnuLogScriptHelp As ToolStripMenuItem + Friend WithEvents mnuTbDataView As ToolStripSplitButton + Friend WithEvents mnuDataViewWindow As ToolStripMenuItem + Friend WithEvents mnuRDataViewerWindow As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index c65a21370f..968b5814c4 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -303,7 +303,7 @@ Public Class frmMain mnuDataFrameMetadat.Checked = False mnuSwapDataLogScript.Checked = False mnuSwapDataMetadata.Checked = False - mnuTbDataView.Checked = True + mnuDataViewWindow.Checked = True mnuOutputWindow.Checked = True mnuLogScript.Checked = False UpdateLayout() @@ -364,7 +364,7 @@ Public Class frmMain MsgBox(ex.Message) End Try - mnuTbDataView.Checked = mnuViewDataView.Checked + mnuDataViewWindow.Checked = mnuViewDataView.Checked mnuOutputWindow.Checked = mnuViewOutput.Checked mnuLogScript.Checked = mnuViewLogScript.Checked End Sub @@ -1832,8 +1832,9 @@ Public Class frmMain dlgInfill.ShowDialog() End Sub - Private Sub mnuDataView_Click(sender As Object, e As EventArgs) Handles mnuTbDataView.Click + Private Sub mnuDataView_Click(sender As Object, e As EventArgs) Handles mnuTbDataView.ButtonClick, mnuDataViewWindow.Click mnuViewDataView.Checked = Not mnuViewDataView.Checked + mnuDataViewWindow.Checked = mnuViewDataView.Checked UpdateLayout() End Sub From ea551584ebf6974eb7115b28e521197fcbe5e0d6 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 13 Nov 2024 14:56:16 +0300 Subject: [PATCH 17/37] 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 18/37] 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 19/37] 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 9e1d534d813530fb196a3001f8fbb5be236a8b33 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:36:35 +0100 Subject: [PATCH 20/37] Changes in the calculations.R --- .../InstatObject/R/Backend_Components/calculations.R | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/instat/static/InstatObject/R/Backend_Components/calculations.R b/instat/static/InstatObject/R/Backend_Components/calculations.R index 7ade797128..ebb95254ec 100644 --- a/instat/static/InstatObject/R/Backend_Components/calculations.R +++ b/instat/static/InstatObject/R/Backend_Components/calculations.R @@ -495,9 +495,8 @@ DataBook$set("public", "apply_instat_calculation", function(calc, curr_data_list if (any(stringr::str_detect("ordered", col_data_type))){ # put in here the ones that DO work for ordered factor - if (any(grepl("summary_count|summary_count_miss|summary_count_all|summary_min|summary_max|summary_range|summary_median|summary_quantile|p10|p20|p25|p30|p33|p40|p60|p67|p70|p75|p80|p90", formula_fn_exp))){ - if (any(grepl("summary_count_non_missing|summary_count_missing|summary_n_distinct|summary_count|summary_min|summary_max|summary_range|summary_median|summary_quantile|p10|p20|p25|p30|p33|p40|p60|p67|p70|p75|p80|p90", formula_fn_exp))){ + if (any(grepl("summary_count|summary_count_miss|summary_n_distinct|summary_count_all|summary_min|summary_max|summary_range|summary_median|summary_quantile|p10|p20|p25|p30|p33|p40|p60|p67|p70|p75|p80|p90", formula_fn_exp))){ curr_data_list[[c_data_label]] <- curr_data_list[[c_data_label]] %>% dplyr::summarise(!!calc$result_name := !!rlang::parse_expr(calc$function_exp)) @@ -510,9 +509,8 @@ DataBook$set("public", "apply_instat_calculation", function(calc, curr_data_list } else if (any(stringr::str_detect("factor | character", col_data_type))){ # put in here the ones that DO work for factor or character - if (any(grepl("summary_count|summary_count_miss|summary_count_all", formula_fn_exp))){ - - if (any(grepl("summary_count_non_missing|summary_count_missing|summary_n_distinct|summary_count", formula_fn_exp))){ + + if (any(grepl("summary_count|summary_count_miss|summary_n_distinct|summary_count_all", formula_fn_exp))){ curr_data_list[[c_data_label]] <- curr_data_list[[c_data_label]] %>% dplyr::summarise(!!calc$result_name := !!rlang::parse_expr(calc$function_exp)) From 144e1f2c3fe31972d3e4647165de45b4fbbd4758 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Thu, 14 Nov 2024 13:33:10 +0000 Subject: [PATCH 21/37] Fixing sort for descending --- instat/static/InstatObject/R/data_object_R6.R | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 05d230eb34..394c50eff4 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -1567,19 +1567,10 @@ DataSheet$set("public", "sort_dataframe", function(col_names = c(), decreasing = message("No sorting to be done.") } } else { - # Build the expressions using rlang for sorting columns - col_names_exp <- purrr::map(col_names, function(col_name) { - if (!(col_name %in% names(curr_data))) { - stop(col_name, " is not a column in the data.") - } - if (decreasing) dplyr::desc(rlang::sym(col_name)) else rlang::sym(col_name) - }) - - # Handle the case where sorting by row names and column names at the same time if (by_row_names) warning("Cannot sort by columns and row names. Sorting will be done by given columns only.") - - # Sort the data based on the expressions - self$set_data(dplyr::arrange(curr_data, !!!col_names_exp)) + + if (decreasing) self$set_data(dplyr::arrange(curr_data, dplyr::across(dplyr::all_of(col_names), desc))) + else self$set_data(dplyr::arrange(curr_data, dplyr::across(dplyr::all_of(col_names)))) } self$data_changed <- TRUE } From 98833d78f730860d5bf9c809bbd8222139d69abf Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 14 Nov 2024 16:51:37 +0300 Subject: [PATCH 22/37] 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 0a1ad3243a0b8d1b4adc5bc4fd5b9c9b1b0431cb Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 14 Nov 2024 17:27:17 +0300 Subject: [PATCH 23/37] changes to the code --- instat/dlgSummaryTables.Designer.vb | 15 --------------- instat/dlgSummaryTables.vb | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/instat/dlgSummaryTables.Designer.vb b/instat/dlgSummaryTables.Designer.vb index dc580406db..62161275db 100644 --- a/instat/dlgSummaryTables.Designer.vb +++ b/instat/dlgSummaryTables.Designer.vb @@ -55,7 +55,6 @@ Partial Class dlgSummaryTables Me.ucrPnlMargin = New instat.UcrPanel() Me.lblMarginName = New System.Windows.Forms.Label() Me.lblVariables = New System.Windows.Forms.Label() - Me.cmdFormatTable = New System.Windows.Forms.Button() Me.rdoFrequencyTable = New System.Windows.Forms.RadioButton() Me.rdoSummaryTable = New System.Windows.Forms.RadioButton() Me.grpPercentages = New System.Windows.Forms.GroupBox() @@ -297,18 +296,6 @@ Partial Class dlgSummaryTables Me.lblVariables.Tag = "" Me.lblVariables.Text = "Variables :" ' - 'cmdFormatTable - ' - Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFormatTable.Location = New System.Drawing.Point(429, 696) - 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 = 19 - Me.cmdFormatTable.Text = "Format Table..." - Me.cmdFormatTable.UseVisualStyleBackColor = True - Me.cmdFormatTable.Visible = False - ' 'rdoFrequencyTable ' Me.rdoFrequencyTable.Appearance = System.Windows.Forms.Appearance.Button @@ -701,7 +688,6 @@ Partial Class dlgSummaryTables Me.Controls.Add(Me.rdoFrequencyTable) Me.Controls.Add(Me.rdoSummaryTable) Me.Controls.Add(Me.ucrPnlSummaryFrequencyTables) - Me.Controls.Add(Me.cmdFormatTable) Me.Controls.Add(Me.ucrReorderSummary) Me.Controls.Add(Me.lblVariables) Me.Controls.Add(Me.ucrInputMarginName) @@ -763,7 +749,6 @@ Partial Class dlgSummaryTables Friend WithEvents ucrInputMarginName As ucrInputTextBox Friend WithEvents lblVariables As Label Friend WithEvents ucrReorderSummary As ucrReorder - Friend WithEvents cmdFormatTable As Button Friend WithEvents ucrPnlSummaryFrequencyTables As UcrPanel Friend WithEvents rdoFrequencyTable As RadioButton Friend WithEvents rdoSummaryTable As RadioButton diff --git a/instat/dlgSummaryTables.vb b/instat/dlgSummaryTables.vb index 909a040bf8..5239070065 100644 --- a/instat/dlgSummaryTables.vb +++ b/instat/dlgSummaryTables.vb @@ -313,8 +313,18 @@ Public Class dlgSummaryTables End If End Sub + Private Sub btnMoreOptions_Click(sender As Object, e As EventArgs) Handles btnMoreOptions.Click - sdgTableOptions.Setup(ucrSelectorSummaryTables.strCurrentDataFrame, clsJoiningPipeOperator) + Dim clsROperator As ROperator + If rdoFrequencyTable.Checked Then + clsROperator = clsFrequencyOperator + ElseIf rdoSummaryTable.Checked Then + clsROperator = clsSummaryOperator + Else + Exit Sub + End If + + sdgTableOptions.Setup(ucrSelectorSummaryTables.strCurrentDataFrame, clsROperator) sdgTableOptions.ShowDialog(Me) End Sub @@ -338,7 +348,7 @@ Public Class dlgSummaryTables TestOKEnabled() End Sub - Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Handles cmdFormatTable.Click + Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Dim clsROperator As ROperator If rdoFrequencyTable.Checked Then @@ -385,7 +395,6 @@ Public Class dlgSummaryTables Private Sub ucrPnlSummaryFrequencyTables_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSummaryFrequencyTables.ControlValueChanged cmdSummaries.Visible = rdoSummaryTable.Checked - cmdFormatTable.Location = New Point(286, If(rdoSummaryTable.Checked, 464, 273)) DialogueSize() SettingParameters() From 7c487403889ee160173caee347112ea52df2e5ec Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 15 Nov 2024 09:02:07 +0300 Subject: [PATCH 24/37] Added gtextras package name --- instat/UserTables/sdgTableOptions.vb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index 7140bb5b89..5eb01b1fca 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -77,10 +77,11 @@ Public Class sdgTableOptions Private Sub SetupTheme(clsOperator As ROperator) clsThemeRFunction = New RFunction + clsThemeRFunction.SetPackageName("gtExtras") ' Uncheck then the check radio button to forces the panel to raise its ControlValueChanged event - rdoSelectTheme.Checked = False - rdoSelectTheme.Checked = True + 'rdoSelectTheme.Checked = False + 'rdoSelectTheme.Checked = True If Not clsOperator.ContainsParameter("theme_format") Then Exit Sub From 5077a3452cff468c3605413172887de7d9658c77 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 15 Nov 2024 09:11:57 +0300 Subject: [PATCH 25/37] Refactored the code --- instat/UserTables/sdgTableOptions.vb | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index 5eb01b1fca..d7fa2263d4 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -76,26 +76,12 @@ Public Class sdgTableOptions ' Themes Private Sub SetupTheme(clsOperator As ROperator) - clsThemeRFunction = New RFunction - clsThemeRFunction.SetPackageName("gtExtras") - - ' Uncheck then the check radio button to forces the panel to raise its ControlValueChanged event - 'rdoSelectTheme.Checked = False - 'rdoSelectTheme.Checked = True - - If Not clsOperator.ContainsParameter("theme_format") Then - Exit Sub - End If - - clsThemeRFunction = clsOperator.GetParameter("theme_format").clsArgumentCodeStructure - - If clsThemeRFunction.strRCommand = "tab_options" Then - rdoManualTheme.Checked = True + If clsOperator.ContainsParameter("theme_format") Then + clsThemeRFunction = clsOperator.GetParameter("theme_format").clsArgumentCodeStructure Else - rdoSelectTheme.Checked = True - ucrCboSelectThemes.SetName(clsThemeRFunction.strRCommand) + clsThemeRFunction = New RFunction + clsThemeRFunction.SetPackageName("gtExtras") End If - End Sub Private Sub ucrPnlThemes_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlThemesPanel.ControlValueChanged From 4c6ade9d3bd90967386f338b519b502b4b67d52a Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:22:03 +0100 Subject: [PATCH 26/37] Fixed bug in Labels dialogue --- instat/dlgLabelsLevels.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgLabelsLevels.vb b/instat/dlgLabelsLevels.vb index c3eac2d5c0..a83bc95ce5 100644 --- a/instat/dlgLabelsLevels.vb +++ b/instat/dlgLabelsLevels.vb @@ -80,7 +80,7 @@ Public Class dlgLabelsLevels ucrSelectorForLabels.Focus() - clsSumCountMissingFunction.SetRCommand("summary_count_missing") + clsSumCountMissingFunction.SetRCommand("summary_count_miss") clsViewLabelsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$set_factor_levels") ucrBase.clsRsyntax.SetBaseRFunction(clsViewLabelsFunction) From d71a1c49052ff5aed8519f0e0c29c64a86b67d65 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 18 Nov 2024 18:51:58 +0300 Subject: [PATCH 27/37] 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 28/37] 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 29/37] 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 30/37] 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 43a173387ed793aef7c84593cffae482b2028107 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Tue, 26 Nov 2024 08:58:39 +0300 Subject: [PATCH 31/37] rename with improvements --- instat/dlgName.vb | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/instat/dlgName.vb b/instat/dlgName.vb index 8d04924200..6a37f79f96 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -145,7 +145,7 @@ Public Class dlgName ucrPnlOptions.AddToLinkedControls({ucrPnlCase, ucrPnlSelectData}, {rdoRenameWith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlCase.AddToLinkedControls(ucrInputCase, {rdoMakeCleanNames}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Snake") ucrPnlCase.AddToLinkedControls(ucrNudAbbreviate, {rdoAbbreviate}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="8") - ucrPnlCase.AddToLinkedControls(ucrInputReplace, {rdoReplace}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlCase.AddToLinkedControls(ucrInputReplace, {rdoReplace}, bNewLinkedHideIfParameterMissing:=True) ucrPnlCase.AddToLinkedControls(ucrInputBy, {rdoReplace}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") ucrPnlCase.AddToLinkedControls(ucrInputEdit, {rdoReplace}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Starts With") ucrPnlSelectData.AddToLinkedControls(ucrReceiverColumns, {rdoSelectedColumn}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -660,20 +660,26 @@ Public Class dlgName Private Sub RemovePattern() If rdoWholeDataFrame.Checked Then - If rdoReplace.Checked Then - clsDefaultRFunction.AddParameter("type", Chr(34) & "rename_with" & Chr(34), iPosition:=1) - clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) - clsDefaultRFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText() & Chr(34), iPosition:=4) - clsDefaultRFunction.RemoveParameterByName("label") - clsDefaultRFunction.AddParameter("replacement", Chr(34) & ucrInputBy.GetText() & Chr(34), iPosition:=5) - If ucrInputEdit.GetText = "Starts With" Then - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsStartwithFunction, iPosition:=3) - ElseIf ucrInputEdit.GetText = "Ends With" Then - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsEndswithFunction, iPosition:=3) - ElseIf ucrInputEdit.GetText = "Matches" Then - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsMatchesFunction, iPosition:=3) - ElseIf ucrInputEdit.GetText = "Contains" Then - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsContainsFunction, iPosition:=3) + If rdoRenameWith.Checked Then + If rdoReplace.Checked Then + clsDefaultRFunction.AddParameter("type", Chr(34) & "rename_with" & Chr(34), iPosition:=1) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) + clsDefaultRFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText() & Chr(34), iPosition:=4) + clsDefaultRFunction.RemoveParameterByName("label") + clsDefaultRFunction.AddParameter("replacement", Chr(34) & ucrInputBy.GetText() & Chr(34), iPosition:=5) + If ucrInputEdit.GetText = "Starts With" Then + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsStartwithFunction, iPosition:=3) + ElseIf ucrInputEdit.GetText = "Ends With" Then + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsEndswithFunction, iPosition:=3) + ElseIf ucrInputEdit.GetText = "Matches" Then + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsMatchesFunction, iPosition:=3) + ElseIf ucrInputEdit.GetText = "Contains" Then + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsContainsFunction, iPosition:=3) + End If + Else + clsDefaultRFunction.RemoveParameterByName("pattern") + clsDefaultRFunction.RemoveParameterByName("replacement") + clsDefaultRFunction.RemoveParameterByName(".cols") End If Else clsDefaultRFunction.RemoveParameterByName("pattern") From 1a39a2986a3b61c3cb7de08d40f51cdb0f4a8bb5 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 26 Nov 2024 12:54:10 +0300 Subject: [PATCH 32/37] 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 3ee9b3d303a5ad486f28d514f46accb21e4a9e05 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 26 Nov 2024 13:13:51 +0300 Subject: [PATCH 33/37] changes to the code --- instat/dlgDescribeTwoVariable.Designer.vb | 52 ++++++++++----------- instat/translations/rInstatTranslations.db | Bin 8306688 -> 8306688 bytes 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index fe9da77487..6f4ad6015c 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() @@ -359,6 +359,29 @@ Partial Class dlgDescribeTwoVariable Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" ' + 'ucrReceiverColumns + ' + Me.ucrReceiverColumns.AutoSize = True + Me.ucrReceiverColumns.frmParent = Me + 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 + ' 'rdoOCol ' Me.rdoOCol.AutoSize = True @@ -475,29 +498,6 @@ Partial Class dlgDescribeTwoVariable Me.ucrSaveTable.Size = New System.Drawing.Size(459, 36) 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 @@ -710,7 +710,7 @@ Partial Class dlgDescribeTwoVariable Me.Name = "dlgDescribeTwoVariable" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Describe_Two_Variable" - Me.Text = "Describe Two Variables" + Me.Text = "Summarise Two/Three Variables" Me.grpSummaries.ResumeLayout(False) Me.grpSummaries.PerformLayout() Me.grpDisplay.ResumeLayout(False) diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index b93a21cd916ded828d72748adab25dd442219e04..03eb772e1dc8c3ad774252d3c95c0b3e06fe9c99 100644 GIT binary patch delta 635 zcmXZV&sR(V0LAfn^W!~}MkP^d5~ech>>z*2on(^O2i10 zu!wa;oTww#6ZJ%b*g!N8jYJc%k!U715iP`KVhhnqv=Lj0cA|qw5}m|0qKnv0>>zd$ zDWaR`A$o~jM4H%5^b!4pO$-owzQOt45KiQRo<^q@3&+0(KU$nW5i5}njc2o2|Ci`tAKxX8jJd(#!mM8L5X62d8NkytM XFVE$Lyp&h6Ag|?(ybZjycV7KJm;waW delta 635 zcmWm4Ia5<%0EJ<)-Xwql5d|TFk;N#%ON>bLDk2IlXhexC?g!Vn2E`5MQk+RnGYv^M*n9JqNs%3Y1 zKO61gKyWfQW10DMw#T$4voTZCVn@u%YBXZzzFEoHa>AA#$;eL0$}Z`Z-O?vH*&}Bv8aJZo&fayiZTnncDG8+y59cKbD+I zZ(+&#Qq{p+ALW_|CjbBd From 2f222a5113429a9c1a1209ad41e3a9df38718675 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Tue, 26 Nov 2024 10:15:39 +0000 Subject: [PATCH 34/37] Update release-build.yml @N-thony This updates the release to point to IDEMS repository for Data. Please double check on next release --- .github/workflows/release-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index cc94814728..328705a201 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -104,7 +104,7 @@ jobs: - name: Checkout Instat Data uses: actions/checkout@v3 with: - repository: ' africanmathsinitiative/R-Instat-Data' + repository: ' IDEMSInternational/R-Instat-Data' fetch-depth: 0 path: 'InstatData' From 6d8f1cdd905e4fa85a9cf0ab2d82ba40d030de64 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 27 Nov 2024 11:47:13 +0300 Subject: [PATCH 35/37] 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 26eb99a376111e5c6a3f21327cbfd0fce446e26b Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:04:38 +0300 Subject: [PATCH 36/37] code improvements --- instat/dlgName.vb | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/instat/dlgName.vb b/instat/dlgName.vb index 6a37f79f96..b108de0f7e 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -660,27 +660,23 @@ Public Class dlgName Private Sub RemovePattern() If rdoWholeDataFrame.Checked Then - If rdoRenameWith.Checked Then - If rdoReplace.Checked Then - clsDefaultRFunction.AddParameter("type", Chr(34) & "rename_with" & Chr(34), iPosition:=1) - clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) - clsDefaultRFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText() & Chr(34), iPosition:=4) - clsDefaultRFunction.RemoveParameterByName("label") - clsDefaultRFunction.AddParameter("replacement", Chr(34) & ucrInputBy.GetText() & Chr(34), iPosition:=5) - If ucrInputEdit.GetText = "Starts With" Then + If rdoRenameWith.Checked AndAlso rdoReplace.Checked Then + clsDefaultRFunction.AddParameter("type", Chr(34) & "rename_with" & Chr(34), iPosition:=1) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) + clsDefaultRFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText() & Chr(34), iPosition:=4) + clsDefaultRFunction.RemoveParameterByName("label") + clsDefaultRFunction.AddParameter("replacement", Chr(34) & ucrInputBy.GetText() & Chr(34), iPosition:=5) + + Select Case ucrInputEdit.GetText + Case "Starts With" clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsStartwithFunction, iPosition:=3) - ElseIf ucrInputEdit.GetText = "Ends With" Then + Case "Ends With" clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsEndswithFunction, iPosition:=3) - ElseIf ucrInputEdit.GetText = "Matches" Then + Case "Matches" clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsMatchesFunction, iPosition:=3) - ElseIf ucrInputEdit.GetText = "Contains" Then + Case "Contains" clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsContainsFunction, iPosition:=3) - End If - Else - clsDefaultRFunction.RemoveParameterByName("pattern") - clsDefaultRFunction.RemoveParameterByName("replacement") - clsDefaultRFunction.RemoveParameterByName(".cols") - End If + End Select Else clsDefaultRFunction.RemoveParameterByName("pattern") clsDefaultRFunction.RemoveParameterByName("replacement") From 39f452cd4ad85e9ea067c673f28e1e3a422110fb Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 28 Nov 2024 17:20:01 +0300 Subject: [PATCH 37/37] 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