diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index d2a3d494067..7c5ce7f72bb 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -38,190 +38,283 @@ Partial Class dlgDescribeTwoVariable 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.cmdSummaries = New System.Windows.Forms.Button() - Me.lblFirstVariable = New System.Windows.Forms.Label() - Me.lbSecondVariable = New System.Windows.Forms.Label() - Me.grpOptions = New System.Windows.Forms.GroupBox() + Me.rdoThreeVariable = New System.Windows.Forms.RadioButton() + Me.cmdFormatTable = New System.Windows.Forms.Button() + Me.lblThreeVariableSecondFactor = New System.Windows.Forms.Label() Me.cmdMissingOptions = New System.Windows.Forms.Button() - Me.ucrChkOmitMissing = New instat.ucrCheck() - Me.lblSummary = New System.Windows.Forms.Label() + Me.lbSecondVariable = New System.Windows.Forms.Label() + Me.lblFirstVariable = New System.Windows.Forms.Label() + Me.grpColumnFactor = New System.Windows.Forms.GroupBox() + Me.rdoVariableFactor = New System.Windows.Forms.RadioButton() + Me.rdoSummaryVariable = New System.Windows.Forms.RadioButton() + Me.rdoNoColumnFactor = New System.Windows.Forms.RadioButton() + Me.grpSummaries = New System.Windows.Forms.GroupBox() Me.lblFirstType = New System.Windows.Forms.Label() + Me.lblSecondBy = New System.Windows.Forms.Label() + Me.lblThreeVariableCategorical = New System.Windows.Forms.Label() + Me.lblSummaryName = New System.Windows.Forms.Label() + Me.lblSummary = New System.Windows.Forms.Label() Me.lblBy = New System.Windows.Forms.Label() Me.lblSecondType = New System.Windows.Forms.Label() - Me.lblSummaryName = New System.Windows.Forms.Label() - Me.grpSummaries = New System.Windows.Forms.GroupBox() - Me.rdoCustomize = New System.Windows.Forms.RadioButton() + Me.lblFirstGroupByFactor = New System.Windows.Forms.Label() Me.rdoSkim = New System.Windows.Forms.RadioButton() - Me.lbSecondOpt = New System.Windows.Forms.Label() - Me.lblSecondFactor = New System.Windows.Forms.Label() - Me.lblNumericVariable = New System.Windows.Forms.Label() + Me.lblThirdVariable = New System.Windows.Forms.Label() + Me.lblSecondGroupByFactor = New System.Windows.Forms.Label() + Me.rdoTwoVariable = New System.Windows.Forms.RadioButton() + Me.cmdSummaries = New System.Windows.Forms.Button() Me.lblMarginName = New System.Windows.Forms.Label() Me.grpDisplay = New System.Windows.Forms.GroupBox() - Me.ucrReceiverPercentages = New instat.ucrReceiverSingle() - Me.lblFactorsAsPercentage = New System.Windows.Forms.Label() + Me.lblFactorAsPercentage = New System.Windows.Forms.Label() + Me.ucrSaveTable = New instat.ucrSave() Me.ucrChkPercentageProportion = New instat.ucrCheck() + Me.ucrReceiverPercentages = New instat.ucrReceiverSingle() Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() - Me.grpFrequency = New System.Windows.Forms.GroupBox() - Me.ucrNudColumnFactors = New instat.ucrNud() - Me.lblColumnFactors = New System.Windows.Forms.Label() - Me.ucrNudSigFigs = New instat.ucrNud() Me.ucrInputMarginName = New instat.ucrInputTextBox() - Me.lblSigFigs = New System.Windows.Forms.Label() + Me.ucrReorderSummary = New instat.ucrReorder() Me.ucrChkDisplayMargins = New instat.ucrCheck() - Me.rdoThreeVariable = New System.Windows.Forms.RadioButton() + Me.ucrReceiverColumnFactor = New instat.ucrReceiverSingle() + Me.ucrPnlColumnFactor = New instat.UcrPanel() Me.ucrBase = New instat.ucrButtons() - Me.ucrReceiverNumericVariable = New instat.ucrReceiverSingle() - Me.ucrReceiverSecondFactor = New instat.ucrReceiverSingle() - Me.ucrReceiverSecondOpt = New instat.ucrReceiverSingle() - Me.ucrPnlDescribe = New instat.UcrPanel() - Me.ucrReceiverSecondVar = New instat.ucrReceiverSingle() - Me.ucrReceiverFirstVars = New instat.ucrReceiverMultiple() + Me.ucrReceiverThreeVariableThirdVariable = New instat.ucrReceiverSingle() + Me.ucrReceiverSecondSkimrGroupByFactor = New instat.ucrReceiverSingle() + Me.ucrReceiverSecondTwoVariableFactor = New instat.ucrReceiverSingle() Me.ucrSelectorDescribeTwoVar = New instat.ucrSelectorByDataFrameAddRemove() - Me.grpOptions.SuspendLayout() + Me.ucrReceiverFirstVars = New instat.ucrReceiverMultiple() + Me.ucrPnlDescribe = New instat.UcrPanel() + Me.ucrReceiverThreeVariableSecondFactor = New instat.ucrReceiverSingle() + Me.ucrReceiverSkimrGroupByFactor = New instat.ucrReceiverSingle() + Me.ucrChkOmitMissing = New instat.ucrCheck() + Me.grpColumnFactor.SuspendLayout() Me.grpSummaries.SuspendLayout() Me.grpDisplay.SuspendLayout() - Me.grpFrequency.SuspendLayout() Me.SuspendLayout() ' - 'cmdSummaries + 'rdoThreeVariable ' - Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSummaries.Location = New System.Drawing.Point(6, 70) - Me.cmdSummaries.Name = "cmdSummaries" - Me.cmdSummaries.Size = New System.Drawing.Size(105, 23) - Me.cmdSummaries.TabIndex = 1 - Me.cmdSummaries.Tag = "Summaries" - Me.cmdSummaries.Text = "Summaries" - Me.cmdSummaries.UseVisualStyleBackColor = True + Me.rdoThreeVariable.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoThreeVariable.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoThreeVariable.FlatAppearance.BorderSize = 2 + 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.Name = "rdoThreeVariable" + Me.rdoThreeVariable.Size = New System.Drawing.Size(150, 42) + Me.rdoThreeVariable.TabIndex = 26 + Me.rdoThreeVariable.Text = "Three Variables" + Me.rdoThreeVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoThreeVariable.UseVisualStyleBackColor = True + ' + 'cmdFormatTable + ' + Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdFormatTable.Location = New System.Drawing.Point(489, 634) + 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 = 44 + Me.cmdFormatTable.Text = "Format Table..." + Me.cmdFormatTable.UseVisualStyleBackColor = True + ' + '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.Name = "lblThreeVariableSecondFactor" + Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(150, 22) + Me.lblThreeVariableSecondFactor.TabIndex = 35 + Me.lblThreeVariableSecondFactor.Tag = "" + Me.lblThreeVariableSecondFactor.Text = "Second Variable :" + ' + 'cmdMissingOptions + ' + Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdMissingOptions.Location = New System.Drawing.Point(250, 444) + 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 = 46 + Me.cmdMissingOptions.Text = "Missing Options..." + Me.cmdMissingOptions.UseVisualStyleBackColor = True + ' + '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.Name = "lbSecondVariable" + Me.lbSecondVariable.Size = New System.Drawing.Size(150, 22) + Me.lbSecondVariable.TabIndex = 27 + Me.lbSecondVariable.Tag = "" + Me.lbSecondVariable.Text = "Second Variable:" ' 'lblFirstVariable ' Me.lblFirstVariable.AutoSize = True Me.lblFirstVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstVariable.Location = New System.Drawing.Point(268, 58) + 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.TabIndex = 4 + Me.lblFirstVariable.Size = New System.Drawing.Size(114, 20) + Me.lblFirstVariable.TabIndex = 31 Me.lblFirstVariable.Tag = "" Me.lblFirstVariable.Text = "First Variables:" ' - 'lbSecondVariable + 'grpColumnFactor + ' + Me.grpColumnFactor.Controls.Add(Me.ucrReceiverColumnFactor) + Me.grpColumnFactor.Controls.Add(Me.rdoVariableFactor) + Me.grpColumnFactor.Controls.Add(Me.rdoSummaryVariable) + Me.grpColumnFactor.Controls.Add(Me.rdoNoColumnFactor) + Me.grpColumnFactor.Controls.Add(Me.ucrPnlColumnFactor) + Me.grpColumnFactor.Location = New System.Drawing.Point(21, 504) + Me.grpColumnFactor.Margin = New System.Windows.Forms.Padding(4) + Me.grpColumnFactor.Name = "grpColumnFactor" + Me.grpColumnFactor.Padding = New System.Windows.Forms.Padding(4) + Me.grpColumnFactor.Size = New System.Drawing.Size(382, 146) + Me.grpColumnFactor.TabIndex = 51 + Me.grpColumnFactor.TabStop = False + Me.grpColumnFactor.Text = "Columns" + ' + 'rdoVariableFactor + ' + Me.rdoVariableFactor.AutoSize = True + Me.rdoVariableFactor.Location = New System.Drawing.Point(22, 68) + Me.rdoVariableFactor.Margin = New System.Windows.Forms.Padding(4) + Me.rdoVariableFactor.Name = "rdoVariableFactor" + Me.rdoVariableFactor.Size = New System.Drawing.Size(142, 24) + Me.rdoVariableFactor.TabIndex = 51 + Me.rdoVariableFactor.TabStop = True + Me.rdoVariableFactor.Text = "Variable Factor" + Me.rdoVariableFactor.UseVisualStyleBackColor = True + ' + 'rdoSummaryVariable + ' + Me.rdoSummaryVariable.AutoSize = True + Me.rdoSummaryVariable.Location = New System.Drawing.Point(22, 34) + Me.rdoSummaryVariable.Margin = New System.Windows.Forms.Padding(4) + Me.rdoSummaryVariable.Name = "rdoSummaryVariable" + Me.rdoSummaryVariable.Size = New System.Drawing.Size(163, 24) + Me.rdoSummaryVariable.TabIndex = 47 + Me.rdoSummaryVariable.TabStop = True + Me.rdoSummaryVariable.Text = "Summary Variable" + Me.rdoSummaryVariable.UseVisualStyleBackColor = True + ' + 'rdoNoColumnFactor + ' + Me.rdoNoColumnFactor.AutoSize = True + Me.rdoNoColumnFactor.Location = New System.Drawing.Point(22, 99) + Me.rdoNoColumnFactor.Margin = New System.Windows.Forms.Padding(4) + Me.rdoNoColumnFactor.Name = "rdoNoColumnFactor" + Me.rdoNoColumnFactor.Size = New System.Drawing.Size(162, 24) + Me.rdoNoColumnFactor.TabIndex = 50 + Me.rdoNoColumnFactor.TabStop = True + Me.rdoNoColumnFactor.Text = "No Column Factor" + Me.rdoNoColumnFactor.UseVisualStyleBackColor = True ' - Me.lbSecondVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lbSecondVariable.Location = New System.Drawing.Point(268, 164) - Me.lbSecondVariable.Name = "lbSecondVariable" - Me.lbSecondVariable.Size = New System.Drawing.Size(100, 15) - Me.lbSecondVariable.TabIndex = 3 - Me.lbSecondVariable.Tag = "" - Me.lbSecondVariable.Text = "Second Variable:" + 'grpSummaries ' - 'grpOptions + Me.grpSummaries.Controls.Add(Me.lblFirstType) + Me.grpSummaries.Controls.Add(Me.lblSecondBy) + Me.grpSummaries.Controls.Add(Me.lblThreeVariableCategorical) + Me.grpSummaries.Controls.Add(Me.lblSummaryName) + 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(17, 328) + Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4) + Me.grpSummaries.Name = "grpSummaries" + Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4) + Me.grpSummaries.Size = New System.Drawing.Size(315, 108) + Me.grpSummaries.TabIndex = 39 + Me.grpSummaries.TabStop = False ' - Me.grpOptions.Controls.Add(Me.cmdMissingOptions) - Me.grpOptions.Controls.Add(Me.ucrChkOmitMissing) - Me.grpOptions.Controls.Add(Me.cmdSummaries) - Me.grpOptions.Location = New System.Drawing.Point(242, 222) - Me.grpOptions.Name = "grpOptions" - Me.grpOptions.Size = New System.Drawing.Size(169, 103) - Me.grpOptions.TabIndex = 12 - Me.grpOptions.TabStop = False - Me.grpOptions.Text = "Options" + 'lblFirstType ' - 'cmdMissingOptions + 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.Name = "lblFirstType" + Me.lblFirstType.Size = New System.Drawing.Size(0, 20) + Me.lblFirstType.TabIndex = 0 ' - Me.cmdMissingOptions.Enabled = False - Me.cmdMissingOptions.Location = New System.Drawing.Point(7, 44) - Me.cmdMissingOptions.Name = "cmdMissingOptions" - Me.cmdMissingOptions.Size = New System.Drawing.Size(104, 23) - Me.cmdMissingOptions.TabIndex = 2 - Me.cmdMissingOptions.Text = "Options" - Me.cmdMissingOptions.UseVisualStyleBackColor = True + 'lblSecondBy ' - 'ucrChkOmitMissing + 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.Name = "lblSecondBy" + Me.lblSecondBy.Size = New System.Drawing.Size(25, 20) + Me.lblSecondBy.TabIndex = 1 + Me.lblSecondBy.Text = "by" ' - Me.ucrChkOmitMissing.AutoSize = True - Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(9, 19) - Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" - Me.ucrChkOmitMissing.Size = New System.Drawing.Size(143, 23) - Me.ucrChkOmitMissing.TabIndex = 0 + 'lblThreeVariableCategorical + ' + 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.Name = "lblThreeVariableCategorical" + Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(86, 20) + Me.lblThreeVariableCategorical.TabIndex = 3 + Me.lblThreeVariableCategorical.Text = "categorical" + ' + 'lblSummaryName + ' + 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.Name = "lblSummaryName" + Me.lblSummaryName.Size = New System.Drawing.Size(0, 20) + Me.lblSummaryName.TabIndex = 5 ' 'lblSummary ' Me.lblSummary.AutoSize = True Me.lblSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummary.Location = New System.Drawing.Point(6, 43) + 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 = 4 Me.lblSummary.Text = "Summary:" ' - 'lblFirstType - ' - Me.lblFirstType.ForeColor = System.Drawing.SystemColors.ControlText - Me.lblFirstType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstType.Location = New System.Drawing.Point(-20, 16) - Me.lblFirstType.Name = "lblFirstType" - Me.lblFirstType.Size = New System.Drawing.Size(83, 13) - Me.lblFirstType.TabIndex = 0 - Me.lblFirstType.TextAlign = System.Drawing.ContentAlignment.TopRight - ' 'lblBy ' Me.lblBy.AutoSize = True Me.lblBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblBy.Location = New System.Drawing.Point(66, 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.TabIndex = 1 + Me.lblBy.Size = New System.Drawing.Size(25, 20) + Me.lblBy.TabIndex = 6 Me.lblBy.Text = "by" ' 'lblSecondType ' Me.lblSecondType.AutoSize = True Me.lblSecondType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondType.Location = New System.Drawing.Point(85, 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.TabIndex = 2 - ' - 'lblSummaryName - ' - Me.lblSummaryName.AutoSize = True - Me.lblSummaryName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummaryName.Location = New System.Drawing.Point(60, 43) - Me.lblSummaryName.Name = "lblSummaryName" - Me.lblSummaryName.Size = New System.Drawing.Size(0, 13) - Me.lblSummaryName.TabIndex = 3 - ' - 'grpSummaries + Me.lblSecondType.Size = New System.Drawing.Size(0, 20) + Me.lblSecondType.TabIndex = 0 ' - Me.grpSummaries.Controls.Add(Me.lblFirstType) - Me.grpSummaries.Controls.Add(Me.lblSummaryName) - 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(10, 227) - Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Size = New System.Drawing.Size(210, 72) - Me.grpSummaries.TabIndex = 11 - Me.grpSummaries.TabStop = False + 'lblFirstGroupByFactor ' - 'rdoCustomize - ' - Me.rdoCustomize.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoCustomize.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCustomize.FlatAppearance.BorderSize = 2 - Me.rdoCustomize.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCustomize.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoCustomize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoCustomize.Location = New System.Drawing.Point(144, 12) - Me.rdoCustomize.Name = "rdoCustomize" - Me.rdoCustomize.Size = New System.Drawing.Size(100, 28) - Me.rdoCustomize.TabIndex = 2 - Me.rdoCustomize.Text = "Two Variables" - Me.rdoCustomize.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoCustomize.UseVisualStyleBackColor = True + 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.Name = "lblFirstGroupByFactor" + Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(150, 22) + Me.lblFirstGroupByFactor.TabIndex = 29 + Me.lblFirstGroupByFactor.Tag = "" + Me.lblFirstGroupByFactor.Text = "Factor (Optional) :" ' 'rdoSkim ' @@ -231,161 +324,144 @@ 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(49, 12) + Me.rdoSkim.Location = New System.Drawing.Point(143, 12) + Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4) Me.rdoSkim.Name = "rdoSkim" - Me.rdoSkim.Size = New System.Drawing.Size(100, 28) - Me.rdoSkim.TabIndex = 1 + Me.rdoSkim.Size = New System.Drawing.Size(150, 42) + Me.rdoSkim.TabIndex = 23 Me.rdoSkim.Text = "Skim" Me.rdoSkim.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoSkim.UseVisualStyleBackColor = True ' - 'lbSecondOpt - ' - Me.lbSecondOpt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lbSecondOpt.Location = New System.Drawing.Point(271, 163) - Me.lbSecondOpt.Name = "lbSecondOpt" - Me.lbSecondOpt.Size = New System.Drawing.Size(100, 15) - Me.lbSecondOpt.TabIndex = 6 - Me.lbSecondOpt.Tag = "" - Me.lbSecondOpt.Text = "Factor (Optional) :" - ' - 'lblSecondFactor - ' - Me.lblSecondFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondFactor.Location = New System.Drawing.Point(270, 206) - Me.lblSecondFactor.Name = "lblSecondFactor" - Me.lblSecondFactor.Size = New System.Drawing.Size(137, 15) - Me.lblSecondFactor.TabIndex = 8 - Me.lblSecondFactor.Tag = "" - Me.lblSecondFactor.Text = "Second Factor (Optional) :" + '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.Name = "lblThirdVariable" + Me.lblThirdVariable.Size = New System.Drawing.Size(231, 22) + Me.lblThirdVariable.TabIndex = 37 + Me.lblThirdVariable.Tag = "" + Me.lblThirdVariable.Text = "Third Variable :" + ' + '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.Name = "lblSecondGroupByFactor" + Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(206, 22) + Me.lblSecondGroupByFactor.TabIndex = 33 + Me.lblSecondGroupByFactor.Tag = "" + Me.lblSecondGroupByFactor.Text = "Second Factor (Optional) :" + ' + 'rdoTwoVariable + ' + Me.rdoTwoVariable.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoTwoVariable.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoTwoVariable.FlatAppearance.BorderSize = 2 + 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.Name = "rdoTwoVariable" + Me.rdoTwoVariable.Size = New System.Drawing.Size(150, 42) + Me.rdoTwoVariable.TabIndex = 24 + Me.rdoTwoVariable.Text = "Two Variables" + Me.rdoTwoVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoTwoVariable.UseVisualStyleBackColor = True ' - 'lblNumericVariable + 'cmdSummaries ' - Me.lblNumericVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblNumericVariable.Location = New System.Drawing.Point(270, 203) - Me.lblNumericVariable.Name = "lblNumericVariable" - Me.lblNumericVariable.Size = New System.Drawing.Size(154, 15) - Me.lblNumericVariable.TabIndex = 10 - Me.lblNumericVariable.Tag = "" - Me.lblNumericVariable.Text = "Numeric Variable (Optional):" + Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdSummaries.Location = New System.Drawing.Point(465, 344) + 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 + Me.cmdSummaries.Tag = "Summaries" + Me.cmdSummaries.Text = "Choose Summaries..." + Me.cmdSummaries.UseVisualStyleBackColor = True ' 'lblMarginName ' - Me.lblMarginName.AutoSize = True Me.lblMarginName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMarginName.Location = New System.Drawing.Point(11, 101) + 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(41, 13) - Me.lblMarginName.TabIndex = 19 - Me.lblMarginName.Text = "Name :" + Me.lblMarginName.Size = New System.Drawing.Size(140, 22) + Me.lblMarginName.TabIndex = 54 + Me.lblMarginName.Tag = "" + Me.lblMarginName.Text = "Margin Name:" ' 'grpDisplay ' - Me.grpDisplay.Controls.Add(Me.ucrReceiverPercentages) - Me.grpDisplay.Controls.Add(Me.lblFactorsAsPercentage) Me.grpDisplay.Controls.Add(Me.ucrChkPercentageProportion) + Me.grpDisplay.Controls.Add(Me.lblFactorAsPercentage) + Me.grpDisplay.Controls.Add(Me.ucrReceiverPercentages) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) - Me.grpDisplay.Location = New System.Drawing.Point(239, 250) + Me.grpDisplay.Location = New System.Drawing.Point(412, 308) + Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Size = New System.Drawing.Size(174, 120) - Me.grpDisplay.TabIndex = 21 + Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4) + Me.grpDisplay.Size = New System.Drawing.Size(291, 172) + Me.grpDisplay.TabIndex = 56 Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" ' - 'ucrReceiverPercentages + 'lblFactorAsPercentage ' - Me.ucrReceiverPercentages.AutoSize = True - Me.ucrReceiverPercentages.frmParent = Me - Me.ucrReceiverPercentages.Location = New System.Drawing.Point(21, 63) - 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.strNcFilePath = "" - Me.ucrReceiverPercentages.TabIndex = 8 - Me.ucrReceiverPercentages.ucrSelector = Nothing + Me.lblFactorAsPercentage.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFactorAsPercentage.Location = New System.Drawing.Point(14, 63) + Me.lblFactorAsPercentage.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFactorAsPercentage.Name = "lblFactorAsPercentage" + Me.lblFactorAsPercentage.Size = New System.Drawing.Size(231, 22) + Me.lblFactorAsPercentage.TabIndex = 56 + Me.lblFactorAsPercentage.Tag = "" + Me.lblFactorAsPercentage.Text = "Factor as Percentage:" ' - 'lblFactorsAsPercentage + 'ucrSaveTable ' - Me.lblFactorsAsPercentage.AutoSize = True - Me.lblFactorsAsPercentage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFactorsAsPercentage.Location = New System.Drawing.Point(18, 44) - Me.lblFactorsAsPercentage.Name = "lblFactorsAsPercentage" - Me.lblFactorsAsPercentage.Size = New System.Drawing.Size(117, 13) - Me.lblFactorsAsPercentage.TabIndex = 1 - Me.lblFactorsAsPercentage.Tag = "Factors as Percentage:" - Me.lblFactorsAsPercentage.Text = "Factors as Percentage:" + Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveTable.Location = New System.Drawing.Point(23, 676) + Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSaveTable.Name = "ucrSaveTable" + Me.ucrSaveTable.Size = New System.Drawing.Size(598, 36) + Me.ucrSaveTable.TabIndex = 57 ' 'ucrChkPercentageProportion ' Me.ucrChkPercentageProportion.AutoSize = True Me.ucrChkPercentageProportion.Checked = False - Me.ucrChkPercentageProportion.Location = New System.Drawing.Point(14, 86) + Me.ucrChkPercentageProportion.Location = New System.Drawing.Point(18, 126) + Me.ucrChkPercentageProportion.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkPercentageProportion.Name = "ucrChkPercentageProportion" - Me.ucrChkPercentageProportion.Size = New System.Drawing.Size(154, 23) - Me.ucrChkPercentageProportion.TabIndex = 3 + Me.ucrChkPercentageProportion.Size = New System.Drawing.Size(214, 51) + Me.ucrChkPercentageProportion.TabIndex = 57 + ' + 'ucrReceiverPercentages + ' + Me.ucrReceiverPercentages.AutoSize = True + Me.ucrReceiverPercentages.frmParent = Nothing + Me.ucrReceiverPercentages.Location = New System.Drawing.Point(18, 86) + Me.ucrReceiverPercentages.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPercentages.Name = "ucrReceiverPercentages" + Me.ucrReceiverPercentages.Selector = Nothing + Me.ucrReceiverPercentages.Size = New System.Drawing.Size(214, 30) + Me.ucrReceiverPercentages.strNcFilePath = "" + Me.ucrReceiverPercentages.TabIndex = 55 + Me.ucrReceiverPercentages.ucrSelector = Nothing ' 'ucrChkDisplayAsPercentage ' Me.ucrChkDisplayAsPercentage.AutoSize = True Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 19) + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(18, 26) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(135, 23) - Me.ucrChkDisplayAsPercentage.TabIndex = 0 - ' - 'grpFrequency - ' - Me.grpFrequency.Controls.Add(Me.ucrNudColumnFactors) - Me.grpFrequency.Controls.Add(Me.lblColumnFactors) - Me.grpFrequency.Controls.Add(Me.ucrNudSigFigs) - Me.grpFrequency.Controls.Add(Me.ucrInputMarginName) - Me.grpFrequency.Controls.Add(Me.lblMarginName) - Me.grpFrequency.Controls.Add(Me.lblSigFigs) - Me.grpFrequency.Controls.Add(Me.ucrChkDisplayMargins) - Me.grpFrequency.Location = New System.Drawing.Point(10, 302) - Me.grpFrequency.Name = "grpFrequency" - Me.grpFrequency.Size = New System.Drawing.Size(223, 127) - Me.grpFrequency.TabIndex = 22 - Me.grpFrequency.TabStop = False - Me.grpFrequency.Text = "Display" - ' - 'ucrNudColumnFactors - ' - Me.ucrNudColumnFactors.AutoSize = True - Me.ucrNudColumnFactors.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudColumnFactors.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudColumnFactors.Location = New System.Drawing.Point(129, 48) - Me.ucrNudColumnFactors.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudColumnFactors.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudColumnFactors.Name = "ucrNudColumnFactors" - Me.ucrNudColumnFactors.Size = New System.Drawing.Size(50, 20) - Me.ucrNudColumnFactors.TabIndex = 22 - Me.ucrNudColumnFactors.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'lblColumnFactors - ' - Me.lblColumnFactors.AutoSize = True - Me.lblColumnFactors.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumnFactors.Location = New System.Drawing.Point(8, 53) - Me.lblColumnFactors.Name = "lblColumnFactors" - Me.lblColumnFactors.Size = New System.Drawing.Size(83, 13) - Me.lblColumnFactors.TabIndex = 21 - Me.lblColumnFactors.Tag = "" - Me.lblColumnFactors.Text = "Column Factors:" - ' - 'ucrNudSigFigs - ' - Me.ucrNudSigFigs.AutoSize = True - Me.ucrNudSigFigs.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSigFigs.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSigFigs.Location = New System.Drawing.Point(129, 22) - Me.ucrNudSigFigs.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSigFigs.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSigFigs.Name = "ucrNudSigFigs" - Me.ucrNudSigFigs.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSigFigs.TabIndex = 5 - Me.ucrNudSigFigs.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(214, 51) + Me.ucrChkDisplayAsPercentage.TabIndex = 54 ' 'ucrInputMarginName ' @@ -393,224 +469,271 @@ Partial Class dlgDescribeTwoVariable Me.ucrInputMarginName.AutoSize = True Me.ucrInputMarginName.IsMultiline = False Me.ucrInputMarginName.IsReadOnly = False - Me.ucrInputMarginName.Location = New System.Drawing.Point(53, 98) + Me.ucrInputMarginName.Location = New System.Drawing.Point(171, 477) + Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputMarginName.Name = "ucrInputMarginName" - Me.ucrInputMarginName.Size = New System.Drawing.Size(74, 21) - Me.ucrInputMarginName.TabIndex = 20 + Me.ucrInputMarginName.Size = New System.Drawing.Size(206, 32) + Me.ucrInputMarginName.TabIndex = 55 ' - 'lblSigFigs + 'ucrReorderSummary ' - Me.lblSigFigs.AutoSize = True - Me.lblSigFigs.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSigFigs.Location = New System.Drawing.Point(8, 25) - Me.lblSigFigs.Name = "lblSigFigs" - Me.lblSigFigs.Size = New System.Drawing.Size(96, 13) - Me.lblSigFigs.TabIndex = 4 - Me.lblSigFigs.Tag = "Significant_Figures:" - Me.lblSigFigs.Text = "Significant Figures:" + Me.ucrReorderSummary.Location = New System.Drawing.Point(412, 387) + 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 = 52 + Me.ucrReorderSummary.ucrDataFrameList = Nothing + Me.ucrReorderSummary.ucrReceiver = Nothing ' 'ucrChkDisplayMargins ' Me.ucrChkDisplayMargins.AutoSize = True Me.ucrChkDisplayMargins.Checked = False - Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(9, 74) + Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(25, 444) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" - Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(149, 23) - Me.ucrChkDisplayMargins.TabIndex = 17 - ' - 'rdoThreeVariable - ' - Me.rdoThreeVariable.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoThreeVariable.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoThreeVariable.FlatAppearance.BorderSize = 2 - 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(242, 12) - Me.rdoThreeVariable.Name = "rdoThreeVariable" - Me.rdoThreeVariable.Size = New System.Drawing.Size(100, 28) - Me.rdoThreeVariable.TabIndex = 23 - Me.rdoThreeVariable.Text = "Three Variables" - Me.rdoThreeVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoThreeVariable.UseVisualStyleBackColor = True + Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) + Me.ucrChkDisplayMargins.TabIndex = 53 + ' + 'ucrReceiverColumnFactor + ' + Me.ucrReceiverColumnFactor.AutoSize = True + Me.ucrReceiverColumnFactor.frmParent = Nothing + Me.ucrReceiverColumnFactor.Location = New System.Drawing.Point(198, 64) + Me.ucrReceiverColumnFactor.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverColumnFactor.Name = "ucrReceiverColumnFactor" + Me.ucrReceiverColumnFactor.Selector = Nothing + Me.ucrReceiverColumnFactor.Size = New System.Drawing.Size(178, 30) + Me.ucrReceiverColumnFactor.strNcFilePath = "" + Me.ucrReceiverColumnFactor.TabIndex = 52 + Me.ucrReceiverColumnFactor.ucrSelector = Nothing + ' + 'ucrPnlColumnFactor + ' + Me.ucrPnlColumnFactor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlColumnFactor.Location = New System.Drawing.Point(9, 27) + Me.ucrPnlColumnFactor.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlColumnFactor.Name = "ucrPnlColumnFactor" + Me.ucrPnlColumnFactor.Size = New System.Drawing.Size(184, 108) + Me.ucrPnlColumnFactor.TabIndex = 48 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(8, 435) + Me.ucrBase.Location = New System.Drawing.Point(23, 734) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) - Me.ucrBase.TabIndex = 13 - ' - 'ucrReceiverNumericVariable - ' - Me.ucrReceiverNumericVariable.AutoSize = True - Me.ucrReceiverNumericVariable.frmParent = Me - Me.ucrReceiverNumericVariable.Location = New System.Drawing.Point(272, 222) - Me.ucrReceiverNumericVariable.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverNumericVariable.Name = "ucrReceiverNumericVariable" - Me.ucrReceiverNumericVariable.Selector = Nothing - Me.ucrReceiverNumericVariable.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverNumericVariable.strNcFilePath = "" - Me.ucrReceiverNumericVariable.TabIndex = 11 - Me.ucrReceiverNumericVariable.ucrSelector = Nothing - ' - 'ucrReceiverSecondFactor - ' - Me.ucrReceiverSecondFactor.AutoSize = True - Me.ucrReceiverSecondFactor.frmParent = Me - Me.ucrReceiverSecondFactor.Location = New System.Drawing.Point(272, 222) - Me.ucrReceiverSecondFactor.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSecondFactor.Name = "ucrReceiverSecondFactor" - Me.ucrReceiverSecondFactor.Selector = Nothing - Me.ucrReceiverSecondFactor.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverSecondFactor.strNcFilePath = "" - Me.ucrReceiverSecondFactor.TabIndex = 9 - Me.ucrReceiverSecondFactor.ucrSelector = Nothing - ' - 'ucrReceiverSecondOpt - ' - Me.ucrReceiverSecondOpt.AutoSize = True - Me.ucrReceiverSecondOpt.frmParent = Me - Me.ucrReceiverSecondOpt.Location = New System.Drawing.Point(271, 179) - Me.ucrReceiverSecondOpt.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSecondOpt.Name = "ucrReceiverSecondOpt" - Me.ucrReceiverSecondOpt.Selector = Nothing - Me.ucrReceiverSecondOpt.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverSecondOpt.strNcFilePath = "" - Me.ucrReceiverSecondOpt.TabIndex = 7 - Me.ucrReceiverSecondOpt.ucrSelector = Nothing + Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.TabIndex = 43 + ' + 'ucrReceiverThreeVariableThirdVariable + ' + Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True + Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me + Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 306) + 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.strNcFilePath = "" + Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 38 + Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing + ' + 'ucrReceiverSecondSkimrGroupByFactor + ' + Me.ucrReceiverSecondSkimrGroupByFactor.AutoSize = True + Me.ucrReceiverSecondSkimrGroupByFactor.frmParent = Me + 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(180, 30) + Me.ucrReceiverSecondSkimrGroupByFactor.strNcFilePath = "" + Me.ucrReceiverSecondSkimrGroupByFactor.TabIndex = 34 + Me.ucrReceiverSecondSkimrGroupByFactor.ucrSelector = Nothing + ' + 'ucrReceiverSecondTwoVariableFactor + ' + Me.ucrReceiverSecondTwoVariableFactor.AutoSize = True + Me.ucrReceiverSecondTwoVariableFactor.frmParent = Me + 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(180, 30) + Me.ucrReceiverSecondTwoVariableFactor.strNcFilePath = "" + Me.ucrReceiverSecondTwoVariableFactor.TabIndex = 25 + Me.ucrReceiverSecondTwoVariableFactor.ucrSelector = Nothing ' - 'ucrPnlDescribe + 'ucrSelectorDescribeTwoVar ' - Me.ucrPnlDescribe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlDescribe.Location = New System.Drawing.Point(39, 9) - Me.ucrPnlDescribe.Name = "ucrPnlDescribe" - Me.ucrPnlDescribe.Size = New System.Drawing.Size(317, 34) - Me.ucrPnlDescribe.TabIndex = 0 - ' - 'ucrReceiverSecondVar - ' - Me.ucrReceiverSecondVar.AutoSize = True - Me.ucrReceiverSecondVar.frmParent = Me - Me.ucrReceiverSecondVar.Location = New System.Drawing.Point(271, 179) - Me.ucrReceiverSecondVar.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSecondVar.Name = "ucrReceiverSecondVar" - Me.ucrReceiverSecondVar.Selector = Nothing - Me.ucrReceiverSecondVar.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverSecondVar.strNcFilePath = "" - Me.ucrReceiverSecondVar.TabIndex = 2 - Me.ucrReceiverSecondVar.ucrSelector = Nothing + Me.ucrSelectorDescribeTwoVar.AutoSize = True + Me.ucrSelectorDescribeTwoVar.bDropUnusedFilterLevels = False + Me.ucrSelectorDescribeTwoVar.bShowHiddenColumns = False + Me.ucrSelectorDescribeTwoVar.bUseCurrentFilter = True + Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(17, 54) + Me.ucrSelectorDescribeTwoVar.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorDescribeTwoVar.Name = "ucrSelectorDescribeTwoVar" + Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorDescribeTwoVar.TabIndex = 28 ' 'ucrReceiverFirstVars ' Me.ucrReceiverFirstVars.AutoSize = True Me.ucrReceiverFirstVars.frmParent = Me - Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(271, 76) + 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 = 5 + Me.ucrReceiverFirstVars.TabIndex = 30 Me.ucrReceiverFirstVars.ucrSelector = Nothing ' - 'ucrSelectorDescribeTwoVar + 'ucrPnlDescribe ' - Me.ucrSelectorDescribeTwoVar.AutoSize = True - Me.ucrSelectorDescribeTwoVar.bDropUnusedFilterLevels = False - Me.ucrSelectorDescribeTwoVar.bShowHiddenColumns = False - Me.ucrSelectorDescribeTwoVar.bUseCurrentFilter = True - Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(10, 39) - Me.ucrSelectorDescribeTwoVar.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorDescribeTwoVar.Name = "ucrSelectorDescribeTwoVar" - Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorDescribeTwoVar.TabIndex = 3 + 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.Name = "ucrPnlDescribe" + Me.ucrPnlDescribe.Size = New System.Drawing.Size(476, 51) + Me.ucrPnlDescribe.TabIndex = 22 + ' + 'ucrReceiverThreeVariableSecondFactor + ' + Me.ucrReceiverThreeVariableSecondFactor.AutoSize = True + Me.ucrReceiverThreeVariableSecondFactor.frmParent = Me + 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(180, 30) + Me.ucrReceiverThreeVariableSecondFactor.strNcFilePath = "" + Me.ucrReceiverThreeVariableSecondFactor.TabIndex = 36 + Me.ucrReceiverThreeVariableSecondFactor.ucrSelector = Nothing + ' + 'ucrReceiverSkimrGroupByFactor + ' + Me.ucrReceiverSkimrGroupByFactor.AutoSize = True + Me.ucrReceiverSkimrGroupByFactor.frmParent = Me + 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(180, 30) + Me.ucrReceiverSkimrGroupByFactor.strNcFilePath = "" + Me.ucrReceiverSkimrGroupByFactor.TabIndex = 32 + Me.ucrReceiverSkimrGroupByFactor.ucrSelector = Nothing + ' + 'ucrChkOmitMissing + ' + Me.ucrChkOmitMissing.AutoSize = True + Me.ucrChkOmitMissing.Checked = False + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(25, 444) + 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 ' '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(419, 491) - Me.Controls.Add(Me.rdoThreeVariable) + Me.ClientSize = New System.Drawing.Size(723, 822) + Me.Controls.Add(Me.ucrSaveTable) + Me.Controls.Add(Me.grpDisplay) + Me.Controls.Add(Me.ucrInputMarginName) + Me.Controls.Add(Me.cmdSummaries) + Me.Controls.Add(Me.ucrReorderSummary) + Me.Controls.Add(Me.lblMarginName) + Me.Controls.Add(Me.cmdMissingOptions) + Me.Controls.Add(Me.ucrChkDisplayMargins) + Me.Controls.Add(Me.grpColumnFactor) + Me.Controls.Add(Me.cmdFormatTable) Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.grpFrequency) - Me.Controls.Add(Me.lblNumericVariable) - Me.Controls.Add(Me.lblSecondFactor) - Me.Controls.Add(Me.ucrReceiverSecondFactor) - Me.Controls.Add(Me.grpOptions) - Me.Controls.Add(Me.lbSecondOpt) - Me.Controls.Add(Me.ucrReceiverSecondOpt) + Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) + Me.Controls.Add(Me.ucrReceiverSecondSkimrGroupByFactor) + Me.Controls.Add(Me.ucrReceiverSecondTwoVariableFactor) + Me.Controls.Add(Me.ucrSelectorDescribeTwoVar) + Me.Controls.Add(Me.lblFirstVariable) + Me.Controls.Add(Me.grpSummaries) + Me.Controls.Add(Me.ucrReceiverFirstVars) + Me.Controls.Add(Me.rdoThreeVariable) + Me.Controls.Add(Me.rdoTwoVariable) Me.Controls.Add(Me.rdoSkim) - Me.Controls.Add(Me.rdoCustomize) Me.Controls.Add(Me.ucrPnlDescribe) + Me.Controls.Add(Me.ucrReceiverThreeVariableSecondFactor) + Me.Controls.Add(Me.ucrReceiverSkimrGroupByFactor) + Me.Controls.Add(Me.lblThirdVariable) + Me.Controls.Add(Me.lblSecondGroupByFactor) Me.Controls.Add(Me.lbSecondVariable) - Me.Controls.Add(Me.lblFirstVariable) - Me.Controls.Add(Me.ucrReceiverSecondVar) - Me.Controls.Add(Me.ucrReceiverFirstVars) - Me.Controls.Add(Me.ucrSelectorDescribeTwoVar) - Me.Controls.Add(Me.grpSummaries) - Me.Controls.Add(Me.grpDisplay) - Me.Controls.Add(Me.ucrReceiverNumericVariable) + Me.Controls.Add(Me.lblFirstGroupByFactor) + Me.Controls.Add(Me.lblThreeVariableSecondFactor) + Me.Controls.Add(Me.ucrChkOmitMissing) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDescribeTwoVariable" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Describe_Two_Variable" Me.Text = "Describe Two Variables" - Me.grpOptions.ResumeLayout(False) - Me.grpOptions.PerformLayout() + Me.grpColumnFactor.ResumeLayout(False) + Me.grpColumnFactor.PerformLayout() Me.grpSummaries.ResumeLayout(False) Me.grpSummaries.PerformLayout() Me.grpDisplay.ResumeLayout(False) Me.grpDisplay.PerformLayout() - Me.grpFrequency.ResumeLayout(False) - Me.grpFrequency.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() End Sub - + Friend WithEvents cmdFormatTable As Button + Friend WithEvents lblThreeVariableSecondFactor As Label + Friend WithEvents ucrReceiverThreeVariableSecondFactor As ucrReceiverSingle Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrReceiverThreeVariableThirdVariable As ucrReceiverSingle + Friend WithEvents ucrReceiverSecondSkimrGroupByFactor As ucrReceiverSingle + Friend WithEvents ucrReceiverSkimrGroupByFactor As ucrReceiverSingle + Friend WithEvents ucrReceiverSecondTwoVariableFactor As ucrReceiverSingle Friend WithEvents ucrSelectorDescribeTwoVar As ucrSelectorByDataFrameAddRemove - Friend WithEvents ucrReceiverFirstVars As ucrReceiverMultiple - Friend WithEvents cmdSummaries As Button - Friend WithEvents ucrReceiverSecondVar As ucrReceiverSingle - Friend WithEvents lblFirstVariable As Label - Friend WithEvents lbSecondVariable As Label Friend WithEvents ucrChkOmitMissing As ucrCheck - Friend WithEvents grpOptions As GroupBox - Friend WithEvents lblSecondType As Label - Friend WithEvents lblBy As Label + Friend WithEvents lbSecondVariable As Label + Friend WithEvents lblFirstVariable As Label + Friend WithEvents grpSummaries As GroupBox Friend WithEvents lblFirstType As Label - Friend WithEvents lblSummary As Label + Friend WithEvents lblSecondBy As Label + Friend WithEvents lblThreeVariableCategorical As Label Friend WithEvents lblSummaryName As Label - Friend WithEvents grpSummaries As GroupBox - Friend WithEvents ucrPnlDescribe As UcrPanel - Friend WithEvents ucrReceiverSecondOpt As ucrReceiverSingle + Friend WithEvents lblSummary As Label + Friend WithEvents lblBy As Label + Friend WithEvents lblSecondType As Label + Friend WithEvents lblFirstGroupByFactor As Label + Friend WithEvents lblThirdVariable As Label + Friend WithEvents lblSecondGroupByFactor As Label + Friend WithEvents ucrReceiverFirstVars As ucrReceiverMultiple + Friend WithEvents rdoThreeVariable As RadioButton + Friend WithEvents rdoTwoVariable As RadioButton Friend WithEvents rdoSkim As RadioButton - Friend WithEvents rdoCustomize As RadioButton - Friend WithEvents lbSecondOpt As Label - Friend WithEvents lblSecondFactor As Label - Friend WithEvents ucrReceiverSecondFactor As ucrReceiverSingle - Friend WithEvents lblNumericVariable As Label - Friend WithEvents ucrReceiverNumericVariable As ucrReceiverSingle - Friend WithEvents ucrChkDisplayMargins As ucrCheck + Friend WithEvents ucrPnlDescribe As UcrPanel + Friend WithEvents cmdMissingOptions As Button + Friend WithEvents rdoNoColumnFactor As RadioButton + Friend WithEvents rdoSummaryVariable As RadioButton + Friend WithEvents ucrPnlColumnFactor As UcrPanel + Friend WithEvents grpColumnFactor As GroupBox + Friend WithEvents ucrReorderSummary As ucrReorder + Friend WithEvents cmdSummaries As Button + Friend WithEvents rdoVariableFactor As RadioButton + Friend WithEvents ucrReceiverColumnFactor As ucrReceiverSingle Friend WithEvents ucrInputMarginName As ucrInputTextBox Friend WithEvents lblMarginName As Label + Friend WithEvents ucrChkDisplayMargins As ucrCheck Friend WithEvents grpDisplay As GroupBox - Friend WithEvents lblFactorsAsPercentage As Label Friend WithEvents ucrChkPercentageProportion As ucrCheck - Friend WithEvents ucrChkDisplayAsPercentage As ucrCheck - Friend WithEvents grpFrequency As GroupBox - Friend WithEvents ucrNudColumnFactors As ucrNud - Friend WithEvents lblColumnFactors As Label - Friend WithEvents ucrNudSigFigs As ucrNud - Friend WithEvents lblSigFigs As Label + Friend WithEvents lblFactorAsPercentage As Label Friend WithEvents ucrReceiverPercentages As ucrReceiverSingle - Friend WithEvents rdoThreeVariable As RadioButton - Friend WithEvents cmdMissingOptions As Button + Friend WithEvents ucrChkDisplayAsPercentage As ucrCheck + Friend WithEvents ucrSaveTable As ucrSave End Class diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index f628b431ceb..32eb429a32a 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -18,20 +18,38 @@ Imports instat.Translations Public Class dlgDescribeTwoVariable Private bFirstLoad As Boolean = True Private bReset As Boolean = True + Private bRcodeSet As Boolean = True Private bResetSubdialog As Boolean = False Public strFirstVariablesType, strSecondVariableType As String - Public clsGetDataTypeFunction, clsGetSecondDataTypeFunction, clsRCorrelationFunction, clsRCustomSummaryFunction, - clsCombineFunction, clsRAnovaFunction, clsFrequencyTablesFunction, clsSkimrFunction, clsSummariesListFunction, - clsGroupByFunction, clsDummyFunction, clsMmtableFunction, clsHeaderTopLeftFunction, - clsHeaderLeftTopFunction, clsHeaderLeftTopFuncion, clsCombineFrequencyParametersFunction, - clsSummaryMapFunction, clsCombineMultipleColumnsFunction, clsCombineFactorsFunction, - clsMmtableMapFunction, clsHeaderTopLeftSummaryVariableFunction, - clsCombineFrequencyFactorParameterFunction, clsSelectFunction, clsRenameCombineFunction As New RFunction - Private clsGroupByPipeOperator, clsMmtablePlusOperator, clsMapFrequencyPipeOperator, - clsMmtableTildeOperator, clsDataSelectTildeOperator, clsEmptyOperator, clsSecondEmptyOperator As New ROperator + + 'SUMMARY FUNCTIoNS + Private clsCombineFrequencyParametersFunction, clsCombineFunction, + clsDummyFunction, clsGroupByFunction, clsRAnovaFunction, + clsRCorrelationFunction, clsSkimrFunction, clsSummariesListFunction, + clsSummaryTableCombineFactorsFunction, clsSummaryTableFunction, + clsThreeVariableCombineFrequencyParametersFunction, clsPivotWiderFunction As New RFunction + + 'FORMAT TABLE FUNCTIONS + Private clsFootnoteCellBodyFunction, clsFootnoteCellFunction, + clsFootnoteSubtitleLocationFunction, clsFootnoteTitleLocationFunction, clsSecondFootnoteCellBodyFunction, + clsSecondFootnoteCellFunction, clsStyleListFunction, + clsTabFootnoteSubtitleFunction, clsTabFootnoteTitleFunction, + clsTableSourcenoteFunction, clsTableTitleFunction, clsThemesTabOptionFunction, + clsTabStyleCellTextFunction, clsTabStyleCellTitleFunction, clsTabStyleFunction, + clsTabStylePxFunction, clsgtExtrasThemesFuction As New RFunction + + Private clsGroupByPipeOperator, clsSummaryOperator As New ROperator + + Private clsFrequencyTablesFunction, clsgtFunction, clsCombineFrequencyFactorParameterFunction, + clsSelectFunction, clsRenameCombineFunction 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, + clsJoiningPipeOperator, clsMutableOperator As ROperator Private iUcrBaseXLocation, iDialogueXsize As Integer Private Sub dlgDescribeTwoVariable_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -51,8 +69,7 @@ Public Class dlgDescribeTwoVariable Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 414 ucrBase.clsRsyntax.iCallType = 2 - rdoThreeVariable.Enabled = False - lblNumericVariable.Visible = False + ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False iUcrBaseXLocation = ucrBase.Location.X iDialogueXsize = Me.Size.Width @@ -65,34 +82,35 @@ Public Class dlgDescribeTwoVariable ucrReceiverFirstVars.Selector = ucrSelectorDescribeTwoVar ucrReceiverFirstVars.SetSingleTypeStatus(True, bIsCategoricalNumeric:=True) - ucrReceiverSecondVar.SetParameter(New RParameter("factors", 2)) - ucrReceiverSecondVar.SetParameterIsString() - ucrReceiverSecondVar.Selector = ucrSelectorDescribeTwoVar - ucrReceiverSecondVar.SetLinkedDisplayControl(lbSecondVariable) - - ucrReceiverSecondOpt.SetParameter(New RParameter("factors", 2, bNewIncludeArgumentName:=False)) - ucrReceiverSecondOpt.bWithQuotes = False - ucrReceiverSecondOpt.SetParameterIsString() - ucrReceiverSecondOpt.Selector = ucrSelectorDescribeTwoVar - ucrReceiverSecondOpt.SetLinkedDisplayControl(lbSecondOpt) - ucrReceiverSecondOpt.SetDataType("factor") - - ucrReceiverSecondFactor.SetParameter(New RParameter("second_factor", 3, bNewIncludeArgumentName:=False)) - ucrReceiverSecondFactor.bWithQuotes = False - ucrReceiverSecondFactor.SetParameterIsString() - ucrReceiverSecondFactor.Selector = ucrSelectorDescribeTwoVar - ucrReceiverSecondFactor.SetLinkedDisplayControl(lblSecondFactor) - ucrReceiverSecondFactor.SetDataType("factor") - - ucrReceiverNumericVariable.SetParameter(New RParameter("factor_two", 2, bNewIncludeArgumentName:=False)) - ucrReceiverNumericVariable.SetParameterIsString() - ucrReceiverNumericVariable.Selector = ucrSelectorDescribeTwoVar - ucrReceiverNumericVariable.SetLinkedDisplayControl(lblNumericVariable) + ucrReceiverSecondTwoVariableFactor.SetParameter(New RParameter("factors", 2)) + ucrReceiverSecondTwoVariableFactor.SetParameterIsString() + ucrReceiverSecondTwoVariableFactor.Selector = ucrSelectorDescribeTwoVar + ucrReceiverSecondTwoVariableFactor.SetLinkedDisplayControl(lbSecondVariable) + + ucrReceiverSkimrGroupByFactor.SetParameter(New RParameter("factors", 2, bNewIncludeArgumentName:=False)) + ucrReceiverSkimrGroupByFactor.bWithQuotes = False + ucrReceiverSkimrGroupByFactor.SetParameterIsString() + ucrReceiverSkimrGroupByFactor.Selector = ucrSelectorDescribeTwoVar + ucrReceiverSkimrGroupByFactor.SetLinkedDisplayControl(lblFirstGroupByFactor) + ucrReceiverSkimrGroupByFactor.SetDataType("factor") + + ucrReceiverSecondSkimrGroupByFactor.SetParameter(New RParameter("second_factor", 3, bNewIncludeArgumentName:=False)) + ucrReceiverSecondSkimrGroupByFactor.bWithQuotes = False + ucrReceiverSecondSkimrGroupByFactor.SetParameterIsString() + ucrReceiverSecondSkimrGroupByFactor.Selector = ucrSelectorDescribeTwoVar + ucrReceiverSecondSkimrGroupByFactor.SetLinkedDisplayControl(lblSecondGroupByFactor) + ucrReceiverSecondSkimrGroupByFactor.SetDataType("factor") + + ucrReceiverThreeVariableThirdVariable.SetParameter(New RParameter("second_factors", 3, bNewIncludeArgumentName:=False)) + ucrReceiverThreeVariableThirdVariable.SetParameterIsString() + ucrReceiverThreeVariableThirdVariable.Selector = ucrSelectorDescribeTwoVar + ucrReceiverThreeVariableThirdVariable.SetLinkedDisplayControl(lblThirdVariable) ucrChkOmitMissing.SetParameter(New RParameter("na.rm", 6)) ucrChkOmitMissing.SetText("Omit Missing Values") ucrChkOmitMissing.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkOmitMissing.bUpdateRCodeFromControl = True + 'ucrChkOmitMissing.SetLinkedDisplayControl(cmdMissingOptions) ucrChkDisplayMargins.SetParameter(New RParameter("include_margins", 5)) ucrChkDisplayMargins.SetText("Display Margins") @@ -100,13 +118,6 @@ Public Class dlgDescribeTwoVariable ucrInputMarginName.SetLinkedDisplayControl(lblMarginName) - ucrPnlDescribe.AddRadioButton(rdoCustomize) - ucrPnlDescribe.AddRadioButton(rdoSkim) - ucrPnlDescribe.AddRadioButton(rdoThreeVariable) - ucrPnlDescribe.AddParameterValuesCondition(rdoCustomize, "checked", "customize") - ucrPnlDescribe.AddParameterValuesCondition(rdoSkim, "checked", "skim") - ucrPnlDescribe.AddParameterValuesCondition(rdoThreeVariable, "checked", "three_variable") - ucrChkDisplayAsPercentage.SetParameter(New RParameter("percentage_type", 1)) ucrChkDisplayAsPercentage.SetText("As Percentages") ucrChkDisplayAsPercentage.SetValuesCheckedAndUnchecked(Chr(34) & "factors" & Chr(34), Chr(34) & "none" & Chr(34)) @@ -119,147 +130,134 @@ Public Class dlgDescribeTwoVariable ucrReceiverPercentages.SetParameterIsString() ucrReceiverPercentages.Selector = ucrSelectorDescribeTwoVar ucrReceiverPercentages.SetDataType("factor") - ucrReceiverPercentages.SetLinkedDisplayControl(lblFactorsAsPercentage) + ucrReceiverPercentages.SetLinkedDisplayControl(lblFactorAsPercentage) ucrChkPercentageProportion.SetParameter(New RParameter("perc_decimal", 3)) ucrChkPercentageProportion.SetText("Display as Decimal") ucrChkPercentageProportion.SetRDefault("FALSE") - ucrNudSigFigs.SetParameter(New RParameter("signif_fig", 6)) - ucrNudSigFigs.SetMinMax(0, 22) - ucrNudSigFigs.SetRDefault(2) - - ucrNudColumnFactors.SetMinMax(1, 2) - - ucrPnlDescribe.AddToLinkedControls({ucrReceiverSecondOpt, ucrReceiverSecondFactor}, {rdoSkim, rdoThreeVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlDescribe.AddToLinkedControls({ucrReceiverNumericVariable}, {rdoThreeVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - - clsGetDataTypeFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_variables_metadata") - clsGetDataTypeFunction.AddParameter("property", "data_type_label") + ucrPnlDescribe.AddRadioButton(rdoTwoVariable) + ucrPnlDescribe.AddRadioButton(rdoSkim) + ucrPnlDescribe.AddRadioButton(rdoThreeVariable) + ucrPnlDescribe.AddParameterValuesCondition(rdoTwoVariable, "checked", "customize") + ucrPnlDescribe.AddParameterValuesCondition(rdoSkim, "checked", "skim") + ucrPnlDescribe.AddParameterValuesCondition(rdoThreeVariable, "checked", "three_variable") + rdoThreeVariable.Enabled = False - clsGetSecondDataTypeFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_variables_metadata") - clsGetSecondDataTypeFunction.AddParameter("property", "data_type_label") + ucrPnlDescribe.AddToLinkedControls({ucrReceiverSkimrGroupByFactor, ucrReceiverSecondSkimrGroupByFactor}, {rdoSkim}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlDescribe.AddToLinkedControls({ucrReceiverThreeVariableThirdVariable}, {rdoThreeVariable}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlDescribe.AddToLinkedControls({ucrReceiverSecondTwoVariableFactor}, {rdoTwoVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlDescribe.AddToLinkedControls({ucrReceiverThreeVariableSecondFactor}, {rdoThreeVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrReceiverThreeVariableSecondFactor.SetParameter(New RParameter("second_three_varible_factor", 0, bNewIncludeArgumentName:=False)) + ucrReceiverThreeVariableSecondFactor.SetParameterIsString() + ucrReceiverThreeVariableSecondFactor.Selector = ucrSelectorDescribeTwoVar + ucrReceiverThreeVariableSecondFactor.SetIncludedDataTypes({"factor"}) + ucrReceiverThreeVariableSecondFactor.SetLinkedDisplayControl(lblThreeVariableSecondFactor) + + ucrPnlColumnFactor.AddRadioButton(rdoSummaryVariable) + ucrPnlColumnFactor.AddRadioButton(rdoVariableFactor) + ucrPnlColumnFactor.AddRadioButton(rdoNoColumnFactor) + ucrPnlColumnFactor.AddParameterValuesCondition(rdoNoColumnFactor, "factor_cols", "NoColFactor") + ucrPnlColumnFactor.AddParameterValuesCondition(rdoSummaryVariable, "factor_cols", "Sum") + ucrPnlColumnFactor.AddParameterValuesCondition(rdoVariableFactor, "factor_cols", "FactorVar") + ucrPnlColumnFactor.AddToLinkedControls(ucrReceiverColumnFactor, {rdoVariableFactor}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrReceiverColumnFactor.SetParameter(New RParameter("names_from", 0)) + ucrReceiverColumnFactor.Selector = ucrSelectorDescribeTwoVar + ucrReceiverColumnFactor.SetDataType("factor") + + 'ucrSaveTable.SetPrefix("summary_table") + ucrSaveTable.SetDataFrameSelector(ucrSelectorDescribeTwoVar.ucrAvailableDataFrames) + ucrSaveTable.SetIsTextBox() + + ucrReorderSummary.bDataIsSummaries = True End Sub Private Sub SetDefaults() - clsFrequencyTablesFunction = New RFunction + clsCombineFrequencyParametersFunction = New RFunction + clsCombineFunction = New RFunction + clsDummyFunction = New RFunction + clsFootnoteCellBodyFunction = New RFunction + clsFootnoteCellFunction = New RFunction + clsFootnoteSubtitleLocationFunction = New RFunction + clsFootnoteTitleLocationFunction = New RFunction + clsGroupByFunction = New RFunction clsRAnovaFunction = New RFunction clsRCorrelationFunction = New RFunction - clsSummariesListFunction = New RFunction - clsRCustomSummaryFunction = New RFunction - clsCombineFunction = New RFunction + clsSecondFootnoteCellBodyFunction = New RFunction + clsSecondFootnoteCellFunction = New RFunction clsSkimrFunction = New RFunction + clsStyleListFunction = New RFunction + clsSummariesListFunction = New RFunction + clsSummaryTableCombineFactorsFunction = New RFunction + clsSummaryTableFunction = New RFunction + clsTabFootnoteSubtitleFunction = New RFunction + clsTabFootnoteTitleFunction = New RFunction + clsTableSourcenoteFunction = New RFunction + clsTableTitleFunction = New RFunction + clsThemesTabOptionFunction = New RFunction + clsTabStyleCellTextFunction = New RFunction + clsTabStyleCellTitleFunction = New RFunction + clsTabStyleFunction = New RFunction + clsTabStylePxFunction = New RFunction + clsThreeVariableCombineFrequencyParametersFunction = New RFunction clsGroupByPipeOperator = New ROperator - clsGroupByFunction = New RFunction - clsMmtableFunction = New RFunction - clsHeaderTopLeftFunction = New RFunction - clsHeaderLeftTopFunction = New RFunction - clsHeaderLeftTopFuncion = New RFunction - clsDummyFunction = New RFunction - clsCombineFrequencyParametersFunction = New RFunction - clsSummaryMapFunction = New RFunction - clsCombineMultipleColumnsFunction = New RFunction - clsMmtableMapFunction = New RFunction - clsHeaderTopLeftSummaryVariableFunction = New RFunction - clsCombineFactorsFunction = New RFunction - clsCombineFrequencyFactorParameterFunction = New RFunction - clsSelectFunction = New RFunction - clsRenameCombineFunction = New RFunction - clsDataSelectTildeOperator = New ROperator - clsMmtableTildeOperator = New ROperator - clsMapFrequencyPipeOperator = New ROperator - clsMmtablePlusOperator = New ROperator - clsEmptyOperator = New ROperator - clsSecondEmptyOperator = New ROperator + clsJoiningPipeOperator = New ROperator + clsPipeOperator = New ROperator + clsTabFootnoteOperator = New ROperator + clsgtFunction = New RFunction + clsSummaryOperator = New ROperator + clsPivotWiderFunction = New RFunction + clsgtExtrasThemesFuction = New RFunction + clsMutableOperator = New ROperator ucrSelectorDescribeTwoVar.Reset() ucrReceiverFirstVars.SetMeAsReceiver() ucrInputMarginName.SetText("All") - ucrNudColumnFactors.SetText("2") ucrInputMarginName.Visible = False + ucrSaveTable.Reset() - ucrBase.clsRsyntax.ClearCodes() + 'ucrBase.clsRsyntax.ClearCodes() clsCombineFrequencyParametersFunction.SetRCommand("c") - clsCombineFactorsFunction.SetRCommand("c") - - clsRenameCombineFunction.SetRCommand("c") - clsRenameCombineFunction.AddParameter("first", "1", iPosition:=0, bIncludeArgumentName:=False) - clsRenameCombineFunction.AddParameter("by_var", "2", iPosition:=1) - clsRenameCombineFunction.AddParameter("third", "3", iPosition:=2, bIncludeArgumentName:=False) - clsRenameCombineFunction.AddParameter("fourth", "4", iPosition:=3, bIncludeArgumentName:=False) - - clsSelectFunction.SetPackageName("dplyr") - clsSelectFunction.SetRCommand("select") - clsSelectFunction.AddParameter(".data", clsRFunctionParameter:=clsFrequencyTablesFunction, iPosition:=0) - clsSelectFunction.AddParameter("rename_function", bIncludeArgumentName:=False, clsRFunctionParameter:=clsRenameCombineFunction, iPosition:=1) - - clsCombineFrequencyFactorParameterFunction.SetRCommand("c") - clsCombineFrequencyFactorParameterFunction.AddParameter("factor_by", ".x", - iPosition:=1, bIncludeArgumentName:=False) - - clsEmptyOperator.SetOperation("") - clsEmptyOperator.AddParameter("multiple_receiver_cols", "multiple_receiver_cols", iPosition:=0) - clsEmptyOperator.SetAssignTo("names(list_of_tables)") - - clsSecondEmptyOperator.SetOperation("") - clsSecondEmptyOperator.iCallType = 2 - clsSecondEmptyOperator.AddParameter("list_of_tables", "list_of_tables", iPosition:=0) - - clsDataSelectTildeOperator.SetOperation("~") - clsDataSelectTildeOperator.AddParameter("empty_parameter", "", iPosition:=0) - clsDataSelectTildeOperator.AddParameter("select_function", clsRFunctionParameter:=clsSelectFunction, iPosition:=1) - - clsMmtableTildeOperator.SetOperation("~") - clsMmtableTildeOperator.AddParameter("empty_parameter", "", iPosition:=0) - clsMmtableTildeOperator.AddParameter("mmtable", clsRFunctionParameter:=clsMmtableFunction, iPosition:=1) - - clsCombineMultipleColumnsFunction.SetRCommand("c") - clsCombineMultipleColumnsFunction.SetAssignTo("multiple_receiver_cols") + clsCombineFunction.SetRCommand("c") - clsSummaryMapFunction.SetPackageName("purrr") - clsSummaryMapFunction.SetRCommand("map") - clsSummaryMapFunction.AddParameter(".x", clsRFunctionParameter:=clsCombineMultipleColumnsFunction, iPosition:=0) - clsSummaryMapFunction.AddParameter(".f", clsROperatorParameter:=clsDataSelectTildeOperator, iPosition:=1) + clsDummyFunction.AddParameter("checked", "skim", iPosition:=0) + clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) + clsDummyFunction.AddParameter("theme", "select", iPosition:=2) - clsMmtableMapFunction.SetPackageName("purrr") - clsMmtableMapFunction.SetRCommand("map") - clsMmtableMapFunction.AddParameter(".x", ".", iPosition:=0) - clsMmtableMapFunction.AddParameter(".f", clsROperatorParameter:=clsMmtablePlusOperator, iPosition:=1) + clsPivotWiderFunction.SetRCommand("pivot_wider") + clsPivotWiderFunction.AddParameter("values_from", "value", iPosition:=1) - clsMapFrequencyPipeOperator.SetOperation("%>%") - clsMapFrequencyPipeOperator.AddParameter("map_summary_table", clsRFunctionParameter:=clsSummaryMapFunction, iPosition:=1) - clsMapFrequencyPipeOperator.AddParameter("map_mmtable", clsRFunctionParameter:=clsMmtableMapFunction, iPosition:=2) - clsMapFrequencyPipeOperator.AddParameter("data", clsRFunctionParameter:=ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) - clsMapFrequencyPipeOperator.SetAssignTo("list_of_tables ") + clsFootnoteCellBodyFunction.SetPackageName("gt") + clsFootnoteCellBodyFunction.SetRCommand("cells_body") - clsHeaderTopLeftFunction.SetPackageName("mmtable2") - clsHeaderTopLeftFunction.SetRCommand("header_top_left") + clsFootnoteCellFunction.SetPackageName("gt") + clsFootnoteCellFunction.SetRCommand("tab_footnote") - clsHeaderLeftTopFunction.SetPackageName("mmtable2") - clsHeaderLeftTopFunction.SetRCommand("header_left_top") + clsFootnoteSubtitleLocationFunction.SetPackageName("gt") + clsFootnoteSubtitleLocationFunction.SetRCommand("cells_title") - clsHeaderTopLeftSummaryVariableFunction.SetPackageName("mmtable2") - clsHeaderTopLeftSummaryVariableFunction.SetRCommand("header_top_left") - clsHeaderTopLeftSummaryVariableFunction.AddParameter("variable", Chr(39) & "summary-variable" & Chr(39), iPosition:=0) + clsFootnoteTitleLocationFunction.SetPackageName("gt") + clsFootnoteTitleLocationFunction.SetRCommand("cells_title") - clsMmtableFunction.SetPackageName("mmtable2") - clsMmtableFunction.SetRCommand("mmtable") - clsMmtableFunction.AddParameter("data", ".x", iPosition:=0) - clsMmtableFunction.AddParameter("cells", "value", iPosition:=1) + clsgtExtrasThemesFuction.SetPackageName("gtExtras") - clsDummyFunction.AddParameter("checked", "skim", iPosition:=0) - - clsMmtablePlusOperator.SetOperation("+") - clsMmtablePlusOperator.bBrackets = False - clsMmtablePlusOperator.AddParameter("mmtable2", clsROperatorParameter:=clsMmtableTildeOperator, iPosition:=0) - clsMmtablePlusOperator.AddParameter("header_top_left", clsRFunctionParameter:=clsHeaderTopLeftFunction, iPosition:=1) - clsMmtablePlusOperator.AddParameter("header_left_top", clsRFunctionParameter:=clsHeaderLeftTopFunction, iPosition:=2) + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") clsGroupByPipeOperator.SetOperation("%>%") - clsGroupByPipeOperator.AddParameter("skim", clsRFunctionParameter:=clsSkimrFunction, iPosition:=2, bIncludeArgumentName:=False) - clsGroupByPipeOperator.AddParameter("data", clsRFunctionParameter:=ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) + clsGroupByPipeOperator.AddParameter("skim", clsRFunctionParameter:=clsSkimrFunction, + iPosition:=2, bIncludeArgumentName:=False) + clsGroupByPipeOperator.AddParameter("data", + clsRFunctionParameter:=ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) + 'clsGroupByPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_summary", + ' strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Summary, + ' strRObjectFormatToAssignTo:=RObjectFormat.Text, + ' strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + ' strObjectName:="last_summary") clsGroupByFunction.SetPackageName("dplyr") clsGroupByFunction.SetRCommand("group_by") @@ -269,87 +267,152 @@ Public Class dlgDescribeTwoVariable clsCombineFunction.SetRCommand("c") - clsFrequencyTablesFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$summary_table") - clsFrequencyTablesFunction.AddParameter("data_name", Chr(34) & ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) - clsFrequencyTablesFunction.AddParameter("summaries", Chr(34) & "summary_count" & Chr(34), iPosition:=1) - clsFrequencyTablesFunction.AddParameter("factors", clsRFunctionParameter:=clsCombineFrequencyFactorParameterFunction, iPosition:=2) + clsPipeOperator.SetOperation("%>%") + clsPipeOperator.bBrackets = False + clsRAnovaFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$anova_tables") clsRAnovaFunction.AddParameter("signif.stars", "FALSE", iPosition:=2) clsRAnovaFunction.AddParameter("sign_level", "FALSE", iPosition:=3) clsRAnovaFunction.AddParameter("means", "FALSE", iPosition:=4) + clsRCorrelationFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$cor") + + clsSecondFootnoteCellBodyFunction.SetPackageName("gt") + clsSecondFootnoteCellBodyFunction.SetRCommand("cells_body") + + clsSecondFootnoteCellFunction.SetPackageName("gt") + clsSecondFootnoteCellFunction.SetRCommand("tab_footnote") + + clsStyleListFunction.SetRCommand("list") + clsSummariesListFunction.SetRCommand("c") - clsSummariesListFunction.AddParameter("summary_count_missing", Chr(34) & "summary_count_missing" & Chr(34), bIncludeArgumentName:=False, iPosition:=0) - clsSummariesListFunction.AddParameter("summary_min", Chr(34) & "summary_min" & Chr(34), bIncludeArgumentName:=False, iPosition:=1) - clsSummariesListFunction.AddParameter("p25", Chr(34) & "p25" & Chr(34), bIncludeArgumentName:=False, iPosition:=2) - clsSummariesListFunction.AddParameter("summary_median", Chr(34) & "summary_median" & Chr(34), bIncludeArgumentName:=False, iPosition:=3) - clsSummariesListFunction.AddParameter("summary_mean", Chr(34) & "summary_mean" & Chr(34), bIncludeArgumentName:=False, iPosition:=4) - clsSummariesListFunction.AddParameter("p75", Chr(34) & "p75" & Chr(34), bIncludeArgumentName:=False, iPosition:=5) - clsSummariesListFunction.AddParameter("summary_max", Chr(34) & "summary_max" & Chr(34), bIncludeArgumentName:=False, iPosition:=6) - - clsRCustomSummaryFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$summary") - clsRCustomSummaryFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesListFunction) - - clsRCustomSummaryFunction.AddParameter("store_results", "FALSE", iPosition:=4) - clsRCustomSummaryFunction.AddParameter("drop", "TRUE", iPosition:=5) - clsRCustomSummaryFunction.AddParameter("na.rm", "FALSE", iPosition:=6) - clsRCustomSummaryFunction.AddParameter("return_output", "TRUE", iPosition:=7) + clsSummariesListFunction.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), + bIncludeArgumentName:=False, iPosition:=0) - clsRCorrelationFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$cor") + clsSummaryTableCombineFactorsFunction.SetRCommand("c") - clsRAnovaFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$anova_tables") + clsSummaryTableFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$summary_table") + clsSummaryTableFunction.AddParameter("treat_columns_as_factor", "FALSE", iPosition:=3) + clsSummaryTableFunction.SetAssignTo("summary_table") + clsgtFunction.SetPackageName("gt") + clsgtFunction.SetRCommand("gt") + + clsSummaryOperator.SetOperation("%>%") + clsSummaryOperator.AddParameter("tableFun", clsRFunctionParameter:=clsSummaryTableFunction, iPosition:=0) + clsSummaryOperator.AddParameter("gttbl", clsRFunctionParameter:=clsgtFunction, iPosition:=1) + + clsJoiningPipeOperator.SetOperation("%>%") + clsJoiningPipeOperator.AddParameter("gtable", clsROperatorParameter:=clsSummaryOperator, iPosition:=0) + 'clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + 'strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + ' strRObjectFormatToAssignTo:=RObjectFormat.Html, + ' strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + ' strObjectName:="last_table") + clsJoiningPipeOperator.bBrackets = False + + clsTableSourcenoteFunction.SetPackageName("gt") + clsTableSourcenoteFunction.SetRCommand("tab_source_note") + + clsTableTitleFunction.SetPackageName("gt") + clsTableTitleFunction.SetRCommand("tab_header") + + clsTabFootnoteOperator.SetOperation("%>%") + clsTabFootnoteOperator.bBrackets = False + + clsTabFootnoteTitleFunction.SetPackageName("gt") + clsTabFootnoteTitleFunction.SetRCommand("tab_footnote") + + clsTabFootnoteSubtitleFunction.SetPackageName("gt") + clsTabFootnoteSubtitleFunction.SetRCommand("tab_footnote") + + clsThemesTabOptionFunction.SetPackageName("gt") + clsThemesTabOptionFunction.SetRCommand("tab_options") + + clsTabStyleCellTextFunction.SetPackageName("gt") + clsTabStyleCellTextFunction.SetRCommand("cell_text") + clsTabStyleCellTextFunction.AddParameter("size", clsRFunctionParameter:=clsTabStylePxFunction, iPosition:=0) + + clsTabStyleCellTitleFunction.SetPackageName("gt") + clsTabStyleCellTitleFunction.SetRCommand("cells_title") + clsTabStyleCellTitleFunction.AddParameter("groups", Chr(34) & "title" & Chr(34), iPosition:=0) + + clsTabStyleFunction.SetRCommand("tab_style") + clsTabStyleFunction.SetPackageName("gt") + clsTabStyleFunction.AddParameter("style", clsRFunctionParameter:=clsTabStyleCellTextFunction, iPosition:=0) + clsTabStyleFunction.AddParameter("location", clsRFunctionParameter:=clsTabStyleCellTitleFunction, iPosition:=1) + + clsTabStylePxFunction.SetPackageName("gt") + clsTabStylePxFunction.SetRCommand("px") + clsTabStylePxFunction.AddParameter("size", "18", bIncludeArgumentName:=False, iPosition:=0) + + clsThreeVariableCombineFrequencyParametersFunction.SetRCommand("c") + + ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetBaseROperator(clsGroupByPipeOperator) bResetSubdialog = True End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrReceiverSecondVar.AddAdditionalCodeParameterPair(clsRAnovaFunction, New RParameter("y_col_name", 2), iAdditionalPairNo:=1) - ucrReceiverSecondVar.AddAdditionalCodeParameterPair(clsRCorrelationFunction, New RParameter("y_col_name", 2), iAdditionalPairNo:=2) - ucrReceiverSecondVar.AddAdditionalCodeParameterPair(clsCombineFrequencyFactorParameterFunction, New RParameter("factor_one", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=3) + bRcodeSet = False + ucrReceiverSecondTwoVariableFactor.AddAdditionalCodeParameterPair(clsRAnovaFunction, New RParameter("y_col_name", 2), iAdditionalPairNo:=1) + ucrReceiverSecondTwoVariableFactor.AddAdditionalCodeParameterPair(clsRCorrelationFunction, New RParameter("y_col_name", 2), iAdditionalPairNo:=2) ucrReceiverFirstVars.AddAdditionalCodeParameterPair(clsRAnovaFunction, New RParameter("x_col_names", 1), iAdditionalPairNo:=1) ucrReceiverFirstVars.AddAdditionalCodeParameterPair(clsRCorrelationFunction, New RParameter("x_col_names", 1), iAdditionalPairNo:=2) ucrReceiverFirstVars.AddAdditionalCodeParameterPair(clsSkimrFunction, New RParameter("col_names", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=3) ucrSelectorDescribeTwoVar.AddAdditionalCodeParameterPair(clsRAnovaFunction, ucrSelectorDescribeTwoVar.GetParameter(), iAdditionalPairNo:=1) - ucrSelectorDescribeTwoVar.AddAdditionalCodeParameterPair(clsRCustomSummaryFunction, ucrSelectorDescribeTwoVar.GetParameter(), iAdditionalPairNo:=2) + ucrSelectorDescribeTwoVar.AddAdditionalCodeParameterPair(clsSummaryTableFunction, ucrSelectorDescribeTwoVar.GetParameter(), iAdditionalPairNo:=2) + ucrSaveTable.AddAdditionalRCode(clsJoiningPipeOperator, iAdditionalPairNo:=1) - ucrChkOmitMissing.SetRCode(clsRCustomSummaryFunction, bReset) - ucrReceiverFirstVars.SetRCode(clsRCustomSummaryFunction, bReset) - ucrReceiverSecondVar.SetRCode(clsRCustomSummaryFunction, bReset) + ucrChkOmitMissing.SetRCode(clsSummaryTableFunction, bReset) + ucrReceiverFirstVars.SetRCode(clsSummaryTableFunction, bReset) + ucrReceiverSecondTwoVariableFactor.SetRCode(clsSummaryTableFunction, bReset) ucrSelectorDescribeTwoVar.SetRCode(clsRCorrelationFunction, bReset) - ucrReceiverSecondOpt.SetRCode(clsGroupByFunction, bReset) - ucrReceiverSecondFactor.SetRCode(clsGroupByFunction, bReset) - ucrChkDisplayMargins.SetRCode(clsCombineFrequencyParametersFunction, bReset) + ucrReceiverSkimrGroupByFactor.SetRCode(clsGroupByFunction, bReset) + ucrReceiverSecondSkimrGroupByFactor.SetRCode(clsGroupByFunction, bReset) ucrChkDisplayAsPercentage.SetRCode(clsCombineFrequencyParametersFunction, bReset) ucrReceiverPercentages.SetRCode(clsCombineFrequencyParametersFunction, bReset) ucrChkPercentageProportion.SetRCode(clsCombineFrequencyParametersFunction, bReset) ucrPnlDescribe.SetRCode(clsDummyFunction, bReset) - ucrNudSigFigs.SetRCode(clsCombineFrequencyParametersFunction, bReset) - Results() + ucrReceiverThreeVariableSecondFactor.SetRCode(clsSummaryTableCombineFactorsFunction, bReset) + ucrReceiverThreeVariableThirdVariable.SetRCode(clsSummaryTableCombineFactorsFunction, bReset) + ucrPnlColumnFactor.SetRCode(clsDummyFunction, bReset) + ucrChkDisplayMargins.SetRCode(clsCombineFrequencyParametersFunction, bReset) + ucrSaveTable.SetRCode(clsGroupByPipeOperator, bReset) + bRcodeSet = True + + FillListView() End Sub Public Sub TestOKEnabled() - If rdoCustomize.Checked Then - If ((Not ucrReceiverSecondVar.IsEmpty()) AndAlso (Not ucrReceiverFirstVars.IsEmpty())) Then - If ((strFirstVariablesType = "numeric" OrElse strFirstVariablesType = "integer") AndAlso (strSecondVariableType = "factor")) AndAlso clsSummariesListFunction.clsParameters.Count = 0 Then - ucrBase.OKEnabled(False) - Else - ucrBase.OKEnabled(True) - End If - Else - ucrBase.OKEnabled(False) - End If - Else - If ucrReceiverFirstVars.IsEmpty Then - ucrBase.OKEnabled(False) - Else - ucrBase.OKEnabled(True) - End If - End If + ucrBase.OKEnabled(Not ucrReceiverFirstVars.IsEmpty AndAlso ( + (rdoTwoVariable.Checked _ + AndAlso Not ucrReceiverSecondTwoVariableFactor.IsEmpty) _ + OrElse rdoSkim.Checked _ + OrElse (Not ucrReceiverThreeVariableSecondFactor.IsEmpty _ + AndAlso Not ucrReceiverThreeVariableThirdVariable.IsEmpty) _ + AndAlso (IsFactorByFactor() OrElse IsNumericByFactor() _ + OrElse IsFactorByNumeric() OrElse IsNumericByNumeric())) AndAlso ucrSaveTable.IsComplete) End Sub + Private Function IsFactorByFactor() As Boolean + Return strFirstVariablesType = "categorical" AndAlso strSecondVariableType = "categorical" + End Function + + Private Function IsFactorByNumeric() As Boolean + Return strFirstVariablesType = "categorical" AndAlso strSecondVariableType = "numeric" + End Function + + Private Function IsNumericByFactor() As Boolean + Return strFirstVariablesType = "numeric" AndAlso strSecondVariableType = "categorical" + End Function + + Private Function IsNumericByNumeric() As Boolean + Return strFirstVariablesType = "numeric" AndAlso strSecondVariableType = "numeric" + End Function + Private Sub ucrBaseDescribeTwoVar_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeForControls(True) @@ -357,120 +420,143 @@ Public Class dlgDescribeTwoVariable End Sub Private Sub cmdSummaries_Click(sender As Object, e As EventArgs) Handles cmdSummaries.Click - sdgSummaries.SetRFunction(clsSummariesListFunction, clsRCustomSummaryFunction, clsCombineFunction, ucrSelectorDescribeTwoVar, bResetSubdialog) + If rdoTwoVariable.Checked Then + If IsNumericByFactor() Then + sdgSummaries.SetRFunction(clsSummariesListFunction, clsSummaryTableFunction, clsCombineFunction, ucrSelectorDescribeTwoVar, bResetSubdialog) + End If + ElseIf rdoThreeVariable.Checked Then + If IsFactorByNumeric() OrElse IsNumericByFactor() Then + sdgSummaries.SetRFunction(clsSummariesListFunction, clsSummaryTableFunction, clsCombineFunction, ucrSelectorDescribeTwoVar, bResetSubdialog) + End If + End If bResetSubdialog = False sdgSummaries.ShowDialog() + FillListView() TestOKEnabled() End Sub Private Sub cmdDisplayOptions_Click(sender As Object, e As EventArgs) - sdgDescribeDisplay.SetRFunction(clsFrequencyTablesFunction, clsRAnovaFunction, bResetSubdialog) + sdgDescribeDisplay.SetRFunction(clsSummaryTableFunction, clsRAnovaFunction, bResetSubdialog) bResetSubdialog = False sdgDescribeDisplay.ShowDialog() TestOKEnabled() End Sub - Public Sub Results() - Dim lstFirstItemTypes As List(Of String) - ucrBase.clsRsyntax.RemoveFromAfterCodes(clsEmptyOperator) - ucrBase.clsRsyntax.RemoveFromAfterCodes(clsSecondEmptyOperator) - If rdoCustomize.Checked Then - grpSummaries.Visible = True - If Not ucrReceiverFirstVars.IsEmpty() Then - lstFirstItemTypes = ucrReceiverFirstVars.GetCurrentItemTypes(True, bIsCategoricalNumeric:=True) - If lstFirstItemTypes.Count = 1 AndAlso lstFirstItemTypes.Contains("logical") Then - lstFirstItemTypes(0) = "categorical" - Else - lstFirstItemTypes.RemoveAll(Function(x) x.Contains("logical")) - End If - If (lstFirstItemTypes.Count > 0) Then - strFirstVariablesType = lstFirstItemTypes(0) - Else - strFirstVariablesType = "" - End If - lblFirstType.Text = strFirstVariablesType - lblFirstType.ForeColor = SystemColors.Highlight - Else - strFirstVariablesType = "" - lblFirstType.Text = "________" - lblFirstType.ForeColor = SystemColors.ControlText - End If - If Not ucrReceiverSecondVar.IsEmpty() Then - strSecondVariableType = ucrReceiverSecondVar.strCurrDataType - If strSecondVariableType.Contains("factor") OrElse strSecondVariableType.Contains("character") OrElse strSecondVariableType.Contains("logical") Then - strSecondVariableType = "categorical" - Else - strSecondVariableType = "numeric" - End If - lblSecondType.Text = strSecondVariableType - lblSecondType.ForeColor = SystemColors.Highlight - Else - strSecondVariableType = "" - lblSecondType.Text = "________" - lblSecondType.ForeColor = SystemColors.ControlText - End If + Private Sub ManageControlsVisibility() + grpSummaries.Visible = rdoThreeVariable.Checked OrElse rdoTwoVariable.Checked + ucrReorderSummary.Visible = IsNumericByFactor() + cmdSummaries.Visible = IsNumericByFactor() + grpColumnFactor.Visible = IsFactorByFactor() OrElse IsNumericByFactor() + ucrChkDisplayMargins.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() + ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactor() + grpDisplay.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() + + If rdoTwoVariable.Checked Then + ucrChkOmitMissing.Visible = strFirstVariablesType = "numeric" + ElseIf rdoThreeVariable.Checked Then + ucrChkOmitMissing.Visible = IsFactorByNumeric() OrElse IsNumericByFactor() + Else + ucrChkOmitMissing.Visible = False + End If + cmdMissingOptions.Visible = ucrChkOmitMissing.Checked + End Sub + + Private Sub ChangeBaseRCode() + If rdoSkim.Checked Then + clsDummyFunction.AddParameter("checked", "skim", iPosition:=0) + + ucrSaveTable.Visible = True + ucrSaveTable.SetPrefix("summary_table") + ucrSaveTable.SetSaveType(RObjectTypeLabel.Summary, strRObjectFormat:=RObjectFormat.Text) + ucrSaveTable.SetAssignToIfUncheckedValue("last_summary") + ucrSaveTable.SetCheckBoxText("Save Summary") + ucrBase.clsRsyntax.SetBaseROperator(clsGroupByPipeOperator) + clsGroupByPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_summary", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Summary, + strRObjectFormatToAssignTo:=RObjectFormat.Text, + strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + strObjectName:="last_summary") - If strFirstVariablesType = "numeric" AndAlso strSecondVariableType = "numeric" Then - grpOptions.Visible = True - cmdSummaries.Visible = False - ucrChkOmitMissing.Visible = True + ElseIf rdoTwoVariable.Checked Then + clsDummyFunction.AddParameter("checked", "customize", iPosition:=0) + If IsNumericByNumeric() Then ucrBase.clsRsyntax.SetBaseRFunction(clsRCorrelationFunction) - lblSummaryName.Text = "Correlations" - lblSummaryName.ForeColor = SystemColors.Highlight - ElseIf strFirstVariablesType = "categorical" AndAlso strSecondVariableType = "numeric" Then - grpOptions.Visible = False + ucrSaveTable.Visible = False + ElseIf IsFactorByNumeric() Then ucrBase.clsRsyntax.SetBaseRFunction(clsRAnovaFunction) - lblSummaryName.Text = "ANOVA tables" - lblSummaryName.ForeColor = SystemColors.Highlight - ElseIf strFirstVariablesType = "numeric" AndAlso strSecondVariableType = "categorical" Then - grpOptions.Visible = True - cmdSummaries.Visible = True - ucrChkOmitMissing.Visible = True - ucrBase.clsRsyntax.SetBaseRFunction(clsRCustomSummaryFunction) - ucrReceiverFirstVars.SetParameterIsString() - lblSummaryName.Text = "Numerical summaries" - lblSummaryName.ForeColor = SystemColors.Highlight - ElseIf strFirstVariablesType = "categorical" AndAlso strSecondVariableType = "categorical" Then - grpOptions.Visible = False - ucrBase.clsRsyntax.SetBaseROperator(clsMapFrequencyPipeOperator) - ucrBase.clsRsyntax.AddToAfterCodes(clsEmptyOperator, 1) - ucrBase.clsRsyntax.AddToAfterCodes(clsSecondEmptyOperator, 2) - lblSummaryName.Text = "Frequency tables" - lblSummaryName.ForeColor = SystemColors.Highlight - Else - grpOptions.Visible = False - lblSummaryName.Text = "__________" - lblSummaryName.ForeColor = SystemColors.ControlText + ucrSaveTable.Visible = False + ElseIf IsNumericByFactor() Then + ucrSaveTable.Visible = True + clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) + ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) + ucrSaveTable.SetPrefix("summary_table") + ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) + ucrSaveTable.SetAssignToIfUncheckedValue("last_table") + ucrSaveTable.SetCheckBoxText("Save Table") + clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + strRObjectFormatToAssignTo:=RObjectFormat.Text, + strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + strObjectName:="last_table") + ElseIf IsFactorByFactor() Then + ucrSaveTable.Visible = True + clsDummyFunction.AddParameter("factor_cols", "FactorVar", iPosition:=1) + ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) + ucrSaveTable.SetPrefix("frequency_table") + ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) + ucrSaveTable.SetAssignToIfUncheckedValue("last_table") + ucrSaveTable.SetCheckBoxText("Save Table") + clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + strRObjectFormatToAssignTo:=RObjectFormat.Text, + strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + strObjectName:="last_table") End If - Else - grpOptions.Visible = False - grpSummaries.Visible = False + ElseIf rdoThreeVariable.Checked Then + clsDummyFunction.AddParameter("checked", "three_variable", iPosition:=0) + ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) + ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) + 'ucrSaveTable.SetAssignToIfUncheckedValue("last_table") + ucrSaveTable.SetCheckBoxText("Save Table") End If - autoTranslate(Me) + FactorColumns() + 'ChangePrefix() End Sub - Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFirstVars.ControlContentsChanged, ucrReceiverSecondVar.ControlContentsChanged, ucrPnlDescribe.ControlContentsChanged - If Not ucrReceiverFirstVars.IsEmpty AndAlso (ucrChangedControl Is ucrReceiverFirstVars OrElse ucrChangedControl Is ucrReceiverSecondVar) Then - Dim iPosition As Integer = 0 - clsCombineMultipleColumnsFunction.ClearParameters() - clsCombineFactorsFunction.ClearParameters() + 'Private Sub ChangePrefix() + ' If rdoSkim.Checked Then + ' ucrSaveTable.SetPrefix("summary_table") + ' Else + ' If IsNumericByFactor() Then + ' ucrSaveTable.SetPrefix("summary_table") + ' ElseIf IsFactorByFactor Then + ' ucrSaveTable.SetPrefix("frequency_table") + ' End If + ' End If + 'End Sub + + Private Sub UpdateCombineFactorParameterFunction() + If rdoThreeVariable.Checked Then + clsSummaryTableFunction.AddParameter("factors", clsRFunctionParameter:=clsSummaryTableCombineFactorsFunction, iPosition:=2) + End If + End Sub - For Each strColumn In ucrReceiverFirstVars.GetVariableNamesList() - clsCombineMultipleColumnsFunction.AddParameter(strColumn, strColumn, bIncludeArgumentName:=False, iPosition:=iPosition) - If ucrReceiverSecondVar.GetVariableNames <> strColumn Then - clsCombineFactorsFunction.AddParameter(strColumn, strColumn, bIncludeArgumentName:=False, iPosition:=iPosition) + Private Sub AddRemoveNAParameter() + clsSummaryTableFunction.RemoveParameterByName("na.rm") + If ucrChkOmitMissing.Checked Then + If rdoTwoVariable.Checked Then + If IsNumericByFactor() Then + clsSummaryTableFunction.AddParameter("na.rm", "TRUE", iPosition:=5) End If - iPosition += 1 - Next - clsCombineFactorsFunction.AddParameter(ucrReceiverSecondVar.GetVariableNames, ucrReceiverSecondVar.GetVariableNames, - bIncludeArgumentName:=False, iPosition:=iPosition) + ElseIf rdoThreeVariable.Checked Then + If IsNumericByFactor() OrElse IsFactorByNumeric() Then + clsSummaryTableFunction.AddParameter("na.rm", "TRUE", iPosition:=5) + End If + End If End If - SwapMmtableHeaderFunctions() - Results() - EnableDisableFrequencyControls() - AddRemoveFrequencyParameters() + 'EnableDisableFrequencyControls() + ' AddRemoveFrequencyParameters() ChangeLocations() - MissingOptions() TestOKEnabled() End Sub @@ -480,61 +566,75 @@ Public Class dlgDescribeTwoVariable Else clsRCorrelationFunction.RemoveParameterByName("use") End If + AddRemoveNAParameter() If Not ucrChkOmitMissing.Checked Then - clsRCustomSummaryFunction.RemoveParameterByName("na_type") - clsRCustomSummaryFunction.RemoveParameterByName("na_max_n") - clsRCustomSummaryFunction.RemoveParameterByName("na_min_n") - clsRCustomSummaryFunction.RemoveParameterByName("na_max_prop") - clsRCustomSummaryFunction.RemoveParameterByName("na_consecutive_n") - Else - clsRCustomSummaryFunction.AddParameter("na_type", clsRFunctionParameter:=clsCombineFunction, iPosition:=9) - End If - MissingOptions() - End Sub - - Private Sub MissingOptions() - If ucrChkOmitMissing.Checked AndAlso strFirstVariablesType = "numeric" AndAlso strSecondVariableType = "categorical" Then - cmdMissingOptions.Enabled = True + clsSummaryTableFunction.RemoveParameterByName("na_type") + clsSummaryTableFunction.RemoveParameterByName("na_max_n") + clsSummaryTableFunction.RemoveParameterByName("na_min_n") + clsSummaryTableFunction.RemoveParameterByName("na_max_prop") + clsSummaryTableFunction.RemoveParameterByName("na_consecutive_n") Else - cmdMissingOptions.Enabled = False + clsSummaryTableFunction.AddParameter("na_type", clsRFunctionParameter:=clsCombineFunction, iPosition:=9) End If End Sub Private Sub ucrPnlDescribe_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlDescribe.ControlValueChanged ucrReceiverFirstVars.Clear() ucrReceiverFirstVars.SetMeAsReceiver() + If rdoSkim.Checked Then - clsDummyFunction.AddParameter("checked", "skim", iPosition:=0) ucrReceiverFirstVars.SetSingleTypeStatus(False) - ucrBase.clsRsyntax.SetBaseROperator(clsGroupByPipeOperator) - ElseIf rdoCustomize.Checked Then - clsDummyFunction.AddParameter("checked", "customize", iPosition:=0) - ucrBase.clsRsyntax.SetBaseRFunction(clsRCustomSummaryFunction) + ucrSaveTable.Location = New Point(23, 286) + ElseIf rdoThreeVariable.Checked Then ucrReceiverFirstVars.SetSingleTypeStatus(True, bIsCategoricalNumeric:=True) + lblThreeVariableCategorical.Visible = True + lblThreeVariableCategorical.Location = New Point(106, 18) + lblSecondType.Location = New Point(12, 33) + lblSecondBy.Visible = True Else - clsDummyFunction.AddParameter("checked", "three_variable", iPosition:=0) + ucrSaveTable.Location = New Point(23, 450) + ucrReceiverFirstVars.SetSingleTypeStatus(True, bIsCategoricalNumeric:=True) + lblThreeVariableCategorical.Visible = False + lblThreeVariableCategorical.Location = New Point(12, 33) + lblSecondType.Location = New Point(106, 18) + lblSecondBy.Visible = False End If + ' cmdSummaries.Visible = rdoTwoVariable.Checked OrElse rdoThreeVariable.Checked + + ChangeFirstTypeLabel() + AssignSecondVariableType() + ChangeBaseRCode() + ManageControlsVisibility() + UpdateSummaryTableFunction() + UpdateCombineFactorParameterFunction() ChangeLocations() + EnableDisableFrequencyControls() + AddRemoveNAParameter() + HideFormatTableButton() + End Sub + + Private Sub HideFormatTableButton() + cmdFormatTable.Visible = IsNumericByFactor() _ + OrElse IsFactorByFactor() OrElse (IsFactorByNumeric() _ + AndAlso rdoThreeVariable.Checked) End Sub Private Sub ChangeLocations() - If rdoSkim.Checked Then - ucrBase.Location = New Point(iUcrBaseXLocation, 328) - Me.Size = New System.Drawing.Point(iDialogueXsize, 425) + If IsNumericByFactor() OrElse IsFactorByFactor() _ + OrElse (IsFactorByNumeric() AndAlso rdoThreeVariable.Checked) Then + ucrBase.Location = New Point(iUcrBaseXLocation, 487) + Me.Size = New Point(iDialogueXsize, 580) + ElseIf IsFactorByNumeric() Then + ucrBase.Location = New Point(iUcrBaseXLocation, 319) + Me.Size = New Point(iDialogueXsize, 415) Else - If strFirstVariablesType = "categorical" AndAlso - strSecondVariableType = "categorical" Then - ucrBase.Location = New Point(iUcrBaseXLocation, 435) - Me.Size = New System.Drawing.Point(iDialogueXsize, 530) - Else - ucrBase.Location = New Point(iUcrBaseXLocation, 328) - Me.Size = New System.Drawing.Point(iDialogueXsize, 425) - End If + ucrBase.Location = New Point(iUcrBaseXLocation, 328) + Me.Size = New Point(iDialogueXsize, 425) End If End Sub - Private Sub ucrReceiverSecondOpt_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSecondOpt.ControlValueChanged - If ucrReceiverSecondOpt.IsEmpty Then + Private Sub ucrReceiverSecondOpt_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSkimrGroupByFactor.ControlValueChanged + If ucrReceiverSkimrGroupByFactor.IsEmpty Then clsGroupByPipeOperator.RemoveParameterByName("group") Else clsGroupByPipeOperator.AddParameter("group", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1, bIncludeArgumentName:=False) @@ -542,88 +642,389 @@ Public Class dlgDescribeTwoVariable End Sub Private Sub EnableDisableFrequencyControls() - If rdoCustomize.Checked Then - If strFirstVariablesType = "categorical" AndAlso strSecondVariableType = "categorical" Then - grpDisplay.Visible = True - grpFrequency.Visible = True - ucrChkDisplayMargins.Visible = True - ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked - Else - ucrReceiverFirstVars.SetMeAsReceiver() - DisableFrequencyControls() - End If - Else - DisableFrequencyControls() - End If + ' grpThreeVariablePercentages.Visible = rdoThreeVariable.Checked _ + ' AndAlso IsFactorByFactor() + 'grpDisplay.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() + 'OrElse IsNumericByCategorical()) + ' grpFrequency.Visible = (rdoTwoVariable.Checked AndAlso (IsCategoricalByCategorical() _ + 'OrElse IsNumericByCategorical())) OrElse (rdoThreeVariable.Checked _ + 'AndAlso (IsNumericByCategorical() OrElse IsCategoricalByNumeric() _ + ' OrElse IsCategoricalByCategorical())) + 'ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked End Sub - Private Sub DisableFrequencyControls() - grpDisplay.Visible = False - grpFrequency.Visible = False - ucrChkDisplayMargins.Visible = False - ucrInputMarginName.Visible = False + Private Sub Display_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlColumnFactor.ControlValueChanged, ucrReceiverColumnFactor.ControlValueChanged + FactorColumns() End Sub - Private Sub SwapMmtableHeaderFunctions() - If rdoCustomize.Checked Then - clsMmtablePlusOperator.RemoveParameterByName("summary_variable") - clsMmtablePlusOperator.AddParameter("header_top_left", clsRFunctionParameter:=clsHeaderTopLeftFunction, iPosition:=1) - If Not ucrReceiverSecondVar.IsEmpty Then - If ucrNudColumnFactors.GetText = 1 Then - clsHeaderLeftTopFunction.AddParameter("variable", Chr(39) & "by_var" & Chr(39), iPosition:=0) - clsHeaderTopLeftFunction.AddParameter("variable", ucrReceiverSecondVar.GetVariableNames(), iPosition:=0) - ElseIf ucrNudColumnFactors.GetText = 2 Then - clsHeaderTopLeftFunction.AddParameter("variable", Chr(39) & "by_var" & Chr(39), iPosition:=0) - clsHeaderLeftTopFunction.AddParameter("variable", ucrReceiverSecondVar.GetVariableNames(), iPosition:=0) - End If + Private Sub FactorColumns() + If rdoNoColumnFactor.Checked Then + clsSummaryOperator.RemoveParameterByName("col_factor") + clsDummyFunction.AddParameter("factor_cols", "NoColFactor", iPosition:=1) + Else + clsSummaryOperator.AddParameter("col_factor", clsRFunctionParameter:=clsPivotWiderFunction, iPosition:=1) + If rdoSummaryVariable.Checked Then + clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) + clsPivotWiderFunction.AddParameter("names_from", Chr(39) & "summary-variable" & Chr(39), iPosition:=0) + ElseIf rdoVariableFactor.Checked Then + ucrReceiverColumnFactor.SetMeAsReceiver() + clsDummyFunction.AddParameter("factor_cols", "FactorVar", iPosition:=1) + clsPivotWiderFunction.AddParameter("names_from", ucrReceiverColumnFactor.GetVariableNames(False), iPosition:=0) End If End If + AddingColumnFactor() End Sub Private Sub AddRemoveFrequencyParameters() - If strFirstVariablesType = "categorical" AndAlso strSecondVariableType = "categorical" Then - For Each strParameter In lstFrequencyParameters - clsFrequencyTablesFunction.RemoveParameterByName(strParameter) - Next - For Each clsParameter In clsCombineFrequencyParametersFunction.clsParameters - clsFrequencyTablesFunction.AddParameter(clsParameter) - Next + If rdoSkim.Checked Then + Exit Sub End If + + For Each strParameter In lstFrequencyParameters + clsSummaryTableFunction.RemoveParameterByName(strParameter) + Next + + Dim clsTempFrequency As RFunction = If(rdoThreeVariable.Checked, + clsThreeVariableCombineFrequencyParametersFunction, + clsCombineFrequencyParametersFunction).Clone + + For Each clsParameter In clsTempFrequency.clsParameters + If IsFactorByFactor() Then + clsSummaryTableFunction.AddParameter(clsParameter) + Else + If IsNumericByFactor() OrElse IsFactorByNumeric() Then + Select Case clsParameter.strArgumentName + Case "signif_fig", "include_margins", "margin_name" + clsSummaryTableFunction.AddParameter(clsParameter) + End Select + End If + End If + Next End Sub Private Sub Frequencies_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPercentageProportion.ControlValueChanged, - ucrChkDisplayAsPercentage.ControlValueChanged, ucrNudSigFigs.ControlValueChanged, ucrChkDisplayMargins.ControlValueChanged, + ucrChkDisplayAsPercentage.ControlValueChanged, ucrChkDisplayMargins.ControlValueChanged, ucrReceiverPercentages.ControlValueChanged, ucrInputMarginName.ControlValueChanged - If rdoCustomize.Checked Then + ' ucrChkDisplayAsPercentage.ControlValueChanged, ucrChkThreeVariablePercentageProportion.ControlValueChanged, ucrChkThreeVariableDisplayAsPercentage.ControlValueChanged + If rdoTwoVariable.Checked Then If ucrChkDisplayAsPercentage.Checked Then ucrReceiverPercentages.SetMeAsReceiver() Else ucrReceiverFirstVars.SetMeAsReceiver() End If + ' ElseIf rdoThreeVariable.Checked Then + ' If ucrChkThreeVariableDisplayAsPercentage.Checked Then + ' ucrReceiverThreeVariablePercentage.SetMeAsReceiver() + Else + ucrReceiverFirstVars.SetMeAsReceiver() End If + ' End If If ucrChkDisplayMargins.Checked Then ucrInputMarginName.Visible = True clsCombineFrequencyParametersFunction.AddParameter("margin_name", Chr(34) & ucrInputMarginName.GetText & Chr(34), iPosition:=6) + 'clsThreeVariableCombineFrequencyParametersFunction.AddParameter("margin_name", Chr(34) & ucrInputMarginName.GetText & Chr(34), iPosition:=6) Else ucrInputMarginName.Visible = False clsCombineFrequencyParametersFunction.RemoveParameterByName("margin_name") + 'clsThreeVariableCombineFrequencyParametersFunction.RemoveParameterByName("margin_name") End If - AddRemoveFrequencyParameters() - End Sub - Private Sub ucrNudColumnFactors_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudColumnFactors.ControlValueChanged - SwapMmtableHeaderFunctions() + AddRemoveFrequencyParameters() End Sub Private Sub ucrSelectorDescribeTwoVar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorDescribeTwoVar.ControlValueChanged clsGroupByPipeOperator.AddParameter("data", clsRFunctionParameter:=ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) - clsMapFrequencyPipeOperator.AddParameter("data", clsRFunctionParameter:=ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) - clsFrequencyTablesFunction.AddParameter("data_name", Chr(34) & ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + + ' clsJoiningPipeOperator._strDataFrameNameToAddAssignToObject = ucrSelectorDescribeTwoVar.strCurrentDataFrame + ' clsGroupByPipeOperator._strDataFrameNameToAddAssignToObject = ucrSelectorDescribeTwoVar.strCurrentDataFrame + End Sub + + Private Sub UpdateSummaryTableFunction() + If rdoSkim.Checked Then + Exit Sub + End If + If rdoTwoVariable.Checked Then + If IsFactorByFactor() Then + clsSummaryTableFunction.AddParameter("summaries", "count_label", iPosition:=4) + ElseIf IsNumericByFactor() Then + clsSummaryTableFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesListFunction, iPosition:=4) + End If + ElseIf rdoThreeVariable.Checked Then + If IsFactorByNumeric() Then + clsSummaryTableFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesListFunction, iPosition:=4) + ElseIf IsFactorByFactor() Then + clsSummaryTableFunction.AddParameter("summaries", "count_label", iPosition:=4) + ElseIf IsNumericByFactor() Then + clsSummaryTableFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesListFunction, iPosition:=4) + End If + End If + End Sub + + Private Sub ucrReceiverNumericVariable_ControlValueAndContentChanged(ucrChangedControl As ucrCore) Handles ucrReceiverThreeVariableThirdVariable.ControlValueChanged + AssignSecondVariableType() + ManageControlsVisibility() + UpdateCombineFactorParameterFunction() + ChangeBaseRCode() + ChangeLocations() + EnableDisableFrequencyControls() + UpdateSummaryTableFunction() + AddRemoveFrequencyParameters() + AddRemoveNAParameter() + HideFormatTableButton() + ' TestOKEnabled() + End Sub + + Private Sub ChangeSumaryLabelText() + If rdoSkim.Checked Then + Exit Sub + End If + Dim strSummaryName As String = "" + + If IsFactorByFactor() Then + strSummaryName = "Frequency tables" + ElseIf IsNumericByFactor() Then + strSummaryName = "Summary tables" + Else + If rdoTwoVariable.Checked Then + If IsNumericByNumeric() Then + strSummaryName = "Correlations" + ElseIf IsFactorByNumeric() Then + strSummaryName = "ANOVA tables" + Else + strSummaryName = "" + End If + ElseIf rdoThreeVariable.Checked Then + strSummaryName = "Summary tables" + End If + End If + + If strSummaryName <> "" Then + lblSummaryName.Text = strSummaryName + lblSummaryName.ForeColor = SystemColors.Highlight + Else + lblSummaryName.Text = "__________" + lblSummaryName.ForeColor = SystemColors.ControlText + End If + autoTranslate(Me) + End Sub + + Private Sub AssignSecondVariableType() + If rdoTwoVariable.Checked OrElse rdoThreeVariable.Checked Then + Dim ucrCurrentReceiver As ucrReceiverSingle = If(rdoTwoVariable.Checked, + ucrReceiverSecondTwoVariableFactor, ucrReceiverThreeVariableThirdVariable) + If Not ucrCurrentReceiver.IsEmpty Then + strSecondVariableType = If({"factor", "character", "logical"}.Contains(ucrCurrentReceiver.strCurrDataType), + "categorical", "numeric") + lblSecondType.Text = strSecondVariableType + lblSecondType.ForeColor = SystemColors.Highlight + + Else + strSecondVariableType = "" + lblSecondType.Text = "________" + lblSecondType.ForeColor = SystemColors.ControlText + End If + ChangeSumaryLabelText() + End If + ManageControlsVisibility() End Sub + Private Sub ucrReceiverSecondTwoVariableFactor_ValueAndContentChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSecondTwoVariableFactor.ControlValueChanged, + ucrReceiverSecondTwoVariableFactor.ControlContentsChanged + AssignSecondVariableType() + ChangeBaseRCode() + UpdateSummaryTableFunction() + ChangeLocations() + 'EnableDisableFrequencyControls() + AddRemoveNAParameter() + HideFormatTableButton() + ManageControlsVisibility() + 'TestOKEnabled() + End Sub + + Private Sub ChangeFirstTypeLabel() + Dim lstFirstItemTypes As List(Of String) + If Not ucrReceiverFirstVars.IsEmpty() Then + lstFirstItemTypes = ucrReceiverFirstVars.GetCurrentItemTypes(True, bIsCategoricalNumeric:=True) + If lstFirstItemTypes.Count = 1 AndAlso lstFirstItemTypes.Contains("logical") Then + lstFirstItemTypes(0) = "categorical" + Else + lstFirstItemTypes.RemoveAll(Function(x) x.Contains("logical")) + End If + If (lstFirstItemTypes.Count > 0) Then + strFirstVariablesType = lstFirstItemTypes(0) + Else + strFirstVariablesType = "" + End If + Else + strFirstVariablesType = "" + End If + + If strFirstVariablesType <> "" Then + lblFirstType.Text = strFirstVariablesType + lblFirstType.ForeColor = SystemColors.Highlight + Else + lblFirstType.Text = "________" + lblFirstType.ForeColor = SystemColors.ControlText + End If + End Sub + + Private Sub ucrReceiverFirstVars_ControlValueAndContentChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFirstVars.ControlValueChanged + 'ucrReceiverFirstVars.ControlContentsChanged() + ChangeFirstTypeLabel() + ChangeSumaryLabelText() + UpdateSummaryTableFunction() + UpdateCombineFactorParameterFunction() + ChangeBaseRCode() + ManageControlsVisibility() + ChangeLocations() + EnableDisableFrequencyControls() + AddRemoveFrequencyParameters() + AddRemoveNAParameter() + HideFormatTableButton() + 'TestOKEnabled() + End Sub + + Private Sub ucrReceiverThreeVariableSecondFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverThreeVariableSecondFactor.ControlValueChanged + UpdateCombineFactorParameterFunction() + End Sub + + Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFirstVars.ControlContentsChanged, + ucrReceiverSecondTwoVariableFactor.ControlContentsChanged, ucrPnlDescribe.ControlContentsChanged, + ucrReceiverThreeVariableThirdVariable.ControlContentsChanged + TestOKEnabled() + End Sub + + Private Sub ucrReceiverSecondTwoVariableFactor_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverSecondTwoVariableFactor.SelectionChanged + MatchingCategoricalByCategoricalVariables(ucrReceiverSecondTwoVariableFactor) + End Sub + + Private Sub ucrReceiverFirstVars_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverFirstVars.SelectionChanged + MatchingCategoricalByCategoricalVariables(ucrReceiverFirstVars) + End Sub + + Private Sub ucrReceiverThreeVariableSecondFactor_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverThreeVariableSecondFactor.SelectionChanged + MatchingCategoricalByCategoricalVariables(ucrReceiverThreeVariableSecondFactor) + End Sub + + Private Sub ucrReceiverThreeVariableThirdVariable_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverThreeVariableThirdVariable.SelectionChanged + MatchingCategoricalByCategoricalVariables(ucrReceiverThreeVariableThirdVariable) + End Sub + + Private Sub MatchingCategoricalByCategoricalVariables(sender As ucrReceiver) + If Not bRcodeSet OrElse rdoSkim.Checked OrElse sender.IsEmpty Then + Exit Sub + End If + Dim bContainedInMultipleReceiver As Boolean = False + + If TypeOf (sender) Is ucrReceiverSingle Then + bContainedInMultipleReceiver = ucrReceiverFirstVars.GetVariableNamesList.Contains( + TryCast(sender, ucrReceiverSingle).GetVariableNames) + ElseIf TypeOf (sender) Is ucrReceiverMultiple Then + Dim lstMultipleVariables As String() = TryCast(sender, ucrReceiverMultiple).GetVariableNamesList() + If rdoTwoVariable.Checked Then + bContainedInMultipleReceiver = lstMultipleVariables.Contains(ucrReceiverSecondTwoVariableFactor.GetVariableNames) + Else + bContainedInMultipleReceiver = lstMultipleVariables.Contains(ucrReceiverThreeVariableSecondFactor.GetVariableNames) OrElse ( + lstMultipleVariables.Contains(ucrReceiverThreeVariableThirdVariable.GetVariableNames) AndAlso strSecondVariableType = "categorical") + End If + End If + + + If sender Is ucrReceiverSecondTwoVariableFactor Then + If bContainedInMultipleReceiver And strFirstVariablesType = "categorical" Then + DisplayWarning(" First Variable ") + End If + ElseIf sender Is ucrReceiverThreeVariableThirdVariable Then + If (bContainedInMultipleReceiver And strFirstVariablesType = "categorical") OrElse + (ucrReceiverThreeVariableThirdVariable.GetVariableNames = ucrReceiverThreeVariableSecondFactor.GetVariableNames) Then + DisplayWarning(" First Variable and Second Variable ") + End If + ElseIf sender Is ucrReceiverThreeVariableSecondFactor Then + If (strFirstVariablesType = "categorical" AndAlso bContainedInMultipleReceiver) OrElse + (ucrReceiverThreeVariableThirdVariable.GetVariableNames = ucrReceiverThreeVariableSecondFactor.GetVariableNames) Then + DisplayWarning(" First Variable and Third Variable ") + End If + ElseIf sender Is ucrReceiverFirstVars Then + If rdoTwoVariable.Checked Then + If strSecondVariableType = "categorical" AndAlso bContainedInMultipleReceiver Then + DisplayWarning(" Second Variable ") + End If + ElseIf rdoThreeVariable.Checked Then + If bContainedInMultipleReceiver Then + DisplayWarning(" Second Variable and Third Variable ") + End If + End If + End If + End Sub + + Private Sub DisplayWarning(strMessage As String) + MsgBox("Pick a categorical variable different from those selected in the" & strMessage & "to avoid Errors", vbOKOnly, "Matching Factor Variables") + End Sub + + Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Handles cmdFormatTable.Click + sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, + clsNewThemesTabOptionFunction:=clsThemesTabOptionFunction, clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, + clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, + clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, + clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, clsNewgtExtraThemesFunction:=clsgtExtrasThemesFuction, clsNewMutableOperator:=clsMutableOperator, + clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, bReset:=bReset) + sdgFormatSummaryTables.ShowDialog() + End Sub Private Sub cmdMissingOptions_Click(sender As Object, e As EventArgs) Handles cmdMissingOptions.Click - sdgMissingOptions.SetRFunction(clsNewSummaryFunction:=clsRCustomSummaryFunction, clsNewConcFunction:=clsCombineFunction, bReset:=bResetSubdialog) + sdgMissingOptions.SetRFunction(clsNewSummaryFunction:=clsSummaryTableFunction, clsNewConcFunction:=clsCombineFunction, bReset:=bResetSubdialog) bResetSubdialog = False sdgMissingOptions.ShowDialog() End Sub -End Class \ No newline at end of file + + Private Sub FillListView() + If clsSummariesListFunction.clsParameters.Count > 0 Then + ucrReorderSummary.lstAvailableData.Clear() + ucrReorderSummary.lstAvailableData.Columns.Add("Summaries") + ucrReorderSummary.lstAvailableData.Columns(0).Width = -2 + For i = 0 To clsSummariesListFunction.clsParameters.Count - 1 + clsSummariesListFunction.clsParameters(i).Position = i + ucrReorderSummary.lstAvailableData.Items.Add(clsSummariesListFunction.clsParameters(i).strArgumentName) + Next + Else + ucrReorderSummary.lstAvailableData.Items.Clear() + End If + End Sub + + Private Sub ucrReorderSummary_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReorderSummary.ControlValueChanged + Dim lstOrderedSummaries As New List(Of RParameter) + Dim iPosition As Integer = 0 + For i = 0 To ucrReorderSummary.lstAvailableData.Items.Count - 1 + lstOrderedSummaries.Add(clsSummariesListFunction.GetParameter(ucrReorderSummary.lstAvailableData.Items(i).Text)) + Next + + clsSummariesListFunction.ClearParameters() + 'Changing the parameter positions + For Each clsParameter In lstOrderedSummaries + clsParameter.Position = iPosition + clsSummariesListFunction.AddParameter(clsParameter) + iPosition += 1 + Next + End Sub + + Private Sub AddingColumnFactor() + Dim lstVariables As New List(Of String) + Dim iXVarCount As Integer + + iXVarCount = lstVariables.Count + If bRcodeSet Then + If lstVariables.Contains(ucrReceiverColumnFactor.GetVariableNames(False)) OrElse + Not ucrReceiverSecondTwoVariableFactor.GetVariableNames().Contains(ucrReceiverColumnFactor.GetVariableNames(False)) Then + ucrReceiverColumnFactor.Clear() + ucrReceiverSecondTwoVariableFactor.SetMeAsReceiver() + End If + If iXVarCount = 0 AndAlso Not ucrReceiverSecondTwoVariableFactor.IsEmpty AndAlso + ucrReceiverColumnFactor.IsEmpty() Then + ucrReceiverColumnFactor.SetText(ucrReceiverSecondTwoVariableFactor.GetVariableNames(False)) + ucrReceiverSecondTwoVariableFactor.SetMeAsReceiver() + ElseIf ucrReceiverSecondTwoVariableFactor.IsEmpty Then + ucrReceiverColumnFactor.Clear() + End If + 'lstVariables = ucrReceiverSecondTwoVariableFactor.GetVariableNamesAsList() + End If + End Sub +End Class diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index 9d5c27dd49f..48f1cf788f6 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -746,7 +746,7 @@ Public Class dlgLinePlot Private Sub PeakOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PeakOptionsToolStripMenuItem.Click openSdgLayerOptions(clsPeakFunction) End Sub - + Private Sub DumbbellOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DumbbellOptionsToolStripMenuItem.Click openSdgLayerOptions(clsGeomDumbbellFunction) End Sub @@ -754,7 +754,7 @@ Public Class dlgLinePlot Private Sub LineOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LineOptionsToolStripMenuItem.Click openSdgLayerOptions(clsGeomLineFunction) End Sub - + Private Sub SmoothOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SmoothOptionsToolStripMenuItem.Click openSdgLayerOptions(clsGeomSmoothFunction) End Sub @@ -766,7 +766,7 @@ Public Class dlgLinePlot Private Sub PathOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PathOptionsToolStripMenuItem.Click openSdgLayerOptions(clsPathFunction) End Sub - + Private Sub StepOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles StepOptionsToolStripMenuItem.Click openSdgLayerOptions(clsGeomStepFunction) End Sub diff --git a/instat/dlgSummaryTables.vb b/instat/dlgSummaryTables.vb index 83b33aa566c..607c7cc44f3 100644 --- a/instat/dlgSummaryTables.vb +++ b/instat/dlgSummaryTables.vb @@ -396,7 +396,7 @@ Public Class dlgSummaryTables clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, - clsNewMutableOPerator:=clsSummaryOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, + clsNewMutableOperator:=clsSummaryOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction, clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog) Else @@ -404,7 +404,7 @@ Public Class dlgSummaryTables clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, - clsNewMutableOPerator:=clsFrequencyOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, + clsNewMutableOperator:=clsFrequencyOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction, clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog) End If diff --git a/instat/sdgFormatSummaryTables.vb b/instat/sdgFormatSummaryTables.vb index 9296e0b6661..a4890c9a25b 100644 --- a/instat/sdgFormatSummaryTables.vb +++ b/instat/sdgFormatSummaryTables.vb @@ -133,7 +133,7 @@ Public Class sdgFormatSummaryTables End Sub Public Sub SetRCode(bReset As Boolean, clsNewTableTitleFunction As RFunction, clsNewTabFootnoteTitleFunction As RFunction, clsNewFootnoteCellFunction As RFunction, - clsNewTableSourcenoteFunction As RFunction, clsNewTabStyleFunction As RFunction, clsNewMutableOPerator As ROperator, + clsNewTableSourcenoteFunction As RFunction, clsNewTabStyleFunction As RFunction, clsNewMutableOperator As ROperator, clsNewPipeOperator As ROperator, clsNewFootnoteTitleLocationFunction As RFunction, clsNewFootnoteSubtitleLocationFunction As RFunction, clsNewTabFootnoteSubtitleFunction As RFunction, clsNewFootnoteCellBodyFunction As RFunction, clsNewJoiningOperator As ROperator, clsNewSecondFootnoteCellFunction As RFunction, clsNewTabStyleCellTextFunction As RFunction,