From e4b3c8de8c124cfba778e8d5a9d42db524823a35 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 11 May 2016 12:15:46 +0300 Subject: [PATCH 01/22] Editing dlgInsertColumns --- instat/dlgInsertColumn.Designer.vb | 140 +++++++++++++++++++++++++---- instat/dlgInsertColumn.vb | 2 +- 2 files changed, 122 insertions(+), 20 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index bd33fd59ce9..1fed42d2e31 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -23,7 +23,6 @@ Partial Class dlgInsertColumn Private Sub InitializeComponent() Me.lblDefaultValues = New System.Windows.Forms.Label() - Me.lblNumberCols = New System.Windows.Forms.Label() Me.lblStartPos = New System.Windows.Forms.Label() Me.nudPos = New System.Windows.Forms.NumericUpDown() Me.nudNumCols = New System.Windows.Forms.NumericUpDown() @@ -33,8 +32,18 @@ Partial Class dlgInsertColumn Me.rdoInsertRows = New System.Windows.Forms.RadioButton() Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() Me.lblNumberOfRowsToInsert = New System.Windows.Forms.Label() + Me.ucrSelectorInseertColumns = New instat.ucrSelectorAddRemove() + Me.ucrReceiverInsertColumns = New instat.ucrReceiverMultiple() + Me.lblColumnsToInsert = New System.Windows.Forms.Label() + Me.lblDataFrame = New System.Windows.Forms.Label() + Me.grpInsert = New System.Windows.Forms.GroupBox() + Me.rdoAtEnd = New System.Windows.Forms.RadioButton() + Me.rdoAtStart = New System.Windows.Forms.RadioButton() + Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() + Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() CType(Me.nudPos, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudNumCols, System.ComponentModel.ISupportInitialize).BeginInit() + Me.grpInsert.SuspendLayout() Me.SuspendLayout() ' 'lblDefaultValues @@ -46,19 +55,10 @@ Partial Class dlgInsertColumn Me.lblDefaultValues.TabIndex = 2 Me.lblDefaultValues.Text = "Default Value" ' - 'lblNumberCols - ' - Me.lblNumberCols.AutoSize = True - Me.lblNumberCols.Location = New System.Drawing.Point(9, 83) - Me.lblNumberCols.Name = "lblNumberCols" - Me.lblNumberCols.Size = New System.Drawing.Size(140, 13) - Me.lblNumberCols.TabIndex = 0 - Me.lblNumberCols.Text = "Number of Columns to Insert" - ' 'lblStartPos ' Me.lblStartPos.AutoSize = True - Me.lblStartPos.Location = New System.Drawing.Point(9, 109) + Me.lblStartPos.Location = New System.Drawing.Point(12, 111) Me.lblStartPos.Name = "lblStartPos" Me.lblStartPos.Size = New System.Drawing.Size(85, 13) Me.lblStartPos.TabIndex = 4 @@ -84,14 +84,15 @@ Partial Class dlgInsertColumn ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 157) + Me.ucrBase.Location = New System.Drawing.Point(12, 257) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) Me.ucrBase.TabIndex = 8 ' 'ucrDataFramesList ' - Me.ucrDataFramesList.Location = New System.Drawing.Point(12, 8) + Me.ucrDataFramesList.Location = New System.Drawing.Point(12, 32) + Me.ucrDataFramesList.Margin = New System.Windows.Forms.Padding(0) Me.ucrDataFramesList.Name = "ucrDataFramesList" Me.ucrDataFramesList.Size = New System.Drawing.Size(127, 41) Me.ucrDataFramesList.TabIndex = 0 @@ -106,7 +107,7 @@ Partial Class dlgInsertColumn 'rdoInsertRows ' Me.rdoInsertRows.AutoSize = True - Me.rdoInsertRows.Location = New System.Drawing.Point(112, 55) + Me.rdoInsertRows.Location = New System.Drawing.Point(112, 12) Me.rdoInsertRows.Name = "rdoInsertRows" Me.rdoInsertRows.Size = New System.Drawing.Size(81, 17) Me.rdoInsertRows.TabIndex = 11 @@ -117,7 +118,7 @@ Partial Class dlgInsertColumn 'rdoInsertColumns ' Me.rdoInsertColumns.AutoSize = True - Me.rdoInsertColumns.Location = New System.Drawing.Point(12, 55) + Me.rdoInsertColumns.Location = New System.Drawing.Point(12, 12) Me.rdoInsertColumns.Name = "rdoInsertColumns" Me.rdoInsertColumns.Size = New System.Drawing.Size(94, 17) Me.rdoInsertColumns.TabIndex = 11 @@ -128,23 +129,114 @@ Partial Class dlgInsertColumn 'lblNumberOfRowsToInsert ' Me.lblNumberOfRowsToInsert.AutoSize = True - Me.lblNumberOfRowsToInsert.Location = New System.Drawing.Point(9, 82) + Me.lblNumberOfRowsToInsert.Location = New System.Drawing.Point(12, 80) Me.lblNumberOfRowsToInsert.Name = "lblNumberOfRowsToInsert" Me.lblNumberOfRowsToInsert.Size = New System.Drawing.Size(127, 13) Me.lblNumberOfRowsToInsert.TabIndex = 14 Me.lblNumberOfRowsToInsert.Text = "Number of Rows to Insert" ' + 'ucrSelectorInseertColumns + ' + Me.ucrSelectorInseertColumns.Location = New System.Drawing.Point(12, 47) + Me.ucrSelectorInseertColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorInseertColumns.Name = "ucrSelectorInseertColumns" + Me.ucrSelectorInseertColumns.Size = New System.Drawing.Size(250, 187) + Me.ucrSelectorInseertColumns.TabIndex = 15 + ' + 'ucrReceiverInsertColumns + ' + Me.ucrReceiverInsertColumns.Location = New System.Drawing.Point(281, 47) + Me.ucrReceiverInsertColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverInsertColumns.Name = "ucrReceiverInsertColumns" + Me.ucrReceiverInsertColumns.Selector = Nothing + Me.ucrReceiverInsertColumns.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverInsertColumns.TabIndex = 16 + ' + 'lblColumnsToInsert + ' + Me.lblColumnsToInsert.AutoSize = True + Me.lblColumnsToInsert.Location = New System.Drawing.Point(278, 30) + Me.lblColumnsToInsert.Name = "lblColumnsToInsert" + Me.lblColumnsToInsert.Size = New System.Drawing.Size(88, 13) + Me.lblColumnsToInsert.TabIndex = 17 + Me.lblColumnsToInsert.Text = "Columns to Insert" + ' + 'lblDataFrame + ' + Me.lblDataFrame.AutoSize = True + Me.lblDataFrame.Location = New System.Drawing.Point(9, 30) + Me.lblDataFrame.Name = "lblDataFrame" + Me.lblDataFrame.Size = New System.Drawing.Size(62, 13) + Me.lblDataFrame.TabIndex = 18 + Me.lblDataFrame.Text = "Data Frame" + ' + 'grpInsert + ' + Me.grpInsert.Controls.Add(Me.ucrInputBeforeAfter) + Me.grpInsert.Controls.Add(Me.rdoBeforeAfter) + Me.grpInsert.Controls.Add(Me.rdoAtStart) + Me.grpInsert.Controls.Add(Me.rdoAtEnd) + Me.grpInsert.Location = New System.Drawing.Point(281, 151) + Me.grpInsert.Name = "grpInsert" + Me.grpInsert.Size = New System.Drawing.Size(200, 100) + Me.grpInsert.TabIndex = 19 + Me.grpInsert.TabStop = False + Me.grpInsert.Text = "Insert" + ' + 'rdoAtEnd + ' + Me.rdoAtEnd.AutoSize = True + Me.rdoAtEnd.Location = New System.Drawing.Point(6, 19) + Me.rdoAtEnd.Name = "rdoAtEnd" + Me.rdoAtEnd.Size = New System.Drawing.Size(57, 17) + Me.rdoAtEnd.TabIndex = 0 + Me.rdoAtEnd.TabStop = True + Me.rdoAtEnd.Text = "At End" + Me.rdoAtEnd.UseVisualStyleBackColor = True + ' + 'rdoAtStart + ' + Me.rdoAtStart.AutoSize = True + Me.rdoAtStart.Location = New System.Drawing.Point(7, 43) + Me.rdoAtStart.Name = "rdoAtStart" + Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) + Me.rdoAtStart.TabIndex = 1 + Me.rdoAtStart.TabStop = True + Me.rdoAtStart.Text = "At Start" + Me.rdoAtStart.UseVisualStyleBackColor = True + ' + 'rdoBeforeAfter + ' + Me.rdoBeforeAfter.AutoSize = True + Me.rdoBeforeAfter.Location = New System.Drawing.Point(7, 65) + Me.rdoBeforeAfter.Name = "rdoBeforeAfter" + Me.rdoBeforeAfter.Size = New System.Drawing.Size(14, 13) + Me.rdoBeforeAfter.TabIndex = 2 + Me.rdoBeforeAfter.TabStop = True + Me.rdoBeforeAfter.UseVisualStyleBackColor = True + ' + 'ucrInputBeforeAfter + ' + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(27, 62) + Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" + Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) + Me.ucrInputBeforeAfter.TabIndex = 3 + ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(430, 218) + Me.ClientSize = New System.Drawing.Size(490, 318) + Me.Controls.Add(Me.grpInsert) + Me.Controls.Add(Me.lblDataFrame) + Me.Controls.Add(Me.lblColumnsToInsert) + Me.Controls.Add(Me.ucrReceiverInsertColumns) + Me.Controls.Add(Me.ucrSelectorInseertColumns) Me.Controls.Add(Me.ucrInputDefaultData) Me.Controls.Add(Me.lblDefaultValues) Me.Controls.Add(Me.lblStartPos) Me.Controls.Add(Me.nudNumCols) Me.Controls.Add(Me.nudPos) - Me.Controls.Add(Me.lblNumberCols) Me.Controls.Add(Me.lblNumberOfRowsToInsert) Me.Controls.Add(Me.rdoInsertColumns) Me.Controls.Add(Me.rdoInsertRows) @@ -156,6 +248,8 @@ Partial Class dlgInsertColumn Me.Text = "Insert Columns/Rows" CType(Me.nudPos, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.nudNumCols, System.ComponentModel.ISupportInitialize).EndInit() + Me.grpInsert.ResumeLayout(False) + Me.grpInsert.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -163,7 +257,6 @@ Partial Class dlgInsertColumn Friend WithEvents ucrDataFramesList As ucrDataFrame Friend WithEvents lblDefaultValues As Label - Friend WithEvents lblNumberCols As Label Friend WithEvents lblStartPos As Label Friend WithEvents ucrBase As ucrButtons Friend WithEvents nudPos As NumericUpDown @@ -172,4 +265,13 @@ Partial Class dlgInsertColumn Friend WithEvents rdoInsertRows As RadioButton Friend WithEvents rdoInsertColumns As RadioButton Friend WithEvents lblNumberOfRowsToInsert As Label + Friend WithEvents ucrSelectorInseertColumns As ucrSelectorAddRemove + Friend WithEvents ucrReceiverInsertColumns As ucrReceiverMultiple + Friend WithEvents lblColumnsToInsert As Label + Friend WithEvents lblDataFrame As Label + Friend WithEvents grpInsert As GroupBox + Friend WithEvents ucrInputBeforeAfter As ucrInputComboBox + Friend WithEvents rdoBeforeAfter As RadioButton + Friend WithEvents rdoAtStart As RadioButton + Friend WithEvents rdoAtEnd As RadioButton End Class diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index beed70d7a41..f2edb79c2b0 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -130,7 +130,7 @@ Public Class dlgInsertColumn Private Sub RowsOrColumns() If rdoInsertColumns.Checked Then - ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$insert_column_in_data") + ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") lblNumberCols.Visible = True lblNumberOfRowsToInsert.Visible = False ucrBase.clsRsyntax.RemoveParameter("number_rows") From 26ed668228435ad7840c843c8ee38a4024110a2a Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 11 May 2016 19:15:47 +0300 Subject: [PATCH 02/22] Editing dlgInsertColumnsOrRows --- instat/dlgInsertColumn.Designer.vb | 224 +++++++++++++++++------------ instat/dlgInsertColumn.vb | 172 +++++++++++++++++----- 2 files changed, 273 insertions(+), 123 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 1fed42d2e31..6fca6c00ccb 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -22,39 +22,35 @@ Partial Class dlgInsertColumn 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.lblDefaultValues = New System.Windows.Forms.Label() Me.lblStartPos = New System.Windows.Forms.Label() Me.nudPos = New System.Windows.Forms.NumericUpDown() Me.nudNumCols = New System.Windows.Forms.NumericUpDown() - Me.ucrBase = New instat.ucrButtons() - Me.ucrDataFramesList = New instat.ucrDataFrame() - Me.ucrInputDefaultData = New instat.ucrInputTextBox() Me.rdoInsertRows = New System.Windows.Forms.RadioButton() Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() Me.lblNumberOfRowsToInsert = New System.Windows.Forms.Label() - Me.ucrSelectorInseertColumns = New instat.ucrSelectorAddRemove() - Me.ucrReceiverInsertColumns = New instat.ucrReceiverMultiple() Me.lblColumnsToInsert = New System.Windows.Forms.Label() Me.lblDataFrame = New System.Windows.Forms.Label() Me.grpInsert = New System.Windows.Forms.GroupBox() - Me.rdoAtEnd = New System.Windows.Forms.RadioButton() - Me.rdoAtStart = New System.Windows.Forms.RadioButton() - Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() + Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() + Me.rdoAtStart = New System.Windows.Forms.RadioButton() + Me.rdoAtEnd = New System.Windows.Forms.RadioButton() + Me.lblNumberOfColumnsToInsert = New System.Windows.Forms.Label() + Me.nudInsertColumns = New System.Windows.Forms.NumericUpDown() + Me.ucrReceiverColumnsToInsert = New instat.ucrReceiverSingle() + Me.ucrSelectorInseertColumns = New instat.ucrSelectorAddRemove() + Me.ucrBase = New instat.ucrButtons() + Me.ucrDataFramesList = New instat.ucrDataFrame() + Me.lblDefaultValue = New System.Windows.Forms.Label() + Me.ucrInputDefaultValue = New instat.ucrInputTextBox() + Me.lblPrefixforInsertedColumns = New System.Windows.Forms.Label() + Me.ucrInputPrefixForInsertedColumns = New instat.ucrInputComboBox() CType(Me.nudPos, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudNumCols, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpInsert.SuspendLayout() + CType(Me.nudInsertColumns, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'lblDefaultValues - ' - Me.lblDefaultValues.AutoSize = True - Me.lblDefaultValues.Location = New System.Drawing.Point(9, 137) - Me.lblDefaultValues.Name = "lblDefaultValues" - Me.lblDefaultValues.Size = New System.Drawing.Size(71, 13) - Me.lblDefaultValues.TabIndex = 2 - Me.lblDefaultValues.Text = "Default Value" - ' 'lblStartPos ' Me.lblStartPos.AutoSize = True @@ -82,28 +78,6 @@ Partial Class dlgInsertColumn Me.nudNumCols.TabIndex = 1 Me.nudNumCols.Value = New Decimal(New Integer() {1, 0, 0, 0}) ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(12, 257) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 53) - Me.ucrBase.TabIndex = 8 - ' - 'ucrDataFramesList - ' - Me.ucrDataFramesList.Location = New System.Drawing.Point(12, 32) - Me.ucrDataFramesList.Margin = New System.Windows.Forms.Padding(0) - Me.ucrDataFramesList.Name = "ucrDataFramesList" - Me.ucrDataFramesList.Size = New System.Drawing.Size(127, 41) - Me.ucrDataFramesList.TabIndex = 0 - ' - 'ucrInputDefaultData - ' - Me.ucrInputDefaultData.Location = New System.Drawing.Point(157, 130) - Me.ucrInputDefaultData.Name = "ucrInputDefaultData" - Me.ucrInputDefaultData.Size = New System.Drawing.Size(121, 21) - Me.ucrInputDefaultData.TabIndex = 10 - ' 'rdoInsertRows ' Me.rdoInsertRows.AutoSize = True @@ -135,27 +109,10 @@ Partial Class dlgInsertColumn Me.lblNumberOfRowsToInsert.TabIndex = 14 Me.lblNumberOfRowsToInsert.Text = "Number of Rows to Insert" ' - 'ucrSelectorInseertColumns - ' - Me.ucrSelectorInseertColumns.Location = New System.Drawing.Point(12, 47) - Me.ucrSelectorInseertColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorInseertColumns.Name = "ucrSelectorInseertColumns" - Me.ucrSelectorInseertColumns.Size = New System.Drawing.Size(250, 187) - Me.ucrSelectorInseertColumns.TabIndex = 15 - ' - 'ucrReceiverInsertColumns - ' - Me.ucrReceiverInsertColumns.Location = New System.Drawing.Point(281, 47) - Me.ucrReceiverInsertColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverInsertColumns.Name = "ucrReceiverInsertColumns" - Me.ucrReceiverInsertColumns.Selector = Nothing - Me.ucrReceiverInsertColumns.Size = New System.Drawing.Size(120, 100) - Me.ucrReceiverInsertColumns.TabIndex = 16 - ' 'lblColumnsToInsert ' Me.lblColumnsToInsert.AutoSize = True - Me.lblColumnsToInsert.Location = New System.Drawing.Point(278, 30) + Me.lblColumnsToInsert.Location = New System.Drawing.Point(398, 79) Me.lblColumnsToInsert.Name = "lblColumnsToInsert" Me.lblColumnsToInsert.Size = New System.Drawing.Size(88, 13) Me.lblColumnsToInsert.TabIndex = 17 @@ -176,23 +133,29 @@ Partial Class dlgInsertColumn Me.grpInsert.Controls.Add(Me.rdoBeforeAfter) Me.grpInsert.Controls.Add(Me.rdoAtStart) Me.grpInsert.Controls.Add(Me.rdoAtEnd) - Me.grpInsert.Location = New System.Drawing.Point(281, 151) + Me.grpInsert.Location = New System.Drawing.Point(272, 32) Me.grpInsert.Name = "grpInsert" - Me.grpInsert.Size = New System.Drawing.Size(200, 100) + Me.grpInsert.Size = New System.Drawing.Size(120, 92) Me.grpInsert.TabIndex = 19 Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" ' - 'rdoAtEnd + 'ucrInputBeforeAfter ' - Me.rdoAtEnd.AutoSize = True - Me.rdoAtEnd.Location = New System.Drawing.Point(6, 19) - Me.rdoAtEnd.Name = "rdoAtEnd" - Me.rdoAtEnd.Size = New System.Drawing.Size(57, 17) - Me.rdoAtEnd.TabIndex = 0 - Me.rdoAtEnd.TabStop = True - Me.rdoAtEnd.Text = "At End" - Me.rdoAtEnd.UseVisualStyleBackColor = True + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(27, 62) + Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" + Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) + Me.ucrInputBeforeAfter.TabIndex = 3 + ' + 'rdoBeforeAfter + ' + Me.rdoBeforeAfter.AutoSize = True + Me.rdoBeforeAfter.Location = New System.Drawing.Point(7, 65) + Me.rdoBeforeAfter.Name = "rdoBeforeAfter" + Me.rdoBeforeAfter.Size = New System.Drawing.Size(14, 13) + Me.rdoBeforeAfter.TabIndex = 2 + Me.rdoBeforeAfter.TabStop = True + Me.rdoBeforeAfter.UseVisualStyleBackColor = True ' 'rdoAtStart ' @@ -205,35 +168,113 @@ Partial Class dlgInsertColumn Me.rdoAtStart.Text = "At Start" Me.rdoAtStart.UseVisualStyleBackColor = True ' - 'rdoBeforeAfter + 'rdoAtEnd ' - Me.rdoBeforeAfter.AutoSize = True - Me.rdoBeforeAfter.Location = New System.Drawing.Point(7, 65) - Me.rdoBeforeAfter.Name = "rdoBeforeAfter" - Me.rdoBeforeAfter.Size = New System.Drawing.Size(14, 13) - Me.rdoBeforeAfter.TabIndex = 2 - Me.rdoBeforeAfter.TabStop = True - Me.rdoBeforeAfter.UseVisualStyleBackColor = True + Me.rdoAtEnd.AutoSize = True + Me.rdoAtEnd.Location = New System.Drawing.Point(6, 19) + Me.rdoAtEnd.Name = "rdoAtEnd" + Me.rdoAtEnd.Size = New System.Drawing.Size(57, 17) + Me.rdoAtEnd.TabIndex = 0 + Me.rdoAtEnd.TabStop = True + Me.rdoAtEnd.Text = "At End" + Me.rdoAtEnd.UseVisualStyleBackColor = True ' - 'ucrInputBeforeAfter + 'lblNumberOfColumnsToInsert ' - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(27, 62) - Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" - Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) - Me.ucrInputBeforeAfter.TabIndex = 3 + Me.lblNumberOfColumnsToInsert.AutoSize = True + Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(269, 136) + Me.lblNumberOfColumnsToInsert.Name = "lblNumberOfColumnsToInsert" + Me.lblNumberOfColumnsToInsert.Size = New System.Drawing.Size(140, 13) + Me.lblNumberOfColumnsToInsert.TabIndex = 21 + Me.lblNumberOfColumnsToInsert.Text = "Number of Columns to Insert" + ' + 'nudInsertColumns + ' + Me.nudInsertColumns.Location = New System.Drawing.Point(422, 134) + Me.nudInsertColumns.Name = "nudInsertColumns" + Me.nudInsertColumns.Size = New System.Drawing.Size(45, 20) + Me.nudInsertColumns.TabIndex = 22 + ' + 'ucrReceiverColumnsToInsert + ' + Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(401, 95) + Me.ucrReceiverColumnsToInsert.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverColumnsToInsert.Name = "ucrReceiverColumnsToInsert" + Me.ucrReceiverColumnsToInsert.Selector = Nothing + Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(85, 20) + Me.ucrReceiverColumnsToInsert.TabIndex = 20 + ' + 'ucrSelectorInseertColumns + ' + Me.ucrSelectorInseertColumns.Location = New System.Drawing.Point(9, 43) + Me.ucrSelectorInseertColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorInseertColumns.Name = "ucrSelectorInseertColumns" + Me.ucrSelectorInseertColumns.Size = New System.Drawing.Size(250, 187) + Me.ucrSelectorInseertColumns.TabIndex = 15 + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 237) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 8 + ' + 'ucrDataFramesList + ' + Me.ucrDataFramesList.Location = New System.Drawing.Point(12, 32) + Me.ucrDataFramesList.Margin = New System.Windows.Forms.Padding(0) + Me.ucrDataFramesList.Name = "ucrDataFramesList" + Me.ucrDataFramesList.Size = New System.Drawing.Size(127, 41) + Me.ucrDataFramesList.TabIndex = 0 + ' + 'lblDefaultValue + ' + Me.lblDefaultValue.AutoSize = True + Me.lblDefaultValue.Location = New System.Drawing.Point(269, 168) + Me.lblDefaultValue.Name = "lblDefaultValue" + Me.lblDefaultValue.Size = New System.Drawing.Size(71, 13) + Me.lblDefaultValue.TabIndex = 23 + Me.lblDefaultValue.Text = "Default Value" + ' + 'ucrInputDefaultValue + ' + Me.ucrInputDefaultValue.Location = New System.Drawing.Point(422, 160) + Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" + Me.ucrInputDefaultValue.Size = New System.Drawing.Size(45, 21) + Me.ucrInputDefaultValue.TabIndex = 24 + ' + 'lblPrefixforInsertedColumns + ' + Me.lblPrefixforInsertedColumns.AutoSize = True + Me.lblPrefixforInsertedColumns.Location = New System.Drawing.Point(269, 188) + Me.lblPrefixforInsertedColumns.Name = "lblPrefixforInsertedColumns" + Me.lblPrefixforInsertedColumns.Size = New System.Drawing.Size(138, 13) + Me.lblPrefixforInsertedColumns.TabIndex = 25 + Me.lblPrefixforInsertedColumns.Text = "Prefix for Inserted Column(s)" + ' + 'ucrInputPrefixForInsertedColumns + ' + Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(272, 205) + Me.ucrInputPrefixForInsertedColumns.Name = "ucrInputPrefixForInsertedColumns" + Me.ucrInputPrefixForInsertedColumns.Size = New System.Drawing.Size(195, 21) + Me.ucrInputPrefixForInsertedColumns.TabIndex = 26 ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(490, 318) + Me.ClientSize = New System.Drawing.Size(492, 293) + Me.Controls.Add(Me.ucrInputPrefixForInsertedColumns) + Me.Controls.Add(Me.lblPrefixforInsertedColumns) + Me.Controls.Add(Me.ucrInputDefaultValue) + Me.Controls.Add(Me.lblDefaultValue) + Me.Controls.Add(Me.nudInsertColumns) + Me.Controls.Add(Me.lblNumberOfColumnsToInsert) + Me.Controls.Add(Me.ucrReceiverColumnsToInsert) Me.Controls.Add(Me.grpInsert) Me.Controls.Add(Me.lblDataFrame) Me.Controls.Add(Me.lblColumnsToInsert) - Me.Controls.Add(Me.ucrReceiverInsertColumns) Me.Controls.Add(Me.ucrSelectorInseertColumns) - Me.Controls.Add(Me.ucrInputDefaultData) - Me.Controls.Add(Me.lblDefaultValues) Me.Controls.Add(Me.lblStartPos) Me.Controls.Add(Me.nudNumCols) Me.Controls.Add(Me.nudPos) @@ -250,23 +291,21 @@ Partial Class dlgInsertColumn CType(Me.nudNumCols, System.ComponentModel.ISupportInitialize).EndInit() Me.grpInsert.ResumeLayout(False) Me.grpInsert.PerformLayout() + CType(Me.nudInsertColumns, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub Friend WithEvents ucrDataFramesList As ucrDataFrame - Friend WithEvents lblDefaultValues As Label Friend WithEvents lblStartPos As Label Friend WithEvents ucrBase As ucrButtons Friend WithEvents nudPos As NumericUpDown Friend WithEvents nudNumCols As NumericUpDown - Friend WithEvents ucrInputDefaultData As ucrInputTextBox Friend WithEvents rdoInsertRows As RadioButton Friend WithEvents rdoInsertColumns As RadioButton Friend WithEvents lblNumberOfRowsToInsert As Label Friend WithEvents ucrSelectorInseertColumns As ucrSelectorAddRemove - Friend WithEvents ucrReceiverInsertColumns As ucrReceiverMultiple Friend WithEvents lblColumnsToInsert As Label Friend WithEvents lblDataFrame As Label Friend WithEvents grpInsert As GroupBox @@ -274,4 +313,11 @@ Partial Class dlgInsertColumn Friend WithEvents rdoBeforeAfter As RadioButton Friend WithEvents rdoAtStart As RadioButton Friend WithEvents rdoAtEnd As RadioButton + Friend WithEvents ucrReceiverColumnsToInsert As ucrReceiverSingle + Friend WithEvents lblNumberOfColumnsToInsert As Label + Friend WithEvents nudInsertColumns As NumericUpDown + Friend WithEvents lblDefaultValue As Label + Friend WithEvents ucrInputDefaultValue As ucrInputTextBox + Friend WithEvents lblPrefixforInsertedColumns As Label + Friend WithEvents ucrInputPrefixForInsertedColumns As ucrInputComboBox End Class diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index f2edb79c2b0..8dd9675bcd2 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -21,6 +21,7 @@ Public Class dlgInsertColumn Private Sub dlgInsertColumn_Load(sender As Object, e As EventArgs) Handles MyBase.Load ucrBase.iHelpTopicID = 52 If bFirstLoad Then + InitialiseDialog setDefaults() bFirstLoad = False Else @@ -29,9 +30,20 @@ Public Class dlgInsertColumn TestOKEnabled() End Sub + Private Sub InitialiseDialog() + ucrReceiverColumnsToInsert.Selector = ucrSelectorInseertColumns + ucrReceiverColumnsToInsert.SetMeAsReceiver() + ucrInputPrefixForInsertedColumns.SetItemsTypeAsColumns() + ucrInputPrefixForInsertedColumns.SetDefaultTypeAsColumn() + ucrInputPrefixForInsertedColumns.SetDataFrameSelector(ucrDataFramesList) + ucrInputBeforeAfter.cboInput.Items.Add("Before") + ucrInputBeforeAfter.cboInput.Items.Add("After") + + End Sub + Private Sub TestOKEnabled() If rdoInsertColumns.Checked Then - If ((nudNumCols.Text <> "") And (nudPos.Text <> "") And Not ucrInputDefaultData.IsEmpty) Then + If ((nudInsertColumns.Text <> "") And (Not ucrInputDefaultValue.IsEmpty) And (Not ucrInputPrefixForInsertedColumns.IsEmpty)) Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -51,27 +63,31 @@ Public Class dlgInsertColumn If rdoInsertColumns.Checked Then If nudPos.Value > ucrDataFramesList.iColumnCount + 1 Then nudPos.Value = ucrDataFramesList.iColumnCount + 1 - ucrBase.clsRsyntax.AddParameter("number_cols", nudNumCols.Value) + ucrBase.clsRsyntax.AddParameter("num_cols", nudNumCols.Value) End If ElseIf rdoInsertRows.Checked Then If nudPos.Value > ucrDataFramesList.iDataFrameLength + 1 Then nudPos.Value = ucrDataFramesList.iDataFrameLength + 1 - ucrBase.clsRsyntax.AddParameter("number_cols", nudNumCols.Value) + ucrBase.clsRsyntax.AddParameter("num_cols", nudNumCols.Value) End If End If End Sub Private Sub setDefaults() rdoInsertColumns.Checked = True + rdoAtEnd.Checked = True RowsOrColumns() - ucrInputDefaultData.SetName("NA") ucrDataFramesList.Reset() - ucrInputDefaultData.Reset() + End Sub Private Sub nudPos_TextChanged(sender As Object, e As EventArgs) Handles nudPos.TextChanged - If Not nudPos.Text = "" Then - ucrBase.clsRsyntax.AddParameter("start_pos", nudPos.Value) + If rdoInsertRows.Checked Then + If Not nudPos.Text = "" Then + ucrBase.clsRsyntax.AddParameter("start_pos", nudPos.Value) + Else + ucrBase.clsRsyntax.RemoveParameter("start_pos") + End If Else ucrBase.clsRsyntax.RemoveParameter("start_pos") End If @@ -84,10 +100,10 @@ Public Class dlgInsertColumn Private Sub NumberofColumnsOrRows() If rdoInsertColumns.Checked Then - If Not nudNumCols.Text = "" Then - ucrBase.clsRsyntax.AddParameter("number_cols", nudNumCols.Value) + If Not nudInsertColumns.Text = "" Then + ucrBase.clsRsyntax.AddParameter("num_cols", nudNumCols.Value) Else - ucrBase.clsRsyntax.RemoveParameter("number_cols") + ucrBase.clsRsyntax.RemoveParameter("num_cols") End If ElseIf rdoInsertRows.Checked Then @@ -104,10 +120,17 @@ Public Class dlgInsertColumn TestOKEnabled() End Sub - Private Sub ucrDataFramesList_DataFrameChanged() Handles ucrDataFramesList.DataFrameChanged - ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrDataFramesList.cboAvailableDataFrames.SelectedItem & Chr(34)) + Private Sub ucrDataFramesList_DataFrameChanged() Handles ucrDataFramesList.DataFrameChanged + If rdoInsertRows.Checked Then + ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrDataFramesList.cboAvailableDataFrames.SelectedItem & Chr(34)) + Else + ucrSelectorInseertColumns.strCurrentDataFrame = ucrDataFramesList.cboAvailableDataFrames.SelectedItem + ucrSelectorInseertColumns.LoadList() + ucrBase.clsRsyntax.RemoveParameter("data_name") + End If End Sub + Private Sub ucrDataFramesList_DataFrameChanged(sender As Object, e As EventArgs, strPrevDataFrame As String) Handles ucrDataFramesList.DataFrameChanged dataFrameListMaxMinPos() End Sub @@ -131,52 +154,129 @@ Public Class dlgInsertColumn Private Sub RowsOrColumns() If rdoInsertColumns.Checked Then ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") - lblNumberCols.Visible = True - lblNumberOfRowsToInsert.Visible = False + InsertParam() ucrBase.clsRsyntax.RemoveParameter("number_rows") - nudNumCols.Value = 1 + nudInsertColumns.Value = 1 + ucrInputPrefixForInsertedColumns.SetPrefix("X") + ucrInputDefaultValue.SetName("NA") NumberofColumnsOrRows() - ucrInputDeDataValues() dataFrameListMaxMinPos() - nudNumCols.Maximum = 100 - lblDefaultValues.Visible = True - ucrInputDefaultData.Visible = True + grpInsert.Visible = True + ucrSelectorInseertColumns.Visible = True + ucrDataFramesList.Visible = False + nudInsertColumns.Maximum = 100 + nudNumCols.Visible = False + nudPos.Visible = False + lblDataFrame.Visible = True + addColumData() + BeforeAfterPara() + lblPrefixforInsertedColumns.Visible = True + lblDefaultValue.Visible = True + ucrInputPrefixForInsertedColumns.Visible = True + ucrInputDefaultValue.Visible = True Else ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") - lblNumberCols.Visible = False lblNumberOfRowsToInsert.Visible = True - ucrBase.clsRsyntax.RemoveParameter("number_cols") + ucrBase.clsRsyntax.RemoveParameter("num_cols") nudNumCols.Value = 1 NumberofColumnsOrRows() - ucrInputDeDataValues() dataFrameListMaxMinPos() nudNumCols.Maximum = 1000 - ucrInputDefaultData.Visible = False - lblDefaultValues.Visible = False + grpInsert.Visible = False + addColumData() + InsertParam() + BeforeAfterPara() + ucrSelectorInseertColumns.Visible = False + ucrDataFramesList.Visible = True + nudNumCols.Visible = True + nudPos.Visible = True + lblDataFrame.Visible = False + lblPrefixforInsertedColumns.Visible = False + lblDefaultValue.Visible = False + ucrInputPrefixForInsertedColumns.Visible = False + ucrInputDefaultValue.Visible = False + End If + + End Sub + + Private Sub grpInsert_CheckedChanged(sender As Object, e As EventArgs) Handles rdoAtEnd.CheckedChanged, rdoAtStart.CheckedChanged, rdoBeforeAfter.CheckedChanged + InsertParam() + End Sub + + Private Sub InsertParam() + If rdoAtEnd.Checked Then + ucrBase.clsRsyntax.AddOperatorParameter("before", "FALSE") + ucrReceiverColumnsToInsert.Visible = False + lblNumberOfColumnsToInsert.Visible = False + nudInsertColumns.Visible = False + lblColumnsToInsert.Visible = False + ElseIf rdoAtStart.Checked Then + ucrBase.clsRsyntax.AddOperatorParameter("before", "TRUE") + ucrReceiverColumnsToInsert.Visible = False + lblNumberOfColumnsToInsert.Visible = False + nudInsertColumns.Visible = False + lblColumnsToInsert.Visible = False + Else + ucrReceiverColumnsToInsert.Visible = True + lblNumberOfColumnsToInsert.Visible = True + nudInsertColumns.Visible = True + lblColumnsToInsert.Visible = True + End If + End Sub + + Private Sub ucrInputBeforeAfter_NameChanged() Handles ucrInputBeforeAfter.NameChanged + If rdoBeforeAfter.Checked = True Then + If Not ucrInputBeforeAfter.IsEmpty Then + Select Case ucrInputBeforeAfter.GetText + Case "Before" + ucrBase.clsRsyntax.AddParameter("before", "TRUE") + Case "After" + ucrBase.clsRsyntax.AddParameter("before", "FALSE") + + End Select + Else + ucrBase.clsRsyntax.RemoveParameter("before") + End If End If End Sub - Private Sub ucrInputDefaultData_Namechanged() Handles ucrInputDefaultData.NameChanged - ucrInputDeDataValues() + Private Sub ucrReceiverColumnsToInsert_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverColumnsToInsert.SelectionChanged + BeforeAfterPara() TestOKEnabled() End Sub - Private Sub ucrInputDeDataValues() + Private Sub BeforeAfterPara() + If rdoBeforeAfter.Checked Then + If Not ucrReceiverColumnsToInsert.IsEmpty Then + ucrBase.clsRsyntax.AddParameter("adjacent_column", clsRFunctionParameter:=ucrReceiverColumnsToInsert.GetVariables()) + Else + ucrBase.clsRsyntax.RemoveParameter("adjacent_column") + End If + Else + ucrBase.clsRsyntax.RemoveParameter("adjacent_column") + End If + End Sub + + Private Sub ucrInputDefaultValue_NameChanged() Handles ucrInputDefaultValue.NameChanged + addColumData() + TestOKEnabled() + End Sub + Private Sub addColumData() If rdoInsertColumns.Checked Then - If Not ucrInputDefaultData.IsEmpty Then - If (ucrInputDefaultData.GetText.ToLower()) = "true" Then + If Not ucrInputDefaultValue.IsEmpty Then + If (ucrInputDefaultValue.GetText.ToLower()) = "true" Then ucrBase.clsRsyntax.AddParameter("col_data", "TRUE") - ElseIf (ucrInputDefaultData.GetText.ToLower()) = "false" Then + ElseIf (ucrInputDefaultValue.GetText.ToLower()) = "false" Then ucrBase.clsRsyntax.AddParameter("col_data", "FALSE") - ElseIf (ucrInputDefaultData.GetText.ToLower()) = "na" + ElseIf (ucrInputDefaultValue.GetText.ToLower()) = "na" ucrBase.clsRsyntax.AddParameter("col_data", "NA") - ElseIf IsNumeric(ucrInputDefaultData.GetText) Then - ucrBase.clsRsyntax.AddParameter("col_data", ucrInputDefaultData.GetText) + ElseIf IsNumeric(ucrInputDefaultValue.GetText) Then + ucrBase.clsRsyntax.AddParameter("col_data", ucrInputDefaultValue.GetText) Else - ucrBase.clsRsyntax.AddParameter("col_data", Chr(34) & ucrInputDefaultData.GetText & Chr(34)) + ucrBase.clsRsyntax.AddParameter("col_data", Chr(34) & ucrInputDefaultValue.GetText & Chr(34)) End If Else ucrBase.clsRsyntax.RemoveParameter("col_data") @@ -185,4 +285,8 @@ Public Class dlgInsertColumn ucrBase.clsRsyntax.RemoveParameter("col_data") End If End Sub + + Private Sub ucrInputPrefixForInsertedColumns_NameChanged() Handles ucrInputPrefixForInsertedColumns.NameChanged + ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrInputPrefixForInsertedColumns.GetText, strTempDataframe:=ucrDataFramesList.cboAvailableDataFrames.Text, strTempColumn:=ucrInputPrefixForInsertedColumns.GetText, bAssignToIsPrefix:=True) + End Sub End Class \ No newline at end of file From 56b91d9460680f9ce18ae05f694a9129154efcdf Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 12 May 2016 09:16:22 +0300 Subject: [PATCH 03/22] Editing dlgInsertRowsOrColumns --- instat/dlgInsertColumn.vb | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 8dd9675bcd2..0fc310d3964 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -61,14 +61,14 @@ Public Class dlgInsertColumn Private Sub ReopenDialog() ucrDataFramesList.Reset() If rdoInsertColumns.Checked Then - If nudPos.Value > ucrDataFramesList.iColumnCount + 1 Then - nudPos.Value = ucrDataFramesList.iColumnCount + 1 - ucrBase.clsRsyntax.AddParameter("num_cols", nudNumCols.Value) + If nudInsertColumns.Value > ucrDataFramesList.iColumnCount + 1 Then + nudInsertColumns.Value = ucrDataFramesList.iColumnCount + 1 + ucrBase.clsRsyntax.AddParameter("num_cols", nudInsertColumns.Value) End If ElseIf rdoInsertRows.Checked Then If nudPos.Value > ucrDataFramesList.iDataFrameLength + 1 Then nudPos.Value = ucrDataFramesList.iDataFrameLength + 1 - ucrBase.clsRsyntax.AddParameter("num_cols", nudNumCols.Value) + ucrBase.clsRsyntax.AddParameter("number_rows", nudNumCols.Value) End If End If End Sub @@ -121,13 +121,10 @@ Public Class dlgInsertColumn End Sub Private Sub ucrDataFramesList_DataFrameChanged() Handles ucrDataFramesList.DataFrameChanged - If rdoInsertRows.Checked Then - ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrDataFramesList.cboAvailableDataFrames.SelectedItem & Chr(34)) - Else - ucrSelectorInseertColumns.strCurrentDataFrame = ucrDataFramesList.cboAvailableDataFrames.SelectedItem - ucrSelectorInseertColumns.LoadList() - ucrBase.clsRsyntax.RemoveParameter("data_name") - End If + ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrDataFramesList.cboAvailableDataFrames.SelectedItem & Chr(34)) + ucrSelectorInseertColumns.strCurrentDataFrame = ucrDataFramesList.cboAvailableDataFrames.SelectedItem + ucrSelectorInseertColumns.LoadList() + End Sub @@ -175,7 +172,7 @@ Public Class dlgInsertColumn ucrInputPrefixForInsertedColumns.Visible = True ucrInputDefaultValue.Visible = True - Else + ElseIf rdoInsertRows.Checked Then ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") lblNumberOfRowsToInsert.Visible = True ucrBase.clsRsyntax.RemoveParameter("num_cols") From 3ad8fc0df74d8d9d5af0264efd35cd4d419a8346 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 12 May 2016 11:39:59 +0300 Subject: [PATCH 04/22] Editing dlgInsertRowsOrColumns --- instat/dlgInsertColumn.Designer.vb | 88 +++++++++++++++--------------- instat/dlgInsertColumn.vb | 58 ++++++++++++-------- 2 files changed, 78 insertions(+), 68 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 6fca6c00ccb..690be5763da 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -31,20 +31,20 @@ Partial Class dlgInsertColumn Me.lblColumnsToInsert = New System.Windows.Forms.Label() Me.lblDataFrame = New System.Windows.Forms.Label() Me.grpInsert = New System.Windows.Forms.GroupBox() - Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.rdoAtStart = New System.Windows.Forms.RadioButton() Me.rdoAtEnd = New System.Windows.Forms.RadioButton() Me.lblNumberOfColumnsToInsert = New System.Windows.Forms.Label() Me.nudInsertColumns = New System.Windows.Forms.NumericUpDown() + Me.lblDefaultValue = New System.Windows.Forms.Label() + Me.lblPrefixforInsertedColumns = New System.Windows.Forms.Label() + Me.ucrInputPrefixForInsertedColumns = New instat.ucrInputComboBox() + Me.ucrInputDefaultValue = New instat.ucrInputTextBox() Me.ucrReceiverColumnsToInsert = New instat.ucrReceiverSingle() + Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() Me.ucrSelectorInseertColumns = New instat.ucrSelectorAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrDataFramesList = New instat.ucrDataFrame() - Me.lblDefaultValue = New System.Windows.Forms.Label() - Me.ucrInputDefaultValue = New instat.ucrInputTextBox() - Me.lblPrefixforInsertedColumns = New System.Windows.Forms.Label() - Me.ucrInputPrefixForInsertedColumns = New instat.ucrInputComboBox() CType(Me.nudPos, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudNumCols, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpInsert.SuspendLayout() @@ -140,13 +140,6 @@ Partial Class dlgInsertColumn Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" ' - 'ucrInputBeforeAfter - ' - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(27, 62) - Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" - Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) - Me.ucrInputBeforeAfter.TabIndex = 3 - ' 'rdoBeforeAfter ' Me.rdoBeforeAfter.AutoSize = True @@ -195,6 +188,38 @@ Partial Class dlgInsertColumn Me.nudInsertColumns.Size = New System.Drawing.Size(45, 20) Me.nudInsertColumns.TabIndex = 22 ' + 'lblDefaultValue + ' + Me.lblDefaultValue.AutoSize = True + Me.lblDefaultValue.Location = New System.Drawing.Point(269, 168) + Me.lblDefaultValue.Name = "lblDefaultValue" + Me.lblDefaultValue.Size = New System.Drawing.Size(71, 13) + Me.lblDefaultValue.TabIndex = 23 + Me.lblDefaultValue.Text = "Default Value" + ' + 'lblPrefixforInsertedColumns + ' + Me.lblPrefixforInsertedColumns.AutoSize = True + Me.lblPrefixforInsertedColumns.Location = New System.Drawing.Point(269, 188) + Me.lblPrefixforInsertedColumns.Name = "lblPrefixforInsertedColumns" + Me.lblPrefixforInsertedColumns.Size = New System.Drawing.Size(138, 13) + Me.lblPrefixforInsertedColumns.TabIndex = 25 + Me.lblPrefixforInsertedColumns.Text = "Prefix for Inserted Column(s)" + ' + 'ucrInputPrefixForInsertedColumns + ' + Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(272, 205) + Me.ucrInputPrefixForInsertedColumns.Name = "ucrInputPrefixForInsertedColumns" + Me.ucrInputPrefixForInsertedColumns.Size = New System.Drawing.Size(195, 21) + Me.ucrInputPrefixForInsertedColumns.TabIndex = 26 + ' + 'ucrInputDefaultValue + ' + Me.ucrInputDefaultValue.Location = New System.Drawing.Point(422, 160) + Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" + Me.ucrInputDefaultValue.Size = New System.Drawing.Size(45, 21) + Me.ucrInputDefaultValue.TabIndex = 24 + ' 'ucrReceiverColumnsToInsert ' Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(401, 95) @@ -204,6 +229,13 @@ Partial Class dlgInsertColumn Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(85, 20) Me.ucrReceiverColumnsToInsert.TabIndex = 20 ' + 'ucrInputBeforeAfter + ' + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(27, 62) + Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" + Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) + Me.ucrInputBeforeAfter.TabIndex = 3 + ' 'ucrSelectorInseertColumns ' Me.ucrSelectorInseertColumns.Location = New System.Drawing.Point(9, 43) @@ -227,38 +259,6 @@ Partial Class dlgInsertColumn Me.ucrDataFramesList.Size = New System.Drawing.Size(127, 41) Me.ucrDataFramesList.TabIndex = 0 ' - 'lblDefaultValue - ' - Me.lblDefaultValue.AutoSize = True - Me.lblDefaultValue.Location = New System.Drawing.Point(269, 168) - Me.lblDefaultValue.Name = "lblDefaultValue" - Me.lblDefaultValue.Size = New System.Drawing.Size(71, 13) - Me.lblDefaultValue.TabIndex = 23 - Me.lblDefaultValue.Text = "Default Value" - ' - 'ucrInputDefaultValue - ' - Me.ucrInputDefaultValue.Location = New System.Drawing.Point(422, 160) - Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" - Me.ucrInputDefaultValue.Size = New System.Drawing.Size(45, 21) - Me.ucrInputDefaultValue.TabIndex = 24 - ' - 'lblPrefixforInsertedColumns - ' - Me.lblPrefixforInsertedColumns.AutoSize = True - Me.lblPrefixforInsertedColumns.Location = New System.Drawing.Point(269, 188) - Me.lblPrefixforInsertedColumns.Name = "lblPrefixforInsertedColumns" - Me.lblPrefixforInsertedColumns.Size = New System.Drawing.Size(138, 13) - Me.lblPrefixforInsertedColumns.TabIndex = 25 - Me.lblPrefixforInsertedColumns.Text = "Prefix for Inserted Column(s)" - ' - 'ucrInputPrefixForInsertedColumns - ' - Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(272, 205) - Me.ucrInputPrefixForInsertedColumns.Name = "ucrInputPrefixForInsertedColumns" - Me.ucrInputPrefixForInsertedColumns.Size = New System.Drawing.Size(195, 21) - Me.ucrInputPrefixForInsertedColumns.TabIndex = 26 - ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 0fc310d3964..3895dbb1768 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -60,20 +60,18 @@ Public Class dlgInsertColumn Private Sub ReopenDialog() ucrDataFramesList.Reset() - If rdoInsertColumns.Checked Then - If nudInsertColumns.Value > ucrDataFramesList.iColumnCount + 1 Then - nudInsertColumns.Value = ucrDataFramesList.iColumnCount + 1 - ucrBase.clsRsyntax.AddParameter("num_cols", nudInsertColumns.Value) - End If - ElseIf rdoInsertRows.Checked Then + If rdoInsertRows.Checked Then If nudPos.Value > ucrDataFramesList.iDataFrameLength + 1 Then nudPos.Value = ucrDataFramesList.iDataFrameLength + 1 ucrBase.clsRsyntax.AddParameter("number_rows", nudNumCols.Value) End If + Else End If End Sub Private Sub setDefaults() + ucrInputPrefixForInsertedColumns.SetPrefix("X") + ucrInputDefaultValue.SetName("NA") rdoInsertColumns.Checked = True rdoAtEnd.Checked = True RowsOrColumns() @@ -99,22 +97,19 @@ Public Class dlgInsertColumn End Sub Private Sub NumberofColumnsOrRows() - If rdoInsertColumns.Checked Then - If Not nudInsertColumns.Text = "" Then - ucrBase.clsRsyntax.AddParameter("num_cols", nudNumCols.Value) - Else - ucrBase.clsRsyntax.RemoveParameter("num_cols") - End If - - ElseIf rdoInsertRows.Checked Then + If rdoInsertRows.Checked Then If Not nudNumCols.Text = "" Then ucrBase.clsRsyntax.AddParameter("number_rows", nudNumCols.Value) Else ucrBase.clsRsyntax.RemoveParameter("number_rows") End If + Else + ucrBase.clsRsyntax.RemoveParameter("number_rows") End If End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset setDefaults() TestOKEnabled() @@ -122,9 +117,11 @@ Public Class dlgInsertColumn Private Sub ucrDataFramesList_DataFrameChanged() Handles ucrDataFramesList.DataFrameChanged ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrDataFramesList.cboAvailableDataFrames.SelectedItem & Chr(34)) - ucrSelectorInseertColumns.strCurrentDataFrame = ucrDataFramesList.cboAvailableDataFrames.SelectedItem - ucrSelectorInseertColumns.LoadList() - + If rdoInsertColumns.Checked Then + ucrSelectorInseertColumns.strCurrentDataFrame = ucrDataFramesList.cboAvailableDataFrames.SelectedItem + ucrSelectorInseertColumns.LoadList() + Else + End If End Sub @@ -133,13 +130,10 @@ Public Class dlgInsertColumn End Sub Private Sub dataFrameListMaxMinPos() - If rdoInsertColumns.Checked Then - nudPos.Maximum = ucrDataFramesList.iColumnCount + 1 - nudPos.Value = ucrDataFramesList.iColumnCount + 1 - - Else + If rdoInsertRows.Checked Then nudPos.Maximum = ucrDataFramesList.iDataFrameLength + 1 nudPos.Value = ucrDataFramesList.iDataFrameLength + 1 + Else End If End Sub @@ -154,8 +148,6 @@ Public Class dlgInsertColumn InsertParam() ucrBase.clsRsyntax.RemoveParameter("number_rows") nudInsertColumns.Value = 1 - ucrInputPrefixForInsertedColumns.SetPrefix("X") - ucrInputDefaultValue.SetName("NA") NumberofColumnsOrRows() dataFrameListMaxMinPos() grpInsert.Visible = True @@ -167,6 +159,7 @@ Public Class dlgInsertColumn lblDataFrame.Visible = True addColumData() BeforeAfterPara() + ColsToInsert() lblPrefixforInsertedColumns.Visible = True lblDefaultValue.Visible = True ucrInputPrefixForInsertedColumns.Visible = True @@ -184,6 +177,7 @@ Public Class dlgInsertColumn addColumData() InsertParam() BeforeAfterPara() + ColsToInsert() ucrSelectorInseertColumns.Visible = False ucrDataFramesList.Visible = True nudNumCols.Visible = True @@ -286,4 +280,20 @@ Public Class dlgInsertColumn Private Sub ucrInputPrefixForInsertedColumns_NameChanged() Handles ucrInputPrefixForInsertedColumns.NameChanged ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrInputPrefixForInsertedColumns.GetText, strTempDataframe:=ucrDataFramesList.cboAvailableDataFrames.Text, strTempColumn:=ucrInputPrefixForInsertedColumns.GetText, bAssignToIsPrefix:=True) End Sub + + Private Sub nudInsertColumns_TextChanged(sender As Object, e As EventArgs) Handles nudInsertColumns.TextChanged + ColsToInsert() + TestOKEnabled() + End Sub + + Private Sub ColsToInsert() + If rdoInsertColumns.Checked Then + If Not nudInsertColumns.Text = "" Then + ucrBase.clsRsyntax.AddParameter("num_cols", nudNumCols.Value) + Else + ucrBase.clsRsyntax.RemoveParameter("num_cols") + End If + ucrBase.clsRsyntax.RemoveParameter("num_cols") + End If + End Sub End Class \ No newline at end of file From bd26640cfbcd1c5ee639401bdd8904f0efcdb20f Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 12 May 2016 15:25:12 +0300 Subject: [PATCH 05/22] Editing dlgInsertRowsOrColumns --- instat/dlgInsertColumn.Designer.vb | 34 +++++++++++++++--------------- instat/dlgInsertColumn.vb | 22 ++++++++++--------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 690be5763da..f177a1eb06d 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -31,6 +31,7 @@ Partial Class dlgInsertColumn Me.lblColumnsToInsert = New System.Windows.Forms.Label() Me.lblDataFrame = New System.Windows.Forms.Label() Me.grpInsert = New System.Windows.Forms.GroupBox() + Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.rdoAtStart = New System.Windows.Forms.RadioButton() Me.rdoAtEnd = New System.Windows.Forms.RadioButton() @@ -38,13 +39,12 @@ Partial Class dlgInsertColumn Me.nudInsertColumns = New System.Windows.Forms.NumericUpDown() Me.lblDefaultValue = New System.Windows.Forms.Label() Me.lblPrefixforInsertedColumns = New System.Windows.Forms.Label() - Me.ucrInputPrefixForInsertedColumns = New instat.ucrInputComboBox() Me.ucrInputDefaultValue = New instat.ucrInputTextBox() Me.ucrReceiverColumnsToInsert = New instat.ucrReceiverSingle() - Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() Me.ucrSelectorInseertColumns = New instat.ucrSelectorAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrDataFramesList = New instat.ucrDataFrame() + Me.ucrInputPrefixForInsertedColumns = New instat.ucrInputTextBox() CType(Me.nudPos, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudNumCols, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpInsert.SuspendLayout() @@ -140,6 +140,13 @@ Partial Class dlgInsertColumn Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" ' + 'ucrInputBeforeAfter + ' + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(27, 62) + Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" + Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) + Me.ucrInputBeforeAfter.TabIndex = 3 + ' 'rdoBeforeAfter ' Me.rdoBeforeAfter.AutoSize = True @@ -206,13 +213,6 @@ Partial Class dlgInsertColumn Me.lblPrefixforInsertedColumns.TabIndex = 25 Me.lblPrefixforInsertedColumns.Text = "Prefix for Inserted Column(s)" ' - 'ucrInputPrefixForInsertedColumns - ' - Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(272, 205) - Me.ucrInputPrefixForInsertedColumns.Name = "ucrInputPrefixForInsertedColumns" - Me.ucrInputPrefixForInsertedColumns.Size = New System.Drawing.Size(195, 21) - Me.ucrInputPrefixForInsertedColumns.TabIndex = 26 - ' 'ucrInputDefaultValue ' Me.ucrInputDefaultValue.Location = New System.Drawing.Point(422, 160) @@ -229,13 +229,6 @@ Partial Class dlgInsertColumn Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(85, 20) Me.ucrReceiverColumnsToInsert.TabIndex = 20 ' - 'ucrInputBeforeAfter - ' - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(27, 62) - Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" - Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) - Me.ucrInputBeforeAfter.TabIndex = 3 - ' 'ucrSelectorInseertColumns ' Me.ucrSelectorInseertColumns.Location = New System.Drawing.Point(9, 43) @@ -259,6 +252,13 @@ Partial Class dlgInsertColumn Me.ucrDataFramesList.Size = New System.Drawing.Size(127, 41) Me.ucrDataFramesList.TabIndex = 0 ' + 'ucrInputPrefixForInsertedColumns + ' + Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(272, 205) + Me.ucrInputPrefixForInsertedColumns.Name = "ucrInputPrefixForInsertedColumns" + Me.ucrInputPrefixForInsertedColumns.Size = New System.Drawing.Size(195, 21) + Me.ucrInputPrefixForInsertedColumns.TabIndex = 26 + ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -319,5 +319,5 @@ Partial Class dlgInsertColumn Friend WithEvents lblDefaultValue As Label Friend WithEvents ucrInputDefaultValue As ucrInputTextBox Friend WithEvents lblPrefixforInsertedColumns As Label - Friend WithEvents ucrInputPrefixForInsertedColumns As ucrInputComboBox + Friend WithEvents ucrInputPrefixForInsertedColumns As ucrInputTextBox End Class diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 3895dbb1768..8732f44486d 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -33,7 +33,6 @@ Public Class dlgInsertColumn Private Sub InitialiseDialog() ucrReceiverColumnsToInsert.Selector = ucrSelectorInseertColumns ucrReceiverColumnsToInsert.SetMeAsReceiver() - ucrInputPrefixForInsertedColumns.SetItemsTypeAsColumns() ucrInputPrefixForInsertedColumns.SetDefaultTypeAsColumn() ucrInputPrefixForInsertedColumns.SetDataFrameSelector(ucrDataFramesList) ucrInputBeforeAfter.cboInput.Items.Add("Before") @@ -70,16 +69,20 @@ Public Class dlgInsertColumn End Sub Private Sub setDefaults() - ucrInputPrefixForInsertedColumns.SetPrefix("X") - ucrInputDefaultValue.SetName("NA") rdoInsertColumns.Checked = True - rdoAtEnd.Checked = True + ucrInputPrefixForInsertedColumns.SetName("X") + ucrInputDefaultValue.SetName("NA") RowsOrColumns() + rdoAtEnd.Checked = True ucrDataFramesList.Reset() End Sub Private Sub nudPos_TextChanged(sender As Object, e As EventArgs) Handles nudPos.TextChanged + startpo() + End Sub + + Private Sub startpo() If rdoInsertRows.Checked Then If Not nudPos.Text = "" Then ucrBase.clsRsyntax.AddParameter("start_pos", nudPos.Value) @@ -117,11 +120,8 @@ Public Class dlgInsertColumn Private Sub ucrDataFramesList_DataFrameChanged() Handles ucrDataFramesList.DataFrameChanged ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrDataFramesList.cboAvailableDataFrames.SelectedItem & Chr(34)) - If rdoInsertColumns.Checked Then - ucrSelectorInseertColumns.strCurrentDataFrame = ucrDataFramesList.cboAvailableDataFrames.SelectedItem - ucrSelectorInseertColumns.LoadList() - Else - End If + ucrSelectorInseertColumns.strCurrentDataFrame = ucrDataFramesList.cboAvailableDataFrames.SelectedItem + ucrSelectorInseertColumns.LoadList() End Sub @@ -160,6 +160,7 @@ Public Class dlgInsertColumn addColumData() BeforeAfterPara() ColsToInsert() + startpo() lblPrefixforInsertedColumns.Visible = True lblDefaultValue.Visible = True ucrInputPrefixForInsertedColumns.Visible = True @@ -172,6 +173,7 @@ Public Class dlgInsertColumn nudNumCols.Value = 1 NumberofColumnsOrRows() dataFrameListMaxMinPos() + startpo() nudNumCols.Maximum = 1000 grpInsert.Visible = False addColumData() @@ -278,7 +280,7 @@ Public Class dlgInsertColumn End Sub Private Sub ucrInputPrefixForInsertedColumns_NameChanged() Handles ucrInputPrefixForInsertedColumns.NameChanged - ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrInputPrefixForInsertedColumns.GetText, strTempDataframe:=ucrDataFramesList.cboAvailableDataFrames.Text, strTempColumn:=ucrInputPrefixForInsertedColumns.GetText, bAssignToIsPrefix:=True) + ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrInputPrefixForInsertedColumns.GetText, strTempDataframe:=ucrDataFramesList.cboAvailableDataFrames.Text, strTempColumn:=ucrInputPrefixForInsertedColumns.GetText) End Sub Private Sub nudInsertColumns_TextChanged(sender As Object, e As EventArgs) Handles nudInsertColumns.TextChanged From aaf84249378e4fc3863350a6b677d45a1ae3cbb9 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 12 May 2016 16:38:02 +0300 Subject: [PATCH 06/22] Editing dlgInsertRowsOrColumns --- instat/dlgInsertColumn.vb | 64 +++++++++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 20 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 8732f44486d..e73aa78c08f 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -33,8 +33,6 @@ Public Class dlgInsertColumn Private Sub InitialiseDialog() ucrReceiverColumnsToInsert.Selector = ucrSelectorInseertColumns ucrReceiverColumnsToInsert.SetMeAsReceiver() - ucrInputPrefixForInsertedColumns.SetDefaultTypeAsColumn() - ucrInputPrefixForInsertedColumns.SetDataFrameSelector(ucrDataFramesList) ucrInputBeforeAfter.cboInput.Items.Add("Before") ucrInputBeforeAfter.cboInput.Items.Add("After") @@ -150,6 +148,7 @@ Public Class dlgInsertColumn nudInsertColumns.Value = 1 NumberofColumnsOrRows() dataFrameListMaxMinPos() + ColName() grpInsert.Visible = True ucrSelectorInseertColumns.Visible = True ucrDataFramesList.Visible = False @@ -161,6 +160,7 @@ Public Class dlgInsertColumn BeforeAfterPara() ColsToInsert() startpo() + BeforeParameter() lblPrefixforInsertedColumns.Visible = True lblDefaultValue.Visible = True ucrInputPrefixForInsertedColumns.Visible = True @@ -180,6 +180,8 @@ Public Class dlgInsertColumn InsertParam() BeforeAfterPara() ColsToInsert() + ColName() + BeforeParameter() ucrSelectorInseertColumns.Visible = False ucrDataFramesList.Visible = True nudNumCols.Visible = True @@ -219,20 +221,27 @@ Public Class dlgInsertColumn End Sub Private Sub ucrInputBeforeAfter_NameChanged() Handles ucrInputBeforeAfter.NameChanged - If rdoBeforeAfter.Checked = True Then - If Not ucrInputBeforeAfter.IsEmpty Then - Select Case ucrInputBeforeAfter.GetText - Case "Before" - ucrBase.clsRsyntax.AddParameter("before", "TRUE") - Case "After" - ucrBase.clsRsyntax.AddParameter("before", "FALSE") + BeforeAfterPara() + End Sub - End Select - Else - ucrBase.clsRsyntax.RemoveParameter("before") + Private Sub BeforeParameter() + If rdoInsertColumns.Checked Then + If rdoBeforeAfter.Checked = True Then + If Not ucrInputBeforeAfter.IsEmpty Then + Select Case ucrInputBeforeAfter.GetText + Case "Before" + ucrBase.clsRsyntax.AddParameter("before", "TRUE") + Case "After" + ucrBase.clsRsyntax.AddParameter("before", "FALSE") + + End Select + Else + ucrBase.clsRsyntax.RemoveParameter("before") + End If End If + Else + ucrBase.clsRsyntax.RemoveParameter("before") End If - End Sub Private Sub ucrReceiverColumnsToInsert_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverColumnsToInsert.SelectionChanged @@ -241,11 +250,13 @@ Public Class dlgInsertColumn End Sub Private Sub BeforeAfterPara() - If rdoBeforeAfter.Checked Then - If Not ucrReceiverColumnsToInsert.IsEmpty Then - ucrBase.clsRsyntax.AddParameter("adjacent_column", clsRFunctionParameter:=ucrReceiverColumnsToInsert.GetVariables()) - Else - ucrBase.clsRsyntax.RemoveParameter("adjacent_column") + If rdoInsertColumns.Checked Then + If rdoBeforeAfter.Checked Then + If Not ucrReceiverColumnsToInsert.IsEmpty Then + ucrBase.clsRsyntax.AddParameter("adjacent_column", ucrReceiverColumnsToInsert.GetVariableNames()) + Else + ucrBase.clsRsyntax.RemoveParameter("adjacent_column") + End If End If Else ucrBase.clsRsyntax.RemoveParameter("adjacent_column") @@ -280,7 +291,20 @@ Public Class dlgInsertColumn End Sub Private Sub ucrInputPrefixForInsertedColumns_NameChanged() Handles ucrInputPrefixForInsertedColumns.NameChanged - ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrInputPrefixForInsertedColumns.GetText, strTempDataframe:=ucrDataFramesList.cboAvailableDataFrames.Text, strTempColumn:=ucrInputPrefixForInsertedColumns.GetText) + ColName() + TestOKEnabled() + End Sub + + Private Sub ColName() + If rdoInsertColumns.Checked Then + If Not ucrInputPrefixForInsertedColumns.IsEmpty Then + ucrBase.clsRsyntax.AddParameter("col_name", Chr(34) & ucrInputPrefixForInsertedColumns.GetText & Chr(34)) + Else + ucrBase.clsRsyntax.RemoveParameter("col_name") + End If + Else + ucrBase.clsRsyntax.RemoveParameter("col_name") + End If End Sub Private Sub nudInsertColumns_TextChanged(sender As Object, e As EventArgs) Handles nudInsertColumns.TextChanged @@ -291,7 +315,7 @@ Public Class dlgInsertColumn Private Sub ColsToInsert() If rdoInsertColumns.Checked Then If Not nudInsertColumns.Text = "" Then - ucrBase.clsRsyntax.AddParameter("num_cols", nudNumCols.Value) + ucrBase.clsRsyntax.AddParameter("num_cols", nudInsertColumns.Value) Else ucrBase.clsRsyntax.RemoveParameter("num_cols") End If From 9bd9d2615ef50c8a80384eed8d50a4f8eac29732 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 12 May 2016 16:54:02 +0300 Subject: [PATCH 07/22] Editing dlgInsertRowsOrColumns --- instat/dlgInsertColumn.vb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index e73aa78c08f..9774ed9f70a 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -191,6 +191,10 @@ Public Class dlgInsertColumn lblDefaultValue.Visible = False ucrInputPrefixForInsertedColumns.Visible = False ucrInputDefaultValue.Visible = False + lblColumnsToInsert.Visible = False + lblNumberOfColumnsToInsert.Visible = False + nudInsertColumns.Visible = False + ucrReceiverColumnsToInsert.Visible = False End If End Sub @@ -319,6 +323,7 @@ Public Class dlgInsertColumn Else ucrBase.clsRsyntax.RemoveParameter("num_cols") End If + Else ucrBase.clsRsyntax.RemoveParameter("num_cols") End If End Sub From 7f647ec33afd02c1b56d960e644698dfe5cb3596 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 12 May 2016 17:04:40 +0300 Subject: [PATCH 08/22] Editing dlgInsertRowsOrColumns --- instat/dlgInsertColumn.vb | 2 -- 1 file changed, 2 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 9774ed9f70a..f4f2d639368 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -239,8 +239,6 @@ Public Class dlgInsertColumn ucrBase.clsRsyntax.AddParameter("before", "FALSE") End Select - Else - ucrBase.clsRsyntax.RemoveParameter("before") End If End If Else From ae82c64e4f87927b3ce7100f56bf401a8472e96b Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 12 May 2016 18:30:22 +0300 Subject: [PATCH 09/22] Editing dlgInsertColumnsOrRows --- instat/dlgInsertColumn.vb | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index f4f2d639368..bbe8b3a566e 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -195,6 +195,7 @@ Public Class dlgInsertColumn lblNumberOfColumnsToInsert.Visible = False nudInsertColumns.Visible = False ucrReceiverColumnsToInsert.Visible = False + ucrBase.clsRsyntax.RemoveParameter("before") End If End Sub @@ -206,12 +207,14 @@ Public Class dlgInsertColumn Private Sub InsertParam() If rdoAtEnd.Checked Then ucrBase.clsRsyntax.AddOperatorParameter("before", "FALSE") + ucrBase.clsRsyntax.RemoveParameter("adjacent_column") ucrReceiverColumnsToInsert.Visible = False lblNumberOfColumnsToInsert.Visible = False nudInsertColumns.Visible = False lblColumnsToInsert.Visible = False ElseIf rdoAtStart.Checked Then ucrBase.clsRsyntax.AddOperatorParameter("before", "TRUE") + ucrBase.clsRsyntax.RemoveParameter("adjacent_column") ucrReceiverColumnsToInsert.Visible = False lblNumberOfColumnsToInsert.Visible = False nudInsertColumns.Visible = False @@ -226,20 +229,18 @@ Public Class dlgInsertColumn Private Sub ucrInputBeforeAfter_NameChanged() Handles ucrInputBeforeAfter.NameChanged BeforeAfterPara() + End Sub Private Sub BeforeParameter() If rdoInsertColumns.Checked Then - If rdoBeforeAfter.Checked = True Then - If Not ucrInputBeforeAfter.IsEmpty Then - Select Case ucrInputBeforeAfter.GetText - Case "Before" - ucrBase.clsRsyntax.AddParameter("before", "TRUE") - Case "After" - ucrBase.clsRsyntax.AddParameter("before", "FALSE") - - End Select - End If + If rdoBeforeAfter.Checked Then + Select Case ucrInputBeforeAfter.GetText + Case "Before" + ucrBase.clsRsyntax.AddParameter("before", "TRUE") + Case "After" + ucrBase.clsRsyntax.AddParameter("before", "FALSE") + End Select End If Else ucrBase.clsRsyntax.RemoveParameter("before") @@ -259,6 +260,8 @@ Public Class dlgInsertColumn Else ucrBase.clsRsyntax.RemoveParameter("adjacent_column") End If + Else + ucrBase.clsRsyntax.RemoveParameter("adjacent_column") End If Else ucrBase.clsRsyntax.RemoveParameter("adjacent_column") From 6d240592e0205698cb81dcd7a629ec19f47afe3e Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 12 May 2016 20:30:10 +0300 Subject: [PATCH 10/22] Editing dlgInsertRowsOrColumns --- instat/dlgInsertColumn.Designer.vb | 38 +++++++++++++++--------------- instat/dlgInsertColumn.vb | 22 +++++++++++------ 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index f177a1eb06d..d81f54bd65f 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -31,7 +31,6 @@ Partial Class dlgInsertColumn Me.lblColumnsToInsert = New System.Windows.Forms.Label() Me.lblDataFrame = New System.Windows.Forms.Label() Me.grpInsert = New System.Windows.Forms.GroupBox() - Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.rdoAtStart = New System.Windows.Forms.RadioButton() Me.rdoAtEnd = New System.Windows.Forms.RadioButton() @@ -39,12 +38,13 @@ Partial Class dlgInsertColumn Me.nudInsertColumns = New System.Windows.Forms.NumericUpDown() Me.lblDefaultValue = New System.Windows.Forms.Label() Me.lblPrefixforInsertedColumns = New System.Windows.Forms.Label() + Me.ucrInputPrefixForInsertedColumns = New instat.ucrInputTextBox() Me.ucrInputDefaultValue = New instat.ucrInputTextBox() Me.ucrReceiverColumnsToInsert = New instat.ucrReceiverSingle() + Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() Me.ucrSelectorInseertColumns = New instat.ucrSelectorAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrDataFramesList = New instat.ucrDataFrame() - Me.ucrInputPrefixForInsertedColumns = New instat.ucrInputTextBox() CType(Me.nudPos, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudNumCols, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpInsert.SuspendLayout() @@ -140,13 +140,6 @@ Partial Class dlgInsertColumn Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" ' - 'ucrInputBeforeAfter - ' - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(27, 62) - Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" - Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) - Me.ucrInputBeforeAfter.TabIndex = 3 - ' 'rdoBeforeAfter ' Me.rdoBeforeAfter.AutoSize = True @@ -207,12 +200,19 @@ Partial Class dlgInsertColumn 'lblPrefixforInsertedColumns ' Me.lblPrefixforInsertedColumns.AutoSize = True - Me.lblPrefixforInsertedColumns.Location = New System.Drawing.Point(269, 188) + Me.lblPrefixforInsertedColumns.Location = New System.Drawing.Point(9, 248) Me.lblPrefixforInsertedColumns.Name = "lblPrefixforInsertedColumns" Me.lblPrefixforInsertedColumns.Size = New System.Drawing.Size(138, 13) Me.lblPrefixforInsertedColumns.TabIndex = 25 Me.lblPrefixforInsertedColumns.Text = "Prefix for Inserted Column(s)" ' + 'ucrInputPrefixForInsertedColumns + ' + Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(153, 246) + Me.ucrInputPrefixForInsertedColumns.Name = "ucrInputPrefixForInsertedColumns" + Me.ucrInputPrefixForInsertedColumns.Size = New System.Drawing.Size(256, 21) + Me.ucrInputPrefixForInsertedColumns.TabIndex = 26 + ' 'ucrInputDefaultValue ' Me.ucrInputDefaultValue.Location = New System.Drawing.Point(422, 160) @@ -229,6 +229,13 @@ Partial Class dlgInsertColumn Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(85, 20) Me.ucrReceiverColumnsToInsert.TabIndex = 20 ' + 'ucrInputBeforeAfter + ' + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(27, 62) + Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" + Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) + Me.ucrInputBeforeAfter.TabIndex = 3 + ' 'ucrSelectorInseertColumns ' Me.ucrSelectorInseertColumns.Location = New System.Drawing.Point(9, 43) @@ -239,7 +246,7 @@ Partial Class dlgInsertColumn ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 237) + Me.ucrBase.Location = New System.Drawing.Point(12, 273) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) Me.ucrBase.TabIndex = 8 @@ -252,18 +259,11 @@ Partial Class dlgInsertColumn Me.ucrDataFramesList.Size = New System.Drawing.Size(127, 41) Me.ucrDataFramesList.TabIndex = 0 ' - 'ucrInputPrefixForInsertedColumns - ' - Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(272, 205) - Me.ucrInputPrefixForInsertedColumns.Name = "ucrInputPrefixForInsertedColumns" - Me.ucrInputPrefixForInsertedColumns.Size = New System.Drawing.Size(195, 21) - Me.ucrInputPrefixForInsertedColumns.TabIndex = 26 - ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(492, 293) + Me.ClientSize = New System.Drawing.Size(492, 331) Me.Controls.Add(Me.ucrInputPrefixForInsertedColumns) Me.Controls.Add(Me.lblPrefixforInsertedColumns) Me.Controls.Add(Me.ucrInputDefaultValue) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index bbe8b3a566e..66168f3a8c6 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -150,7 +150,6 @@ Public Class dlgInsertColumn dataFrameListMaxMinPos() ColName() grpInsert.Visible = True - ucrSelectorInseertColumns.Visible = True ucrDataFramesList.Visible = False nudInsertColumns.Maximum = 100 nudNumCols.Visible = False @@ -165,6 +164,11 @@ Public Class dlgInsertColumn lblDefaultValue.Visible = True ucrInputPrefixForInsertedColumns.Visible = True ucrInputDefaultValue.Visible = True + lblNumberOfColumnsToInsert.Visible = True + nudInsertColumns.Visible = True + lblNumberOfRowsToInsert.Visible = False + lblStartPos.Visible = False + ElseIf rdoInsertRows.Checked Then ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") @@ -186,6 +190,7 @@ Public Class dlgInsertColumn ucrDataFramesList.Visible = True nudNumCols.Visible = True nudPos.Visible = True + lblStartPos.Visible = True lblDataFrame.Visible = False lblPrefixforInsertedColumns.Visible = False lblDefaultValue.Visible = False @@ -209,21 +214,24 @@ Public Class dlgInsertColumn ucrBase.clsRsyntax.AddOperatorParameter("before", "FALSE") ucrBase.clsRsyntax.RemoveParameter("adjacent_column") ucrReceiverColumnsToInsert.Visible = False - lblNumberOfColumnsToInsert.Visible = False - nudInsertColumns.Visible = False + ucrSelectorInseertColumns.Visible = False + ucrDataFramesList.Visible = True + lblDataFrame.Visible = False lblColumnsToInsert.Visible = False ElseIf rdoAtStart.Checked Then ucrBase.clsRsyntax.AddOperatorParameter("before", "TRUE") ucrBase.clsRsyntax.RemoveParameter("adjacent_column") ucrReceiverColumnsToInsert.Visible = False - lblNumberOfColumnsToInsert.Visible = False - nudInsertColumns.Visible = False lblColumnsToInsert.Visible = False + ucrSelectorInseertColumns.Visible = False + lblDataFrame.Visible = False + ucrDataFramesList.Visible = True + Else ucrReceiverColumnsToInsert.Visible = True - lblNumberOfColumnsToInsert.Visible = True - nudInsertColumns.Visible = True + ucrSelectorInseertColumns.Visible = True lblColumnsToInsert.Visible = True + lblDataFrame.Visible = True End If End Sub From 730943137e40137a9773e657c118c4bfc6449d27 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Fri, 13 May 2016 14:24:01 +0300 Subject: [PATCH 11/22] Editing dlgInsertRowsOrColumns --- instat/dlgInsertColumn.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 66168f3a8c6..b3c98d15281 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -73,6 +73,7 @@ Public Class dlgInsertColumn RowsOrColumns() rdoAtEnd.Checked = True ucrDataFramesList.Reset() + ucrInputBeforeAfter.SetName("Before") End Sub @@ -143,6 +144,7 @@ Public Class dlgInsertColumn Private Sub RowsOrColumns() If rdoInsertColumns.Checked Then ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") + BeforeAfterPara() InsertParam() ucrBase.clsRsyntax.RemoveParameter("number_rows") nudInsertColumns.Value = 1 @@ -156,7 +158,6 @@ Public Class dlgInsertColumn nudPos.Visible = False lblDataFrame.Visible = True addColumData() - BeforeAfterPara() ColsToInsert() startpo() BeforeParameter() @@ -236,8 +237,7 @@ Public Class dlgInsertColumn End Sub Private Sub ucrInputBeforeAfter_NameChanged() Handles ucrInputBeforeAfter.NameChanged - BeforeAfterPara() - + BeforeParameter() End Sub Private Sub BeforeParameter() @@ -246,7 +246,7 @@ Public Class dlgInsertColumn Select Case ucrInputBeforeAfter.GetText Case "Before" ucrBase.clsRsyntax.AddParameter("before", "TRUE") - Case "After" + Case Else ucrBase.clsRsyntax.AddParameter("before", "FALSE") End Select End If From d2ff8d340bb15d999c6b79699c1fdfdd9a1d292f Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 19 May 2016 10:00:35 +0300 Subject: [PATCH 12/22] Editing dlgInsertRowsOrColumns --- instat/dlgInsertColumn.Designer.vb | 56 +++++++++--------------------- instat/dlgInsertColumn.vb | 13 ++----- 2 files changed, 18 insertions(+), 51 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index d81f54bd65f..e93b8d3ce8b 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -28,8 +28,6 @@ Partial Class dlgInsertColumn Me.rdoInsertRows = New System.Windows.Forms.RadioButton() Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() Me.lblNumberOfRowsToInsert = New System.Windows.Forms.Label() - Me.lblColumnsToInsert = New System.Windows.Forms.Label() - Me.lblDataFrame = New System.Windows.Forms.Label() Me.grpInsert = New System.Windows.Forms.GroupBox() Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.rdoAtStart = New System.Windows.Forms.RadioButton() @@ -109,33 +107,15 @@ Partial Class dlgInsertColumn Me.lblNumberOfRowsToInsert.TabIndex = 14 Me.lblNumberOfRowsToInsert.Text = "Number of Rows to Insert" ' - 'lblColumnsToInsert - ' - Me.lblColumnsToInsert.AutoSize = True - Me.lblColumnsToInsert.Location = New System.Drawing.Point(398, 79) - Me.lblColumnsToInsert.Name = "lblColumnsToInsert" - Me.lblColumnsToInsert.Size = New System.Drawing.Size(88, 13) - Me.lblColumnsToInsert.TabIndex = 17 - Me.lblColumnsToInsert.Text = "Columns to Insert" - ' - 'lblDataFrame - ' - Me.lblDataFrame.AutoSize = True - Me.lblDataFrame.Location = New System.Drawing.Point(9, 30) - Me.lblDataFrame.Name = "lblDataFrame" - Me.lblDataFrame.Size = New System.Drawing.Size(62, 13) - Me.lblDataFrame.TabIndex = 18 - Me.lblDataFrame.Text = "Data Frame" - ' 'grpInsert ' Me.grpInsert.Controls.Add(Me.ucrInputBeforeAfter) Me.grpInsert.Controls.Add(Me.rdoBeforeAfter) Me.grpInsert.Controls.Add(Me.rdoAtStart) Me.grpInsert.Controls.Add(Me.rdoAtEnd) - Me.grpInsert.Location = New System.Drawing.Point(272, 32) + Me.grpInsert.Location = New System.Drawing.Point(265, 58) Me.grpInsert.Name = "grpInsert" - Me.grpInsert.Size = New System.Drawing.Size(120, 92) + Me.grpInsert.Size = New System.Drawing.Size(137, 92) Me.grpInsert.TabIndex = 19 Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" @@ -143,7 +123,7 @@ Partial Class dlgInsertColumn 'rdoBeforeAfter ' Me.rdoBeforeAfter.AutoSize = True - Me.rdoBeforeAfter.Location = New System.Drawing.Point(7, 65) + Me.rdoBeforeAfter.Location = New System.Drawing.Point(6, 70) Me.rdoBeforeAfter.Name = "rdoBeforeAfter" Me.rdoBeforeAfter.Size = New System.Drawing.Size(14, 13) Me.rdoBeforeAfter.TabIndex = 2 @@ -153,7 +133,7 @@ Partial Class dlgInsertColumn 'rdoAtStart ' Me.rdoAtStart.AutoSize = True - Me.rdoAtStart.Location = New System.Drawing.Point(7, 43) + Me.rdoAtStart.Location = New System.Drawing.Point(6, 42) Me.rdoAtStart.Name = "rdoAtStart" Me.rdoAtStart.Size = New System.Drawing.Size(60, 17) Me.rdoAtStart.TabIndex = 1 @@ -175,7 +155,7 @@ Partial Class dlgInsertColumn 'lblNumberOfColumnsToInsert ' Me.lblNumberOfColumnsToInsert.AutoSize = True - Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(269, 136) + Me.lblNumberOfColumnsToInsert.Location = New System.Drawing.Point(262, 163) Me.lblNumberOfColumnsToInsert.Name = "lblNumberOfColumnsToInsert" Me.lblNumberOfColumnsToInsert.Size = New System.Drawing.Size(140, 13) Me.lblNumberOfColumnsToInsert.TabIndex = 21 @@ -183,7 +163,7 @@ Partial Class dlgInsertColumn ' 'nudInsertColumns ' - Me.nudInsertColumns.Location = New System.Drawing.Point(422, 134) + Me.nudInsertColumns.Location = New System.Drawing.Point(408, 156) Me.nudInsertColumns.Name = "nudInsertColumns" Me.nudInsertColumns.Size = New System.Drawing.Size(45, 20) Me.nudInsertColumns.TabIndex = 22 @@ -191,7 +171,7 @@ Partial Class dlgInsertColumn 'lblDefaultValue ' Me.lblDefaultValue.AutoSize = True - Me.lblDefaultValue.Location = New System.Drawing.Point(269, 168) + Me.lblDefaultValue.Location = New System.Drawing.Point(265, 187) Me.lblDefaultValue.Name = "lblDefaultValue" Me.lblDefaultValue.Size = New System.Drawing.Size(71, 13) Me.lblDefaultValue.TabIndex = 23 @@ -200,7 +180,7 @@ Partial Class dlgInsertColumn 'lblPrefixforInsertedColumns ' Me.lblPrefixforInsertedColumns.AutoSize = True - Me.lblPrefixforInsertedColumns.Location = New System.Drawing.Point(9, 248) + Me.lblPrefixforInsertedColumns.Location = New System.Drawing.Point(9, 270) Me.lblPrefixforInsertedColumns.Name = "lblPrefixforInsertedColumns" Me.lblPrefixforInsertedColumns.Size = New System.Drawing.Size(138, 13) Me.lblPrefixforInsertedColumns.TabIndex = 25 @@ -208,37 +188,37 @@ Partial Class dlgInsertColumn ' 'ucrInputPrefixForInsertedColumns ' - Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(153, 246) + Me.ucrInputPrefixForInsertedColumns.Location = New System.Drawing.Point(166, 265) Me.ucrInputPrefixForInsertedColumns.Name = "ucrInputPrefixForInsertedColumns" Me.ucrInputPrefixForInsertedColumns.Size = New System.Drawing.Size(256, 21) Me.ucrInputPrefixForInsertedColumns.TabIndex = 26 ' 'ucrInputDefaultValue ' - Me.ucrInputDefaultValue.Location = New System.Drawing.Point(422, 160) + Me.ucrInputDefaultValue.Location = New System.Drawing.Point(408, 182) Me.ucrInputDefaultValue.Name = "ucrInputDefaultValue" Me.ucrInputDefaultValue.Size = New System.Drawing.Size(45, 21) Me.ucrInputDefaultValue.TabIndex = 24 ' 'ucrReceiverColumnsToInsert ' - Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(401, 95) + Me.ucrReceiverColumnsToInsert.Location = New System.Drawing.Point(408, 121) Me.ucrReceiverColumnsToInsert.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumnsToInsert.Name = "ucrReceiverColumnsToInsert" Me.ucrReceiverColumnsToInsert.Selector = Nothing - Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(85, 20) + Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(75, 20) Me.ucrReceiverColumnsToInsert.TabIndex = 20 ' 'ucrInputBeforeAfter ' - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(27, 62) + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(26, 65) Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) Me.ucrInputBeforeAfter.TabIndex = 3 ' 'ucrSelectorInseertColumns ' - Me.ucrSelectorInseertColumns.Location = New System.Drawing.Point(9, 43) + Me.ucrSelectorInseertColumns.Location = New System.Drawing.Point(12, 75) Me.ucrSelectorInseertColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorInseertColumns.Name = "ucrSelectorInseertColumns" Me.ucrSelectorInseertColumns.Size = New System.Drawing.Size(250, 187) @@ -246,7 +226,7 @@ Partial Class dlgInsertColumn ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 273) + Me.ucrBase.Location = New System.Drawing.Point(12, 292) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 53) Me.ucrBase.TabIndex = 8 @@ -263,7 +243,7 @@ Partial Class dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(492, 331) + Me.ClientSize = New System.Drawing.Size(492, 351) Me.Controls.Add(Me.ucrInputPrefixForInsertedColumns) Me.Controls.Add(Me.lblPrefixforInsertedColumns) Me.Controls.Add(Me.ucrInputDefaultValue) @@ -272,8 +252,6 @@ Partial Class dlgInsertColumn Me.Controls.Add(Me.lblNumberOfColumnsToInsert) Me.Controls.Add(Me.ucrReceiverColumnsToInsert) Me.Controls.Add(Me.grpInsert) - Me.Controls.Add(Me.lblDataFrame) - Me.Controls.Add(Me.lblColumnsToInsert) Me.Controls.Add(Me.ucrSelectorInseertColumns) Me.Controls.Add(Me.lblStartPos) Me.Controls.Add(Me.nudNumCols) @@ -306,8 +284,6 @@ Partial Class dlgInsertColumn Friend WithEvents rdoInsertColumns As RadioButton Friend WithEvents lblNumberOfRowsToInsert As Label Friend WithEvents ucrSelectorInseertColumns As ucrSelectorAddRemove - Friend WithEvents lblColumnsToInsert As Label - Friend WithEvents lblDataFrame As Label Friend WithEvents grpInsert As GroupBox Friend WithEvents ucrInputBeforeAfter As ucrInputComboBox Friend WithEvents rdoBeforeAfter As RadioButton diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index b3c98d15281..206bf0a58c0 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -73,8 +73,7 @@ Public Class dlgInsertColumn RowsOrColumns() rdoAtEnd.Checked = True ucrDataFramesList.Reset() - ucrInputBeforeAfter.SetName("Before") - + ucrInputBeforeAfter.SetName("After") End Sub Private Sub nudPos_TextChanged(sender As Object, e As EventArgs) Handles nudPos.TextChanged @@ -156,7 +155,6 @@ Public Class dlgInsertColumn nudInsertColumns.Maximum = 100 nudNumCols.Visible = False nudPos.Visible = False - lblDataFrame.Visible = True addColumData() ColsToInsert() startpo() @@ -192,12 +190,10 @@ Public Class dlgInsertColumn nudNumCols.Visible = True nudPos.Visible = True lblStartPos.Visible = True - lblDataFrame.Visible = False lblPrefixforInsertedColumns.Visible = False lblDefaultValue.Visible = False ucrInputPrefixForInsertedColumns.Visible = False ucrInputDefaultValue.Visible = False - lblColumnsToInsert.Visible = False lblNumberOfColumnsToInsert.Visible = False nudInsertColumns.Visible = False ucrReceiverColumnsToInsert.Visible = False @@ -217,22 +213,17 @@ Public Class dlgInsertColumn ucrReceiverColumnsToInsert.Visible = False ucrSelectorInseertColumns.Visible = False ucrDataFramesList.Visible = True - lblDataFrame.Visible = False - lblColumnsToInsert.Visible = False ElseIf rdoAtStart.Checked Then ucrBase.clsRsyntax.AddOperatorParameter("before", "TRUE") ucrBase.clsRsyntax.RemoveParameter("adjacent_column") ucrReceiverColumnsToInsert.Visible = False - lblColumnsToInsert.Visible = False ucrSelectorInseertColumns.Visible = False - lblDataFrame.Visible = False ucrDataFramesList.Visible = True Else ucrReceiverColumnsToInsert.Visible = True ucrSelectorInseertColumns.Visible = True - lblColumnsToInsert.Visible = True - lblDataFrame.Visible = True + ucrDataFramesList.Visible = True End If End Sub From 445903749c78d10bd376ec99ffad0412b756270c Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 19 May 2016 15:12:46 +0300 Subject: [PATCH 13/22] Editing dlgInsertRowsOrColumns --- instat/dlgInsertColumn.vb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 206bf0a58c0..4c3f55bf740 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -70,10 +70,11 @@ Public Class dlgInsertColumn rdoInsertColumns.Checked = True ucrInputPrefixForInsertedColumns.SetName("X") ucrInputDefaultValue.SetName("NA") + ucrDataFramesList.Reset() RowsOrColumns() rdoAtEnd.Checked = True - ucrDataFramesList.Reset() ucrInputBeforeAfter.SetName("After") + End Sub Private Sub nudPos_TextChanged(sender As Object, e As EventArgs) Handles nudPos.TextChanged @@ -151,7 +152,6 @@ Public Class dlgInsertColumn dataFrameListMaxMinPos() ColName() grpInsert.Visible = True - ucrDataFramesList.Visible = False nudInsertColumns.Maximum = 100 nudNumCols.Visible = False nudPos.Visible = False @@ -186,7 +186,6 @@ Public Class dlgInsertColumn ColName() BeforeParameter() ucrSelectorInseertColumns.Visible = False - ucrDataFramesList.Visible = True nudNumCols.Visible = True nudPos.Visible = True lblStartPos.Visible = True @@ -212,18 +211,15 @@ Public Class dlgInsertColumn ucrBase.clsRsyntax.RemoveParameter("adjacent_column") ucrReceiverColumnsToInsert.Visible = False ucrSelectorInseertColumns.Visible = False - ucrDataFramesList.Visible = True + ElseIf rdoAtStart.Checked Then ucrBase.clsRsyntax.AddOperatorParameter("before", "TRUE") ucrBase.clsRsyntax.RemoveParameter("adjacent_column") ucrReceiverColumnsToInsert.Visible = False ucrSelectorInseertColumns.Visible = False - ucrDataFramesList.Visible = True - Else ucrReceiverColumnsToInsert.Visible = True ucrSelectorInseertColumns.Visible = True - ucrDataFramesList.Visible = True End If End Sub From 405711891591c8984ab0bc41a7954eccd130e09c Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Thu, 19 May 2016 19:00:47 +0300 Subject: [PATCH 14/22] Editing dlgInsertColumnsOrRows --- instat/dlgInsertColumn.vb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 4c3f55bf740..e2eb09a20c3 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -207,13 +207,13 @@ Public Class dlgInsertColumn Private Sub InsertParam() If rdoAtEnd.Checked Then - ucrBase.clsRsyntax.AddOperatorParameter("before", "FALSE") + ucrBase.clsRsyntax.AddParameter("before", "FALSE") ucrBase.clsRsyntax.RemoveParameter("adjacent_column") ucrReceiverColumnsToInsert.Visible = False ucrSelectorInseertColumns.Visible = False ElseIf rdoAtStart.Checked Then - ucrBase.clsRsyntax.AddOperatorParameter("before", "TRUE") + ucrBase.clsRsyntax.AddParameter("before", "TRUE") ucrBase.clsRsyntax.RemoveParameter("adjacent_column") ucrReceiverColumnsToInsert.Visible = False ucrSelectorInseertColumns.Visible = False @@ -221,6 +221,7 @@ Public Class dlgInsertColumn ucrReceiverColumnsToInsert.Visible = True ucrSelectorInseertColumns.Visible = True End If + End Sub Private Sub ucrInputBeforeAfter_NameChanged() Handles ucrInputBeforeAfter.NameChanged From 9f3ff0976a58c9f5a0dd3ebecc130e5b0a76c895 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Fri, 20 May 2016 10:14:54 +0300 Subject: [PATCH 15/22] Editing dlgInsertRowsOrColumns --- instat/dlgInsertColumn.Designer.vb | 16 ++++++++-------- instat/dlgInsertColumn.vb | 17 ++++++++++++----- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index e93b8d3ce8b..826bc11e4ac 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -29,6 +29,7 @@ Partial Class dlgInsertColumn Me.rdoInsertColumns = New System.Windows.Forms.RadioButton() Me.lblNumberOfRowsToInsert = New System.Windows.Forms.Label() Me.grpInsert = New System.Windows.Forms.GroupBox() + Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() Me.rdoBeforeAfter = New System.Windows.Forms.RadioButton() Me.rdoAtStart = New System.Windows.Forms.RadioButton() Me.rdoAtEnd = New System.Windows.Forms.RadioButton() @@ -39,7 +40,6 @@ Partial Class dlgInsertColumn Me.ucrInputPrefixForInsertedColumns = New instat.ucrInputTextBox() Me.ucrInputDefaultValue = New instat.ucrInputTextBox() Me.ucrReceiverColumnsToInsert = New instat.ucrReceiverSingle() - Me.ucrInputBeforeAfter = New instat.ucrInputComboBox() Me.ucrSelectorInseertColumns = New instat.ucrSelectorAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrDataFramesList = New instat.ucrDataFrame() @@ -120,6 +120,13 @@ Partial Class dlgInsertColumn Me.grpInsert.TabStop = False Me.grpInsert.Text = "Insert" ' + 'ucrInputBeforeAfter + ' + Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(26, 65) + Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" + Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) + Me.ucrInputBeforeAfter.TabIndex = 3 + ' 'rdoBeforeAfter ' Me.rdoBeforeAfter.AutoSize = True @@ -209,13 +216,6 @@ Partial Class dlgInsertColumn Me.ucrReceiverColumnsToInsert.Size = New System.Drawing.Size(75, 20) Me.ucrReceiverColumnsToInsert.TabIndex = 20 ' - 'ucrInputBeforeAfter - ' - Me.ucrInputBeforeAfter.Location = New System.Drawing.Point(26, 65) - Me.ucrInputBeforeAfter.Name = "ucrInputBeforeAfter" - Me.ucrInputBeforeAfter.Size = New System.Drawing.Size(93, 21) - Me.ucrInputBeforeAfter.TabIndex = 3 - ' 'ucrSelectorInseertColumns ' Me.ucrSelectorInseertColumns.Location = New System.Drawing.Point(12, 75) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index e2eb09a20c3..cd58dc5dbb9 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -84,12 +84,12 @@ Public Class dlgInsertColumn Private Sub startpo() If rdoInsertRows.Checked Then If Not nudPos.Text = "" Then - ucrBase.clsRsyntax.AddParameter("start_pos", nudPos.Value) + ucrBase.clsRsyntax.AddParameter("start_row", nudPos.Value) Else - ucrBase.clsRsyntax.RemoveParameter("start_pos") + ucrBase.clsRsyntax.RemoveParameter("start_row") End If Else - ucrBase.clsRsyntax.RemoveParameter("start_pos") + ucrBase.clsRsyntax.RemoveParameter("start_row") End If End Sub @@ -167,6 +167,10 @@ Public Class dlgInsertColumn nudInsertColumns.Visible = True lblNumberOfRowsToInsert.Visible = False lblStartPos.Visible = False + rdoAtEnd.Visible = True + rdoAtStart.Visible = True + rdoBeforeAfter.Visible = True + ucrInputBeforeAfter.Visible = True ElseIf rdoInsertRows.Checked Then @@ -178,7 +182,10 @@ Public Class dlgInsertColumn dataFrameListMaxMinPos() startpo() nudNumCols.Maximum = 1000 - grpInsert.Visible = False + rdoAtEnd.Visible = True + rdoAtStart.Visible = True + rdoBeforeAfter.Visible = False + ucrInputBeforeAfter.Visible = False addColumData() InsertParam() BeforeAfterPara() @@ -196,7 +203,7 @@ Public Class dlgInsertColumn lblNumberOfColumnsToInsert.Visible = False nudInsertColumns.Visible = False ucrReceiverColumnsToInsert.Visible = False - ucrBase.clsRsyntax.RemoveParameter("before") + End If End Sub From 064b5e5026ecd2f9f56e7920f2334da6931cabd8 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Tue, 24 May 2016 09:09:48 +0300 Subject: [PATCH 16/22] Editing Insert or Row columns --- instat/dlgInsertColumn.Designer.vb | 2 +- instat/dlgInsertColumn.vb | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 826bc11e4ac..09c687c9828 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -218,7 +218,7 @@ Partial Class dlgInsertColumn ' 'ucrSelectorInseertColumns ' - Me.ucrSelectorInseertColumns.Location = New System.Drawing.Point(12, 75) + Me.ucrSelectorInseertColumns.Location = New System.Drawing.Point(9, 75) Me.ucrSelectorInseertColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorInseertColumns.Name = "ucrSelectorInseertColumns" Me.ucrSelectorInseertColumns.Size = New System.Drawing.Size(250, 187) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index cd58dc5dbb9..85b8bbe6058 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -58,8 +58,8 @@ Public Class dlgInsertColumn Private Sub ReopenDialog() ucrDataFramesList.Reset() If rdoInsertRows.Checked Then - If nudPos.Value > ucrDataFramesList.iDataFrameLength + 1 Then - nudPos.Value = ucrDataFramesList.iDataFrameLength + 1 + If nudPos.Value = ucrDataFramesList.iDataFrameLength Then + nudPos.Value = ucrDataFramesList.iDataFrameLength ucrBase.clsRsyntax.AddParameter("number_rows", nudNumCols.Value) End If Else @@ -74,6 +74,7 @@ Public Class dlgInsertColumn RowsOrColumns() rdoAtEnd.Checked = True ucrInputBeforeAfter.SetName("After") + nudPos.Value = ucrDataFramesList.iDataFrameLength End Sub @@ -130,8 +131,8 @@ Public Class dlgInsertColumn Private Sub dataFrameListMaxMinPos() If rdoInsertRows.Checked Then - nudPos.Maximum = ucrDataFramesList.iDataFrameLength + 1 - nudPos.Value = ucrDataFramesList.iDataFrameLength + 1 + nudPos.Maximum = ucrDataFramesList.iDataFrameLength + nudPos.Value = ucrDataFramesList.iDataFrameLength Else End If End Sub @@ -171,6 +172,8 @@ Public Class dlgInsertColumn rdoAtStart.Visible = True rdoBeforeAfter.Visible = True ucrInputBeforeAfter.Visible = True + nudNumCols.Focus() + nudPos.Focus() ElseIf rdoInsertRows.Checked Then @@ -203,7 +206,7 @@ Public Class dlgInsertColumn lblNumberOfColumnsToInsert.Visible = False nudInsertColumns.Visible = False ucrReceiverColumnsToInsert.Visible = False - + nudInsertColumns.Focus() End If End Sub From 6a08f4a5a5074d01a6a5b8b23a101df7062a8d6e Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Tue, 24 May 2016 15:21:07 +0300 Subject: [PATCH 17/22] Editing Insert columns or rows --- instat/dlgInsertColumn.Designer.vb | 43 ++++++++++++++++++++++++++++++ instat/dlgInsertColumn.vb | 24 +++++++++++++++-- 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/instat/dlgInsertColumn.Designer.vb b/instat/dlgInsertColumn.Designer.vb index 09c687c9828..9718244f57d 100644 --- a/instat/dlgInsertColumn.Designer.vb +++ b/instat/dlgInsertColumn.Designer.vb @@ -43,10 +43,14 @@ Partial Class dlgInsertColumn Me.ucrSelectorInseertColumns = New instat.ucrSelectorAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrDataFramesList = New instat.ucrDataFrame() + Me.grpOPtions = New System.Windows.Forms.GroupBox() + Me.rdoBefore = New System.Windows.Forms.RadioButton() + Me.rdoAfter = New System.Windows.Forms.RadioButton() CType(Me.nudPos, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudNumCols, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpInsert.SuspendLayout() CType(Me.nudInsertColumns, System.ComponentModel.ISupportInitialize).BeginInit() + Me.grpOPtions.SuspendLayout() Me.SuspendLayout() ' 'lblStartPos @@ -239,11 +243,45 @@ Partial Class dlgInsertColumn Me.ucrDataFramesList.Size = New System.Drawing.Size(127, 41) Me.ucrDataFramesList.TabIndex = 0 ' + 'grpOPtions + ' + Me.grpOPtions.Controls.Add(Me.rdoAfter) + Me.grpOPtions.Controls.Add(Me.rdoBefore) + Me.grpOPtions.Location = New System.Drawing.Point(265, 58) + Me.grpOPtions.Name = "grpOPtions" + Me.grpOPtions.Size = New System.Drawing.Size(124, 67) + Me.grpOPtions.TabIndex = 27 + Me.grpOPtions.TabStop = False + Me.grpOPtions.Text = "OPtions" + ' + 'rdoBefore + ' + Me.rdoBefore.AutoSize = True + Me.rdoBefore.Location = New System.Drawing.Point(7, 20) + Me.rdoBefore.Name = "rdoBefore" + Me.rdoBefore.Size = New System.Drawing.Size(56, 17) + Me.rdoBefore.TabIndex = 0 + Me.rdoBefore.TabStop = True + Me.rdoBefore.Text = "Before" + Me.rdoBefore.UseVisualStyleBackColor = True + ' + 'rdoAfter + ' + Me.rdoAfter.AutoSize = True + Me.rdoAfter.Location = New System.Drawing.Point(7, 44) + Me.rdoAfter.Name = "rdoAfter" + Me.rdoAfter.Size = New System.Drawing.Size(47, 17) + Me.rdoAfter.TabIndex = 1 + Me.rdoAfter.TabStop = True + Me.rdoAfter.Text = "After" + Me.rdoAfter.UseVisualStyleBackColor = True + ' 'dlgInsertColumn ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(492, 351) + Me.Controls.Add(Me.grpOPtions) Me.Controls.Add(Me.ucrInputPrefixForInsertedColumns) Me.Controls.Add(Me.lblPrefixforInsertedColumns) Me.Controls.Add(Me.ucrInputDefaultValue) @@ -270,6 +308,8 @@ Partial Class dlgInsertColumn Me.grpInsert.ResumeLayout(False) Me.grpInsert.PerformLayout() CType(Me.nudInsertColumns, System.ComponentModel.ISupportInitialize).EndInit() + Me.grpOPtions.ResumeLayout(False) + Me.grpOPtions.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -296,4 +336,7 @@ Partial Class dlgInsertColumn Friend WithEvents ucrInputDefaultValue As ucrInputTextBox Friend WithEvents lblPrefixforInsertedColumns As Label Friend WithEvents ucrInputPrefixForInsertedColumns As ucrInputTextBox + Friend WithEvents grpOPtions As GroupBox + Friend WithEvents rdoAfter As RadioButton + Friend WithEvents rdoBefore As RadioButton End Class diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index 85b8bbe6058..d8faae8864a 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -73,6 +73,7 @@ Public Class dlgInsertColumn ucrDataFramesList.Reset() RowsOrColumns() rdoAtEnd.Checked = True + rdoAfter.Checked = True ucrInputBeforeAfter.SetName("After") nudPos.Value = ucrDataFramesList.iDataFrameLength @@ -141,6 +142,19 @@ Public Class dlgInsertColumn RowsOrColumns() End Sub + Private Sub grpOPtions_CheckedChanged(sender As Object, e As EventArgs) Handles rdoBefore.CheckedChanged, rdoAfter.CheckedChanged + OPtionstoInsert() + End Sub + + Private Sub OPtionstoInsert() + If rdoInsertRows.Checked Then + If rdoAfter.Checked Then + ucrBase.clsRsyntax.AddParameter("before", "FALSE") + ElseIf rdoBefore.Checked Then + ucrBase.clsRsyntax.AddParameter("before", "TRUE") + End If + End If + End Sub Private Sub RowsOrColumns() If rdoInsertColumns.Checked Then @@ -153,11 +167,13 @@ Public Class dlgInsertColumn dataFrameListMaxMinPos() ColName() grpInsert.Visible = True + grpOPtions.Visible = False nudInsertColumns.Maximum = 100 nudNumCols.Visible = False nudPos.Visible = False addColumData() ColsToInsert() + OPtionstoInsert() startpo() BeforeParameter() lblPrefixforInsertedColumns.Visible = True @@ -185,13 +201,14 @@ Public Class dlgInsertColumn dataFrameListMaxMinPos() startpo() nudNumCols.Maximum = 1000 - rdoAtEnd.Visible = True - rdoAtStart.Visible = True + rdoAtEnd.Visible = False + rdoAtStart.Visible = False rdoBeforeAfter.Visible = False ucrInputBeforeAfter.Visible = False addColumData() InsertParam() BeforeAfterPara() + OPtionstoInsert() ColsToInsert() ColName() BeforeParameter() @@ -207,6 +224,9 @@ Public Class dlgInsertColumn nudInsertColumns.Visible = False ucrReceiverColumnsToInsert.Visible = False nudInsertColumns.Focus() + grpInsert.Visible = False + grpOPtions.Visible = True + End If End Sub From 61ea382ca20136ee185884e41bdd167ee8eda757 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Tue, 24 May 2016 20:12:55 +0300 Subject: [PATCH 18/22] Editing Insert Rows or Columns dialog --- instat/dlgInsertColumn.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instat/dlgInsertColumn.vb b/instat/dlgInsertColumn.vb index d8faae8864a..47239daa3b0 100644 --- a/instat/dlgInsertColumn.vb +++ b/instat/dlgInsertColumn.vb @@ -159,6 +159,7 @@ Public Class dlgInsertColumn Private Sub RowsOrColumns() If rdoInsertColumns.Checked Then ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") + ucrBase.clsRsyntax.AddParameter("use_col_name_as_prefix", "TRUE") BeforeAfterPara() InsertParam() ucrBase.clsRsyntax.RemoveParameter("number_rows") @@ -196,6 +197,7 @@ Public Class dlgInsertColumn ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$insert_row_in_data") lblNumberOfRowsToInsert.Visible = True ucrBase.clsRsyntax.RemoveParameter("num_cols") + ucrBase.clsRsyntax.RemoveParameter("use_col_name_as_prefix") nudNumCols.Value = 1 NumberofColumnsOrRows() dataFrameListMaxMinPos() From b0374f47e748318deacfd58f31253a756ae547a6 Mon Sep 17 00:00:00 2001 From: Mary Mutahi Date: Mon, 30 May 2016 22:28:22 +0300 Subject: [PATCH 19/22] dlgBoxplot-organizing the designer --- instat/dlgBoxPlot.designer.vb | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/instat/dlgBoxPlot.designer.vb b/instat/dlgBoxPlot.designer.vb index 631296303a6..6cb19a94e33 100644 --- a/instat/dlgBoxPlot.designer.vb +++ b/instat/dlgBoxPlot.designer.vb @@ -37,9 +37,9 @@ Partial Class dlgBoxplot ' 'cmdOptions ' - Me.cmdOptions.Location = New System.Drawing.Point(132, 268) + Me.cmdOptions.Location = New System.Drawing.Point(138, 228) Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Size = New System.Drawing.Size(106, 26) + Me.cmdOptions.Size = New System.Drawing.Size(120, 25) Me.cmdOptions.TabIndex = 8 Me.cmdOptions.Tag = "Options" Me.cmdOptions.Text = "Plot Options" @@ -48,7 +48,7 @@ Partial Class dlgBoxplot 'lblByFactors ' Me.lblByFactors.AutoSize = True - Me.lblByFactors.Location = New System.Drawing.Point(295, 168) + Me.lblByFactors.Location = New System.Drawing.Point(275, 164) Me.lblByFactors.Name = "lblByFactors" Me.lblByFactors.Size = New System.Drawing.Size(100, 13) Me.lblByFactors.TabIndex = 2 @@ -58,7 +58,7 @@ Partial Class dlgBoxplot 'lblBySecondFactor ' Me.lblBySecondFactor.AutoSize = True - Me.lblBySecondFactor.Location = New System.Drawing.Point(295, 215) + Me.lblBySecondFactor.Location = New System.Drawing.Point(275, 209) Me.lblBySecondFactor.Name = "lblBySecondFactor" Me.lblBySecondFactor.Size = New System.Drawing.Size(140, 13) Me.lblBySecondFactor.TabIndex = 4 @@ -67,9 +67,9 @@ Partial Class dlgBoxplot ' 'cmdBoxPlotOptions ' - Me.cmdBoxPlotOptions.Location = New System.Drawing.Point(10, 268) + Me.cmdBoxPlotOptions.Location = New System.Drawing.Point(10, 228) Me.cmdBoxPlotOptions.Name = "cmdBoxPlotOptions" - Me.cmdBoxPlotOptions.Size = New System.Drawing.Size(106, 26) + Me.cmdBoxPlotOptions.Size = New System.Drawing.Size(120, 25) Me.cmdBoxPlotOptions.TabIndex = 7 Me.cmdBoxPlotOptions.Tag = "BoxPlot_Options" Me.cmdBoxPlotOptions.Text = "BoxPlot Options" @@ -78,7 +78,7 @@ Partial Class dlgBoxplot 'chkHorizontalBoxplot ' Me.chkHorizontalBoxplot.AutoSize = True - Me.chkHorizontalBoxplot.Location = New System.Drawing.Point(10, 203) + Me.chkHorizontalBoxplot.Location = New System.Drawing.Point(10, 202) Me.chkHorizontalBoxplot.Name = "chkHorizontalBoxplot" Me.chkHorizontalBoxplot.Size = New System.Drawing.Size(111, 17) Me.chkHorizontalBoxplot.TabIndex = 6 @@ -88,19 +88,19 @@ Partial Class dlgBoxplot ' 'ucrVariablesAsFactorForBoxplot ' - Me.ucrVariablesAsFactorForBoxplot.Location = New System.Drawing.Point(283, 29) + Me.ucrVariablesAsFactorForBoxplot.Location = New System.Drawing.Point(255, 25) Me.ucrVariablesAsFactorForBoxplot.Name = "ucrVariablesAsFactorForBoxplot" - Me.ucrVariablesAsFactorForBoxplot.Size = New System.Drawing.Size(125, 136) + Me.ucrVariablesAsFactorForBoxplot.Size = New System.Drawing.Size(120, 130) Me.ucrVariablesAsFactorForBoxplot.TabIndex = 1 Me.ucrVariablesAsFactorForBoxplot.ucrVariableSelector = Nothing ' 'ucrSecondFactorReceiver ' - Me.ucrSecondFactorReceiver.Location = New System.Drawing.Point(295, 231) + Me.ucrSecondFactorReceiver.Location = New System.Drawing.Point(275, 222) Me.ucrSecondFactorReceiver.Margin = New System.Windows.Forms.Padding(0) Me.ucrSecondFactorReceiver.Name = "ucrSecondFactorReceiver" Me.ucrSecondFactorReceiver.Selector = Nothing - Me.ucrSecondFactorReceiver.Size = New System.Drawing.Size(106, 26) + Me.ucrSecondFactorReceiver.Size = New System.Drawing.Size(120, 20) Me.ucrSecondFactorReceiver.TabIndex = 5 ' 'ucrSelectorBoxPlot @@ -108,37 +108,37 @@ Partial Class dlgBoxplot Me.ucrSelectorBoxPlot.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorBoxPlot.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorBoxPlot.Name = "ucrSelectorBoxPlot" - Me.ucrSelectorBoxPlot.Size = New System.Drawing.Size(230, 190) + Me.ucrSelectorBoxPlot.Size = New System.Drawing.Size(210, 180) Me.ucrSelectorBoxPlot.TabIndex = 0 ' 'ucrByFactorsReceiver ' - Me.ucrByFactorsReceiver.Location = New System.Drawing.Point(295, 184) + Me.ucrByFactorsReceiver.Location = New System.Drawing.Point(275, 179) Me.ucrByFactorsReceiver.Margin = New System.Windows.Forms.Padding(0) Me.ucrByFactorsReceiver.Name = "ucrByFactorsReceiver" Me.ucrByFactorsReceiver.Selector = Nothing - Me.ucrByFactorsReceiver.Size = New System.Drawing.Size(106, 26) + Me.ucrByFactorsReceiver.Size = New System.Drawing.Size(120, 20) Me.ucrByFactorsReceiver.TabIndex = 3 ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(10, 309) + Me.ucrBase.Location = New System.Drawing.Point(10, 291) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 51) + Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 9 ' 'ucrSaveBoxplot ' - Me.ucrSaveBoxplot.Location = New System.Drawing.Point(10, 230) + Me.ucrSaveBoxplot.Location = New System.Drawing.Point(10, 262) Me.ucrSaveBoxplot.Name = "ucrSaveBoxplot" - Me.ucrSaveBoxplot.Size = New System.Drawing.Size(263, 32) + Me.ucrSaveBoxplot.Size = New System.Drawing.Size(265, 20) Me.ucrSaveBoxplot.TabIndex = 10 ' 'dlgBoxplot ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(435, 365) + Me.ClientSize = New System.Drawing.Size(419, 344) Me.Controls.Add(Me.ucrSaveBoxplot) Me.Controls.Add(Me.ucrVariablesAsFactorForBoxplot) Me.Controls.Add(Me.chkHorizontalBoxplot) From 41738a2bccc8207d9b768db1bf628fb15b6b7a79 Mon Sep 17 00:00:00 2001 From: Mary Mutahi Date: Mon, 30 May 2016 23:08:32 +0300 Subject: [PATCH 20/22] dlgBarAndPiechart-organizing the designer --- instat/dlgBarAndPieChart.Designer.vb | 46 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/instat/dlgBarAndPieChart.Designer.vb b/instat/dlgBarAndPieChart.Designer.vb index c3e8ba57451..bcaa846df18 100644 --- a/instat/dlgBarAndPieChart.Designer.vb +++ b/instat/dlgBarAndPieChart.Designer.vb @@ -41,7 +41,7 @@ Partial Class dlgBarAndPieChart 'lblFactor ' Me.lblFactor.AutoSize = True - Me.lblFactor.Location = New System.Drawing.Point(273, 110) + Me.lblFactor.Location = New System.Drawing.Point(255, 80) Me.lblFactor.Name = "lblFactor" Me.lblFactor.Size = New System.Drawing.Size(40, 13) Me.lblFactor.TabIndex = 2 @@ -51,7 +51,7 @@ Partial Class dlgBarAndPieChart 'lblSecondFactor ' Me.lblSecondFactor.AutoSize = True - Me.lblSecondFactor.Location = New System.Drawing.Point(276, 156) + Me.lblSecondFactor.Location = New System.Drawing.Point(255, 134) Me.lblSecondFactor.Name = "lblSecondFactor" Me.lblSecondFactor.Size = New System.Drawing.Size(77, 13) Me.lblSecondFactor.TabIndex = 4 @@ -61,9 +61,9 @@ Partial Class dlgBarAndPieChart 'cmdBarChartOptions ' Me.cmdBarChartOptions.Enabled = False - Me.cmdBarChartOptions.Location = New System.Drawing.Point(12, 237) + Me.cmdBarChartOptions.Location = New System.Drawing.Point(10, 237) Me.cmdBarChartOptions.Name = "cmdBarChartOptions" - Me.cmdBarChartOptions.Size = New System.Drawing.Size(152, 23) + Me.cmdBarChartOptions.Size = New System.Drawing.Size(120, 25) Me.cmdBarChartOptions.TabIndex = 6 Me.cmdBarChartOptions.Tag = "Bar_Chart_Options" Me.cmdBarChartOptions.Text = "Bar Chart Options" @@ -71,9 +71,9 @@ Partial Class dlgBarAndPieChart ' 'cmdOptions ' - Me.cmdOptions.Location = New System.Drawing.Point(174, 237) + Me.cmdOptions.Location = New System.Drawing.Point(148, 237) Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Size = New System.Drawing.Size(96, 23) + Me.cmdOptions.Size = New System.Drawing.Size(120, 25) Me.cmdOptions.TabIndex = 7 Me.cmdOptions.Tag = "Plot_Options..." Me.cmdOptions.Text = "Plot Options..." @@ -82,7 +82,7 @@ Partial Class dlgBarAndPieChart 'rdoBarChart ' Me.rdoBarChart.AutoSize = True - Me.rdoBarChart.Location = New System.Drawing.Point(57, 15) + Me.rdoBarChart.Location = New System.Drawing.Point(10, 10) Me.rdoBarChart.Name = "rdoBarChart" Me.rdoBarChart.Size = New System.Drawing.Size(69, 17) Me.rdoBarChart.TabIndex = 0 @@ -94,7 +94,7 @@ Partial Class dlgBarAndPieChart 'rdoPieChart ' Me.rdoPieChart.AutoSize = True - Me.rdoPieChart.Location = New System.Drawing.Point(280, 15) + Me.rdoPieChart.Location = New System.Drawing.Point(280, 10) Me.rdoPieChart.Name = "rdoPieChart" Me.rdoPieChart.Size = New System.Drawing.Size(68, 17) Me.rdoPieChart.TabIndex = 1 @@ -107,17 +107,17 @@ Partial Class dlgBarAndPieChart ' Me.grpSelection.Controls.Add(Me.rdoBarChart) Me.grpSelection.Controls.Add(Me.rdoPieChart) - Me.grpSelection.Location = New System.Drawing.Point(12, 5) + Me.grpSelection.Location = New System.Drawing.Point(10, 3) Me.grpSelection.Name = "grpSelection" - Me.grpSelection.Size = New System.Drawing.Size(410, 41) + Me.grpSelection.Size = New System.Drawing.Size(397, 40) Me.grpSelection.TabIndex = 0 Me.grpSelection.TabStop = False ' 'cmdPieChartOptions ' - Me.cmdPieChartOptions.Location = New System.Drawing.Point(12, 237) + Me.cmdPieChartOptions.Location = New System.Drawing.Point(11, 237) Me.cmdPieChartOptions.Name = "cmdPieChartOptions" - Me.cmdPieChartOptions.Size = New System.Drawing.Size(152, 23) + Me.cmdPieChartOptions.Size = New System.Drawing.Size(120, 25) Me.cmdPieChartOptions.TabIndex = 9 Me.cmdPieChartOptions.Tag = "Pie_Chart_Options" Me.cmdPieChartOptions.Text = "Pie Chart Options" @@ -125,49 +125,49 @@ Partial Class dlgBarAndPieChart ' 'ucrSecondReceiver ' - Me.ucrSecondReceiver.Location = New System.Drawing.Point(276, 169) + Me.ucrSecondReceiver.Location = New System.Drawing.Point(255, 147) Me.ucrSecondReceiver.Margin = New System.Windows.Forms.Padding(0) Me.ucrSecondReceiver.Name = "ucrSecondReceiver" Me.ucrSecondReceiver.Selector = Nothing - Me.ucrSecondReceiver.Size = New System.Drawing.Size(106, 26) + Me.ucrSecondReceiver.Size = New System.Drawing.Size(120, 20) Me.ucrSecondReceiver.TabIndex = 5 ' 'ucrFactorReceiver ' - Me.ucrFactorReceiver.Location = New System.Drawing.Point(273, 123) + Me.ucrFactorReceiver.Location = New System.Drawing.Point(255, 96) Me.ucrFactorReceiver.Margin = New System.Windows.Forms.Padding(0) Me.ucrFactorReceiver.Name = "ucrFactorReceiver" Me.ucrFactorReceiver.Selector = Nothing - Me.ucrFactorReceiver.Size = New System.Drawing.Size(106, 26) + Me.ucrFactorReceiver.Size = New System.Drawing.Size(120, 20) Me.ucrFactorReceiver.TabIndex = 3 ' 'ucrBarChartSelector ' - Me.ucrBarChartSelector.Location = New System.Drawing.Point(12, 49) + Me.ucrBarChartSelector.Location = New System.Drawing.Point(10, 46) Me.ucrBarChartSelector.Margin = New System.Windows.Forms.Padding(0) Me.ucrBarChartSelector.Name = "ucrBarChartSelector" - Me.ucrBarChartSelector.Size = New System.Drawing.Size(242, 185) + Me.ucrBarChartSelector.Size = New System.Drawing.Size(210, 180) Me.ucrBarChartSelector.TabIndex = 1 ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 293) + Me.ucrBase.Location = New System.Drawing.Point(12, 304) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 9 ' 'ucrSaveBar ' - Me.ucrSaveBar.Location = New System.Drawing.Point(12, 265) + Me.ucrSaveBar.Location = New System.Drawing.Point(10, 273) Me.ucrSaveBar.Name = "ucrSaveBar" - Me.ucrSaveBar.Size = New System.Drawing.Size(265, 27) + Me.ucrSaveBar.Size = New System.Drawing.Size(265, 20) Me.ucrSaveBar.TabIndex = 8 ' 'dlgBarAndPieChart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(428, 348) + Me.ClientSize = New System.Drawing.Size(419, 358) Me.Controls.Add(Me.ucrSaveBar) Me.Controls.Add(Me.grpSelection) Me.Controls.Add(Me.cmdOptions) From 9daf5289ea9fa7fe6dfd12cf4dfa5d75aef56133 Mon Sep 17 00:00:00 2001 From: Mary Mutahi Date: Tue, 31 May 2016 00:09:49 +0300 Subject: [PATCH 21/22] dlgCCA-organizing the designer --- instat/dlgCanonicalCorrelationAnalysis.Designer.vb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/instat/dlgCanonicalCorrelationAnalysis.Designer.vb b/instat/dlgCanonicalCorrelationAnalysis.Designer.vb index 772b2e4fb25..e7c5e9a51c2 100644 --- a/instat/dlgCanonicalCorrelationAnalysis.Designer.vb +++ b/instat/dlgCanonicalCorrelationAnalysis.Designer.vb @@ -57,7 +57,7 @@ Partial Class dlgCanonicalCorrelationAnalysis ' Me.cmdCCAOptions.Location = New System.Drawing.Point(10, 246) Me.cmdCCAOptions.Name = "cmdCCAOptions" - Me.cmdCCAOptions.Size = New System.Drawing.Size(94, 23) + Me.cmdCCAOptions.Size = New System.Drawing.Size(120, 25) Me.cmdCCAOptions.TabIndex = 7 Me.cmdCCAOptions.Tag = "CCA_Options..." Me.cmdCCAOptions.Text = "CCA Options..." @@ -66,7 +66,7 @@ Partial Class dlgCanonicalCorrelationAnalysis 'chkSaveResult ' Me.chkSaveResult.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.chkSaveResult.Location = New System.Drawing.Point(10, 212) + Me.chkSaveResult.Location = New System.Drawing.Point(10, 282) Me.chkSaveResult.Name = "chkSaveResult" Me.chkSaveResult.Size = New System.Drawing.Size(90, 24) Me.chkSaveResult.TabIndex = 8 @@ -102,14 +102,14 @@ Partial Class dlgCanonicalCorrelationAnalysis ' 'ucrBaseCCA ' - Me.ucrBaseCCA.Location = New System.Drawing.Point(10, 281) + Me.ucrBaseCCA.Location = New System.Drawing.Point(10, 312) Me.ucrBaseCCA.Name = "ucrBaseCCA" Me.ucrBaseCCA.Size = New System.Drawing.Size(410, 52) Me.ucrBaseCCA.TabIndex = 0 ' 'ucrResultName ' - Me.ucrResultName.Location = New System.Drawing.Point(106, 211) + Me.ucrResultName.Location = New System.Drawing.Point(106, 281) Me.ucrResultName.Name = "ucrResultName" Me.ucrResultName.Size = New System.Drawing.Size(145, 21) Me.ucrResultName.TabIndex = 10 @@ -118,7 +118,7 @@ Partial Class dlgCanonicalCorrelationAnalysis ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(419, 334) + Me.ClientSize = New System.Drawing.Size(419, 365) Me.Controls.Add(Me.ucrResultName) Me.Controls.Add(Me.chkSaveResult) Me.Controls.Add(Me.cmdCCAOptions) From a296c89d88ba6e8d772585ab5cf0f155008a0858 Mon Sep 17 00:00:00 2001 From: Mary Mutahi Date: Tue, 31 May 2016 00:18:46 +0300 Subject: [PATCH 22/22] dlgCopySheet-organizing the designer --- instat/dlgCopySheet.Designer.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instat/dlgCopySheet.Designer.vb b/instat/dlgCopySheet.Designer.vb index fd674919ce3..ce8c63ce230 100644 --- a/instat/dlgCopySheet.Designer.vb +++ b/instat/dlgCopySheet.Designer.vb @@ -30,14 +30,14 @@ Partial Class dlgCopySheet ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 59) + Me.ucrBase.Location = New System.Drawing.Point(10, 69) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 0 ' 'ucrDataFrameCopySheets ' - Me.ucrDataFrameCopySheets.Location = New System.Drawing.Point(13, 13) + Me.ucrDataFrameCopySheets.Location = New System.Drawing.Point(10, 10) Me.ucrDataFrameCopySheets.Margin = New System.Windows.Forms.Padding(0) Me.ucrDataFrameCopySheets.Name = "ucrDataFrameCopySheets" Me.ucrDataFrameCopySheets.Size = New System.Drawing.Size(120, 40) @@ -46,7 +46,7 @@ Partial Class dlgCopySheet 'lblNewSheetName ' Me.lblNewSheetName.AutoSize = True - Me.lblNewSheetName.Location = New System.Drawing.Point(148, 33) + Me.lblNewSheetName.Location = New System.Drawing.Point(150, 37) Me.lblNewSheetName.Name = "lblNewSheetName" Me.lblNewSheetName.Size = New System.Drawing.Size(91, 13) Me.lblNewSheetName.TabIndex = 2 @@ -64,7 +64,7 @@ Partial Class dlgCopySheet ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(437, 123) + Me.ClientSize = New System.Drawing.Size(419, 123) Me.Controls.Add(Me.ucrNewSheetName) Me.Controls.Add(Me.lblNewSheetName) Me.Controls.Add(Me.ucrDataFrameCopySheets)