diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index 16e31a8d4f..5eb45c48ae 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -100,7 +100,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoThreeVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoThreeVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoThreeVariable.Location = New System.Drawing.Point(432, 12) - Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4) Me.rdoThreeVariable.Name = "rdoThreeVariable" Me.rdoThreeVariable.Size = New System.Drawing.Size(150, 42) Me.rdoThreeVariable.TabIndex = 3 @@ -113,7 +113,7 @@ Partial Class dlgDescribeTwoVariable Me.cmdFormatTable.Enabled = False Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdFormatTable.Location = New System.Drawing.Point(489, 645) - Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4) Me.cmdFormatTable.Name = "cmdFormatTable" Me.cmdFormatTable.Size = New System.Drawing.Size(156, 34) Me.cmdFormatTable.TabIndex = 23 @@ -135,7 +135,7 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdMissingOptions.Location = New System.Drawing.Point(538, 440) - Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4) Me.cmdMissingOptions.Name = "cmdMissingOptions" Me.cmdMissingOptions.Size = New System.Drawing.Size(158, 34) Me.cmdMissingOptions.TabIndex = 21 @@ -175,9 +175,9 @@ Partial Class dlgDescribeTwoVariable Me.grpSummaries.Controls.Add(Me.lblBy) Me.grpSummaries.Controls.Add(Me.lblSecondType) Me.grpSummaries.Location = New System.Drawing.Point(16, 328) - Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4) Me.grpSummaries.Size = New System.Drawing.Size(315, 108) Me.grpSummaries.TabIndex = 17 Me.grpSummaries.TabStop = False @@ -276,7 +276,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoSkim.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSkim.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoSkim.Location = New System.Drawing.Point(142, 12) - Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4) Me.rdoSkim.Name = "rdoSkim" Me.rdoSkim.Size = New System.Drawing.Size(150, 42) Me.rdoSkim.TabIndex = 1 @@ -315,7 +315,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoTwoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTwoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoTwoVariable.Location = New System.Drawing.Point(286, 12) - Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4) Me.rdoTwoVariable.Name = "rdoTwoVariable" Me.rdoTwoVariable.Size = New System.Drawing.Size(150, 42) Me.rdoTwoVariable.TabIndex = 2 @@ -327,7 +327,7 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdSummaries.Location = New System.Drawing.Point(465, 372) - Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4) Me.cmdSummaries.Name = "cmdSummaries" Me.cmdSummaries.Size = New System.Drawing.Size(180, 34) Me.cmdSummaries.TabIndex = 1 @@ -350,11 +350,11 @@ Partial Class dlgDescribeTwoVariable ' Me.grpDisplay.Controls.Add(Me.ucrReceiverColumns) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) - Me.grpDisplay.Location = New System.Drawing.Point(414, 278) - Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDisplay.Location = New System.Drawing.Point(414, 286) + Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.grpDisplay.Size = New System.Drawing.Size(291, 219) + Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4) + Me.grpDisplay.Size = New System.Drawing.Size(291, 265) Me.grpDisplay.TabIndex = 15 Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" @@ -363,29 +363,29 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverColumns.AutoSize = True Me.ucrReceiverColumns.frmParent = Me - Me.ucrReceiverColumns.Location = New System.Drawing.Point(30, 138) + Me.ucrReceiverColumns.Location = New System.Drawing.Point(40, 138) Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumns.Name = "ucrReceiverColumns" Me.ucrReceiverColumns.Selector = Nothing - Me.ucrReceiverColumns.Size = New System.Drawing.Size(270, 183) + Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 123) Me.ucrReceiverColumns.strNcFilePath = "" - Me.ucrReceiverColumns.TabIndex = 55 + Me.ucrReceiverColumns.TabIndex = 46 Me.ucrReceiverColumns.ucrSelector = Nothing ' 'ucrChkDisplayAsPercentage ' Me.ucrChkDisplayAsPercentage.AutoSize = True Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(21, 33) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(21, 32) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(256, 76) + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(256, 36) Me.ucrChkDisplayAsPercentage.TabIndex = 54 ' 'rdoOCol ' Me.rdoOCol.AutoSize = True - Me.rdoOCol.Location = New System.Drawing.Point(432, 336) + Me.rdoOCol.Location = New System.Drawing.Point(432, 357) Me.rdoOCol.Name = "rdoOCol" Me.rdoOCol.Size = New System.Drawing.Size(81, 24) Me.rdoOCol.TabIndex = 40 @@ -396,7 +396,7 @@ Partial Class dlgDescribeTwoVariable 'rdoOCell ' Me.rdoOCell.AutoSize = True - Me.rdoOCell.Location = New System.Drawing.Point(612, 334) + Me.rdoOCell.Location = New System.Drawing.Point(612, 355) Me.rdoOCell.Name = "rdoOCell" Me.rdoOCell.Size = New System.Drawing.Size(84, 24) Me.rdoOCell.TabIndex = 41 @@ -407,7 +407,7 @@ Partial Class dlgDescribeTwoVariable 'rdoORow ' Me.rdoORow.AutoSize = True - Me.rdoORow.Location = New System.Drawing.Point(518, 336) + Me.rdoORow.Location = New System.Drawing.Point(518, 357) Me.rdoORow.Name = "rdoORow" Me.rdoORow.Size = New System.Drawing.Size(90, 24) Me.rdoORow.TabIndex = 42 @@ -432,7 +432,7 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverPercentages.AutoSize = True Me.ucrReceiverPercentages.frmParent = Me - Me.ucrReceiverPercentages.Location = New System.Drawing.Point(430, 369) + Me.ucrReceiverPercentages.Location = New System.Drawing.Point(430, 390) Me.ucrReceiverPercentages.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPercentages.Name = "ucrReceiverPercentages" Me.ucrReceiverPercentages.Selector = Nothing @@ -444,7 +444,7 @@ Partial Class dlgDescribeTwoVariable 'ucrpnlPercent ' Me.ucrpnlPercent.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrpnlPercent.Location = New System.Drawing.Point(424, 332) + Me.ucrpnlPercent.Location = New System.Drawing.Point(424, 353) Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrpnlPercent.Name = "ucrpnlPercent" Me.ucrpnlPercent.Size = New System.Drawing.Size(270, 38) @@ -505,7 +505,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrInputMarginName.IsMultiline = False Me.ucrInputMarginName.IsReadOnly = False Me.ucrInputMarginName.Location = New System.Drawing.Point(171, 477) - Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) + Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputMarginName.Name = "ucrInputMarginName" Me.ucrInputMarginName.Size = New System.Drawing.Size(206, 32) Me.ucrInputMarginName.TabIndex = 22 @@ -513,7 +513,7 @@ Partial Class dlgDescribeTwoVariable 'ucrReorderSummary ' Me.ucrReorderSummary.Location = New System.Drawing.Point(412, 410) - Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9) Me.ucrReorderSummary.Name = "ucrReorderSummary" Me.ucrReorderSummary.Size = New System.Drawing.Size(291, 234) Me.ucrReorderSummary.TabIndex = 16 @@ -525,7 +525,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(22, 734) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 25 @@ -559,7 +559,7 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrPnlDescribe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlDescribe.Location = New System.Drawing.Point(138, 4) - Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlDescribe.Name = "ucrPnlDescribe" Me.ucrPnlDescribe.Size = New System.Drawing.Size(476, 51) Me.ucrPnlDescribe.TabIndex = 0 @@ -582,7 +582,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkDisplayMargins.AutoSize = True Me.ucrChkDisplayMargins.Checked = False Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(26, 444) - Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) Me.ucrChkDisplayMargins.TabIndex = 18 @@ -592,7 +592,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkLevSig.AutoSize = True Me.ucrChkLevSig.Checked = False Me.ucrChkLevSig.Location = New System.Drawing.Point(596, 279) - Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkLevSig.Name = "ucrChkLevSig" Me.ucrChkLevSig.Size = New System.Drawing.Size(129, 34) Me.ucrChkLevSig.TabIndex = 38 @@ -602,7 +602,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkTotal.AutoSize = True Me.ucrChkTotal.Checked = False Me.ucrChkTotal.Location = New System.Drawing.Point(465, 279) - Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkTotal.Name = "ucrChkTotal" Me.ucrChkTotal.Size = New System.Drawing.Size(146, 34) Me.ucrChkTotal.TabIndex = 44 @@ -612,7 +612,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkMeans.AutoSize = True Me.ucrChkMeans.Checked = False Me.ucrChkMeans.Location = New System.Drawing.Point(465, 312) - Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkMeans.Name = "ucrChkMeans" Me.ucrChkMeans.Size = New System.Drawing.Size(146, 34) Me.ucrChkMeans.TabIndex = 37 @@ -622,7 +622,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkCorrelations.AutoSize = True Me.ucrChkCorrelations.Checked = False Me.ucrChkCorrelations.Location = New System.Drawing.Point(465, 381) - Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkCorrelations.Name = "ucrChkCorrelations" Me.ucrChkCorrelations.Size = New System.Drawing.Size(224, 34) Me.ucrChkCorrelations.TabIndex = 35 @@ -632,7 +632,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkSwapXYVar.AutoSize = True Me.ucrChkSwapXYVar.Checked = False Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(465, 346) - Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkSwapXYVar.Name = "ucrChkSwapXYVar" Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(236, 34) Me.ucrChkSwapXYVar.TabIndex = 36 @@ -642,7 +642,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkOmitMissing.AutoSize = True Me.ucrChkOmitMissing.Checked = False Me.ucrChkOmitMissing.Location = New System.Drawing.Point(465, 416) - Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) Me.ucrChkOmitMissing.TabIndex = 0 @@ -652,7 +652,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkInteraction.AutoSize = True Me.ucrChkInteraction.Checked = False Me.ucrChkInteraction.Location = New System.Drawing.Point(465, 380) - Me.ucrChkInteraction.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkInteraction.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkInteraction.Name = "ucrChkInteraction" Me.ucrChkInteraction.Size = New System.Drawing.Size(214, 34) Me.ucrChkInteraction.TabIndex = 45 @@ -663,11 +663,11 @@ Partial Class dlgDescribeTwoVariable Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ClientSize = New System.Drawing.Size(723, 700) - Me.Controls.Add(Me.ucrReorderSummary) Me.Controls.Add(Me.cmdSummaries) + Me.Controls.Add(Me.ucrReceiverPercentages) + Me.Controls.Add(Me.ucrReorderSummary) Me.Controls.Add(Me.ucrChkInteraction) Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) - Me.Controls.Add(Me.ucrReceiverPercentages) Me.Controls.Add(Me.rdoORow) Me.Controls.Add(Me.rdoOCell) Me.Controls.Add(Me.rdoOCol) @@ -704,7 +704,7 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.ucrChkMeans) Me.Controls.Add(Me.ucrChkOmitMissing) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDescribeTwoVariable" @@ -765,7 +765,7 @@ Partial Class dlgDescribeTwoVariable Friend WithEvents rdoOCell As RadioButton Friend WithEvents rdoOCol As RadioButton Friend WithEvents ucrpnlPercent As UcrPanel - Friend WithEvents ucrReceiverColumns As ucrReceiverMultiple Friend WithEvents ucrChkTotal As ucrCheck Friend WithEvents ucrChkInteraction As ucrCheck + Friend WithEvents ucrReceiverColumns As ucrReceiverMultiple End Class diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index d6977a559b..0da50e2892 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -771,7 +771,7 @@ Public Class dlgDescribeTwoVariable ucrChkLevSig.Visible = False ucrChkTotal.Visible = False ucrChkInteraction.Visible = False - ucrSaveTable.Location = New Point(23, 385) + ucrSaveTable.Location = New Point(23, 370) clsDummyFunction.AddParameter("factor_cols", "FactorVar", iPosition:=1) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) ucrSaveTable.SetPrefix("frequency_table") @@ -1422,7 +1422,7 @@ Public Class dlgDescribeTwoVariable End If End Sub - Private Sub Frequencies_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverPercentages.ControlValueChanged, ucrReceiverColumns.ControlValueChanged, + Private Sub Frequencies_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverPercentages.ControlValueChanged, ucrChkDisplayAsPercentage.ControlValueChanged, ucrChkDisplayMargins.ControlValueChanged, ucrInputMarginName.ControlValueChanged, ucrpnlPercent.ControlValueChanged If rdoTwoVariable.Checked Then If ucrChkDisplayAsPercentage.Checked Then