From a35d675022c41232f6f673177c2baf4f06547093 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 11 Feb 2022 12:38:24 +0300 Subject: [PATCH 01/39] initial bug fix --- instat/dlgPasteNewDataFrame.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instat/dlgPasteNewDataFrame.vb b/instat/dlgPasteNewDataFrame.vb index 32d0a021d8f..892792cd51a 100644 --- a/instat/dlgPasteNewDataFrame.vb +++ b/instat/dlgPasteNewDataFrame.vb @@ -126,6 +126,8 @@ Public Class dlgPasteNewDataFrame 'However this has been added to achieve reproducibility in future Try Dim clipBoardText As String = My.Computer.Clipboard.GetText + 'I added this code 11/02/2022. But it has a bug + clipBoardText = clipBoardText.Replace("""", "\""") Dim arrStrTemp() As String = clipBoardText.Split(New String() {Environment.NewLine}, StringSplitOptions.None) If arrStrTemp.Length > 1000 Then MsgBox("Requested clipboard data has more than 1000 rows. Only a maximum of 1000 rows can be pasted") From e395efb9a4beec3037edefe02b4b6c46b2c62946 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 11 Feb 2022 14:19:32 +0300 Subject: [PATCH 02/39] fixed double qutes --- instat/dlgPasteNewDataFrame.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgPasteNewDataFrame.vb b/instat/dlgPasteNewDataFrame.vb index 892792cd51a..cbafb4be16c 100644 --- a/instat/dlgPasteNewDataFrame.vb +++ b/instat/dlgPasteNewDataFrame.vb @@ -126,7 +126,7 @@ Public Class dlgPasteNewDataFrame 'However this has been added to achieve reproducibility in future Try Dim clipBoardText As String = My.Computer.Clipboard.GetText - 'I added this code 11/02/2022. But it has a bug + 'escape any double quotes because of how clipr is implemented. See issue #7199 for more details clipBoardText = clipBoardText.Replace("""", "\""") Dim arrStrTemp() As String = clipBoardText.Split(New String() {Environment.NewLine}, StringSplitOptions.None) If arrStrTemp.Length > 1000 Then From 9b56c39528835ad7db2c61d853a81bc1cfa03b5c Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 15 Feb 2022 15:48:16 +0300 Subject: [PATCH 03/39] Added copy paste functionality --- instat/dlgPasteNewColumns.Designer.vb | 159 ++++++++++++++++++++++- instat/dlgPasteNewColumns.vb | 177 +++++++++++++++++++++++++- 2 files changed, 333 insertions(+), 3 deletions(-) diff --git a/instat/dlgPasteNewColumns.Designer.vb b/instat/dlgPasteNewColumns.Designer.vb index d68cd84fe90..3691d8300b9 100644 --- a/instat/dlgPasteNewColumns.Designer.vb +++ b/instat/dlgPasteNewColumns.Designer.vb @@ -20,22 +20,177 @@ Partial Class dlgPasteNewColumns 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() + Me.lblConfirmText = New System.Windows.Forms.Label() + Me.grdDataPreview = New unvell.ReoGrid.ReoGridControl() + Me.btnRefreshPreview = New System.Windows.Forms.Button() + Me.panelNoDataPreview = New System.Windows.Forms.Panel() + Me.lblNoDataPreview = New System.Windows.Forms.Label() + Me.ucrBase = New instat.ucrButtons() + Me.ucrChkRowHeader = New instat.ucrCheck() + Me.ucrDataFrameSelected = New instat.ucrDataFrame() + Me.lblLinesToPreview = New System.Windows.Forms.Label() + Me.ucrNudPreviewLines = New instat.ucrNud() + Me.lblPreviewHeader = New System.Windows.Forms.Label() + Me.panelNoDataPreview.SuspendLayout() Me.SuspendLayout() ' + 'lblConfirmText + ' + Me.lblConfirmText.AutoSize = True + Me.lblConfirmText.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblConfirmText.Location = New System.Drawing.Point(7, 157) + Me.lblConfirmText.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblConfirmText.Name = "lblConfirmText" + Me.lblConfirmText.Size = New System.Drawing.Size(189, 13) + Me.lblConfirmText.TabIndex = 5 + Me.lblConfirmText.Text = "Click Ok to paste data to new columns" + ' + 'grdDataPreview + ' + Me.grdDataPreview.BackColor = System.Drawing.Color.White + Me.grdDataPreview.ColumnHeaderContextMenuStrip = Nothing + Me.grdDataPreview.LeadHeaderContextMenuStrip = Nothing + Me.grdDataPreview.Location = New System.Drawing.Point(228, 37) + Me.grdDataPreview.Name = "grdDataPreview" + Me.grdDataPreview.Readonly = True + Me.grdDataPreview.RowHeaderContextMenuStrip = Nothing + Me.grdDataPreview.Script = Nothing + Me.grdDataPreview.SheetTabContextMenuStrip = Nothing + Me.grdDataPreview.SheetTabNewButtonVisible = False + Me.grdDataPreview.SheetTabVisible = True + Me.grdDataPreview.SheetTabWidth = 60 + Me.grdDataPreview.ShowScrollEndSpacing = True + Me.grdDataPreview.Size = New System.Drawing.Size(404, 166) + Me.grdDataPreview.TabIndex = 13 + ' + 'btnRefreshPreview + ' + Me.btnRefreshPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnRefreshPreview.Location = New System.Drawing.Point(530, 11) + Me.btnRefreshPreview.Name = "btnRefreshPreview" + Me.btnRefreshPreview.Size = New System.Drawing.Size(100, 23) + Me.btnRefreshPreview.TabIndex = 17 + Me.btnRefreshPreview.Text = "Refresh Preview" + Me.btnRefreshPreview.UseVisualStyleBackColor = True + ' + 'panelNoDataPreview + ' + Me.panelNoDataPreview.Controls.Add(Me.lblNoDataPreview) + Me.panelNoDataPreview.Location = New System.Drawing.Point(228, 37) + Me.panelNoDataPreview.Name = "panelNoDataPreview" + Me.panelNoDataPreview.Size = New System.Drawing.Size(402, 166) + Me.panelNoDataPreview.TabIndex = 18 + ' + 'lblNoDataPreview + ' + Me.lblNoDataPreview.AutoSize = True + Me.lblNoDataPreview.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblNoDataPreview.Location = New System.Drawing.Point(121, 64) + Me.lblNoDataPreview.Name = "lblNoDataPreview" + Me.lblNoDataPreview.Size = New System.Drawing.Size(168, 25) + Me.lblNoDataPreview.TabIndex = 0 + Me.lblNoDataPreview.Text = "No Data Loaded" + ' + 'ucrBase + ' + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(10, 214) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 6 + ' + 'ucrChkRowHeader + ' + Me.ucrChkRowHeader.AutoSize = True + Me.ucrChkRowHeader.Checked = False + Me.ucrChkRowHeader.Location = New System.Drawing.Point(10, 73) + Me.ucrChkRowHeader.Name = "ucrChkRowHeader" + Me.ucrChkRowHeader.Size = New System.Drawing.Size(198, 23) + Me.ucrChkRowHeader.TabIndex = 1 + ' + 'ucrDataFrameSelected + ' + Me.ucrDataFrameSelected.AutoSize = True + Me.ucrDataFrameSelected.bDropUnusedFilterLevels = False + Me.ucrDataFrameSelected.bUseCurrentFilter = True + Me.ucrDataFrameSelected.Location = New System.Drawing.Point(10, 9) + Me.ucrDataFrameSelected.Margin = New System.Windows.Forms.Padding(0) + Me.ucrDataFrameSelected.Name = "ucrDataFrameSelected" + Me.ucrDataFrameSelected.Size = New System.Drawing.Size(151, 50) + Me.ucrDataFrameSelected.TabIndex = 0 + ' + 'lblLinesToPreview + ' + Me.lblLinesToPreview.AutoSize = True + Me.lblLinesToPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblLinesToPreview.Location = New System.Drawing.Point(379, 17) + Me.lblLinesToPreview.Name = "lblLinesToPreview" + Me.lblLinesToPreview.Size = New System.Drawing.Size(88, 13) + Me.lblLinesToPreview.TabIndex = 19 + Me.lblLinesToPreview.Text = "Lines to Preview:" + ' + 'ucrNudPreviewLines + ' + Me.ucrNudPreviewLines.AutoSize = True + Me.ucrNudPreviewLines.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPreviewLines.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudPreviewLines.Location = New System.Drawing.Point(473, 13) + Me.ucrNudPreviewLines.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrNudPreviewLines.Maximum = New Decimal(New Integer() {10000, 0, 0, 0}) + Me.ucrNudPreviewLines.Minimum = New Decimal(New Integer() {10, 0, 0, 0}) + Me.ucrNudPreviewLines.Name = "ucrNudPreviewLines" + Me.ucrNudPreviewLines.Size = New System.Drawing.Size(50, 20) + Me.ucrNudPreviewLines.TabIndex = 20 + Me.ucrNudPreviewLines.Value = New Decimal(New Integer() {10, 0, 0, 0}) + ' + 'lblPreviewHeader + ' + Me.lblPreviewHeader.AutoSize = True + Me.lblPreviewHeader.Location = New System.Drawing.Point(228, 17) + Me.lblPreviewHeader.Name = "lblPreviewHeader" + Me.lblPreviewHeader.Size = New System.Drawing.Size(119, 13) + Me.lblPreviewHeader.TabIndex = 21 + Me.lblPreviewHeader.Text = "Preview of copied data:" + ' 'dlgPasteNewColumns ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(533, 292) + Me.ClientSize = New System.Drawing.Size(637, 273) + Me.Controls.Add(Me.lblPreviewHeader) + Me.Controls.Add(Me.lblLinesToPreview) + Me.Controls.Add(Me.ucrNudPreviewLines) + Me.Controls.Add(Me.btnRefreshPreview) + Me.Controls.Add(Me.panelNoDataPreview) + Me.Controls.Add(Me.grdDataPreview) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.lblConfirmText) + Me.Controls.Add(Me.ucrChkRowHeader) + Me.Controls.Add(Me.ucrDataFrameSelected) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "dlgPasteNewColumns" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Paste Data to New Column(s)" + Me.panelNoDataPreview.ResumeLayout(False) + Me.panelNoDataPreview.PerformLayout() Me.ResumeLayout(False) + Me.PerformLayout() End Sub + + Friend WithEvents ucrDataFrameSelected As ucrDataFrame + Friend WithEvents ucrChkRowHeader As ucrCheck + Friend WithEvents lblConfirmText As Label + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents grdDataPreview As unvell.ReoGrid.ReoGridControl + Friend WithEvents btnRefreshPreview As Button + Friend WithEvents panelNoDataPreview As Panel + Friend WithEvents lblNoDataPreview As Label + Friend WithEvents lblLinesToPreview As Label + Friend WithEvents ucrNudPreviewLines As ucrNud + Friend WithEvents lblPreviewHeader As Label End Class diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index 506442412c2..898ceddea81 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -1,5 +1,180 @@ -Public Class dlgPasteNewColumns +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . +Imports RDotNet +Imports instat.Translations +Public Class dlgPasteNewColumns + Private bFirstLoad As Boolean = True + Private bReset As Boolean = True + Private clsPasteFunction As RFunction + 'used to prevent TestOkEnabled from being called multiple times when loading the dialog. + Private bIsOnDialogLoad As Boolean + Private Sub dlgPasteNewColumns_Load(sender As Object, e As EventArgs) Handles MyBase.Load + bIsOnDialogLoad = True + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + bFirstLoad = False + End If + If bReset Then + SetDefaults() + End If + 'reset the clip board data parameter value + SetClipBoardDataParameter() + SetRCodeForControls(bReset) + bReset = False + bIsOnDialogLoad = False + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + 'todo. attach the help id later + 'ucrBase.iHelpTopicID = 332 + + ucrDataFrameSelected.SetText("Paste copied data to:") + ucrDataFrameSelected.SetParameter(New RParameter("data_name", 0)) + ucrDataFrameSelected.SetParameterIsString() + + ucrChkRowHeader.SetText("First row is header") + ucrChkRowHeader.SetParameter(New RParameter("first_clip_row_is_header", 1)) + + ucrNudPreviewLines.Minimum = 10 + End Sub + + Private Sub SetDefaults() + clsPasteFunction = New RFunction + + ucrNudPreviewLines.Value = 10 + ucrDataFrameSelected.Reset() + + clsPasteFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$paste_from_clipboard") + clsPasteFunction.AddParameter("first_clip_row_is_header", "TRUE", iPosition:=0) + SetClipBoardDataParameter() + ucrBase.clsRsyntax.SetBaseRFunction(clsPasteFunction) + End Sub + + Private Sub SetRCodeForControls(bReset As Boolean) + ucrDataFrameSelected.SetRCode(clsPasteFunction, bReset) + ucrChkRowHeader.SetRCode(clsPasteFunction, bReset) + End Sub + + Private Sub TestOkEnabled() + ucrBase.OKEnabled(Not String.IsNullOrEmpty(ucrDataFrameSelected.strCurrDataFrame) AndAlso ValidateAndPreviewCopiedData()) + End Sub + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOkEnabled() End Sub + + Private Sub ucrControls_ControlContentsChanged(ucrchangedControl As ucrCore) Handles ucrDataFrameSelected.ControlContentsChanged, ucrChkRowHeader.ControlContentsChanged, ucrNudPreviewLines.ControlContentsChanged + If Not bIsOnDialogLoad Then + TestOkEnabled() + End If + End Sub + + Private Sub btnRefreshPreview_Click(sender As Object, e As EventArgs) Handles btnRefreshPreview.Click + SetClipBoardDataParameter() + TestOkEnabled() + End Sub + + Public Sub SetClipBoardDataParameter() + 'please note addition of 'clip_board_text' parameter makes the execution of the R code take longer + 'compared to letting R read from the clipboard dierectly. + 'However this has been added to achieve reproducibility in future + Try + 'escape any double quotes because of how clipr is implemented. See issue #7199 for more details + 'clipboard data may have an empty line which is ignored by clipr so just trim it here to get accurate length + Dim clipBoardText As String = My.Computer.Clipboard.GetText().Replace("""", "\""").Trim() + Dim arrStrTemp() As String = clipBoardText.Split(New String() {Environment.NewLine}, StringSplitOptions.None) + If arrStrTemp.Length > 1000 Then + MsgBox("Requested clipboard data has more than 1000 rows. Only a maximum of 1000 rows can be pasted") + clsPasteFunction.AddParameter("clip_board_text", Chr(34) & "" & Chr(34), iPosition:=1) + Else + clsPasteFunction.AddParameter("clip_board_text", Chr(34) & clipBoardText & Chr(34), iPosition:=1) + End If + Catch ex As Exception + 'this error could be due to large clipboard data + MsgBox("Requested clipboard operation did not succeed. Large data detected") + End Try + End Sub + + ''' + ''' validates copied data and displays it for preview. + ''' returns true if copied data can be pasted to the selected data frame or false if not + ''' + ''' + Private Function ValidateAndPreviewCopiedData() As Boolean + Try + 'set feedback controls default states + panelNoDataPreview.Visible = True + lblConfirmText.Text = "Could not preview data. Cannot be pasted." + lblConfirmText.ForeColor = Color.Red + + 'use clipr package to check if structure of data can be pasted to a data frame + Dim dfTemp As DataFrame + Dim clsTempImport As New RFunction + clsTempImport.SetPackageName("clipr") + clsTempImport.SetRCommand("read_clip_tbl") + clsTempImport.AddParameter("x", clsPasteFunction.GetParameter("clip_board_text").strArgumentValue, iPosition:=0) + clsTempImport.AddParameter("header", If(ucrChkRowHeader.Checked, "TRUE", "FALSE"), iPosition:=1) + + 'get the pasted data produced by clipr + dfTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsTempImport.ToScript(), bSilent:=True)?.AsDataFrame + If dfTemp Is Nothing Then + Return False + End If + + lblConfirmText.Text = "Number of columns: " & dfTemp.ColumnCount & Environment.NewLine & + "Number of rows: " & dfTemp.RowCount & Environment.NewLine + + 'validate allowed number of rows + If dfTemp.RowCount = 0 Then + lblConfirmText.Text = lblConfirmText.Text & "No copied data detected." + Return False + ElseIf dfTemp.RowCount < ucrDataFrameSelected.iDataFrameLength Then + lblConfirmText.Text = lblConfirmText.Text & "Too few rows to paste into this data frame. This data frame requires " & ucrDataFrameSelected.iDataFrameLength & " rows." + 'please note, we could allow few rows to be pasted. the R code is already set up to allow + 'but as stated in issue #5991 by Danny this is unlikely to be the correct solution. + 'Left here for reference + 'lblConfirmText.Text = lblConfirmText.Text & Environment.NewLine & + ' (ucrDataFrameSelected.iDataFrameLength - dfTemp.RowCount) & " missing values will be added." + Return False + ElseIf dfTemp.RowCount > ucrDataFrameSelected.iDataFrameLength Then + lblConfirmText.Text = lblConfirmText.Text & "Too many rows to paste into this data frame. This data frame requires " & ucrDataFrameSelected.iDataFrameLength & " rows." + Return False + Else + lblConfirmText.Text = lblConfirmText.Text & "Correct length." + End If + + 'show the data preview only + clsTempImport.AddParameter("nrows", ucrNudPreviewLines.Value, iPosition:=2) + dfTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsTempImport.ToScript(), bSilent:=True)?.AsDataFrame + frmMain.clsGrids.FillSheet(dfTemp, "temp", grdDataPreview, bIncludeDataTypes:=False, iColMax:=frmMain.clsGrids.iMaxCols) + + panelNoDataPreview.Visible = False + lblConfirmText.ForeColor = Color.Green + + Return True + Catch ex As Exception + lblConfirmText.Text = "Could not preview data. Cannot be pasted." + panelNoDataPreview.Visible = True + Return False + End Try + End Function + End Class \ No newline at end of file From 29428b66b85f5120d3285e6d3994e51fa866bcfc Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 15 Feb 2022 18:53:42 +0300 Subject: [PATCH 04/39] Added the necessary R paste commands Modified paste new columns dialog. --- instat/dlgPasteNewColumns.Designer.vb | 12 ++-- instat/dlgPasteNewColumns.vb | 20 ++++-- instat/dlgPasteNewDataFrame.Designer.vb | 8 +-- instat/dlgPasteNewDataFrame.vb | 64 +++++++++---------- instat/static/InstatObject/R/data_object_R6.R | 34 ++++++++-- 5 files changed, 80 insertions(+), 58 deletions(-) diff --git a/instat/dlgPasteNewColumns.Designer.vb b/instat/dlgPasteNewColumns.Designer.vb index 3691d8300b9..e7c9e635102 100644 --- a/instat/dlgPasteNewColumns.Designer.vb +++ b/instat/dlgPasteNewColumns.Designer.vb @@ -38,12 +38,12 @@ Partial Class dlgPasteNewColumns ' 'lblConfirmText ' - Me.lblConfirmText.AutoSize = True + Me.lblConfirmText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.lblConfirmText.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblConfirmText.Location = New System.Drawing.Point(7, 157) + Me.lblConfirmText.Location = New System.Drawing.Point(7, 95) Me.lblConfirmText.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblConfirmText.Name = "lblConfirmText" - Me.lblConfirmText.Size = New System.Drawing.Size(189, 13) + Me.lblConfirmText.Size = New System.Drawing.Size(201, 108) Me.lblConfirmText.TabIndex = 5 Me.lblConfirmText.Text = "Click Ok to paste data to new columns" ' @@ -68,7 +68,7 @@ Partial Class dlgPasteNewColumns 'btnRefreshPreview ' Me.btnRefreshPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnRefreshPreview.Location = New System.Drawing.Point(530, 11) + Me.btnRefreshPreview.Location = New System.Drawing.Point(531, 11) Me.btnRefreshPreview.Name = "btnRefreshPreview" Me.btnRefreshPreview.Size = New System.Drawing.Size(100, 23) Me.btnRefreshPreview.TabIndex = 17 @@ -105,7 +105,7 @@ Partial Class dlgPasteNewColumns ' Me.ucrChkRowHeader.AutoSize = True Me.ucrChkRowHeader.Checked = False - Me.ucrChkRowHeader.Location = New System.Drawing.Point(10, 73) + Me.ucrChkRowHeader.Location = New System.Drawing.Point(10, 65) Me.ucrChkRowHeader.Name = "ucrChkRowHeader" Me.ucrChkRowHeader.Size = New System.Drawing.Size(198, 23) Me.ucrChkRowHeader.TabIndex = 1 @@ -125,7 +125,7 @@ Partial Class dlgPasteNewColumns ' Me.lblLinesToPreview.AutoSize = True Me.lblLinesToPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLinesToPreview.Location = New System.Drawing.Point(379, 17) + Me.lblLinesToPreview.Location = New System.Drawing.Point(374, 17) Me.lblLinesToPreview.Name = "lblLinesToPreview" Me.lblLinesToPreview.Size = New System.Drawing.Size(88, 13) Me.lblLinesToPreview.TabIndex = 19 diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index 898ceddea81..d09f76d4a7d 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -97,8 +97,8 @@ Public Class dlgPasteNewColumns 'compared to letting R read from the clipboard dierectly. 'However this has been added to achieve reproducibility in future Try - 'escape any double quotes because of how clipr is implemented. See issue #7199 for more details 'clipboard data may have an empty line which is ignored by clipr so just trim it here to get accurate length + 'escape any double quotes because of how clipr is implemented. See issue #7199 for more details Dim clipBoardText As String = My.Computer.Clipboard.GetText().Replace("""", "\""").Trim() Dim arrStrTemp() As String = clipBoardText.Split(New String() {Environment.NewLine}, StringSplitOptions.None) If arrStrTemp.Length > 1000 Then @@ -139,8 +139,19 @@ Public Class dlgPasteNewColumns Return False End If + 'parameter 'nrows' commented out for future reference. + 'not added here because we are already limiting data pasting to 1000 rows + 'the lines preview is enforced at the sheet levet + 'clsTempImport.AddParameter("nrows", ucrNudPreviewLines.Value, iPosition:=2) + + dfTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsTempImport.ToScript(), bSilent:=True)?.AsDataFrame + 'show the data preview only. Limit the rows to those set in the ucrNudPreviewLines control + frmMain.clsGrids.FillSheet(dfTemp, "temp", grdDataPreview, bIncludeDataTypes:=False, + iColMax:=frmMain.clsGrids.iMaxCols, iRowMax:=ucrNudPreviewLines.Value) + + panelNoDataPreview.Visible = False lblConfirmText.Text = "Number of columns: " & dfTemp.ColumnCount & Environment.NewLine & - "Number of rows: " & dfTemp.RowCount & Environment.NewLine + "Number of rows: " & dfTemp.RowCount & Environment.NewLine & Environment.NewLine 'validate allowed number of rows If dfTemp.RowCount = 0 Then @@ -161,12 +172,7 @@ Public Class dlgPasteNewColumns lblConfirmText.Text = lblConfirmText.Text & "Correct length." End If - 'show the data preview only - clsTempImport.AddParameter("nrows", ucrNudPreviewLines.Value, iPosition:=2) - dfTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsTempImport.ToScript(), bSilent:=True)?.AsDataFrame - frmMain.clsGrids.FillSheet(dfTemp, "temp", grdDataPreview, bIncludeDataTypes:=False, iColMax:=frmMain.clsGrids.iMaxCols) - panelNoDataPreview.Visible = False lblConfirmText.ForeColor = Color.Green Return True diff --git a/instat/dlgPasteNewDataFrame.Designer.vb b/instat/dlgPasteNewDataFrame.Designer.vb index bf595b3946e..5e070b6efce 100644 --- a/instat/dlgPasteNewDataFrame.Designer.vb +++ b/instat/dlgPasteNewDataFrame.Designer.vb @@ -66,7 +66,7 @@ Partial Class dlgPasteNewDataFrame 'btnRefreshPreview ' Me.btnRefreshPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnRefreshPreview.Location = New System.Drawing.Point(470, 10) + Me.btnRefreshPreview.Location = New System.Drawing.Point(482, 10) Me.btnRefreshPreview.Name = "btnRefreshPreview" Me.btnRefreshPreview.Size = New System.Drawing.Size(100, 23) Me.btnRefreshPreview.TabIndex = 3 @@ -97,7 +97,7 @@ Partial Class dlgPasteNewDataFrame Me.ucrNudPreviewLines.AutoSize = True Me.ucrNudPreviewLines.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreviewLines.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPreviewLines.Location = New System.Drawing.Point(413, 10) + Me.ucrNudPreviewLines.Location = New System.Drawing.Point(425, 10) Me.ucrNudPreviewLines.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrNudPreviewLines.Maximum = New Decimal(New Integer() {10000, 0, 0, 0}) Me.ucrNudPreviewLines.Minimum = New Decimal(New Integer() {10, 0, 0, 0}) @@ -122,9 +122,9 @@ Partial Class dlgPasteNewDataFrame Me.lblConfirmText.Location = New System.Drawing.Point(10, 215) Me.lblConfirmText.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblConfirmText.Name = "lblConfirmText" - Me.lblConfirmText.Size = New System.Drawing.Size(189, 13) + Me.lblConfirmText.Size = New System.Drawing.Size(200, 13) Me.lblConfirmText.TabIndex = 24 - Me.lblConfirmText.Text = "Click Ok to paste data to new columns" + Me.lblConfirmText.Text = "Click Ok to paste data to new data frame" ' 'ucrSaveNewDFName ' diff --git a/instat/dlgPasteNewDataFrame.vb b/instat/dlgPasteNewDataFrame.vb index cbafb4be16c..b3f36e2af04 100644 --- a/instat/dlgPasteNewDataFrame.vb +++ b/instat/dlgPasteNewDataFrame.vb @@ -125,9 +125,9 @@ Public Class dlgPasteNewDataFrame 'compared to letting R read from the clipboard. 'However this has been added to achieve reproducibility in future Try - Dim clipBoardText As String = My.Computer.Clipboard.GetText + 'clipboard data may have an empty line which is ignored by clipr so just trim it here to get accurate length 'escape any double quotes because of how clipr is implemented. See issue #7199 for more details - clipBoardText = clipBoardText.Replace("""", "\""") + Dim clipBoardText As String = My.Computer.Clipboard.GetText.Trim().Replace("""", "\""") Dim arrStrTemp() As String = clipBoardText.Split(New String() {Environment.NewLine}, StringSplitOptions.None) If arrStrTemp.Length > 1000 Then MsgBox("Requested clipboard data has more than 1000 rows. Only a maximum of 1000 rows can be pasted") @@ -146,40 +146,34 @@ Public Class dlgPasteNewDataFrame ''' ''' returns true if copied data can be pasted to the selected data frame or false if not Private Function ValidateAndPreviewCopiedData() As Boolean - Dim bValid As Boolean = False - Dim dfTemp As DataFrame - Dim expTemp As SymbolicExpression - Dim clsTempImport As RFunction - - 'set feedback controls default states - panelNoDataPreview.Visible = True - lblConfirmText.Text = "" - lblConfirmText.ForeColor = Color.Red - - 'use clipr::read_clip_tbl command to check if structure of data can be pasted to a data frame - clsTempImport = clsPasteFunction.Clone() - 'limit the rows to those set in the ucrNudPreviewLines control - clsTempImport.AddParameter("nrows", ucrNudPreviewLines.Value) - - 'get the data frame produced by clipr data frame - expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsTempImport.ToScript(), bSilent:=True) - dfTemp = expTemp?.AsDataFrame - If dfTemp IsNot Nothing Then - Try - 'try to preview the data - frmMain.clsGrids.FillSheet(dfTemp, "temp", grdDataPreview, bIncludeDataTypes:=False, iColMax:=frmMain.clsGrids.iMaxCols) - bValid = True - lblConfirmText.Text = GetTranslation("Click Ok to paste data to new data frames.") - lblConfirmText.ForeColor = Color.Green - Catch - lblConfirmText.Text = GetTranslation("Could not preview data. Cannot be pasted.") - End Try - Else - lblConfirmText.Text = GetTranslation("Could not preview data. Cannot be pasted.") - End If + Try + 'set feedback controls default states + panelNoDataPreview.Visible = True + lblConfirmText.Text = "" + lblConfirmText.ForeColor = Color.Red + + 'use clipr::read_clip_tbl command to check if structure of data can be pasted to a data frame + Dim clsTempImport As RFunction = clsPasteFunction.Clone() + 'limit the rows to those set in the ucrNudPreviewLines control + clsTempImport.AddParameter("nrows", ucrNudPreviewLines.Value) + + 'get the data frame produced by clipr data frame + Dim dfTemp As DataFrame = frmMain.clsRLink.RunInternalScriptGetValue(clsTempImport.ToScript(), bSilent:=True)?.AsDataFrame + If dfTemp Is Nothing Then + Return False + End If + 'try to show preview the data only + frmMain.clsGrids.FillSheet(dfTemp, "temp", grdDataPreview, bIncludeDataTypes:=False, iColMax:=frmMain.clsGrids.iMaxCols) + lblConfirmText.Text = "Click Ok to paste data to new data frame." + lblConfirmText.ForeColor = Color.Green + panelNoDataPreview.Visible = False + Return True + Catch ex As Exception + lblConfirmText.Text = "Could not preview data. Cannot be pasted." + panelNoDataPreview.Visible = True + Return False + End Try - panelNoDataPreview.Visible = Not bValid - Return bValid End Function End Class diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 2b022b0c310..23ff9c8710e 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -957,23 +957,45 @@ DataSheet$set("public", "replace_value_in_data", function(col_names, rows, old_v } ) +#reads passed clipboard data and saves it to selected data frame DataSheet$set("public", "paste_from_clipboard", function(col_names, start_row_pos = 1, first_clip_row_is_header = FALSE, clip_board_text) { - #reads data from clipboard and saves it to selected columns + #get the clipboard text contents as a data frame clip_tbl <- clipr::read_clip_tbl(x = clip_board_text, header = first_clip_row_is_header) + + #get the selected data frame current_tbl <- self$get_data_frame(use_current_filter = FALSE) + #check if copied data rows are more than current data rows + if( nrow(clip_tbl) > nrow(current_tbl) ){ + stop(paste("rows copied cannot be more than number of rows in the data frame.", + "Current data frame rows:", nrow(current_tbl), ". Copied rows:", nrow(clip_tbl)) ) + } + + + #if column names are missing then just add the clip data as new columns and quit function + if( missing(col_names) ){ + #append missing values if rows are less than the selected data frame. + #new column rows should be equal to existing column rows + if( nrow(clip_tbl) < nrow(current_tbl) ){ + empty_values_df <- data.frame(data = matrix(data = NA, nrow = ( nrow(current_tbl) - nrow(clip_tbl) ), ncol = ncol(clip_tbl) )) + names(empty_values_df) <- names(clip_tbl) + clip_tbl <- rbind(clip_tbl, empty_values_df) + } + new_col_names <- colnames(clip_tbl) + for(index in seq_along(new_col_names)){ + self$add_columns_to_data(col_name = new_col_names[index], col_data = clip_tbl[, index]) + } + return() + } + + #for existing column names #check if number of copied columns and selected columns are equal if(ncol(clip_tbl) != length(col_names)){ stop(paste("number of columns are not the same.", "Selected columns:", length(col_names), ". Copied columns:", ncol(clip_tbl)) ) } - #check if copied data rows are more than current data rows - if( nrow(clip_tbl) > nrow(current_tbl) ){ - stop(paste("rows copied cannot be more than number of rows in the data frame.", - "Current data frame rows:", nrow(current_tbl), ". Copied rows:", nrow(clip_tbl)) ) - } #check copied data integrity for(index in seq_along(col_names)){ From 66db7387393bae37b7528848aca627497aa4e71e Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 25 Jul 2023 19:31:19 +0300 Subject: [PATCH 05/39] merged pasting of data frame with pasting of new columns. --- instat/dlgPasteNewColumns.Designer.vb | 267 +++-- instat/dlgPasteNewColumns.vb | 236 ++-- instat/dlgPasteNewDataFrame.Designer.vb | 194 ---- instat/dlgPasteNewDataFrame.resx | 120 -- instat/dlgPasteNewDataFrame.vb | 179 --- instat/frmMain.Designer.vb | 1329 +++++++++++------------ instat/frmMain.resx | 4 +- instat/frmMain.vb | 4 +- instat/instat.vbproj | 9 - 9 files changed, 967 insertions(+), 1375 deletions(-) delete mode 100644 instat/dlgPasteNewDataFrame.Designer.vb delete mode 100644 instat/dlgPasteNewDataFrame.resx delete mode 100644 instat/dlgPasteNewDataFrame.vb diff --git a/instat/dlgPasteNewColumns.Designer.vb b/instat/dlgPasteNewColumns.Designer.vb index e7c9e635102..f2f8f9d4109 100644 --- a/instat/dlgPasteNewColumns.Designer.vb +++ b/instat/dlgPasteNewColumns.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class dlgPasteNewColumns Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -22,159 +22,218 @@ Partial Class dlgPasteNewColumns 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.lblConfirmText = New System.Windows.Forms.Label() - Me.grdDataPreview = New unvell.ReoGrid.ReoGridControl() - Me.btnRefreshPreview = New System.Windows.Forms.Button() + Me.ucrDFSelected = New instat.ucrDataFrame() Me.panelNoDataPreview = New System.Windows.Forms.Panel() Me.lblNoDataPreview = New System.Windows.Forms.Label() - Me.ucrBase = New instat.ucrButtons() - Me.ucrChkRowHeader = New instat.ucrCheck() - Me.ucrDataFrameSelected = New instat.ucrDataFrame() + Me.lblConfirmText = New System.Windows.Forms.Label() Me.lblLinesToPreview = New System.Windows.Forms.Label() - Me.ucrNudPreviewLines = New instat.ucrNud() Me.lblPreviewHeader = New System.Windows.Forms.Label() + Me.btnRefreshPreview = New System.Windows.Forms.Button() + Me.grdDataPreview = New unvell.ReoGrid.ReoGridControl() + Me.ucrSaveNewDFName = New instat.ucrSave() + Me.ucrNudPreviewLines = New instat.ucrNud() + Me.ucrChkRowHeader = New instat.ucrCheck() + Me.ucrBase = New instat.ucrButtons() + Me.rdoColumns = New System.Windows.Forms.RadioButton() + Me.rdoDataFrame = New System.Windows.Forms.RadioButton() + Me.ucrPnl = New instat.UcrPanel() Me.panelNoDataPreview.SuspendLayout() Me.SuspendLayout() ' - 'lblConfirmText - ' - Me.lblConfirmText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.lblConfirmText.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblConfirmText.Location = New System.Drawing.Point(7, 95) - Me.lblConfirmText.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) - Me.lblConfirmText.Name = "lblConfirmText" - Me.lblConfirmText.Size = New System.Drawing.Size(201, 108) - Me.lblConfirmText.TabIndex = 5 - Me.lblConfirmText.Text = "Click Ok to paste data to new columns" - ' - 'grdDataPreview - ' - Me.grdDataPreview.BackColor = System.Drawing.Color.White - Me.grdDataPreview.ColumnHeaderContextMenuStrip = Nothing - Me.grdDataPreview.LeadHeaderContextMenuStrip = Nothing - Me.grdDataPreview.Location = New System.Drawing.Point(228, 37) - Me.grdDataPreview.Name = "grdDataPreview" - Me.grdDataPreview.Readonly = True - Me.grdDataPreview.RowHeaderContextMenuStrip = Nothing - Me.grdDataPreview.Script = Nothing - Me.grdDataPreview.SheetTabContextMenuStrip = Nothing - Me.grdDataPreview.SheetTabNewButtonVisible = False - Me.grdDataPreview.SheetTabVisible = True - Me.grdDataPreview.SheetTabWidth = 60 - Me.grdDataPreview.ShowScrollEndSpacing = True - Me.grdDataPreview.Size = New System.Drawing.Size(404, 166) - Me.grdDataPreview.TabIndex = 13 - ' - 'btnRefreshPreview + 'ucrDFSelected ' - Me.btnRefreshPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnRefreshPreview.Location = New System.Drawing.Point(531, 11) - Me.btnRefreshPreview.Name = "btnRefreshPreview" - Me.btnRefreshPreview.Size = New System.Drawing.Size(100, 23) - Me.btnRefreshPreview.TabIndex = 17 - Me.btnRefreshPreview.Text = "Refresh Preview" - Me.btnRefreshPreview.UseVisualStyleBackColor = True + Me.ucrDFSelected.AutoSize = True + Me.ucrDFSelected.bDropUnusedFilterLevels = False + Me.ucrDFSelected.bUseCurrentFilter = True + Me.ucrDFSelected.Location = New System.Drawing.Point(5, 269) + Me.ucrDFSelected.Margin = New System.Windows.Forms.Padding(0) + Me.ucrDFSelected.Name = "ucrDFSelected" + Me.ucrDFSelected.Size = New System.Drawing.Size(177, 50) + Me.ucrDFSelected.TabIndex = 0 ' 'panelNoDataPreview ' Me.panelNoDataPreview.Controls.Add(Me.lblNoDataPreview) - Me.panelNoDataPreview.Location = New System.Drawing.Point(228, 37) + Me.panelNoDataPreview.Location = New System.Drawing.Point(5, 70) Me.panelNoDataPreview.Name = "panelNoDataPreview" - Me.panelNoDataPreview.Size = New System.Drawing.Size(402, 166) - Me.panelNoDataPreview.TabIndex = 18 + Me.panelNoDataPreview.Size = New System.Drawing.Size(572, 186) + Me.panelNoDataPreview.TabIndex = 36 ' 'lblNoDataPreview ' Me.lblNoDataPreview.AutoSize = True Me.lblNoDataPreview.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblNoDataPreview.Location = New System.Drawing.Point(121, 64) + Me.lblNoDataPreview.Location = New System.Drawing.Point(201, 66) Me.lblNoDataPreview.Name = "lblNoDataPreview" Me.lblNoDataPreview.Size = New System.Drawing.Size(168, 25) Me.lblNoDataPreview.TabIndex = 0 Me.lblNoDataPreview.Text = "No Data Loaded" ' - 'ucrBase - ' - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 214) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 52) - Me.ucrBase.TabIndex = 6 - ' - 'ucrChkRowHeader - ' - Me.ucrChkRowHeader.AutoSize = True - Me.ucrChkRowHeader.Checked = False - Me.ucrChkRowHeader.Location = New System.Drawing.Point(10, 65) - Me.ucrChkRowHeader.Name = "ucrChkRowHeader" - Me.ucrChkRowHeader.Size = New System.Drawing.Size(198, 23) - Me.ucrChkRowHeader.TabIndex = 1 - ' - 'ucrDataFrameSelected + 'lblConfirmText ' - Me.ucrDataFrameSelected.AutoSize = True - Me.ucrDataFrameSelected.bDropUnusedFilterLevels = False - Me.ucrDataFrameSelected.bUseCurrentFilter = True - Me.ucrDataFrameSelected.Location = New System.Drawing.Point(10, 9) - Me.ucrDataFrameSelected.Margin = New System.Windows.Forms.Padding(0) - Me.ucrDataFrameSelected.Name = "ucrDataFrameSelected" - Me.ucrDataFrameSelected.Size = New System.Drawing.Size(151, 50) - Me.ucrDataFrameSelected.TabIndex = 0 + Me.lblConfirmText.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblConfirmText.Location = New System.Drawing.Point(328, 262) + Me.lblConfirmText.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblConfirmText.Name = "lblConfirmText" + Me.lblConfirmText.Size = New System.Drawing.Size(249, 68) + Me.lblConfirmText.TabIndex = 35 + Me.lblConfirmText.Text = "Click Ok to paste data to new data frame" ' 'lblLinesToPreview ' Me.lblLinesToPreview.AutoSize = True Me.lblLinesToPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLinesToPreview.Location = New System.Drawing.Point(374, 17) + Me.lblLinesToPreview.Location = New System.Drawing.Point(315, 50) Me.lblLinesToPreview.Name = "lblLinesToPreview" Me.lblLinesToPreview.Size = New System.Drawing.Size(88, 13) - Me.lblLinesToPreview.TabIndex = 19 + Me.lblLinesToPreview.TabIndex = 34 Me.lblLinesToPreview.Text = "Lines to Preview:" ' + 'lblPreviewHeader + ' + Me.lblPreviewHeader.AutoSize = True + Me.lblPreviewHeader.Location = New System.Drawing.Point(5, 50) + Me.lblPreviewHeader.Name = "lblPreviewHeader" + Me.lblPreviewHeader.Size = New System.Drawing.Size(119, 13) + Me.lblPreviewHeader.TabIndex = 33 + Me.lblPreviewHeader.Text = "Preview of copied data:" + ' + 'btnRefreshPreview + ' + Me.btnRefreshPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnRefreshPreview.Location = New System.Drawing.Point(477, 45) + Me.btnRefreshPreview.Name = "btnRefreshPreview" + Me.btnRefreshPreview.Size = New System.Drawing.Size(100, 23) + Me.btnRefreshPreview.TabIndex = 29 + Me.btnRefreshPreview.Text = "Refresh Preview" + Me.btnRefreshPreview.UseVisualStyleBackColor = True + ' + 'grdDataPreview + ' + Me.grdDataPreview.BackColor = System.Drawing.Color.White + Me.grdDataPreview.ColumnHeaderContextMenuStrip = Nothing + Me.grdDataPreview.LeadHeaderContextMenuStrip = Nothing + Me.grdDataPreview.Location = New System.Drawing.Point(5, 70) + Me.grdDataPreview.Name = "grdDataPreview" + Me.grdDataPreview.Readonly = True + Me.grdDataPreview.RowHeaderContextMenuStrip = Nothing + Me.grdDataPreview.Script = Nothing + Me.grdDataPreview.SheetTabContextMenuStrip = Nothing + Me.grdDataPreview.SheetTabNewButtonVisible = False + Me.grdDataPreview.SheetTabVisible = True + Me.grdDataPreview.SheetTabWidth = 60 + Me.grdDataPreview.ShowScrollEndSpacing = True + Me.grdDataPreview.Size = New System.Drawing.Size(572, 186) + Me.grdDataPreview.TabIndex = 32 + ' + 'ucrSaveNewDFName + ' + Me.ucrSaveNewDFName.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveNewDFName.Location = New System.Drawing.Point(5, 269) + Me.ucrSaveNewDFName.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveNewDFName.Name = "ucrSaveNewDFName" + Me.ucrSaveNewDFName.Size = New System.Drawing.Size(276, 24) + Me.ucrSaveNewDFName.TabIndex = 30 + ' 'ucrNudPreviewLines ' Me.ucrNudPreviewLines.AutoSize = True Me.ucrNudPreviewLines.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreviewLines.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPreviewLines.Location = New System.Drawing.Point(473, 13) + Me.ucrNudPreviewLines.Location = New System.Drawing.Point(420, 45) Me.ucrNudPreviewLines.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrNudPreviewLines.Maximum = New Decimal(New Integer() {10000, 0, 0, 0}) Me.ucrNudPreviewLines.Minimum = New Decimal(New Integer() {10, 0, 0, 0}) Me.ucrNudPreviewLines.Name = "ucrNudPreviewLines" Me.ucrNudPreviewLines.Size = New System.Drawing.Size(50, 20) - Me.ucrNudPreviewLines.TabIndex = 20 + Me.ucrNudPreviewLines.TabIndex = 28 Me.ucrNudPreviewLines.Value = New Decimal(New Integer() {10, 0, 0, 0}) ' - 'lblPreviewHeader + 'ucrChkRowHeader ' - Me.lblPreviewHeader.AutoSize = True - Me.lblPreviewHeader.Location = New System.Drawing.Point(228, 17) - Me.lblPreviewHeader.Name = "lblPreviewHeader" - Me.lblPreviewHeader.Size = New System.Drawing.Size(119, 13) - Me.lblPreviewHeader.TabIndex = 21 - Me.lblPreviewHeader.Text = "Preview of copied data:" + Me.ucrChkRowHeader.AutoSize = True + Me.ucrChkRowHeader.Checked = False + Me.ucrChkRowHeader.Location = New System.Drawing.Point(141, 47) + Me.ucrChkRowHeader.Name = "ucrChkRowHeader" + Me.ucrChkRowHeader.Size = New System.Drawing.Size(169, 23) + Me.ucrChkRowHeader.TabIndex = 27 + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(62, 339) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 31 + ' + 'rdoColumns + ' + Me.rdoColumns.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoColumns.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColumns.FlatAppearance.BorderSize = 2 + Me.rdoColumns.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColumns.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoColumns.Location = New System.Drawing.Point(278, 9) + Me.rdoColumns.Name = "rdoColumns" + Me.rdoColumns.Size = New System.Drawing.Size(99, 27) + Me.rdoColumns.TabIndex = 39 + Me.rdoColumns.TabStop = True + Me.rdoColumns.Text = "As Columns" + Me.rdoColumns.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColumns.UseVisualStyleBackColor = True + ' + 'rdoDataFrame + ' + Me.rdoDataFrame.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoDataFrame.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDataFrame.FlatAppearance.BorderSize = 2 + Me.rdoDataFrame.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDataFrame.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoDataFrame.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoDataFrame.Location = New System.Drawing.Point(176, 9) + Me.rdoDataFrame.Name = "rdoDataFrame" + Me.rdoDataFrame.Size = New System.Drawing.Size(105, 27) + Me.rdoDataFrame.TabIndex = 38 + Me.rdoDataFrame.TabStop = True + Me.rdoDataFrame.Text = "As Data Frame" + Me.rdoDataFrame.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoDataFrame.UseVisualStyleBackColor = True + ' + 'ucrPnl + ' + Me.ucrPnl.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnl.Location = New System.Drawing.Point(134, 7) + Me.ucrPnl.Name = "ucrPnl" + Me.ucrPnl.Size = New System.Drawing.Size(286, 29) + Me.ucrPnl.TabIndex = 37 ' 'dlgPasteNewColumns ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(637, 273) - Me.Controls.Add(Me.lblPreviewHeader) + Me.ClientSize = New System.Drawing.Size(585, 396) + Me.Controls.Add(Me.rdoColumns) + Me.Controls.Add(Me.rdoDataFrame) + Me.Controls.Add(Me.ucrPnl) + Me.Controls.Add(Me.panelNoDataPreview) + Me.Controls.Add(Me.lblConfirmText) Me.Controls.Add(Me.lblLinesToPreview) - Me.Controls.Add(Me.ucrNudPreviewLines) + Me.Controls.Add(Me.lblPreviewHeader) Me.Controls.Add(Me.btnRefreshPreview) - Me.Controls.Add(Me.panelNoDataPreview) Me.Controls.Add(Me.grdDataPreview) - Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.lblConfirmText) + Me.Controls.Add(Me.ucrSaveNewDFName) + Me.Controls.Add(Me.ucrNudPreviewLines) Me.Controls.Add(Me.ucrChkRowHeader) - Me.Controls.Add(Me.ucrDataFrameSelected) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.ucrDFSelected) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "dlgPasteNewColumns" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Paste Data to New Column(s)" + Me.Text = "Paste Data" Me.panelNoDataPreview.ResumeLayout(False) Me.panelNoDataPreview.PerformLayout() Me.ResumeLayout(False) @@ -182,15 +241,19 @@ Partial Class dlgPasteNewColumns End Sub - Friend WithEvents ucrDataFrameSelected As ucrDataFrame - Friend WithEvents ucrChkRowHeader As ucrCheck - Friend WithEvents lblConfirmText As Label - Friend WithEvents ucrBase As ucrButtons - Friend WithEvents grdDataPreview As unvell.ReoGrid.ReoGridControl - Friend WithEvents btnRefreshPreview As Button + Friend WithEvents ucrDFSelected As ucrDataFrame Friend WithEvents panelNoDataPreview As Panel Friend WithEvents lblNoDataPreview As Label + Friend WithEvents lblConfirmText As Label Friend WithEvents lblLinesToPreview As Label - Friend WithEvents ucrNudPreviewLines As ucrNud Friend WithEvents lblPreviewHeader As Label + Friend WithEvents btnRefreshPreview As Button + Friend WithEvents grdDataPreview As unvell.ReoGrid.ReoGridControl + Friend WithEvents ucrSaveNewDFName As ucrSave + Friend WithEvents ucrNudPreviewLines As ucrNud + Friend WithEvents ucrChkRowHeader As ucrCheck + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents rdoColumns As RadioButton + Friend WithEvents rdoDataFrame As RadioButton + Friend WithEvents ucrPnl As UcrPanel End Class diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index d09f76d4a7d..6a222e53917 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -18,13 +18,13 @@ Imports instat.Translations Public Class dlgPasteNewColumns Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsPasteFunction As RFunction + 'Private clsImportColsToNewDFRFunction, clsImportNewDataListRFunction As New RFunction + Private clsReadClipBoardDataRFunction As New RFunction + Private clsImportColsToExistingDFRFunction As RFunction 'used to prevent TestOkEnabled from being called multiple times when loading the dialog. - Private bIsOnDialogLoad As Boolean + Private bValidatePasteData As Boolean = False Private Sub dlgPasteNewColumns_Load(sender As Object, e As EventArgs) Handles MyBase.Load - bIsOnDialogLoad = True - autoTranslate(Me) If bFirstLoad Then InitialiseDialog() bFirstLoad = False @@ -32,80 +32,97 @@ Public Class dlgPasteNewColumns If bReset Then SetDefaults() End If - 'reset the clip board data parameter value - SetClipBoardDataParameter() + SetClipBoardDataParameter() 'reset the clip board data parameter value SetRCodeForControls(bReset) bReset = False - bIsOnDialogLoad = False + bValidatePasteData = True TestOkEnabled() + autoTranslate(Me) + End Sub + + Private Sub dlgPasteNewColumns_Closed(sender As Object, e As EventArgs) Handles Me.Closed + bValidatePasteData = False End Sub Private Sub InitialiseDialog() 'todo. attach the help id later - 'ucrBase.iHelpTopicID = 332 + 'ucrBase.iHelpTopicID = - ucrDataFrameSelected.SetText("Paste copied data to:") - ucrDataFrameSelected.SetParameter(New RParameter("data_name", 0)) - ucrDataFrameSelected.SetParameterIsString() + '---------------------------- + ucrPnl.AddRadioButton(rdoDataFrame) + ucrPnl.AddRadioButton(rdoColumns) + ucrPnl.AddFunctionNamesCondition(rdoDataFrame, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data", bNewIsPositive:=False) + ucrPnl.AddFunctionNamesCondition(rdoColumns, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data", bNewIsPositive:=True) + ucrPnl.AddToLinkedControls(ucrSaveNewDFName, {rdoDataFrame}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnl.AddToLinkedControls(ucrDFSelected, {rdoColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkRowHeader.SetText("First row is header") - ucrChkRowHeader.SetParameter(New RParameter("first_clip_row_is_header", 1)) + ucrChkRowHeader.SetParameter(New RParameter("header", 1)) + + ucrNudPreviewLines.SetMinMax(iNewMin:=10, iNewMax:=1000) + '---------------------------- + + 'paste as data frame + '---------------------------- + ucrSaveNewDFName.SetIsTextBox() + ucrSaveNewDFName.SetSaveTypeAsDataFrame() + ucrSaveNewDFName.SetLabelText("New Data Frame Name:") + ucrSaveNewDFName.SetPrefix("data") + '---------------------------- + + 'paste as column + '---------------------------- + ucrDFSelected.SetText("Paste copied data to:") + ucrDFSelected.SetParameter(New RParameter("data_name", 0)) + ucrDFSelected.SetParameterIsString() + '---------------------------- ucrNudPreviewLines.Minimum = 10 End Sub Private Sub SetDefaults() - clsPasteFunction = New RFunction + clsImportColsToExistingDFRFunction = New RFunction + clsReadClipBoardDataRFunction = New RFunction ucrNudPreviewLines.Value = 10 - ucrDataFrameSelected.Reset() + ucrSaveNewDFName.Reset() + ucrDFSelected.Reset() - clsPasteFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$paste_from_clipboard") - clsPasteFunction.AddParameter("first_clip_row_is_header", "TRUE", iPosition:=0) - SetClipBoardDataParameter() - ucrBase.clsRsyntax.SetBaseRFunction(clsPasteFunction) - End Sub + clsReadClipBoardDataRFunction.SetPackageName("clipr") + clsReadClipBoardDataRFunction.SetRCommand("read_clip_tbl") + 'todo. change to false + clsReadClipBoardDataRFunction.AddParameter("header", "FALSE", iPosition:=1) - Private Sub SetRCodeForControls(bReset As Boolean) - ucrDataFrameSelected.SetRCode(clsPasteFunction, bReset) - ucrChkRowHeader.SetRCode(clsPasteFunction, bReset) - End Sub + clsImportColsToExistingDFRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") + clsImportColsToExistingDFRFunction.AddParameter("col_data", clsRFunctionParameter:=clsReadClipBoardDataRFunction, iPosition:=1) + clsImportColsToExistingDFRFunction.AddParameter("use_col_name_as_prefix", strParameterValue:="TRUE", iPosition:=2) - Private Sub TestOkEnabled() - ucrBase.OKEnabled(Not String.IsNullOrEmpty(ucrDataFrameSelected.strCurrDataFrame) AndAlso ValidateAndPreviewCopiedData()) - End Sub - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - SetDefaults() - SetRCodeForControls(True) - TestOkEnabled() + ucrBase.clsRsyntax.SetBaseRFunction(clsReadClipBoardDataRFunction) End Sub - Private Sub ucrControls_ControlContentsChanged(ucrchangedControl As ucrCore) Handles ucrDataFrameSelected.ControlContentsChanged, ucrChkRowHeader.ControlContentsChanged, ucrNudPreviewLines.ControlContentsChanged - If Not bIsOnDialogLoad Then - TestOkEnabled() - End If - End Sub + Private Sub SetRCodeForControls(bReset As Boolean) + ucrChkRowHeader.SetRCode(clsReadClipBoardDataRFunction, bReset) + ucrDFSelected.SetRCode(clsImportColsToExistingDFRFunction, bReset) + ucrSaveNewDFName.SetRCode(clsReadClipBoardDataRFunction, bReset) - Private Sub btnRefreshPreview_Click(sender As Object, e As EventArgs) Handles btnRefreshPreview.Click - SetClipBoardDataParameter() - TestOkEnabled() + ucrPnl.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) End Sub - Public Sub SetClipBoardDataParameter() - 'please note addition of 'clip_board_text' parameter makes the execution of the R code take longer - 'compared to letting R read from the clipboard dierectly. + Private Sub SetClipBoardDataParameter() + 'please note addition of this parameter makes the execution of the R code take longer + 'compared to letting R read from the clipboard. 'However this has been added to achieve reproducibility in future Try 'clipboard data may have an empty line which is ignored by clipr so just trim it here to get accurate length 'escape any double quotes because of how clipr is implemented. See issue #7199 for more details - Dim clipBoardText As String = My.Computer.Clipboard.GetText().Replace("""", "\""").Trim() + Dim clipBoardText As String = My.Computer.Clipboard.GetText.Trim().Replace("""", "\""") Dim arrStrTemp() As String = clipBoardText.Split(New String() {Environment.NewLine}, StringSplitOptions.None) If arrStrTemp.Length > 1000 Then MsgBox("Requested clipboard data has more than 1000 rows. Only a maximum of 1000 rows can be pasted") - clsPasteFunction.AddParameter("clip_board_text", Chr(34) & "" & Chr(34), iPosition:=1) + clsReadClipBoardDataRFunction.AddParameter("x", Chr(34) & "" & Chr(34), iPosition:=0) Else - clsPasteFunction.AddParameter("clip_board_text", Chr(34) & clipBoardText & Chr(34), iPosition:=1) + clsReadClipBoardDataRFunction.AddParameter("x", Chr(34) & clipBoardText & Chr(34), iPosition:=0) End If Catch ex As Exception 'this error could be due to large clipboard data @@ -113,74 +130,107 @@ Public Class dlgPasteNewColumns End Try End Sub + ''' ''' validates copied data and displays it for preview. - ''' returns true if copied data can be pasted to the selected data frame or false if not ''' - ''' + ''' returns true if copied data can be pasted to the selected data frame or false if not Private Function ValidateAndPreviewCopiedData() As Boolean Try - 'set feedback controls default states + 'reset feedback controls default states panelNoDataPreview.Visible = True - lblConfirmText.Text = "Could not preview data. Cannot be pasted." + lblConfirmText.Text = "" lblConfirmText.ForeColor = Color.Red - 'use clipr package to check if structure of data can be pasted to a data frame - Dim dfTemp As DataFrame - Dim clsTempImport As New RFunction - clsTempImport.SetPackageName("clipr") - clsTempImport.SetRCommand("read_clip_tbl") - clsTempImport.AddParameter("x", clsPasteFunction.GetParameter("clip_board_text").strArgumentValue, iPosition:=0) - clsTempImport.AddParameter("header", If(ucrChkRowHeader.Checked, "TRUE", "FALSE"), iPosition:=1) - - 'get the pasted data produced by clipr - dfTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsTempImport.ToScript(), bSilent:=True)?.AsDataFrame - If dfTemp Is Nothing Then + Dim clsTempReadClipBoardDataRFunction As RFunction = clsReadClipBoardDataRFunction.Clone() + + clsTempReadClipBoardDataRFunction.AddParameter("nrows", ucrNudPreviewLines.Value) 'limit the rows to those set in the ucrNudPreviewLines control + clsTempReadClipBoardDataRFunction.RemoveAssignTo() 'remove assign to before getting the script + Dim dfTemp As DataFrame = frmMain.clsRLink.RunInternalScriptGetValue(clsTempReadClipBoardDataRFunction.ToScript(), bSilent:=True)?.AsDataFrame + If dfTemp Is Nothing OrElse dfTemp.RowCount = 0 Then Return False End If - 'parameter 'nrows' commented out for future reference. - 'not added here because we are already limiting data pasting to 1000 rows - 'the lines preview is enforced at the sheet levet - 'clsTempImport.AddParameter("nrows", ucrNudPreviewLines.Value, iPosition:=2) - - dfTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsTempImport.ToScript(), bSilent:=True)?.AsDataFrame - 'show the data preview only. Limit the rows to those set in the ucrNudPreviewLines control - frmMain.clsGrids.FillSheet(dfTemp, "temp", grdDataPreview, bIncludeDataTypes:=False, - iColMax:=frmMain.clsGrids.iMaxCols, iRowMax:=ucrNudPreviewLines.Value) - - panelNoDataPreview.Visible = False + 'try to show preview the data only + frmMain.clsGrids.FillSheet(dfTemp, "temp", grdDataPreview, bIncludeDataTypes:=False, iColMax:=frmMain.clsGrids.iMaxCols) lblConfirmText.Text = "Number of columns: " & dfTemp.ColumnCount & Environment.NewLine & - "Number of rows: " & dfTemp.RowCount & Environment.NewLine & Environment.NewLine - - 'validate allowed number of rows - If dfTemp.RowCount = 0 Then - lblConfirmText.Text = lblConfirmText.Text & "No copied data detected." - Return False - ElseIf dfTemp.RowCount < ucrDataFrameSelected.iDataFrameLength Then - lblConfirmText.Text = lblConfirmText.Text & "Too few rows to paste into this data frame. This data frame requires " & ucrDataFrameSelected.iDataFrameLength & " rows." - 'please note, we could allow few rows to be pasted. the R code is already set up to allow - 'but as stated in issue #5991 by Danny this is unlikely to be the correct solution. - 'Left here for reference - 'lblConfirmText.Text = lblConfirmText.Text & Environment.NewLine & - ' (ucrDataFrameSelected.iDataFrameLength - dfTemp.RowCount) & " missing values will be added." - Return False - ElseIf dfTemp.RowCount > ucrDataFrameSelected.iDataFrameLength Then - lblConfirmText.Text = lblConfirmText.Text & "Too many rows to paste into this data frame. This data frame requires " & ucrDataFrameSelected.iDataFrameLength & " rows." - Return False - Else - lblConfirmText.Text = lblConfirmText.Text & "Correct length." + "Number of rows: " & dfTemp.RowCount & Environment.NewLine + + If rdoDataFrame.Checked Then + lblConfirmText.Text = lblConfirmText.Text & "Click Ok to paste data to new data frame." + ElseIf rdoColumns.Checked Then + 'validate allowed number of rows + If dfTemp.RowCount < ucrDFSelected.iDataFrameLength Then + lblConfirmText.Text = lblConfirmText.Text & "Too few rows to paste into this data frame. This data frame requires " & ucrDFSelected.iDataFrameLength & " rows." + 'please note, we could allow few rows to be pasted. we can do that ammending add columns R code + 'but as stated in issue #5991 by Danny this is unlikely to be the correct solution. + 'Left here for reference + 'lblConfirmText.Text = lblConfirmText.Text & Environment.NewLine & (ucrDataFrameSelected.iDataFrameLength - dfTemp.RowCount) & " missing values will be added." + Return False + ElseIf dfTemp.RowCount > ucrDFSelected.iDataFrameLength Then + lblConfirmText.Text = lblConfirmText.Text & "Too many rows to paste into this data frame. This data frame requires " & ucrDFSelected.iDataFrameLength & " rows." + Return False + Else + lblConfirmText.Text = lblConfirmText.Text & "Click Ok to paste data to selected data frame." + End If End If - - lblConfirmText.ForeColor = Color.Green - + panelNoDataPreview.Visible = False Return True Catch ex As Exception - lblConfirmText.Text = "Could not preview data. Cannot be pasted." + lblConfirmText.Text = "Could not preview data. Data cannot be pasted." panelNoDataPreview.Visible = True Return False End Try + End Function + Private Sub TestOkEnabled(Optional bValidateCopiedData As Boolean = True) + Dim enableOK As Boolean = False + If rdoDataFrame.Checked Then + enableOK = ucrSaveNewDFName.IsComplete() + ElseIf rdoColumns.Checked Then + enableOK = Not String.IsNullOrEmpty(ucrDFSelected.strCurrDataFrame) + End If + If bValidateCopiedData Then + enableOK = ValidateAndPreviewCopiedData() + End If + ucrBase.OKEnabled(enableOK) + End Sub + + Private Sub ucrPnl_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnl.ControlValueChanged + If rdoDataFrame.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsReadClipBoardDataRFunction) + ElseIf rdoColumns.Checked Then + clsReadClipBoardDataRFunction.SetAssignToObject("data") + ucrBase.clsRsyntax.SetBaseRFunction(clsImportColsToExistingDFRFunction) + End If + + If bValidatePasteData Then + TestOkEnabled() + End If + End Sub + + Private Sub btnRefreshPreview_Click(sender As Object, e As EventArgs) Handles btnRefreshPreview.Click + SetClipBoardDataParameter() + TestOkEnabled() + End Sub + + Private Sub ucrControls_ControlContentsChanged(ucrchangedControl As ucrCore) Handles ucrChkRowHeader.ControlContentsChanged, ucrDFSelected.ControlContentsChanged, ucrSaveNewDFName.ControlContentsChanged, ucrNudPreviewLines.ControlContentsChanged + If bValidatePasteData Then + 'disabled unnecessary validation of copied data because it may take long for large datasets + TestOkEnabled(bValidateCopiedData:=ucrchangedControl IsNot ucrSaveNewDFName AndAlso ucrchangedControl IsNot ucrNudPreviewLines) + End If + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + bValidatePasteData = False + SetDefaults() + SetClipBoardDataParameter() + SetRCodeForControls(True) + bValidatePasteData = True + TestOkEnabled() + End Sub + + End Class \ No newline at end of file diff --git a/instat/dlgPasteNewDataFrame.Designer.vb b/instat/dlgPasteNewDataFrame.Designer.vb deleted file mode 100644 index 5e070b6efce..00000000000 --- a/instat/dlgPasteNewDataFrame.Designer.vb +++ /dev/null @@ -1,194 +0,0 @@ - _ -Partial Class dlgPasteNewDataFrame - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - - Private Sub InitializeComponent() - Me.grdDataPreview = New unvell.ReoGrid.ReoGridControl() - Me.lblPreviewHeader = New System.Windows.Forms.Label() - Me.btnRefreshPreview = New System.Windows.Forms.Button() - Me.ucrBase = New instat.ucrButtons() - Me.lblLinesToPreview = New System.Windows.Forms.Label() - Me.ucrNudPreviewLines = New instat.ucrNud() - Me.ucrChkRowHeader = New instat.ucrCheck() - Me.lblConfirmText = New System.Windows.Forms.Label() - Me.ucrSaveNewDFName = New instat.ucrSave() - Me.panelNoDataPreview = New System.Windows.Forms.Panel() - Me.lblNoDataPreview = New System.Windows.Forms.Label() - Me.panelNoDataPreview.SuspendLayout() - Me.SuspendLayout() - ' - 'grdDataPreview - ' - Me.grdDataPreview.BackColor = System.Drawing.Color.White - Me.grdDataPreview.ColumnHeaderContextMenuStrip = Nothing - Me.grdDataPreview.LeadHeaderContextMenuStrip = Nothing - Me.grdDataPreview.Location = New System.Drawing.Point(10, 35) - Me.grdDataPreview.Name = "grdDataPreview" - Me.grdDataPreview.Readonly = True - Me.grdDataPreview.RowHeaderContextMenuStrip = Nothing - Me.grdDataPreview.Script = Nothing - Me.grdDataPreview.SheetTabContextMenuStrip = Nothing - Me.grdDataPreview.SheetTabNewButtonVisible = False - Me.grdDataPreview.SheetTabVisible = True - Me.grdDataPreview.SheetTabWidth = 60 - Me.grdDataPreview.ShowScrollEndSpacing = True - Me.grdDataPreview.Size = New System.Drawing.Size(572, 166) - Me.grdDataPreview.TabIndex = 14 - ' - 'lblPreviewHeader - ' - Me.lblPreviewHeader.AutoSize = True - Me.lblPreviewHeader.Location = New System.Drawing.Point(10, 15) - Me.lblPreviewHeader.Name = "lblPreviewHeader" - Me.lblPreviewHeader.Size = New System.Drawing.Size(119, 13) - Me.lblPreviewHeader.TabIndex = 18 - Me.lblPreviewHeader.Text = "Preview of copied data:" - ' - 'btnRefreshPreview - ' - Me.btnRefreshPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnRefreshPreview.Location = New System.Drawing.Point(482, 10) - Me.btnRefreshPreview.Name = "btnRefreshPreview" - Me.btnRefreshPreview.Size = New System.Drawing.Size(100, 23) - Me.btnRefreshPreview.TabIndex = 3 - Me.btnRefreshPreview.Text = "Refresh Preview" - Me.btnRefreshPreview.UseVisualStyleBackColor = True - ' - 'ucrBase - ' - Me.ucrBase.AutoSize = True - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 276) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) - Me.ucrBase.TabIndex = 5 - ' - 'lblLinesToPreview - ' - Me.lblLinesToPreview.AutoSize = True - Me.lblLinesToPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLinesToPreview.Location = New System.Drawing.Point(320, 15) - Me.lblLinesToPreview.Name = "lblLinesToPreview" - Me.lblLinesToPreview.Size = New System.Drawing.Size(88, 13) - Me.lblLinesToPreview.TabIndex = 22 - Me.lblLinesToPreview.Text = "Lines to Preview:" - ' - 'ucrNudPreviewLines - ' - Me.ucrNudPreviewLines.AutoSize = True - Me.ucrNudPreviewLines.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudPreviewLines.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPreviewLines.Location = New System.Drawing.Point(425, 10) - Me.ucrNudPreviewLines.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrNudPreviewLines.Maximum = New Decimal(New Integer() {10000, 0, 0, 0}) - Me.ucrNudPreviewLines.Minimum = New Decimal(New Integer() {10, 0, 0, 0}) - Me.ucrNudPreviewLines.Name = "ucrNudPreviewLines" - Me.ucrNudPreviewLines.Size = New System.Drawing.Size(50, 20) - Me.ucrNudPreviewLines.TabIndex = 2 - Me.ucrNudPreviewLines.Value = New Decimal(New Integer() {10, 0, 0, 0}) - ' - 'ucrChkRowHeader - ' - Me.ucrChkRowHeader.AutoSize = True - Me.ucrChkRowHeader.Checked = False - Me.ucrChkRowHeader.Location = New System.Drawing.Point(146, 12) - Me.ucrChkRowHeader.Name = "ucrChkRowHeader" - Me.ucrChkRowHeader.Size = New System.Drawing.Size(169, 23) - Me.ucrChkRowHeader.TabIndex = 1 - ' - 'lblConfirmText - ' - Me.lblConfirmText.AutoSize = True - Me.lblConfirmText.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblConfirmText.Location = New System.Drawing.Point(10, 215) - Me.lblConfirmText.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) - Me.lblConfirmText.Name = "lblConfirmText" - Me.lblConfirmText.Size = New System.Drawing.Size(200, 13) - Me.lblConfirmText.TabIndex = 24 - Me.lblConfirmText.Text = "Click Ok to paste data to new data frame" - ' - 'ucrSaveNewDFName - ' - Me.ucrSaveNewDFName.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveNewDFName.Location = New System.Drawing.Point(10, 243) - Me.ucrSaveNewDFName.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveNewDFName.Name = "ucrSaveNewDFName" - Me.ucrSaveNewDFName.Size = New System.Drawing.Size(246, 24) - Me.ucrSaveNewDFName.TabIndex = 4 - ' - 'panelNoDataPreview - ' - Me.panelNoDataPreview.Controls.Add(Me.lblNoDataPreview) - Me.panelNoDataPreview.Location = New System.Drawing.Point(10, 35) - Me.panelNoDataPreview.Name = "panelNoDataPreview" - Me.panelNoDataPreview.Size = New System.Drawing.Size(572, 166) - Me.panelNoDataPreview.TabIndex = 26 - ' - 'lblNoDataPreview - ' - Me.lblNoDataPreview.AutoSize = True - Me.lblNoDataPreview.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblNoDataPreview.Location = New System.Drawing.Point(121, 64) - Me.lblNoDataPreview.Name = "lblNoDataPreview" - Me.lblNoDataPreview.Size = New System.Drawing.Size(168, 25) - Me.lblNoDataPreview.TabIndex = 0 - Me.lblNoDataPreview.Text = "No Data Loaded" - ' - 'dlgPasteNewDataFrame - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(599, 339) - Me.Controls.Add(Me.panelNoDataPreview) - Me.Controls.Add(Me.ucrSaveNewDFName) - Me.Controls.Add(Me.lblConfirmText) - Me.Controls.Add(Me.lblLinesToPreview) - Me.Controls.Add(Me.ucrNudPreviewLines) - Me.Controls.Add(Me.ucrChkRowHeader) - Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.lblPreviewHeader) - Me.Controls.Add(Me.btnRefreshPreview) - Me.Controls.Add(Me.grdDataPreview) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(2) - Me.Name = "dlgPasteNewDataFrame" - Me.Text = "Paste Data to New Data Frame" - Me.panelNoDataPreview.ResumeLayout(False) - Me.panelNoDataPreview.PerformLayout() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents grdDataPreview As unvell.ReoGrid.ReoGridControl - Friend WithEvents lblPreviewHeader As Label - Friend WithEvents btnRefreshPreview As Button - Friend WithEvents ucrBase As ucrButtons - Friend WithEvents lblLinesToPreview As Label - Friend WithEvents ucrNudPreviewLines As ucrNud - Friend WithEvents ucrChkRowHeader As ucrCheck - Friend WithEvents lblConfirmText As Label - Friend WithEvents ucrSaveNewDFName As ucrSave - Friend WithEvents panelNoDataPreview As Panel - Friend WithEvents lblNoDataPreview As Label -End Class diff --git a/instat/dlgPasteNewDataFrame.resx b/instat/dlgPasteNewDataFrame.resx deleted file mode 100644 index 1af7de150c9..00000000000 --- a/instat/dlgPasteNewDataFrame.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/instat/dlgPasteNewDataFrame.vb b/instat/dlgPasteNewDataFrame.vb deleted file mode 100644 index b3f36e2af04..00000000000 --- a/instat/dlgPasteNewDataFrame.vb +++ /dev/null @@ -1,179 +0,0 @@ -' R- Instat -' Copyright (C) 2015-2017 -' -' This program is free software: you can redistribute it and/or modify -' it under the terms of the GNU General Public License as published by -' the Free Software Foundation, either version 3 of the License, or -' (at your option) any later version. -' -' This program is distributed in the hope that it will be useful, -' but WITHOUT ANY WARRANTY; without even the implied warranty of -' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -' GNU General Public License for more details. -' -' You should have received a copy of the GNU General Public License -' along with this program. If not, see . - -Imports RDotNet -Imports instat.Translations -Public Class dlgPasteNewDataFrame - - Private bFirstLoad As Boolean = True - Private bReset As Boolean = True - Private clsAddDataFunction, clsDataListFunction, clsPasteFunction As New RFunction - - Private Sub dlgPasteNewDataFrame_Load(sender As Object, e As EventArgs) Handles MyBase.Load - If bFirstLoad Then - InitialiseDialog() - bFirstLoad = False - End If - If bReset Then - SetDefaults() - End If - 'reset the clip board data parameter value - SetClipBoardDataParameter() - SetRCodeForControls(bReset) - bReset = False - TestOkEnabled() - autoTranslate(Me) - End Sub - - Private Sub InitialiseDialog() - 'todo. attach the help id later - 'ucrBase.iHelpTopicID = - - ucrSaveNewDFName.SetIsTextBox() - ucrSaveNewDFName.SetSaveTypeAsDataFrame() - ucrSaveNewDFName.SetLabelText("New Data Frame Name:") - ucrSaveNewDFName.SetPrefix("data") - - ucrChkRowHeader.SetText("First row is header") - ucrChkRowHeader.SetParameter(New RParameter("header", 1)) - - ucrNudPreviewLines.SetMinMax(iNewMin:=10, iNewMax:=1000) - End Sub - - Private Sub SetDefaults() - clsAddDataFunction = New RFunction - clsDataListFunction = New RFunction - clsPasteFunction = New RFunction - - 'todo 29/05/2021. this is temporarily done this way because of how - 'function ConstructAssignTo in clsRCodeStructure is currently implemented. - 'It doesn't construct "assignTo" statements correctly - clsAddDataFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_data") - clsAddDataFunction.AddParameter("data_tables", clsRFunctionParameter:=clsDataListFunction, iPosition:=0) - clsDataListFunction.SetRCommand("list") - clsDataListFunction.AddParameter(strParameterName:=ucrSaveNewDFName.GetText, clsRFunctionParameter:=clsPasteFunction, iPosition:=0) - - clsPasteFunction.SetPackageName("clipr") - clsPasteFunction.SetRCommand("read_clip_tbl") - SetClipBoardDataParameter() - clsPasteFunction.AddParameter("header", "TRUE", iPosition:=1) - - ucrBase.clsRsyntax.SetBaseRFunction(clsAddDataFunction) - - ucrNudPreviewLines.Value = 10 - ucrSaveNewDFName.Reset() - End Sub - - Private Sub SetRCodeForControls(bReset As Boolean) - ucrChkRowHeader.SetRCode(clsPasteFunction, bReset) - 'todo 29/05/2021. this is temporarily commented out - 'ucrSaveNewDFName.SetRCode(clsPasteFunction, bReset) - End Sub - - ''' - ''' enables base "OK" and "ToScript" buttons if all entries are valid, disables if not. - ''' - ''' if true, copied data will also be validated - Private Sub TestOkEnabled(Optional bValidateCopiedData As Boolean = True) - 'validation of copied data isn't necessary for situations like checking the typed data frame name - If bValidateCopiedData Then - ucrBase.OKEnabled(ucrSaveNewDFName.IsComplete AndAlso ValidateAndPreviewCopiedData()) - Else - ucrBase.OKEnabled(ucrSaveNewDFName.IsComplete) - End If - End Sub - - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - SetDefaults() - SetRCodeForControls(True) - TestOkEnabled() - End Sub - - Private Sub ucrSaveNewDFName_ControlContentsChanged(ucrchangedControl As ucrCore) Handles ucrSaveNewDFName.ControlContentsChanged - clsDataListFunction.ClearParameters() - clsDataListFunction.AddParameter(strParameterName:=ucrSaveNewDFName.GetText, clsRFunctionParameter:=clsPasteFunction) - 'TestOkEnabled called here because validation of copied data is not necessary and may take long for large data - TestOkEnabled(bValidateCopiedData:=False) - End Sub - - Private Sub ucrControls_ControlValueChangedChanged(ucrchangedControl As ucrCore) Handles ucrChkRowHeader.ControlValueChanged, ucrNudPreviewLines.ControlValueChanged - 'TestOkEnabled called here because ucrChkRowHeader.ControlContentsChanged event is called before the R code is set by the control - 'todo. this could be changed if the ucrCheck raising of ControlContentsChanged event is modified - TestOkEnabled() - End Sub - - Private Sub btnRefreshPreview_Click(sender As Object, e As EventArgs) Handles btnRefreshPreview.Click - SetClipBoardDataParameter() - TestOkEnabled() - End Sub - - Private Sub SetClipBoardDataParameter() - 'please note addition of this parameter makes the execution of the R code take longer - 'compared to letting R read from the clipboard. - 'However this has been added to achieve reproducibility in future - Try - 'clipboard data may have an empty line which is ignored by clipr so just trim it here to get accurate length - 'escape any double quotes because of how clipr is implemented. See issue #7199 for more details - Dim clipBoardText As String = My.Computer.Clipboard.GetText.Trim().Replace("""", "\""") - Dim arrStrTemp() As String = clipBoardText.Split(New String() {Environment.NewLine}, StringSplitOptions.None) - If arrStrTemp.Length > 1000 Then - MsgBox("Requested clipboard data has more than 1000 rows. Only a maximum of 1000 rows can be pasted") - clsPasteFunction.AddParameter("x", Chr(34) & "" & Chr(34), iPosition:=0) - Else - clsPasteFunction.AddParameter("x", Chr(34) & clipBoardText & Chr(34), iPosition:=0) - End If - Catch ex As Exception - 'this error could be due to large clipboard data - MsgBox("Requested clipboard operation did not succeed. Large data detected") - End Try - End Sub - - ''' - ''' validates copied data and displays it for preview. - ''' - ''' returns true if copied data can be pasted to the selected data frame or false if not - Private Function ValidateAndPreviewCopiedData() As Boolean - Try - 'set feedback controls default states - panelNoDataPreview.Visible = True - lblConfirmText.Text = "" - lblConfirmText.ForeColor = Color.Red - - 'use clipr::read_clip_tbl command to check if structure of data can be pasted to a data frame - Dim clsTempImport As RFunction = clsPasteFunction.Clone() - 'limit the rows to those set in the ucrNudPreviewLines control - clsTempImport.AddParameter("nrows", ucrNudPreviewLines.Value) - - 'get the data frame produced by clipr data frame - Dim dfTemp As DataFrame = frmMain.clsRLink.RunInternalScriptGetValue(clsTempImport.ToScript(), bSilent:=True)?.AsDataFrame - If dfTemp Is Nothing Then - Return False - End If - 'try to show preview the data only - frmMain.clsGrids.FillSheet(dfTemp, "temp", grdDataPreview, bIncludeDataTypes:=False, iColMax:=frmMain.clsGrids.iMaxCols) - lblConfirmText.Text = "Click Ok to paste data to new data frame." - lblConfirmText.ForeColor = Color.Green - panelNoDataPreview.Visible = False - Return True - Catch ex As Exception - lblConfirmText.Text = "Could not preview data. Cannot be pasted." - panelNoDataPreview.Visible = True - Return False - End Try - - End Function - -End Class diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 7d0d94628c1..8ad33f43b2f 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -370,8 +370,7 @@ Partial Class frmMain Me.mnuEditCopy = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditCopySpecial = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditPaste = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuPasteSpecial = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuEditPasteNewDataFrame = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditPasteNewCols = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditWordwrap = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditSelectAll = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator71 = New System.Windows.Forms.ToolStripSeparator() @@ -706,7 +705,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, Me.mnuDescribeGeneral, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseTable, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" - Me.mnuDescribe.Size = New System.Drawing.Size(96, 29) + Me.mnuDescribe.Size = New System.Drawing.Size(64, 22) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -714,25 +713,25 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' 'mnuDescribeOneVariableVisualiseData ' Me.mnuDescribeOneVariableVisualiseData.Name = "mnuDescribeOneVariableVisualiseData" - Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableVisualiseData.Text = "Visualise Data..." ' 'ToolStripSeparator72 ' Me.ToolStripSeparator72.Name = "ToolStripSeparator72" - Me.ToolStripSeparator72.Size = New System.Drawing.Size(232, 6) + Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..." Me.mnuDescribeOneVariableSummarise.Text = "Summarise..." Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised" @@ -740,26 +739,26 @@ Partial Class frmMain 'mnuDescribeOneVariableGraph ' Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph" - Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableGraph.Tag = "Graph..." Me.mnuDescribeOneVariableGraph.Text = "Graph..." ' 'ToolStripSeparator33 ' Me.ToolStripSeparator33.Name = "ToolStripSeparator33" - Me.ToolStripSeparator33.Size = New System.Drawing.Size(232, 6) + Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableFrequencies.Text = "Frequencies..." Me.mnuDescribeOneVariableFrequencies.ToolTipText = "Table or Graph. Also Stem and Leaf Plots" ' 'mnuDescribeOneVariableRatingData ' Me.mnuDescribeOneVariableRatingData.Name = "mnuDescribeOneVariableRatingData" - Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -767,26 +766,26 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoThreeVariablesPivotTable ' Me.mnuDescribeTwoThreeVariablesPivotTable.Name = "mnuDescribeTwoThreeVariablesPivotTable" - Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator36 ' Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(305, 6) + Me.ToolStripSeparator36.Size = New System.Drawing.Size(203, 6) ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables" @@ -794,19 +793,19 @@ Partial Class frmMain 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(305, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' @@ -814,14 +813,14 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Name = "mnuDescribeTwoThreeVariablesTwoWayFrequencies" - Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Text = "Two-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.ToolTipText = "Table or Graph" ' 'mnuDescribeTwoThreeVariablesThreeWayFrequencies ' Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Name = "mnuDescribeTwoThreeVariablesThreeWayFrequencies" - Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Text = "Three-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.ToolTipText = "Table or Graph" ' @@ -829,14 +828,14 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.ToolStripSeparator27, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' 'mnuDescribeSpecificBarPieChart ' Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart" - Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificBarPieChart.Tag = "Bar_Chart" Me.mnuDescribeSpecificBarPieChart.Text = "Bar Chart..." Me.mnuDescribeSpecificBarPieChart.ToolTipText = "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds" @@ -844,7 +843,7 @@ Partial Class frmMain 'mnuDescribeSpecificBoxplotJitterViolinPlot ' Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot" - Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Tag = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Text = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.ToolTipText = "Boxplot (including Tufte), Jitter and Violin Plots" @@ -852,7 +851,7 @@ Partial Class frmMain 'mnuDescribeSpecificHistogramDensityFrequencyPlot ' Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot" - Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Tag = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Text = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.ToolTipText = "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons" @@ -860,7 +859,7 @@ Partial Class frmMain 'mnuDescribeSpecificPointPlot ' Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot" - Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..." Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..." Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot" @@ -868,7 +867,7 @@ Partial Class frmMain 'mnuDescribeSpecificLineSmoothPlot ' Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot" - Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificLineSmoothPlot.Tag = "Line_Plot..." Me.mnuDescribeSpecificLineSmoothPlot.Text = "Line Plot..." Me.mnuDescribeSpecificLineSmoothPlot.ToolTipText = "Line Plots, Smoothed Plots, Dumbbell and Slope Plots" @@ -876,12 +875,12 @@ Partial Class frmMain 'ToolStripSeparator26 ' Me.ToolStripSeparator26.Name = "ToolStripSeparator26" - Me.ToolStripSeparator26.Size = New System.Drawing.Size(309, 6) + Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6) ' 'mnuDescribeSpecificMapPlot ' Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot" - Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..." Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map" ' @@ -889,7 +888,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificDotPlot.Enabled = False Me.mnuDescribeSpecificDotPlot.Name = "mnuDescribeSpecificDotPlot" - Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificDotPlot.Tag = "Dotplot..." Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False @@ -897,32 +896,32 @@ Partial Class frmMain 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(309, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(206, 6) ' 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" - Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificMosaic.Text = "Mosaic Plot..." Me.mnuDescribeSpecificMosaic.ToolTipText = "Mosaic Plot" ' 'mnuDescribeSpecificCummulativeDistribution ' Me.mnuDescribeSpecificCummulativeDistribution.Name = "mnuDescribeSpecificCummulativeDistribution" - Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificCummulativeDistribution.Text = "Cumulative Distribution..." Me.mnuDescribeSpecificCummulativeDistribution.ToolTipText = "Cumulative Graph and Exceedance Graph" ' 'mnuDescribeSpecificParallelCoordinatePlot ' Me.mnuDescribeSpecificParallelCoordinatePlot.Name = "mnuDescribeSpecificParallelCoordinatePlot" - Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" @@ -931,14 +930,14 @@ Partial Class frmMain ' Me.mnuDescribeGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneralColumnSummaries, Me.mnuDescribeGeneralTabulation, Me.mnuDescribeGeneralGraphics, Me.ToolStripSeparator38, Me.mnuDescribeGeneralUseSummaries}) Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeGeneral.Tag = "General" Me.mnuDescribeGeneral.Text = "General" ' 'mnuDescribeGeneralColumnSummaries ' Me.mnuDescribeGeneralColumnSummaries.Name = "mnuDescribeGeneralColumnSummaries" - Me.mnuDescribeGeneralColumnSummaries.Size = New System.Drawing.Size(281, 34) + Me.mnuDescribeGeneralColumnSummaries.Size = New System.Drawing.Size(188, 22) Me.mnuDescribeGeneralColumnSummaries.Tag = "Column_Summaries..." Me.mnuDescribeGeneralColumnSummaries.Text = "Column Summaries..." ' @@ -946,7 +945,7 @@ Partial Class frmMain ' Me.mnuDescribeGeneralTabulation.Enabled = False Me.mnuDescribeGeneralTabulation.Name = "mnuDescribeGeneralTabulation" - Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(281, 34) + Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(188, 22) Me.mnuDescribeGeneralTabulation.Tag = "Tabulation..." Me.mnuDescribeGeneralTabulation.Text = "Tabulation..." Me.mnuDescribeGeneralTabulation.Visible = False @@ -954,101 +953,101 @@ Partial Class frmMain 'mnuDescribeGeneralGraphics ' Me.mnuDescribeGeneralGraphics.Name = "mnuDescribeGeneralGraphics" - Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(281, 34) + Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(188, 22) Me.mnuDescribeGeneralGraphics.Tag = "Graphics..." Me.mnuDescribeGeneralGraphics.Text = "Graphics..." ' 'ToolStripSeparator38 ' Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator38.Size = New System.Drawing.Size(185, 6) ' 'mnuDescribeGeneralUseSummaries ' Me.mnuDescribeGeneralUseSummaries.Name = "mnuDescribeGeneralUseSummaries" - Me.mnuDescribeGeneralUseSummaries.Size = New System.Drawing.Size(281, 34) + Me.mnuDescribeGeneralUseSummaries.Size = New System.Drawing.Size(188, 22) Me.mnuDescribeGeneralUseSummaries.Text = "Use Summaries..." ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(268, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(175, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations ' Me.mnuDescribeMultivariateCorrelations.Name = "mnuDescribeMultivariateCorrelations" - Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateCorrelations.Text = "Correlations..." Me.mnuDescribeMultivariateCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' 'mnuDescribeMultivariateprincipalComponents ' Me.mnuDescribeMultivariateprincipalComponents.Name = "mnuDescribeMultivariateprincipalComponents" - Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateprincipalComponents.Text = "Principal Components..." ' 'mnuDescribeMultivariateCanonicalCorrelations ' Me.mnuDescribeMultivariateCanonicalCorrelations.Name = "mnuDescribeMultivariateCanonicalCorrelations" - Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuDescribeMultivariateClusterAnalysis ' Me.mnuDescribeMultivariateClusterAnalysis.Name = "mnuDescribeMultivariateClusterAnalysis" - Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateClusterAnalysis.Text = "Cluster Analysis..." Me.mnuDescribeMultivariateClusterAnalysis.ToolTipText = "Partitioning or Hierarchical" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(268, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(175, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel ' Me.mnuModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributions, Me.ToolStripSeparator3, Me.mnuModelFitModel, Me.mnuModelCompareModels, Me.mnuModelUseModel, Me.mnuModelOtherOneVariable, Me.mnuModelOtherTwoVariables, Me.mnuModelOtherThreeVariables, Me.mnuModelOtherGeneral}) Me.mnuModel.Name = "mnuModel" - Me.mnuModel.Size = New System.Drawing.Size(79, 29) + Me.mnuModel.Size = New System.Drawing.Size(53, 22) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1056,168 +1055,168 @@ Partial Class frmMain ' Me.mnuModelProbabilityDistributions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributionsShowModel, Me.mnuModelProbabilityDistributionsCompareModels, Me.mnuModelProbabilityDistributionsRandomSamplesUseModel}) Me.mnuModelProbabilityDistributions.Name = "mnuModelProbabilityDistributions" - Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(305, 34) + Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(201, 22) Me.mnuModelProbabilityDistributions.Tag = "Probability_Distributions" Me.mnuModelProbabilityDistributions.Text = "Probability Distributions" ' 'mnuModelProbabilityDistributionsShowModel ' Me.mnuModelProbabilityDistributionsShowModel.Name = "mnuModelProbabilityDistributionsShowModel" - Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsShowModel.Text = "Show Model..." ' 'mnuModelProbabilityDistributionsCompareModels ' Me.mnuModelProbabilityDistributionsCompareModels.Enabled = False Me.mnuModelProbabilityDistributionsCompareModels.Name = "mnuModelProbabilityDistributionsCompareModels" - Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsCompareModels.Tag = "Show_Models..." Me.mnuModelProbabilityDistributionsCompareModels.Text = "Compare Models..." ' 'mnuModelProbabilityDistributionsRandomSamplesUseModel ' Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Name = "mnuModelProbabilityDistributionsRandomSamplesUseModel" - Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..." Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples ..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(302, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(198, 6) ' 'mnuModelFitModel ' Me.mnuModelFitModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelFitModelOneVariable, Me.mnuModelFitModelTwoVariables, Me.mnuModelFitModelThreeVariables, Me.mnuModelFitModelFourVariables, Me.ToolStripSeparator24, Me.mnuModelFitModelGeneral, Me.mnuModelFitModelMachineLearning, Me.ToolStripSeparator57, Me.mnuModelFitModelHypothesisTestsKeyboard, Me.mnuModelFitModelModelKeyboard}) Me.mnuModelFitModel.Name = "mnuModelFitModel" - Me.mnuModelFitModel.Size = New System.Drawing.Size(305, 34) + Me.mnuModelFitModel.Size = New System.Drawing.Size(201, 22) Me.mnuModelFitModel.Tag = "Fit_Model..." Me.mnuModelFitModel.Text = "Fit Model" ' 'mnuModelFitModelOneVariable ' Me.mnuModelFitModelOneVariable.Name = "mnuModelFitModelOneVariable" - Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelOneVariable.Text = "One Variable..." ' 'mnuModelFitModelTwoVariables ' Me.mnuModelFitModelTwoVariables.Name = "mnuModelFitModelTwoVariables" - Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelTwoVariables.Text = "Two Variables..." ' 'mnuModelFitModelThreeVariables ' Me.mnuModelFitModelThreeVariables.Name = "mnuModelFitModelThreeVariables" - Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelThreeVariables.Text = "Three Variables..." ' 'mnuModelFitModelFourVariables ' Me.mnuModelFitModelFourVariables.Name = "mnuModelFitModelFourVariables" - Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelFourVariables.Text = "Four Variables..." ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(344, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelGeneral ' Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral" - Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelGeneral.Text = "General..." ' 'mnuModelFitModelMachineLearning ' Me.mnuModelFitModelMachineLearning.Enabled = False Me.mnuModelFitModelMachineLearning.Name = "mnuModelFitModelMachineLearning" - Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelMachineLearning.Text = "Machine Learning (Caret)..." Me.mnuModelFitModelMachineLearning.Visible = False ' 'ToolStripSeparator57 ' Me.ToolStripSeparator57.Name = "ToolStripSeparator57" - Me.ToolStripSeparator57.Size = New System.Drawing.Size(344, 6) + Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelHypothesisTestsKeyboard ' Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard" - Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelHypothesisTestsKeyboard.Text = "Hypothesis Tests Keyboards..." ' 'mnuModelFitModelModelKeyboard ' Me.mnuModelFitModelModelKeyboard.Name = "mnuModelFitModelModelKeyboard" - Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelModelKeyboard.Text = "Fit Model Keyboards..." ' 'mnuModelCompareModels ' Me.mnuModelCompareModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelCompareModelsOneVariable}) Me.mnuModelCompareModels.Name = "mnuModelCompareModels" - Me.mnuModelCompareModels.Size = New System.Drawing.Size(305, 34) + Me.mnuModelCompareModels.Size = New System.Drawing.Size(201, 22) Me.mnuModelCompareModels.Text = "Compare Models" ' 'mnuModelCompareModelsOneVariable ' Me.mnuModelCompareModelsOneVariable.Name = "mnuModelCompareModelsOneVariable" - Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuModelCompareModelsOneVariable.Text = "One Variable..." ' 'mnuModelUseModel ' Me.mnuModelUseModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelUseModelOneVariable, Me.mnuModelUseModelTwoVariables, Me.ToolStripSeparator59, Me.mnuModelUseModelGlance, Me.mnuModelUseModelTidy, Me.mnuModelUseModelAugment, Me.ToolStripSeparator58, Me.mnuModelUseModelUseModelKeyboard}) Me.mnuModelUseModel.Name = "mnuModelUseModel" - Me.mnuModelUseModel.Size = New System.Drawing.Size(305, 34) + Me.mnuModelUseModel.Size = New System.Drawing.Size(201, 22) Me.mnuModelUseModel.Text = "Use Model" ' 'mnuModelUseModelOneVariable ' Me.mnuModelUseModelOneVariable.Name = "mnuModelUseModelOneVariable" - Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelOneVariable.Text = "One Variable..." ' 'mnuModelUseModelTwoVariables ' Me.mnuModelUseModelTwoVariables.Name = "mnuModelUseModelTwoVariables" - Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelTwoVariables.Text = "Two Variables..." ' 'ToolStripSeparator59 ' Me.ToolStripSeparator59.Name = "ToolStripSeparator59" - Me.ToolStripSeparator59.Size = New System.Drawing.Size(297, 6) + Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelGlance ' Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance" - Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelGlance.Text = "Glance..." ' 'mnuModelUseModelTidy ' Me.mnuModelUseModelTidy.Name = "mnuModelUseModelTidy" - Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelTidy.Text = "Tidy..." ' 'mnuModelUseModelAugment ' Me.mnuModelUseModelAugment.Name = "mnuModelUseModelAugment" - Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelAugment.Text = "Augment..." ' 'ToolStripSeparator58 ' Me.ToolStripSeparator58.Name = "ToolStripSeparator58" - Me.ToolStripSeparator58.Size = New System.Drawing.Size(297, 6) + Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelUseModelKeyboard ' Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard" - Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..." ' 'mnuModelOtherOneVariable @@ -1225,14 +1224,14 @@ Partial Class frmMain Me.mnuModelOtherOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherOneVariableExactResults, Me.mnuModelOtherOneVariableSampleSummaryData, Me.mnuModelOtherOneVariableNonParametric, Me.mnuModelOtherOneVariableGoodnessofFit}) Me.mnuModelOtherOneVariable.Enabled = False Me.mnuModelOtherOneVariable.Name = "mnuModelOtherOneVariable" - Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)" Me.mnuModelOtherOneVariable.Text = "Other (One Variable)" ' 'mnuModelOtherOneVariableExactResults ' Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults" - Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1240,7 +1239,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1248,7 +1247,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1256,7 +1255,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -1265,7 +1264,7 @@ Partial Class frmMain Me.mnuModelOtherTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherTwoVariablesTwoSamples, Me.mnuModelOtherTwoVariablesSummaryData, Me.mnuModelOtherTwoVariablesSimpleRegression, Me.mnuModelOtherTwoVariablesOneWayANOVA, Me.mnuModelOtherTwoVariablesNonParametricTwoSamples, Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA}) Me.mnuModelOtherTwoVariables.Enabled = False Me.mnuModelOtherTwoVariables.Name = "mnuModelOtherTwoVariables" - Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" ' @@ -1273,7 +1272,7 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples" - Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..." Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..." ' @@ -1281,21 +1280,21 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData" - Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherTwoVariablesSummaryData.Text = "Summary Data..." ' 'mnuModelOtherTwoVariablesSimpleRegression ' Me.mnuModelOtherTwoVariablesSimpleRegression.Name = "mnuModelOtherTwoVariablesSimpleRegression" - Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesSimpleRegression.Tag = "Simple_Regression..." Me.mnuModelOtherTwoVariablesSimpleRegression.Text = "Simple Regression..." ' 'mnuModelOtherTwoVariablesOneWayANOVA ' Me.mnuModelOtherTwoVariablesOneWayANOVA.Name = "mnuModelOtherTwoVariablesOneWayANOVA" - Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..." ' @@ -1303,14 +1302,14 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples" - Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Tag = "Non_Parameteric_Two_Samples..." Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Text = "Non Parametric Two Samples..." ' 'mnuModelOtherTwoVariablesNonParametricOneWayANOVA ' Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Name = "mnuModelOtherTwoVariablesNonParametricOneWayANOVA" - Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Tag = "Non_Parameteric_One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Text = "Non Parameteric One Way ANOVA..." ' @@ -1319,7 +1318,7 @@ Partial Class frmMain Me.mnuModelOtherThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherThreeVariablesSimpleWithGroups, Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA, Me.mnuModelOtherThreeVariablesChisquareTest}) Me.mnuModelOtherThreeVariables.Enabled = False Me.mnuModelOtherThreeVariables.Name = "mnuModelOtherThreeVariables" - Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" ' @@ -1327,21 +1326,21 @@ Partial Class frmMain ' Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups" - Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesSimpleWithGroups.Tag = "Simple_with_groups..." Me.mnuModelOtherThreeVariablesSimpleWithGroups.Text = "Simple With Groups..." ' 'mnuModelOtherThreeVariablesNonParametricTwoWayANOVA ' Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Name = "mnuModelOtherThreeVariablesNonParametricTwoWayANOVA" - Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Tag = "Non_Parametric_Two_Way_ANOVA..." Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Text = "Non Parametric Two Way ANOVA..." ' 'mnuModelOtherThreeVariablesChisquareTest ' Me.mnuModelOtherThreeVariablesChisquareTest.Name = "mnuModelOtherThreeVariablesChisquareTest" - Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test" Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..." ' @@ -1350,7 +1349,7 @@ Partial Class frmMain Me.mnuModelOtherGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherGeneralANOVAGeneral, Me.mnuModelOtherGeneralRegression, Me.mnuModelOtherGeneralLogLinear}) Me.mnuModelOtherGeneral.Enabled = False Me.mnuModelOtherGeneral.Name = "mnuModelOtherGeneral" - Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" ' @@ -1358,7 +1357,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral" - Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..." Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..." ' @@ -1366,7 +1365,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralRegression.Enabled = False Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression" - Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralRegression.Tag = "Regression..." Me.mnuModelOtherGeneralRegression.Text = "Regression..." ' @@ -1374,7 +1373,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralLogLinear.Enabled = False Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear" - Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' @@ -1382,7 +1381,7 @@ Partial Class frmMain ' Me.mnuClimaticExamine.Enabled = False Me.mnuClimaticExamine.Name = "mnuClimaticExamine" - Me.mnuClimaticExamine.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticExamine.Tag = "Examine" Me.mnuClimaticExamine.Text = "Examine..." Me.mnuClimaticExamine.Visible = False @@ -1391,7 +1390,7 @@ Partial Class frmMain ' Me.mnuClimaticProcess.Enabled = False Me.mnuClimaticProcess.Name = "mnuClimaticProcess" - Me.mnuClimaticProcess.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticProcess.Tag = "Process" Me.mnuClimaticProcess.Text = "Process..." Me.mnuClimaticProcess.Visible = False @@ -1400,7 +1399,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticEvaporationSite, Me.mnuClimaticEvaporationPenman}) Me.mnuClimaticEvaporation.Name = "mnuClimaticEvaporation" - Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticEvaporation.Tag = "Evaporation" Me.mnuClimaticEvaporation.Text = "Evaporation" Me.mnuClimaticEvaporation.Visible = False @@ -1409,7 +1408,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationSite.Enabled = False Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite" - Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(189, 34) + Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationSite.Tag = "Site" Me.mnuClimaticEvaporationSite.Text = "Site..." ' @@ -1417,7 +1416,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationPenman.Enabled = False Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman" - Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(189, 34) + Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationPenman.Tag = "Penman" Me.mnuClimaticEvaporationPenman.Text = "Penman..." ' @@ -1425,7 +1424,7 @@ Partial Class frmMain ' Me.mnuClimaticCrop.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCropCropCoefficients, Me.mnuClimaticCropWaterSatisfactionIndex}) Me.mnuClimaticCrop.Name = "mnuClimaticCrop" - Me.mnuClimaticCrop.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCrop.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCrop.Tag = "Crop" Me.mnuClimaticCrop.Text = "Crop" Me.mnuClimaticCrop.Visible = False @@ -1434,21 +1433,21 @@ Partial Class frmMain ' Me.mnuClimaticCropCropCoefficients.Enabled = False Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients" - Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCropCropCoefficients.Text = "Crop Coefficients..." ' 'mnuClimaticCropWaterSatisfactionIndex ' Me.mnuClimaticCropWaterSatisfactionIndex.Enabled = False Me.mnuClimaticCropWaterSatisfactionIndex.Name = "mnuClimaticCropWaterSatisfactionIndex" - Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCropWaterSatisfactionIndex.Text = "Water Satisfaction Index..." ' 'mnuClimaticHeatSum ' Me.mnuClimaticHeatSum.Enabled = False Me.mnuClimaticHeatSum.Name = "mnuClimaticHeatSum" - Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticHeatSum.Tag = "Heat_Sum" Me.mnuClimaticHeatSum.Text = "Heat Sum..." Me.mnuClimaticHeatSum.Visible = False @@ -1457,7 +1456,7 @@ Partial Class frmMain ' Me.mnuView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuViewDataView, Me.mnuViewOutput, Me.mnuViewLogScript, Me.mnuViewColumnMetadata, Me.mnuViewDataFrameMetadata, Me.mnuViewStructuredMenu, Me.ToolStripSeparator22, Me.mnuViewClimaticMenu, Me.mnuViewProcurementMenu, Me.mnuViewOptionsByContextMenu, Me.ToolStripSeparator39, Me.mnuViewResetToDefaultLayout, Me.mnuViewSwapDataAndMetadata}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(65, 29) + Me.mnuView.Size = New System.Drawing.Size(44, 22) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1465,7 +1464,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(314, 34) + Me.mnuViewDataView.Size = New System.Drawing.Size(205, 22) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1473,21 +1472,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(314, 34) + Me.mnuViewOutput.Size = New System.Drawing.Size(205, 22) Me.mnuViewOutput.Text = "Output" ' 'mnuViewLogScript ' Me.mnuViewLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewLogScript.Name = "mnuViewLogScript" - Me.mnuViewLogScript.Size = New System.Drawing.Size(314, 34) + Me.mnuViewLogScript.Size = New System.Drawing.Size(205, 22) Me.mnuViewLogScript.Text = "Log/Script" ' 'mnuViewColumnMetadata ' Me.mnuViewColumnMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewColumnMetadata.Name = "mnuViewColumnMetadata" - Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(314, 34) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(205, 22) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1495,7 +1494,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(314, 34) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(205, 22) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1503,19 +1502,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(314, 34) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(205, 22) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(311, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(202, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(314, 34) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(205, 22) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1523,7 +1522,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(314, 34) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(205, 22) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1531,131 +1530,131 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(314, 34) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(205, 22) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(311, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(202, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(314, 34) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(205, 22) Me.mnuViewResetToDefaultLayout.Text = "Reset to Default Layout" ' 'mnuViewSwapDataAndMetadata ' Me.mnuViewSwapDataAndMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndMetadata.Name = "mnuViewSwapDataAndMetadata" - Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(314, 34) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(205, 22) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuHelp ' Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpData, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(65, 29) + Me.mnuHelp.Size = New System.Drawing.Size(44, 22) Me.mnuHelp.Tag = "Help" Me.mnuHelp.Text = "Help" ' 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(209, 22) Me.mnuHelpHelpIntroduction.Text = "Introduction" ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpFAQ.Size = New System.Drawing.Size(209, 22) Me.mnuHelpFAQ.Text = "FAQ" ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(209, 22) Me.mnuHelpGetingStarted.Text = "Getting Started" ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(311, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(206, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpWindows.Size = New System.Drawing.Size(209, 22) Me.mnuHelpWindows.Text = "Windows" ' 'mnuHelpMenus ' Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpMenus.Size = New System.Drawing.Size(209, 22) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(209, 22) Me.mnuHelpAboutR.Text = "About R" Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(209, 22) Me.mnuHelpLearningStatistics.Text = "Learning Statistics" Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpRPackages.Size = New System.Drawing.Size(209, 22) Me.mnuHelpRPackages.Text = "R Packages" ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpGlossary.Size = New System.Drawing.Size(209, 22) Me.mnuHelpGlossary.Text = "Glossary" ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpData.Size = New System.Drawing.Size(209, 22) Me.mnuHelpData.Text = "Data" ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpLicence.Size = New System.Drawing.Size(209, 22) Me.mnuHelpLicence.Tag = "Licence..." Me.mnuHelpLicence.Text = "Licence" ' 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(311, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(206, 6) ' 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(209, 22) Me.mnuHelpPackagesDocumentation.Text = "Packages Documentation" ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(209, 6) ' 'mnuClimatic ' Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuClimaticTidyandExamine, Me.mnuExamineEditData, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods}) Me.mnuClimatic.Name = "mnuClimatic" - Me.mnuClimatic.Size = New System.Drawing.Size(90, 29) + Me.mnuClimatic.Size = New System.Drawing.Size(63, 22) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' @@ -1663,271 +1662,271 @@ Partial Class frmMain ' Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.ToolStripSeparator20, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimateFileImportfromClimSoftWizard, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip}) Me.mnuClimaticFile.Name = "mnuClimaticFile" - Me.mnuClimaticFile.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticFile.Text = "File" ' 'mnuClimaticFileImportSST ' Me.mnuClimaticFileImportSST.Name = "mnuClimaticFileImportSST" - Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportSST.Text = "Import SST..." ' 'mnuClimaticFileImportfromIRIDataLibrary ' Me.mnuClimaticFileImportfromIRIDataLibrary.Name = "mnuClimaticFileImportfromIRIDataLibrary" - Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromIRIDataLibrary.Text = "Import from IRI Data Library..." ' 'mnuClimaticFileImportfromClimateDataStore ' Me.mnuClimaticFileImportfromClimateDataStore.Name = "mnuClimaticFileImportfromClimateDataStore" - Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromClimateDataStore.Text = "Import from CDS (Climate Data Store)..." ' 'mnuClimaticFileImportandTidyNetCDF ' Me.mnuClimaticFileImportandTidyNetCDF.Name = "mnuClimaticFileImportandTidyNetCDF" - Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportandTidyNetCDF.Text = "Import and Tidy NetCDF..." ' 'mnuClimaticFileImportandTidyShapefile ' Me.mnuClimaticFileImportandTidyShapefile.Name = "mnuClimaticFileImportandTidyShapefile" - Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportandTidyShapefile.Text = "Import and Tidy Shapefile..." ' 'ToolStripSeparator20 ' Me.ToolStripSeparator20.Name = "ToolStripSeparator20" - Me.ToolStripSeparator20.Size = New System.Drawing.Size(423, 6) + Me.ToolStripSeparator20.Size = New System.Drawing.Size(279, 6) ' 'mnuClimateFileImportfromClimSoft ' Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft" - Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(426, 34) + Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(282, 22) Me.mnuClimateFileImportfromClimSoft.Text = "Import from Climsoft..." ' 'mnuClimateFileImportfromClimSoftWizard ' Me.mnuClimateFileImportfromClimSoftWizard.Name = "mnuClimateFileImportfromClimSoftWizard" - Me.mnuClimateFileImportfromClimSoftWizard.Size = New System.Drawing.Size(426, 34) + Me.mnuClimateFileImportfromClimSoftWizard.Size = New System.Drawing.Size(282, 22) Me.mnuClimateFileImportfromClimSoftWizard.Text = "Import from Climsoft Wizard..." ' 'mnuClimaticFileImportfromCliData ' Me.mnuClimaticFileImportfromCliData.Enabled = False Me.mnuClimaticFileImportfromCliData.Name = "mnuClimaticFileImportfromCliData" - Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..." Me.mnuClimaticFileImportfromCliData.Visible = False ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(423, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" - Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToClimsoft.Text = "Export to Climsoft..." ' 'mnuClimaticFileExportToCPT ' Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" - Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." ' 'mnuExportToWWRToolStrip ' Me.mnuExportToWWRToolStrip.Name = "mnuExportToWWRToolStrip" - Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(426, 34) + Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticTidyandExamine ' Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineVisualiseData, Me.mnuClimaticTidyandExamineTidyDailyData, Me.mnuClimaticTidyandExamineNonNumericCases, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" - Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticTidyandExamine.Text = "Tidy Data" ' 'mnuClimaticTidyandExamineVisualiseData ' Me.mnuClimaticTidyandExamineVisualiseData.Name = "mnuClimaticTidyandExamineVisualiseData" - Me.mnuClimaticTidyandExamineVisualiseData.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineVisualiseData.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineVisualiseData.Text = "Visualise Data..." ' 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineMerge.Text = "Merge..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'mnuExamineEditData ' Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator79, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns}) Me.mnuExamineEditData.Name = "mnuExamineEditData" - Me.mnuExamineEditData.Size = New System.Drawing.Size(325, 34) + Me.mnuExamineEditData.Size = New System.Drawing.Size(212, 22) Me.mnuExamineEditData.Text = "Examine/Edit Data" ' 'mnuExamineEditDataOneVariableSummarise ' Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" - Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuExamineEditDataOneVariableGraph ' Me.mnuExamineEditDataOneVariableGraph.Name = "mnuExamineEditDataOneVariableGraph" - Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuExamineEditDataOneVariableFrequencies ' Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies" - Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'ToolStripSeparator78 ' Me.ToolStripSeparator78.Name = "ToolStripSeparator78" - Me.ToolStripSeparator78.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6) ' 'mnuExamineEditDataPivotTable ' Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" - Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator79 ' Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator79.Size = New System.Drawing.Size(212, 6) ' 'mnuExamineEditDataSetupForDataEditing ' Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" - Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataSetupForDataEditing.Text = "Setup for Data Editing..." ' 'mnuExamineEditDataDailyDataEditing ' Me.mnuExamineEditDataDailyDataEditing.Name = "mnuExamineEditDataDailyDataEditing" - Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..." ' 'mnuExamineEditDataCompareColumns ' Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns" - Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." ' 'mnuClimaticDates ' Me.mnuClimaticDates.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDatesGenerateDates, Me.mnuClimaticDatesMakeDate, Me.mnuClimaticDatesInfillMissingDates, Me.mnuClimaticDatesUseDate, Me.mnuClimaticDatesMakeTime, Me.mnuClimaticDatesUseTime}) Me.mnuClimaticDates.Name = "mnuClimaticDates" - Me.mnuClimaticDates.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDates.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDates.Text = "Dates" ' 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -1935,175 +1934,175 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' 'mnuClimaticDefineClimaticData ' Me.mnuClimaticDefineClimaticData.Name = "mnuClimaticDefineClimaticData" - Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDefineClimaticData.Text = "Define Climatic Data..." ' 'mnuClimaticCheckData ' Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations}) Me.mnuClimaticCheckData.Name = "mnuClimaticCheckData" - Me.mnuClimaticCheckData.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCheckData.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCheckData.Text = "Check Data" ' 'mnuClimaticCheckDataInventory ' Me.mnuClimaticCheckDataInventory.Name = "mnuClimaticCheckDataInventory" - Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataInventory.Text = "Inventory..." ' 'mnuClimaticCheckDataDisplayDaily ' Me.mnuClimaticCheckDataDisplayDaily.Name = "mnuClimaticCheckDataDisplayDaily" - Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataDisplayDaily.Text = "Display Daily..." ' 'ToolStripSeparator65 ' Me.ToolStripSeparator65.Name = "ToolStripSeparator65" - Me.ToolStripSeparator65.Size = New System.Drawing.Size(310, 6) + Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataFillMissingValues ' Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues" - Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataFillMissingValues.Text = "Fill Missing Values..." ' 'mnuClimaticCheckDataBoxplot ' Me.mnuClimaticCheckDataBoxplot.Name = "mnuClimaticCheckDataBoxplot" - Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataBoxplot.Text = "Boxplot..." ' 'mnuClimaticCheckDataQCTemperatures ' Me.mnuClimaticCheckDataQCTemperatures.Name = "mnuClimaticCheckDataQCTemperatures" - Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataQCTemperatures.Text = "QC Temperatures..." ' 'mnuClimaticCheckDataQCRainfall ' Me.mnuClimaticCheckDataQCRainfall.Name = "mnuClimaticCheckDataQCRainfall" - Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataQCRainfall.Text = "QC Rainfall..." ' 'ToolStripSeparator70 ' Me.ToolStripSeparator70.Name = "ToolStripSeparator70" - Me.ToolStripSeparator70.Size = New System.Drawing.Size(310, 6) + Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataHomogenization ' Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization" - Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataHomogenization.Text = "Homogenization..." ' 'mnuClimaticCheckDataCheckStationLocations ' Me.mnuClimaticCheckDataCheckStationLocations.Name = "mnuClimaticCheckDataCheckStationLocations" - Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticPrepare ' Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareClimdex, Me.mnuClimaticPrepareSPI, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) Me.mnuClimaticPrepare.Name = "mnuClimaticPrepare" - Me.mnuClimaticPrepare.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticPrepare.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPrepare.Tag = "Prepare" Me.mnuClimaticPrepare.Text = "Prepare" ' 'mnuCimaticPrepareTransform ' Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" - Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(281, 34) + Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) Me.mnuCimaticPrepareTransform.Text = "Transform..." ' 'mnuClimaticPrepareConversions ' Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions" - Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareConversions.Text = "Conversions..." ' 'ToolStripSeparator37 ' Me.ToolStripSeparator37.Name = "ToolStripSeparator37" - Me.ToolStripSeparator37.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimaticSummaries ' Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." ' 'mnuClimaticPrepareStartoftheRains ' Me.mnuClimaticPrepareStartoftheRains.Name = "mnuClimaticPrepareStartoftheRains" - Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareStartoftheRains.Text = "Start of the Rains..." ' 'mnuClimaticPrepareEndOfRains ' Me.mnuClimaticPrepareEndOfRains.Name = "mnuClimaticPrepareEndOfRains" - Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareEndOfRains.Text = "End of Rains..." ' 'mnuClimaticPrepareLengthOfSeason ' Me.mnuClimaticPrepareLengthOfSeason.Name = "mnuClimaticPrepareLengthOfSeason" - Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareLengthOfSeason.Text = "Length of Season..." ' 'mnuClimaticPrepareSpells ' Me.mnuClimaticPrepareSpells.Name = "mnuClimaticPrepareSpells" - Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSpells.Text = "Spells..." ' 'mnuClimaticPrepareExtremes ' Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" - Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareExtremes.Text = "Extremes..." ' 'ToolStripSeparator64 ' Me.ToolStripSeparator64.Name = "ToolStripSeparator64" - Me.ToolStripSeparator64.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimdex ' Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex" - Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareClimdex.Text = "Climdex..." ' 'mnuClimaticPrepareSPI ' Me.mnuClimaticPrepareSPI.Name = "mnuClimaticPrepareSPI" - Me.mnuClimaticPrepareSPI.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSPI.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSPI.Text = "SPI/SPEI..." ' 'ToolStripSeparator51 ' Me.ToolStripSeparator51.Name = "ToolStripSeparator51" - Me.ToolStripSeparator51.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareEvapotranspiration ' Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration" - Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareEvapotranspiration.Text = "Evapotranspiration..." ' 'mnuClimaticPrepareSummary ' Me.mnuClimaticPrepareSummary.Enabled = False Me.mnuClimaticPrepareSummary.Name = "mnuClimaticPrepareSummary" - Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSummary.Text = "Summary..." Me.mnuClimaticPrepareSummary.Visible = False ' @@ -2111,7 +2110,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareNewWorksheet.Enabled = False Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet" - Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet" Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..." Me.mnuClimaticPrepareNewWorksheet.Visible = False @@ -2120,7 +2119,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareImportDailyData.Enabled = False Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData" - Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareImportDailyData.Tag = "Import_daily_data" Me.mnuClimaticPrepareImportDailyData.Text = "Import daily Data..." Me.mnuClimaticPrepareImportDailyData.Visible = False @@ -2129,7 +2128,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareMakeFactor.Enabled = False Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor" - Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor" Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..." Me.mnuClimaticPrepareMakeFactor.Visible = False @@ -2138,7 +2137,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareShiftDailyData.Enabled = False Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData" - Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareShiftDailyData.Tag = "Shift_Daily_data" Me.mnuClimaticPrepareShiftDailyData.Text = "Shift Daily Data..." Me.mnuClimaticPrepareShiftDailyData.Visible = False @@ -2147,7 +2146,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareUnstackDailyData.Enabled = False Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData" - Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareUnstackDailyData.Tag = "Unstack_Daily_data" Me.mnuClimaticPrepareUnstackDailyData.Text = "Unstack Daily Data..." Me.mnuClimaticPrepareUnstackDailyData.Visible = False @@ -2156,7 +2155,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareStackDailyData.Enabled = False Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData" - Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareStackDailyData.Tag = "Stack_Daily_data" Me.mnuClimaticPrepareStackDailyData.Text = "Stack Daily data..." Me.mnuClimaticPrepareStackDailyData.Visible = False @@ -2164,342 +2163,342 @@ Partial Class frmMain 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" - Me.ToolStripSeparator30.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeRainfall, Me.mnuClimaticDescribeTemperatures, Me.mnuClimaticDescribeWindSpeedDirection, Me.mnuClimaticDescribeSunshineRadiation, Me.ToolStripSeparator17, Me.mnuClimaticDescribeGeneral, Me.ToolStripSeparator31}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" - Me.mnuClimaticDescribe.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDescribe.Text = "Describe" ' 'mnuClimaticDescribeRainfall ' Me.mnuClimaticDescribeRainfall.Enabled = False Me.mnuClimaticDescribeRainfall.Name = "mnuClimaticDescribeRainfall" - Me.mnuClimaticDescribeRainfall.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticDescribeRainfall.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticDescribeRainfall.Text = "Rainfall..." ' 'mnuClimaticDescribeTemperatures ' Me.mnuClimaticDescribeTemperatures.Enabled = False Me.mnuClimaticDescribeTemperatures.Name = "mnuClimaticDescribeTemperatures" - Me.mnuClimaticDescribeTemperatures.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticDescribeTemperatures.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticDescribeTemperatures.Text = "Temperature..." ' 'mnuClimaticDescribeWindSpeedDirection ' Me.mnuClimaticDescribeWindSpeedDirection.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeWindSpeedDirectionWindRose}) Me.mnuClimaticDescribeWindSpeedDirection.Name = "mnuClimaticDescribeWindSpeedDirection" - Me.mnuClimaticDescribeWindSpeedDirection.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticDescribeWindSpeedDirection.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticDescribeWindSpeedDirection.Text = "Wind Speed/Direction..." ' 'mnuClimaticDescribeWindSpeedDirectionWindRose ' Me.mnuClimaticDescribeWindSpeedDirectionWindRose.Name = "mnuClimaticDescribeWindSpeedDirectionWindRose" - Me.mnuClimaticDescribeWindSpeedDirectionWindRose.Size = New System.Drawing.Size(211, 34) + Me.mnuClimaticDescribeWindSpeedDirectionWindRose.Size = New System.Drawing.Size(139, 22) Me.mnuClimaticDescribeWindSpeedDirectionWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeSunshineRadiation ' Me.mnuClimaticDescribeSunshineRadiation.Enabled = False Me.mnuClimaticDescribeSunshineRadiation.Name = "mnuClimaticDescribeSunshineRadiation" - Me.mnuClimaticDescribeSunshineRadiation.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticDescribeSunshineRadiation.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticDescribeSunshineRadiation.Text = "Sunshine/Radiation..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(196, 6) ' 'mnuClimaticDescribeGeneral ' Me.mnuClimaticDescribeGeneral.Enabled = False Me.mnuClimaticDescribeGeneral.Name = "mnuClimaticDescribeGeneral" - Me.mnuClimaticDescribeGeneral.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticDescribeGeneral.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticDescribeGeneral.Text = "General" ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(196, 6) ' 'mnuClimaticNCMP ' Me.mnuClimaticNCMP.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticNCMPIndices, Me.mnuClimaticNCMPVariogram, Me.mnuClimaticNCMPRegionAverage, Me.mnuClimaticNCMPTrendGraphs, Me.mnuClimaticNCMPCountRecords, Me.mnuClimaticNCMPSummary}) Me.mnuClimaticNCMP.Name = "mnuClimaticNCMP" - Me.mnuClimaticNCMP.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticNCMP.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticNCMP.Text = "NCMP" ' 'mnuClimaticNCMPIndices ' Me.mnuClimaticNCMPIndices.Name = "mnuClimaticNCMPIndices" - Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPIndices.Text = "Indices..." ' 'mnuClimaticNCMPVariogram ' Me.mnuClimaticNCMPVariogram.Name = "mnuClimaticNCMPVariogram" - Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPVariogram.Text = "Variogram..." ' 'mnuClimaticNCMPRegionAverage ' Me.mnuClimaticNCMPRegionAverage.Name = "mnuClimaticNCMPRegionAverage" - Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPRegionAverage.Text = "Region Average..." ' 'mnuClimaticNCMPTrendGraphs ' Me.mnuClimaticNCMPTrendGraphs.Name = "mnuClimaticNCMPTrendGraphs" - Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPTrendGraphs.Text = "Trend Graphs..." ' 'mnuClimaticNCMPCountRecords ' Me.mnuClimaticNCMPCountRecords.Name = "mnuClimaticNCMPCountRecords" - Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPCountRecords.Text = "Count Records..." ' 'mnuClimaticNCMPSummary ' Me.mnuClimaticNCMPSummary.Name = "mnuClimaticNCMPSummary" - Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPSummary.Text = "Summary..." ' 'mnuClimaticPICSA ' Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGraph, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" - Me.mnuClimaticPICSA.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPICSA.Text = "PICSA" ' 'mnuClimaticPICSARainfallGraph ' Me.mnuClimaticPICSARainfallGraph.Name = "mnuClimaticPICSARainfallGraph" - Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSARainfallGraph.Text = "Rainfall Graph..." ' 'mnuClimaticPICSATemperatureGraph ' Me.mnuClimaticPICSATemperatureGraph.Name = "mnuClimaticPICSATemperatureGraph" - Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' 'mnuClimaticPICSAGeneralGraph ' Me.mnuClimaticPICSAGeneralGraph.Name = "mnuClimaticPICSAGeneralGraph" - Me.mnuClimaticPICSAGeneralGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSAGeneralGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSAGeneralGraph.Text = "General Graph..." ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" - Me.ToolStripSeparator73.Size = New System.Drawing.Size(361, 6) + Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticPICSACumExeedenceGraph ' Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph" - Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSACumExeedenceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticPICSACrops ' Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops" - Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSACrops.Text = "Crops..." ' 'mnuCMSAF ' Me.mnuCMSAF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCMSAFPlotRegion, Me.mnuClimaticCMSAFExporttoCMSAFRToolbox}) Me.mnuCMSAF.Name = "mnuCMSAF" - Me.mnuCMSAF.Size = New System.Drawing.Size(325, 34) + Me.mnuCMSAF.Size = New System.Drawing.Size(212, 22) Me.mnuCMSAF.Text = "CM SAF" ' 'mnuClimaticCMSAFPlotRegion ' Me.mnuClimaticCMSAFPlotRegion.Name = "mnuClimaticCMSAFPlotRegion" - Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(351, 34) + Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(231, 22) Me.mnuClimaticCMSAFPlotRegion.Text = "Plot Region..." ' 'mnuClimaticCMSAFExporttoCMSAFRToolbox ' Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Name = "mnuClimaticCMSAFExporttoCMSAFRToolbox" - Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(351, 34) + Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(231, 22) Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Text = "Export to CM SAF R Toolbox..." ' 'mnuClimaticCompare ' Me.mnuClimaticCompare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCompareCalculation, Me.mnuClimaticCompareSummary, Me.ToolStripSeparator66, Me.mnuClimaticCompareCorrelations, Me.mnuClimaticCompareScatterplot, Me.mnuClimaticCompareTimeSeriesPlot, Me.mnuClimaticCompareSeasonalPlot, Me.mnuClimaticCompareDensityPlot, Me.mnuClimaticCompareConditionalQuantiles, Me.mnuClimaticCompareTaylorDiagram}) Me.mnuClimaticCompare.Name = "mnuClimaticCompare" - Me.mnuClimaticCompare.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCompare.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCompare.Text = "Compare" ' 'mnuClimaticCompareCalculation ' Me.mnuClimaticCompareCalculation.Name = "mnuClimaticCompareCalculation" - Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareCalculation.Text = "Calculation..." ' 'mnuClimaticCompareSummary ' Me.mnuClimaticCompareSummary.Name = "mnuClimaticCompareSummary" - Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareSummary.Text = "Summary..." ' 'ToolStripSeparator66 ' Me.ToolStripSeparator66.Name = "ToolStripSeparator66" - Me.ToolStripSeparator66.Size = New System.Drawing.Size(293, 6) + Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6) ' 'mnuClimaticCompareCorrelations ' Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations" - Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareCorrelations.Text = "Correlations..." ' 'mnuClimaticCompareScatterplot ' Me.mnuClimaticCompareScatterplot.Name = "mnuClimaticCompareScatterplot" - Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareScatterplot.Text = "Scatterplot..." ' 'mnuClimaticCompareTimeSeriesPlot ' Me.mnuClimaticCompareTimeSeriesPlot.Name = "mnuClimaticCompareTimeSeriesPlot" - Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareTimeSeriesPlot.Text = "Time Series Plot..." ' 'mnuClimaticCompareSeasonalPlot ' Me.mnuClimaticCompareSeasonalPlot.Name = "mnuClimaticCompareSeasonalPlot" - Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareSeasonalPlot.Text = "Seasonal Plot..." ' 'mnuClimaticCompareDensityPlot ' Me.mnuClimaticCompareDensityPlot.Name = "mnuClimaticCompareDensityPlot" - Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareDensityPlot.Text = "Density Plot..." ' 'mnuClimaticCompareConditionalQuantiles ' Me.mnuClimaticCompareConditionalQuantiles.Name = "mnuClimaticCompareConditionalQuantiles" - Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareConditionalQuantiles.Text = "Conditional Quantiles..." ' 'mnuClimaticCompareTaylorDiagram ' Me.mnuClimaticCompareTaylorDiagram.Name = "mnuClimaticCompareTaylorDiagram" - Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareTaylorDiagram.Text = "Taylor Diagram..." ' 'mnuClimaticMapping ' Me.mnuClimaticMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticMappingMap, Me.mnuClimaticMappingCheckStationLocations}) Me.mnuClimaticMapping.Name = "mnuClimaticMapping" - Me.mnuClimaticMapping.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticMapping.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticMapping.Text = "Mapping" ' 'mnuClimaticMappingMap ' Me.mnuClimaticMappingMap.Name = "mnuClimaticMappingMap" - Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticMappingMap.Text = "Map..." ' 'mnuClimaticMappingCheckStationLocations ' Me.mnuClimaticMappingCheckStationLocations.Name = "mnuClimaticMappingCheckStationLocations" - Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticMappingCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticModel ' Me.mnuClimaticModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelCircular, Me.mnuClimaticModelMarkovModelling}) Me.mnuClimaticModel.Name = "mnuClimaticModel" - Me.mnuClimaticModel.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticModel.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticModel.Text = "Model" ' 'mnuClimaticModelsExtremes ' Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" - Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelsExtremes.Text = "Extremes..." ' 'mnuClimaticModelCircular ' Me.mnuClimaticModelCircular.Enabled = False Me.mnuClimaticModelCircular.Name = "mnuClimaticModelCircular" - Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelCircular.Text = "Circular..." Me.mnuClimaticModelCircular.Visible = False ' 'mnuClimaticModelMarkovModelling ' Me.mnuClimaticModelMarkovModelling.Name = "mnuClimaticModelMarkovModelling" - Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelMarkovModelling.Tag = "Markov_Modelling" Me.mnuClimaticModelMarkovModelling.Text = "Markov Modelling..." ' 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticSCF ' Me.mnuClimaticSCF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticSCFSupportOpenSST, Me.mnuClimaticSCFSupportExporttoCPT, Me.ToolStripSeparator32, Me.mnuClimaticSCFSupportCorrelations, Me.mnuClimaticSCFSupportPrincipalComponents, Me.mnuClimaticSCFSupportCanonicalCorrelations, Me.mnuClimaticSCFSupportCumulativeExceedanceGraph}) Me.mnuClimaticSCF.Name = "mnuClimaticSCF" - Me.mnuClimaticSCF.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticSCF.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticSCF.Text = "Seasonal Forecast Support" ' 'mnuClimaticSCFSupportOpenSST ' Me.mnuClimaticSCFSupportOpenSST.Name = "mnuClimaticSCFSupportOpenSST" - Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportOpenSST.Text = "Open SST..." ' 'mnuClimaticSCFSupportExporttoCPT ' Me.mnuClimaticSCFSupportExporttoCPT.Name = "mnuClimaticSCFSupportExporttoCPT" - Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportExporttoCPT.Tag = "Export_to_CPT" Me.mnuClimaticSCFSupportExporttoCPT.Text = "Export to CPT..." ' 'ToolStripSeparator32 ' Me.ToolStripSeparator32.Name = "ToolStripSeparator32" - Me.ToolStripSeparator32.Size = New System.Drawing.Size(361, 6) + Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticSCFSupportCorrelations ' Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations" - Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCorrelations.Text = "Correlations..." ' 'mnuClimaticSCFSupportPrincipalComponents ' Me.mnuClimaticSCFSupportPrincipalComponents.Name = "mnuClimaticSCFSupportPrincipalComponents" - Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportPrincipalComponents.Text = "Principal Components..." ' 'mnuClimaticSCFSupportCanonicalCorrelations ' Me.mnuClimaticSCFSupportCanonicalCorrelations.Name = "mnuClimaticSCFSupportCanonicalCorrelations" - Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuClimaticSCFSupportCumulativeExceedanceGraph ' Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Name = "mnuClimaticSCFSupportCumulativeExceedanceGraph" - Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticClimateMethods ' Me.mnuClimaticClimateMethods.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulation, Me.mnuClimaticClimateMethodsGraphics, Me.mnuClimaticClimateMethodsModel, Me.mnuClimaticClimateMethodsAdditional, Me.mnuClimateMethodsCreateClimateObject}) Me.mnuClimaticClimateMethods.Name = "mnuClimaticClimateMethods" - Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods" Me.mnuClimaticClimateMethods.Text = "Climate Methods" Me.mnuClimaticClimateMethods.Visible = False @@ -2508,7 +2507,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulationStartOfRain, Me.mnuClimaticClimateMethodsDataManipulationEndOfRain, Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth, Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular, Me.mnuClimaticClimateMethodsDataManipulationDayMonth, Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily, Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear, Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal, Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength, Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA, Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents, Me.mnuClimaticClimateMethodsDataManipulationMissingData, Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable, Me.mnuClimateMethodsDataManipulationMonthlySummaries, Me.mnuClimateMethodsDataManipulationOutputForCD}) Me.mnuClimaticClimateMethodsDataManipulation.Name = "mnuClimaticClimateMethodsDataManipulation" - Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation" Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation" ' @@ -2516,7 +2515,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain" - Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..." ' @@ -2524,7 +2523,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain" - Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..." ' @@ -2532,7 +2531,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month" Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..." ' @@ -2540,7 +2539,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular" - Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular" Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..." ' @@ -2548,7 +2547,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month" Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..." ' @@ -2556,7 +2555,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily" Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..." ' @@ -2564,7 +2563,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year" Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..." ' @@ -2572,7 +2571,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal" - Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total" Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..." ' @@ -2580,7 +2579,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength" - Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length" Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..." ' @@ -2588,7 +2587,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA" - Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA" Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..." ' @@ -2596,7 +2595,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents" - Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events" Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..." ' @@ -2604,7 +2603,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData" - Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data" Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..." ' @@ -2612,7 +2611,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable" - Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table" Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..." ' @@ -2620,7 +2619,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries" - Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(342, 34) + Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries" Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..." ' @@ -2628,7 +2627,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD" - Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(342, 34) + Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT" Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..." ' @@ -2636,7 +2635,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphics.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot, Me.mnuClimaticClimateMethodsGraphicsCliplot, Me.mnuClimaticClimateMethodsGraphicsMissingValues, Me.mnuClimaticClimateMethodsGraphicsHistogram, Me.mnuClimaticClimateMethodsGraphicsCumExceedance, Me.mnuClimaticClimateMethodsGraphicsBoxplot, Me.mnuClimaticClimateMethodsGraphicsInventory, Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall, Me.mnuClimaticClimateMethodsGraphicsRainCount, Me.mnuClimaticClimateMethodsGraphicsTimeseries, Me.mnuClimaticClimateMethodsGraphicsWindrose, Me.mnuClimateMethodsGraphicsMultipleLines, Me.mnuClmateMethodThreeSummaries}) Me.mnuClimaticClimateMethodsGraphics.Name = "mnuClimaticClimateMethodsGraphics" - Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics" Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics" ' @@ -2644,7 +2643,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot" - Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot" Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..." ' @@ -2652,7 +2651,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot" - Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot" Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..." ' @@ -2660,7 +2659,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues" - Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values" Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..." ' @@ -2668,7 +2667,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram" - Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram" Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..." ' @@ -2676,7 +2675,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance" - Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence" Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..." ' @@ -2684,7 +2683,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot" - Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot" Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..." ' @@ -2692,7 +2691,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory" - Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory" Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..." ' @@ -2700,7 +2699,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall" - Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall" Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..." ' @@ -2708,7 +2707,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount" - Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count" Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..." ' @@ -2716,7 +2715,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries" - Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries" Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..." ' @@ -2724,7 +2723,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose" - Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose" Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..." ' @@ -2732,7 +2731,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines" - Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(325, 34) + Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22) Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines" Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..." ' @@ -2740,7 +2739,7 @@ Partial Class frmMain ' Me.mnuClmateMethodThreeSummaries.Enabled = False Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries" - Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(325, 34) + Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22) Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries" Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..." ' @@ -2748,7 +2747,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsModel.Enabled = False Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel" - Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsModel.Tag = "Model" Me.mnuClimaticClimateMethodsModel.Text = "Model..." ' @@ -2756,7 +2755,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditional.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsAdditionalOutputForCPT, Me.mnuClimaticClimateMethodsAdditionalRainsStatistics, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain, Me.mnuClimaticClimateMethodsAdditionalWaterBalance}) Me.mnuClimaticClimateMethodsAdditional.Name = "mnuClimaticClimateMethodsAdditional" - Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional" Me.mnuClimaticClimateMethodsAdditional.Text = "Additional" ' @@ -2764,7 +2763,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT" - Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT" Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..." ' @@ -2772,7 +2771,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics" - Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics" Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..." ' @@ -2780,7 +2779,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..." ' @@ -2788,7 +2787,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..." ' @@ -2796,7 +2795,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance" - Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance" Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..." ' @@ -2804,7 +2803,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsCreateClimateObject.Enabled = False Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject" - Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(297, 34) + Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22) Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' @@ -2812,7 +2811,7 @@ Partial Class frmMain ' Me.mnuFileSave.Name = "mnuFileSave" Me.mnuFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys) - Me.mnuFileSave.Size = New System.Drawing.Size(351, 34) + Me.mnuFileSave.Size = New System.Drawing.Size(232, 22) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2820,32 +2819,32 @@ Partial Class frmMain ' Me.mnuFileSaveAs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileSaveAsDataAs, Me.mnuFileSaveAsOutputAs, Me.mnuFileSaveAsLogAs, Me.mnuFileSaveAsScriptAs}) Me.mnuFileSaveAs.Name = "mnuFileSaveAs" - Me.mnuFileSaveAs.Size = New System.Drawing.Size(351, 34) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(232, 22) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' 'mnuFileSaveAsDataAs ' Me.mnuFileSaveAsDataAs.Name = "mnuFileSaveAsDataAs" - Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsDataAs.Text = "Save Data As..." ' 'mnuFileSaveAsOutputAs ' Me.mnuFileSaveAsOutputAs.Name = "mnuFileSaveAsOutputAs" - Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsOutputAs.Text = "Save Output As..." ' 'mnuFileSaveAsLogAs ' Me.mnuFileSaveAsLogAs.Name = "mnuFileSaveAsLogAs" - Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsLogAs.Text = "Save Log As..." ' 'mnuFileSaveAsScriptAs ' Me.mnuFileSaveAsScriptAs.Name = "mnuFileSaveAsScriptAs" - Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsScriptAs.Text = "Save Script As..." ' 'mnuFilePrint @@ -2853,7 +2852,7 @@ Partial Class frmMain Me.mnuFilePrint.Enabled = False Me.mnuFilePrint.Name = "mnuFilePrint" Me.mnuFilePrint.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.P), System.Windows.Forms.Keys) - Me.mnuFilePrint.Size = New System.Drawing.Size(351, 34) + Me.mnuFilePrint.Size = New System.Drawing.Size(232, 22) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -2862,7 +2861,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(351, 34) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(232, 22) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -2870,20 +2869,20 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(348, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(229, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(351, 34) + Me.mnuFIleExit.Size = New System.Drawing.Size(232, 22) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditFindNext, Me.mnuEditReplace, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuPasteSpecial, Me.mnuEditPasteNewDataFrame, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditFindNext, Me.mnuEditReplace, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuEditPasteNewCols, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(58, 29) + Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' @@ -2891,7 +2890,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(366, 34) + Me.mnuEditFind.Size = New System.Drawing.Size(207, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2899,14 +2898,14 @@ Partial Class frmMain ' Me.mnuEditFindNext.Enabled = False Me.mnuEditFindNext.Name = "mnuEditFindNext" - Me.mnuEditFindNext.Size = New System.Drawing.Size(366, 34) + Me.mnuEditFindNext.Size = New System.Drawing.Size(207, 22) Me.mnuEditFindNext.Text = "Find Next" ' 'mnuEditReplace ' Me.mnuEditReplace.Enabled = False Me.mnuEditReplace.Name = "mnuEditReplace" - Me.mnuEditReplace.Size = New System.Drawing.Size(366, 34) + Me.mnuEditReplace.Size = New System.Drawing.Size(207, 22) Me.mnuEditReplace.Tag = "Replace" Me.mnuEditReplace.Text = "Replace" ' @@ -2914,7 +2913,7 @@ Partial Class frmMain ' Me.mnuEditCut.Name = "mnuEditCut" Me.mnuEditCut.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.X), System.Windows.Forms.Keys) - Me.mnuEditCut.Size = New System.Drawing.Size(366, 34) + Me.mnuEditCut.Size = New System.Drawing.Size(207, 22) Me.mnuEditCut.Tag = "Cut" Me.mnuEditCut.Text = "Cut" ' @@ -2922,7 +2921,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(366, 34) + Me.mnuEditCopy.Size = New System.Drawing.Size(207, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2932,7 +2931,7 @@ Partial Class frmMain Me.mnuEditCopySpecial.Name = "mnuEditCopySpecial" Me.mnuEditCopySpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopySpecial.Size = New System.Drawing.Size(366, 34) + Me.mnuEditCopySpecial.Size = New System.Drawing.Size(207, 22) Me.mnuEditCopySpecial.Tag = "Copy_Special" Me.mnuEditCopySpecial.Text = "Copy Special" Me.mnuEditCopySpecial.Visible = False @@ -2941,69 +2940,57 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(366, 34) + Me.mnuEditPaste.Size = New System.Drawing.Size(207, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' - 'mnuPasteSpecial + 'mnuEditPasteNewCols ' - Me.mnuPasteSpecial.Enabled = False - Me.mnuPasteSpecial.Name = "mnuPasteSpecial" - Me.mnuPasteSpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ - Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuPasteSpecial.Size = New System.Drawing.Size(366, 34) - Me.mnuPasteSpecial.Tag = "Paste" - Me.mnuPasteSpecial.Text = "Paste New Columns" - Me.mnuPasteSpecial.Visible = False - ' - 'mnuEditPasteNewDataFrame - ' - Me.mnuEditPasteNewDataFrame.Name = "mnuEditPasteNewDataFrame" - Me.mnuEditPasteNewDataFrame.Size = New System.Drawing.Size(366, 34) - Me.mnuEditPasteNewDataFrame.Tag = "Paste" - Me.mnuEditPasteNewDataFrame.Text = "Paste New Data Frame" + Me.mnuEditPasteNewCols.Name = "mnuEditPasteNewCols" + Me.mnuEditPasteNewCols.Size = New System.Drawing.Size(207, 22) + Me.mnuEditPasteNewCols.Tag = "Paste" + Me.mnuEditPasteNewCols.Text = "Paste New Columns" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(366, 34) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(207, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(366, 34) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(207, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(363, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(204, 6) ' 'mnuEditScript ' Me.mnuEditScript.Name = "mnuEditScript" - Me.mnuEditScript.Size = New System.Drawing.Size(366, 34) + Me.mnuEditScript.Size = New System.Drawing.Size(207, 22) Me.mnuEditScript.Text = "Script" ' 'stsStrip ' Me.stsStrip.ImageScalingSize = New System.Drawing.Size(24, 24) Me.stsStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstatus}) - Me.stsStrip.Location = New System.Drawing.Point(0, 691) + Me.stsStrip.Location = New System.Drawing.Point(0, 460) Me.stsStrip.Name = "stsStrip" - Me.stsStrip.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0) Me.stsStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional - Me.stsStrip.Size = New System.Drawing.Size(1251, 32) + Me.stsStrip.Size = New System.Drawing.Size(834, 22) Me.stsStrip.TabIndex = 8 Me.stsStrip.Text = "Status" ' 'tstatus ' Me.tstatus.Name = "tstatus" - Me.tstatus.Size = New System.Drawing.Size(182, 25) + Me.tstatus.Size = New System.Drawing.Size(119, 17) Me.tstatus.Text = "No worksheet loaded" ' 'Tool_strip @@ -3012,12 +2999,12 @@ Partial Class frmMain Me.Tool_strip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.Tool_strip.ImageScalingSize = New System.Drawing.Size(30, 30) Me.Tool_strip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTbOpen, Me.mnuTbOpenFromLibrary, Me.mnuTbSave, Me.toolStripSeparator, Me.mnuTbLast10Dialogs, Me.separator2, Me.mnuTbDataView, Me.mnuTbOutput, Me.ToolStripSeparator74, Me.mnuLastGraph, Me.ToolStripSeparator75, Me.mnuTbLogScript, Me.mnuMetadata, Me.ToolStripSeparator76, Me.mnuTbResetLayout, Me.separator3, Me.mnuTbHelp, Me.ToolStripSeparator77, Me.mnuTbLan, Me.separator1}) - Me.Tool_strip.Location = New System.Drawing.Point(0, 33) + Me.Tool_strip.Location = New System.Drawing.Point(0, 24) Me.Tool_strip.Name = "Tool_strip" - Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0) + Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) Me.Tool_strip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional Me.Tool_strip.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.Tool_strip.Size = New System.Drawing.Size(1251, 39) + Me.Tool_strip.Size = New System.Drawing.Size(834, 37) Me.Tool_strip.TabIndex = 7 Me.Tool_strip.Text = "Tool" ' @@ -3029,7 +3016,7 @@ Partial Class frmMain Me.mnuTbOpen.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpen.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpen.Name = "mnuTbOpen" - Me.mnuTbOpen.Size = New System.Drawing.Size(53, 36) + Me.mnuTbOpen.Size = New System.Drawing.Size(53, 34) Me.mnuTbOpen.Text = "&Open" Me.mnuTbOpen.ToolTipText = "Import" ' @@ -3040,7 +3027,7 @@ Partial Class frmMain Me.mnuTbOpenFromLibrary.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpenFromLibrary.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpenFromLibrary.Name = "mnuTbOpenFromLibrary" - Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 36) + Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 34) Me.mnuTbOpenFromLibrary.ToolTipText = "Import From Library" ' 'mnuTbSave @@ -3052,40 +3039,40 @@ Partial Class frmMain Me.mnuTbSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbSave.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbSave.Name = "mnuTbSave" - Me.mnuTbSave.Size = New System.Drawing.Size(53, 36) + Me.mnuTbSave.Size = New System.Drawing.Size(53, 34) Me.mnuTbSave.Text = "&Save" ' 'mnuSaveData ' Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveData.Name = "mnuSaveData" - Me.mnuSaveData.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveData.Size = New System.Drawing.Size(139, 22) Me.mnuSaveData.Text = "Save Data" ' 'mnuSaveOutput ' Me.mnuSaveOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveOutput.Name = "mnuSaveOutput" - Me.mnuSaveOutput.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveOutput.Size = New System.Drawing.Size(139, 22) Me.mnuSaveOutput.Text = "Save Output" ' 'mnuSaveScript ' Me.mnuSaveScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveScript.Name = "mnuSaveScript" - Me.mnuSaveScript.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveScript.Size = New System.Drawing.Size(139, 22) Me.mnuSaveScript.Text = "Save Script" ' 'mnuSaveLog ' Me.mnuSaveLog.Name = "mnuSaveLog" - Me.mnuSaveLog.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22) Me.mnuSaveLog.Text = "Save Log" ' 'toolStripSeparator ' Me.toolStripSeparator.Name = "toolStripSeparator" - Me.toolStripSeparator.Size = New System.Drawing.Size(6, 39) + Me.toolStripSeparator.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLast10Dialogs ' @@ -3101,7 +3088,7 @@ Partial Class frmMain 'separator2 ' Me.separator2.Name = "separator2" - Me.separator2.Size = New System.Drawing.Size(6, 39) + Me.separator2.Size = New System.Drawing.Size(6, 37) ' 'mnuTbDataView ' @@ -3111,7 +3098,7 @@ Partial Class frmMain Me.mnuTbDataView.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbDataView.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbDataView.Name = "mnuTbDataView" - Me.mnuTbDataView.Size = New System.Drawing.Size(34, 36) + Me.mnuTbDataView.Size = New System.Drawing.Size(34, 34) Me.mnuTbDataView.ToolTipText = "Toggle Data view open and closed" ' 'mnuTbOutput @@ -3122,13 +3109,13 @@ Partial Class frmMain Me.mnuTbOutput.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOutput.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOutput.Name = "mnuTbOutput" - Me.mnuTbOutput.Size = New System.Drawing.Size(34, 36) + Me.mnuTbOutput.Size = New System.Drawing.Size(34, 34) Me.mnuTbOutput.ToolTipText = "Toggle Output window open and closed" ' 'ToolStripSeparator74 ' Me.ToolStripSeparator74.Name = "ToolStripSeparator74" - Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 37) ' 'mnuLastGraph ' @@ -3145,25 +3132,25 @@ Partial Class frmMain 'mnuNormalViewer ' Me.mnuNormalViewer.Name = "mnuNormalViewer" - Me.mnuNormalViewer.Size = New System.Drawing.Size(194, 34) + Me.mnuNormalViewer.Size = New System.Drawing.Size(128, 22) Me.mnuNormalViewer.Text = "Viewer..." ' 'mnuploty ' Me.mnuploty.Name = "mnuploty" - Me.mnuploty.Size = New System.Drawing.Size(194, 34) + Me.mnuploty.Size = New System.Drawing.Size(128, 22) Me.mnuploty.Text = "Plotly..." ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" - Me.mnuRViewer.Size = New System.Drawing.Size(194, 34) + Me.mnuRViewer.Size = New System.Drawing.Size(128, 22) Me.mnuRViewer.Text = "R Viewer..." ' 'ToolStripSeparator75 ' Me.ToolStripSeparator75.Name = "ToolStripSeparator75" - Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLogScript ' @@ -3181,7 +3168,7 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(196, 34) + Me.mnuLogScript.Size = New System.Drawing.Size(129, 22) Me.mnuLogScript.Text = "Log/Script" ' 'mnuMetadata @@ -3200,20 +3187,20 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(307, 34) + Me.mnuColumnMetadat.Size = New System.Drawing.Size(202, 22) Me.mnuColumnMetadat.Text = " Column Metadata..." ' 'mnuDataFrameMetadat ' Me.mnuDataFrameMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataFrameMetadat.Name = "mnuDataFrameMetadat" - Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(307, 34) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(202, 22) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' 'ToolStripSeparator76 ' Me.ToolStripSeparator76.Name = "ToolStripSeparator76" - Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 37) ' 'mnuTbResetLayout ' @@ -3222,13 +3209,13 @@ Partial Class frmMain Me.mnuTbResetLayout.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbResetLayout.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbResetLayout.Name = "mnuTbResetLayout" - Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 36) + Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 34) Me.mnuTbResetLayout.ToolTipText = "Reset to Default Layout" ' 'separator3 ' Me.separator3.Name = "separator3" - Me.separator3.Size = New System.Drawing.Size(6, 39) + Me.separator3.Size = New System.Drawing.Size(6, 37) ' 'mnuTbHelp ' @@ -3237,13 +3224,13 @@ Partial Class frmMain Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbHelp.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbHelp.Name = "mnuTbHelp" - Me.mnuTbHelp.Size = New System.Drawing.Size(34, 36) + Me.mnuTbHelp.Size = New System.Drawing.Size(34, 34) Me.mnuTbHelp.Text = "He&lp" ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" - Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLan ' @@ -3252,28 +3239,28 @@ Partial Class frmMain Me.mnuTbLan.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbLan.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbLan.Name = "mnuTbLan" - Me.mnuTbLan.Size = New System.Drawing.Size(34, 36) + Me.mnuTbLan.Size = New System.Drawing.Size(34, 34) Me.mnuTbLan.ToolTipText = "Changes the menu language to English, and from English" ' 'separator1 ' Me.separator1.Name = "separator1" - Me.separator1.Size = New System.Drawing.Size(6, 39) + Me.separator1.Size = New System.Drawing.Size(6, 37) ' 'mnuBar ' Me.mnuBar.AllowMerge = False Me.mnuBar.BackColor = System.Drawing.SystemColors.ControlLightLight - Me.mnuBar.GripMargin = New System.Windows.Forms.Padding(2, 2, 0, 2) Me.mnuBar.ImageScalingSize = New System.Drawing.Size(24, 24) Me.mnuBar.ImeMode = System.Windows.Forms.ImeMode.[On] Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuPrepare, Me.mnuDescribe, Me.mnuModel, Me.mnuStructured, Me.mnuClimatic, Me.mnuProcurement, Me.mnuOptionsByContext, Me.mnuTools, Me.mnuView, Me.mnuHelp}) Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" + Me.mnuBar.Padding = New System.Windows.Forms.Padding(4, 1, 0, 1) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True - Me.mnuBar.Size = New System.Drawing.Size(1251, 33) + Me.mnuBar.Size = New System.Drawing.Size(834, 24) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' @@ -3281,7 +3268,7 @@ Partial Class frmMain ' Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" - Me.mnuFile.Size = New System.Drawing.Size(54, 29) + Me.mnuFile.Size = New System.Drawing.Size(37, 22) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3289,7 +3276,7 @@ Partial Class frmMain ' Me.mnuFileNewDataFrame.Name = "mnuFileNewDataFrame" Me.mnuFileNewDataFrame.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) - Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(351, 34) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(232, 22) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3297,33 +3284,33 @@ Partial Class frmMain ' Me.mnuFileImportFromFile.Name = "mnuFileImportFromFile" Me.mnuFileImportFromFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) - Me.mnuFileImportFromFile.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(348, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(229, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3331,7 +3318,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3339,82 +3326,82 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(351, 34) + Me.mnuFileConvert.Size = New System.Drawing.Size(232, 22) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(348, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(229, 6) ' 'mnuFileExport ' Me.mnuFileExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExportExportDataSet, Me.mnuFileExportExportRObjectsToolStripMenuItem, Me.mnuFileExportExportRWorkspace, Me.mnuFileExportExportGraphAsImage}) Me.mnuFileExport.Name = "mnuFileExport" - Me.mnuFileExport.Size = New System.Drawing.Size(351, 34) + Me.mnuFileExport.Size = New System.Drawing.Size(232, 22) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet ' Me.mnuFileExportExportDataSet.Name = "mnuFileExportExportDataSet" - Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportDataSet.Text = "Export Dataset..." ' 'mnuFileExportExportRObjectsToolStripMenuItem ' Me.mnuFileExportExportRObjectsToolStripMenuItem.Name = "mnuFileExportExportRObjectsToolStripMenuItem" - Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportRObjectsToolStripMenuItem.Text = "Export R Objects..." ' 'mnuFileExportExportRWorkspace ' Me.mnuFileExportExportRWorkspace.Name = "mnuFileExportExportRWorkspace" - Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportRWorkspace.Text = "Export R Workspace..." ' 'mnuFileExportExportGraphAsImage ' Me.mnuFileExportExportGraphAsImage.Name = "mnuFileExportExportGraphAsImage" - Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportGraphAsImage.Text = "Export Graph As Image..." ' 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(351, 34) + Me.mnuFileCloseData.Size = New System.Drawing.Size(232, 22) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(348, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(229, 6) ' 'mnuPrepare ' Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) Me.mnuPrepare.Name = "mnuPrepare" - Me.mnuPrepare.Size = New System.Drawing.Size(88, 29) + Me.mnuPrepare.Size = New System.Drawing.Size(59, 22) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -3422,105 +3409,105 @@ Partial Class frmMain ' Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameHideColumns, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' 'mnuPrepareDataFrameViewData ' Me.mnuPrepareDataFrameViewData.Name = "mnuPrepareDataFrameViewData" - Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameViewData.Tag = "View_Data..." Me.mnuPrepareDataFrameViewData.Text = "View Data..." ' 'mnuPrepareDataFrameRenameColumn ' Me.mnuPrepareDataFrameRenameColumn.Name = "mnuPrepareDataFrameRenameColumn" - Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameRenameColumn.Tag = "Rename_Column..." Me.mnuPrepareDataFrameRenameColumn.Text = "Rename Columns..." ' 'mnuPrepareDataFrameDuplicateColumn ' Me.mnuPrepareDataFrameDuplicateColumn.Name = "mnuPrepareDataFrameDuplicateColumn" - Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameDuplicateColumn.Text = "Duplicate Column..." ' 'mnuPrepareDataFrameRowNumbersNames ' Me.mnuPrepareDataFrameRowNumbersNames.Name = "mnuPrepareDataFrameRowNumbersNames" - Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameRowNumbersNames.Tag = "Row_Numbers/Names..." Me.mnuPrepareDataFrameRowNumbersNames.Text = "Row Numbers/Names..." ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameSort ' Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort" - Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' 'mnuPrepareDataFrameFilterRows ' Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" - Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" - Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' Me.mnuPrepareDataFrameReplaceValues.Name = "mnuPrepareDataFrameReplaceValues" - Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameReplaceValues.Tag = "Replace_Values..." Me.mnuPrepareDataFrameReplaceValues.Text = "Replace Values..." ' 'mnuPrepareDataFrameConvertColumns ' Me.mnuPrepareDataFrameConvertColumns.Name = "mnuPrepareDataFrameConvertColumns" - Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameConvertColumns.Tag = "Convert_Columns..." Me.mnuPrepareDataFrameConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameReorderColumns ' Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns" - Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameReorderColumns.Tag = "Reorder_Columns..." Me.mnuPrepareDataFrameReorderColumns.Text = "Reorder Columns..." ' 'mnuPrepareDataFrameAddMergeColumns ' Me.mnuPrepareDataFrameAddMergeColumns.Name = "mnuPrepareDataFrameAddMergeColumns" - Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameAddMergeColumns.Text = "Add (Merge) Columns..." ' 'mnuPrepareDataFrameInsertColumnsRows ' Me.mnuPrepareDataFrameInsertColumnsRows.Name = "mnuPrepareDataFrameInsertColumnsRows" - Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameInsertColumnsRows.Tag = "Insert_Columns/Rows..." Me.mnuPrepareDataFrameInsertColumnsRows.Text = "Insert Columns/Rows..." ' 'mnuPrepareDataFrameDeleteColumnsRows ' Me.mnuPrepareDataFrameDeleteColumnsRows.Name = "mnuPrepareDataFrameDeleteColumnsRows" - Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..." Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..." ' @@ -3528,7 +3515,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameProtectColumn.Enabled = False Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn" - Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameProtectColumn.Tag = "..." Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False @@ -3536,7 +3523,7 @@ Partial Class frmMain 'mnuPrepareDataFrameHideColumns ' Me.mnuPrepareDataFrameHideColumns.Name = "mnuPrepareDataFrameHideColumns" - Me.mnuPrepareDataFrameHideColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameHideColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameHideColumns.Tag = "Hide_Columns..." Me.mnuPrepareDataFrameHideColumns.Text = "Hide/Show Columns..." ' @@ -3544,7 +3531,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns" - Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..." Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..." Me.mnuPrepareDataFrameFreezeColumns.Visible = False @@ -3552,7 +3539,7 @@ Partial Class frmMain 'mnuPrepareDataframeColourByProperty ' Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty" - Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..." ' 'mnuPrepareCheckData @@ -3560,96 +3547,96 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn}) Me.mnuPrepareCheckData.Name = "mnuPrepareCheckData" - Me.mnuPrepareCheckData.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData ' Me.mnuPrepareCheckDataVisualiseData.Name = "mnuPrepareCheckDataVisualiseData" - Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..." ' 'mnuPrepareCheckDataDuplicates ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" - Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' Me.mnuPrepareCheckDataCompareColumns.Name = "mnuPrepareCheckDataCompareColumns" - Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataCompareColumns.Text = "Compare Columns..." ' 'mnuPrepareCheckDataNonNumericCases ' Me.mnuPrepareCheckDataNonNumericCases.Name = "mnuPrepareCheckDataNonNumericCases" - Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator49 ' Me.ToolStripSeparator49.Name = "ToolStripSeparator49" - Me.ToolStripSeparator49.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataBoxplot ' Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot" - Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataBoxplot.Text = "Boxplot..." ' 'mnuPrepareCheckDataOneVariableSummarise ' Me.mnuPrepareCheckDataOneVariableSummarise.Name = "mnuPrepareCheckDataOneVariableSummarise" - Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuPrepareCheckDataOneVariableGraph ' Me.mnuPrepareCheckDataOneVariableGraph.Name = "mnuPrepareCheckDataOneVariableGraph" - Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuPrepareCheckDataOneWayFrequencies ' Me.mnuPrepareCheckDataOneWayFrequencies.Name = "mnuPrepareCheckDataOneWayFrequencies" - Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..." ' 'mnuPrepareCheckDataViewDeleteLabels ' Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels" - Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..." ' 'ToolStripSeparator41 ' Me.ToolStripSeparator41.Name = "ToolStripSeparator41" - Me.ToolStripSeparator41.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataExportOpenRefine ' Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine" - Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataExportOpenRefine.Text = "Export To OpenRefine..." ' 'mnuPrepareCheckDataImportOpenRefine ' Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" - Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' Me.ToolStripSeparator40.Name = "ToolStripSeparator40" - Me.ToolStripSeparator40.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator40.Size = New System.Drawing.Size(242, 6) ' 'mnuPreparePrepareToShareJitter ' Me.mnuPreparePrepareToShareJitter.Enabled = False Me.mnuPreparePrepareToShareJitter.Name = "mnuPreparePrepareToShareJitter" - Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(370, 34) + Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22) Me.mnuPreparePrepareToShareJitter.Text = "Jitter..." Me.mnuPreparePrepareToShareJitter.Visible = False ' @@ -3657,25 +3644,25 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage" - Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Text = "Prepare to Share (sdc package)..." Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Visible = False ' 'mnuPrepareCheckDataAnonymiseIDColumn ' Me.mnuPrepareCheckDataAnonymiseIDColumn.Name = "mnuPrepareCheckDataAnonymiseIDColumn" - Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataAnonymiseIDColumn.Text = "Anonymise ID Column..." ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(272, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(183, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Column: Calculator..." ' @@ -3683,64 +3670,64 @@ Partial Class frmMain ' Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows}) Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate" - Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' 'mnuPrepareColumnNumericRegularSequence ' Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence" - Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRegularSequence.Tag = "Regular_Sequence..." Me.mnuPrepareColumnNumericRegularSequence.Text = "Regular Sequence..." ' 'mnuPrepareColumnNumericEnter ' Me.mnuPrepareColumnNumericEnter.Name = "mnuPrepareColumnNumericEnter" - Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericEnter.Text = "Enter..." ' 'ToolStripSeparator25 ' Me.ToolStripSeparator25.Name = "ToolStripSeparator25" - Me.ToolStripSeparator25.Size = New System.Drawing.Size(301, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRowSummaries.Text = "Row Summaries..." ' 'mnuPrepareColumnNumericTransform ' Me.mnuPrepareColumnNumericTransform.Name = "mnuPrepareColumnNumericTransform" - Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericTransform.Tag = "Rank..." Me.mnuPrepareColumnNumericTransform.Text = "Transform..." ' 'mnuPrepareColumnNumericPolynomials ' Me.mnuPrepareColumnNumericPolynomials.Name = "mnuPrepareColumnNumericPolynomials" - Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPolynomials.Tag = "Polynomials..." Me.mnuPrepareColumnNumericPolynomials.Text = "Polynomials..." ' 'ToolStripSeparator56 ' Me.ToolStripSeparator56.Name = "ToolStripSeparator56" - Me.ToolStripSeparator56.Size = New System.Drawing.Size(301, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRandomSamples.Tag = "Random_Samples..." Me.mnuPrepareColumnNumericRandomSamples.Text = "Random Samples..." ' 'mnuPrepareColumnNumericPermuteRows ' Me.mnuPrepareColumnNumericPermuteRows.Name = "mnuPrepareColumnNumericPermuteRows" - Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' @@ -3748,105 +3735,105 @@ Partial Class frmMain ' Me.mnuPrepareColumnFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnFactorConvertToFactor, Me.mnuPrepareColumnFactorRecodeNumeric, Me.mnuPrepareColumnFactorCountInFactor, Me.ToolStripSeparator12, Me.mnuPrepareColumnFactorRecodeFactor, Me.mnuPrepareColumnFactorCombineFactors, Me.mnuPrepareColumnFactorDummyVariables, Me.ToolStripSeparator14, Me.mnuPrepareColumnFactorLevelsLabels, Me.mnuPrepareColumnFactorReorderLevels, Me.mnuPrepareColumnFactorReferenceLevel, Me.mnuPrepareColumnFactorUnusedLevels, Me.mnuPrepareColumnFactorContrasts, Me.ToolStripSeparator19, Me.mnuPrepareColumnFactorFactorDataFrame}) Me.mnuPrepareColumnFactor.Name = "mnuPrepareColumnFactor" - Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' 'mnuPrepareColumnFactorConvertToFactor ' Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor" - Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor" Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..." ' 'mnuPrepareColumnFactorRecodeNumeric ' Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric" - Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..." Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..." ' 'mnuPrepareColumnFactorCountInFactor ' Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor" - Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorRecodeFactor ' Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor" - Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..." Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..." ' 'mnuPrepareColumnFactorCombineFactors ' Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors" - Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..." Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..." ' 'mnuPrepareColumnFactorDummyVariables ' Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables" - Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..." Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..." ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorLevelsLabels ' Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels" - Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..." Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..." ' 'mnuPrepareColumnFactorReorderLevels ' Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels" - Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..." Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..." ' 'mnuPrepareColumnFactorReferenceLevel ' Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel" - Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..." Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..." ' 'mnuPrepareColumnFactorUnusedLevels ' Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels" - Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..." Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..." ' 'mnuPrepareColumnFactorContrasts ' Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts" - Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..." Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..." ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorFactorDataFrame ' Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame" - Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame" Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..." ' @@ -3854,42 +3841,42 @@ Partial Class frmMain ' Me.mnuPrepareColumnText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnTextFindReplace, Me.mnuPrepareColumnTextSearch, Me.mnuPrepareColumnTextTransform, Me.mnuPrepareColumnTextSplit, Me.mnuPrepareColumnTextCombine, Me.mnuPrepareColumnTextMatch, Me.mnuPrepareColumnTextDistance}) Me.mnuPrepareColumnText.Name = "mnuPrepareColumnText" - Me.mnuPrepareColumnText.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' 'mnuPrepareColumnTextFindReplace ' Me.mnuPrepareColumnTextFindReplace.Name = "mnuPrepareColumnTextFindReplace" - Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextFindReplace.Tag = "Find/Replace..." Me.mnuPrepareColumnTextFindReplace.Text = "Find/Replace..." ' 'mnuPrepareColumnTextSearch ' Me.mnuPrepareColumnTextSearch.Name = "mnuPrepareColumnTextSearch" - Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextSearch.Text = "Search..." Me.mnuPrepareColumnTextSearch.Visible = False ' 'mnuPrepareColumnTextTransform ' Me.mnuPrepareColumnTextTransform.Name = "mnuPrepareColumnTextTransform" - Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextTransform.Tag = "Transform..." Me.mnuPrepareColumnTextTransform.Text = "Transform..." ' 'mnuPrepareColumnTextSplit ' Me.mnuPrepareColumnTextSplit.Name = "mnuPrepareColumnTextSplit" - Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextSplit.Tag = "Split..." Me.mnuPrepareColumnTextSplit.Text = "Split..." ' 'mnuPrepareColumnTextCombine ' Me.mnuPrepareColumnTextCombine.Name = "mnuPrepareColumnTextCombine" - Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextCombine.Tag = "Combine..." Me.mnuPrepareColumnTextCombine.Text = "Combine..." ' @@ -3897,7 +3884,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnTextMatch.Enabled = False Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch" - Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextMatch.Tag = "Match..." Me.mnuPrepareColumnTextMatch.Text = "Match..." Me.mnuPrepareColumnTextMatch.Visible = False @@ -3905,7 +3892,7 @@ Partial Class frmMain 'mnuPrepareColumnTextDistance ' Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance" - Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextDistance.Tag = "Distance..." Me.mnuPrepareColumnTextDistance.Text = "Distance..." ' @@ -3913,38 +3900,38 @@ Partial Class frmMain ' Me.mnuPrepareColumnDate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDateGenerateDate, Me.mnuPrepareColumnDateMakeDate, Me.mnuPrepareColumnDateInfillMissingDates, Me.mnuPrepareColumnDateUseDate, Me.mnuPrepareColumnDateMakeTime, Me.mnuPrepareColumnDateUseTime}) Me.mnuPrepareColumnDate.Name = "mnuPrepareColumnDate" - Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate ' Me.mnuPrepareColumnDateGenerateDate.Name = "mnuPrepareColumnDateGenerateDate" - Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateGenerateDate.Text = "Generate Dates..." ' 'mnuPrepareColumnDateMakeDate ' Me.mnuPrepareColumnDateMakeDate.Name = "mnuPrepareColumnDateMakeDate" - Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateMakeDate.Text = "Make Date..." ' 'mnuPrepareColumnDateInfillMissingDates ' Me.mnuPrepareColumnDateInfillMissingDates.Name = "mnuPrepareColumnDateInfillMissingDates" - Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuPrepareColumnDateUseDate ' Me.mnuPrepareColumnDateUseDate.Name = "mnuPrepareColumnDateUseDate" - Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateUseDate.Text = "Use Date..." ' 'mnuPrepareColumnDateMakeTime ' Me.mnuPrepareColumnDateMakeTime.Enabled = False Me.mnuPrepareColumnDateMakeTime.Name = "mnuPrepareColumnDateMakeTime" - Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..." Me.mnuPrepareColumnDateMakeTime.Visible = False ' @@ -3952,7 +3939,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDateUseTime.Enabled = False Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" - Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateUseTime.Text = "Use Time..." Me.mnuPrepareColumnDateUseTime.Visible = False ' @@ -3960,170 +3947,170 @@ Partial Class frmMain ' Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" - Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(263, 34) + Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22) Me.mnuPrepareColumnDefineConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator55 ' Me.ToolStripSeparator55.Name = "ToolStripSeparator55" - Me.ToolStripSeparator55.Size = New System.Drawing.Size(260, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(263, 34) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(272, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(183, 6) ' 'mnuPrepareDataReshape ' Me.mnuPrepareDataReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnReshapeColumnSummaries, Me.mnuPrepareColumnReshapeGeneralSummaries, Me.ToolStripSeparator10, Me.mnuPrepareColumnReshapeStack, Me.mnuPrepareColumnReshapeUnstack, Me.mnuPrepareColumnReshapeMerge, Me.ToolStripSeparator11, Me.mnuPrepareAppendDataFrame, Me.mnuPrepareColumnReshapeSubset, Me.mnuPrepareColumnReshapeRandomSubset, Me.mnuPrepareColumnReshapeTranspose, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" - Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' 'mnuPrepareColumnReshapeColumnSummaries ' Me.mnuPrepareColumnReshapeColumnSummaries.Name = "mnuPrepareColumnReshapeColumnSummaries" - Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeColumnSummaries.Tag = "Column_Summaries..." Me.mnuPrepareColumnReshapeColumnSummaries.Text = "Column Summaries..." ' 'mnuPrepareColumnReshapeGeneralSummaries ' Me.mnuPrepareColumnReshapeGeneralSummaries.Name = "mnuPrepareColumnReshapeGeneralSummaries" - Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeGeneralSummaries.Text = "General Summaries..." ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareColumnReshapeStack ' Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack" - Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeStack.Tag = "Stack..." Me.mnuPrepareColumnReshapeStack.Text = "Stack (Pivot Longer)..." ' 'mnuPrepareColumnReshapeUnstack ' Me.mnuPrepareColumnReshapeUnstack.Name = "mnuPrepareColumnReshapeUnstack" - Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeUnstack.Tag = "Unstack..." Me.mnuPrepareColumnReshapeUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuPrepareColumnReshapeMerge ' Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge" - Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..." Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..." ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareAppendDataFrame ' Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame" - Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareAppendDataFrame.Text = "Append (Bind Rows)..." ' 'mnuPrepareColumnReshapeSubset ' Me.mnuPrepareColumnReshapeSubset.Name = "mnuPrepareColumnReshapeSubset" - Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeSubset.Tag = "Subset..." Me.mnuPrepareColumnReshapeSubset.Text = "Subset..." ' 'mnuPrepareColumnReshapeRandomSubset ' Me.mnuPrepareColumnReshapeRandomSubset.Name = "mnuPrepareColumnReshapeRandomSubset" - Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeRandomSubset.Tag = "Random_Subset..." Me.mnuPrepareColumnReshapeRandomSubset.Text = "Random Subset..." ' 'mnuPrepareColumnReshapeTranspose ' Me.mnuPrepareColumnReshapeTranspose.Name = "mnuPrepareColumnReshapeTranspose" - Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeTranspose.Tag = "Transpose..." Me.mnuPrepareColumnReshapeTranspose.Text = "Transpose..." ' 'mnuPrepareDataReshapeScaleOrDistance ' Me.mnuPrepareDataReshapeScaleOrDistance.Name = "mnuPrepareDataReshapeScaleOrDistance" - Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..." ' 'mnuPrepareDataReshapeRandomSplit ' Me.mnuPrepareDataReshapeRandomSplit.Enabled = False Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" - Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(272, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(183, 6) ' 'mnuPrepareKeysAndLinks ' Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment}) Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks" - Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey ' Me.mnuPrepareKeysAndLinksAddKey.Name = "mnuPrepareKeysAndLinksAddKey" - Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddKey.Text = "Add Key..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKey ' Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Name = "mnuPrepareKeysAndLinksViewAndRemoveKey" - Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Text = "View and Remove Keys..." ' 'mnuPrepareKeysAndLinksAddLink ' Me.mnuPrepareKeysAndLinksAddLink.Name = "mnuPrepareKeysAndLinksAddLink" - Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddLink.Text = "Add Link..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKeys ' Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Name = "mnuPrepareKeysAndLinksViewAndRemoveKeys" - Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Text = "View and Remove Links..." ' 'mnuPrepareKeysAndLinksAddComment ' Me.mnuPrepareKeysAndLinksAddComment.Name = "mnuPrepareKeysAndLinksAddComment" - Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddComment.Text = "Add Comment..." ' 'mnuPrepareDataBook ' Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata}) Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook" - Me.mnuPrepareDataBook.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4131,7 +4118,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata" - Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDataFrameMetadata.Tag = "Data_Frame_Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Text = "Data Frame Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Visible = False @@ -4139,46 +4126,46 @@ Partial Class frmMain 'mnuPrepareDataObjectRenameDataFrame ' Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame" - Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectRenameDataFrame.Tag = "ReName_Data_Frame..." Me.mnuPrepareDataObjectRenameDataFrame.Text = "Rename Data Frame..." ' 'mnuPrepareDataObjectReorderDataFrames ' Me.mnuPrepareDataObjectReorderDataFrames.Name = "mnuPrepareDataObjectReorderDataFrames" - Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectReorderDataFrames.Tag = "Reorder_Data_Frames..." Me.mnuPrepareDataObjectReorderDataFrames.Text = "Reorder Data Frames..." ' 'mnuPrepareDataObjectCopyDataFrame ' Me.mnuPrepareDataObjectCopyDataFrame.Name = "mnuPrepareDataObjectCopyDataFrame" - Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectCopyDataFrame.Tag = "Copy_Data_Frame..." Me.mnuPrepareDataObjectCopyDataFrame.Text = "Copy Data Frame..." ' 'mnuPrepareDataObjectDeleteDataFrame ' Me.mnuPrepareDataObjectDeleteDataFrame.Name = "mnuPrepareDataObjectDeleteDataFrame" - Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDeleteDataFrame.Tag = "Delete_Data_Frame..." Me.mnuPrepareDataObjectDeleteDataFrame.Text = "Delete Data Frames..." ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(315, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6) ' 'mnuPrepareDataObjectHideDataframes ' Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes" - Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectHideDataframes.Text = "Hide/Show Data Frames..." ' 'mnuPrepareDataObjectMetadata ' Me.mnuPrepareDataObjectMetadata.Name = "mnuPrepareDataObjectMetadata" - Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..." Me.mnuPrepareDataObjectMetadata.Text = "Metadata..." ' @@ -4186,7 +4173,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectRenameMetadata.Enabled = False Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata" - Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Visible = False @@ -4195,7 +4182,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectReorderMetadata.Enabled = False Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata" - Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Visible = False @@ -4204,7 +4191,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata" - Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Visible = False @@ -4213,35 +4200,35 @@ Partial Class frmMain ' Me.mnuPrepareRObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareRObjectsView, Me.mnuPrepareRObjectsRename, Me.mnuPrepareRObjectsReorder, Me.mnuPrepareRObjectsDelete}) Me.mnuPrepareRObjects.Name = "mnuPrepareRObjects" - Me.mnuPrepareRObjects.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' 'mnuPrepareRObjectsView ' Me.mnuPrepareRObjectsView.Name = "mnuPrepareRObjectsView" - Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsView.Tag = "View..." Me.mnuPrepareRObjectsView.Text = "View..." ' 'mnuPrepareRObjectsRename ' Me.mnuPrepareRObjectsRename.Name = "mnuPrepareRObjectsRename" - Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsRename.Tag = "Rename..." Me.mnuPrepareRObjectsRename.Text = "Rename..." ' 'mnuPrepareRObjectsReorder ' Me.mnuPrepareRObjectsReorder.Name = "mnuPrepareRObjectsReorder" - Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsReorder.Tag = "Reorder" Me.mnuPrepareRObjectsReorder.Text = "Reorder..." ' 'mnuPrepareRObjectsDelete ' Me.mnuPrepareRObjectsDelete.Name = "mnuPrepareRObjectsDelete" - Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsDelete.Tag = "Delete..." Me.mnuPrepareRObjectsDelete.Text = "Delete..." ' @@ -4249,78 +4236,78 @@ Partial Class frmMain ' Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext, Me.mnuStructuredSurvey}) Me.mnuStructured.Name = "mnuStructured" - Me.mnuStructured.Size = New System.Drawing.Size(109, 29) + Me.mnuStructured.Size = New System.Drawing.Size(74, 22) Me.mnuStructured.Text = "Structured" ' 'mnuStructuredCircular ' Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine, Me.mnuStructuredCircularCalculator, Me.mnuStructuredCircularSummaries, Me.ToolStripSeparator46, Me.mnuStructuredCircularDensityPlot, Me.ToolStripSeparator67, Me.mnuStructuredCircularWindRose, Me.mnuStructuredCircularWindPollutionRose, Me.mnuStructuredCircularOtherRosePlots, Me.ToolStripSeparator68, Me.mnuStructuredCircularCirclize}) Me.mnuStructuredCircular.Name = "mnuStructuredCircular" - Me.mnuStructuredCircular.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredCircular.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredCircular.Text = "Circular" ' 'mnuStructuredCircularDefine ' Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" - Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularDefine.Text = "Define..." ' 'mnuStructuredCircularCalculator ' Me.mnuStructuredCircularCalculator.Name = "mnuStructuredCircularCalculator" - Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularCalculator.Text = "Calculator..." ' 'mnuStructuredCircularSummaries ' Me.mnuStructuredCircularSummaries.Name = "mnuStructuredCircularSummaries" - Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularSummaries.Text = "Summaries..." ' 'ToolStripSeparator46 ' Me.ToolStripSeparator46.Name = "ToolStripSeparator46" - Me.ToolStripSeparator46.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularDensityPlot ' Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot" - Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularDensityPlot.Text = "Circular Plots..." ' 'ToolStripSeparator67 ' Me.ToolStripSeparator67.Name = "ToolStripSeparator67" - Me.ToolStripSeparator67.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularWindRose ' Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose" - Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularWindRose.Text = "Wind Rose..." ' 'mnuStructuredCircularWindPollutionRose ' Me.mnuStructuredCircularWindPollutionRose.Name = "mnuStructuredCircularWindPollutionRose" - Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuStructuredCircularOtherRosePlots ' Me.mnuStructuredCircularOtherRosePlots.Name = "mnuStructuredCircularOtherRosePlots" - Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularOtherRosePlots.Text = "Other Rose Plots" ' 'ToolStripSeparator68 ' Me.ToolStripSeparator68.Name = "ToolStripSeparator68" - Me.ToolStripSeparator68.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator68.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularCirclize ' Me.mnuStructuredCircularCirclize.Enabled = False Me.mnuStructuredCircularCirclize.Name = "mnuStructuredCircularCirclize" - Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularCirclize.Text = "Circlize..." Me.mnuStructuredCircularCirclize.Visible = False ' @@ -4328,126 +4315,126 @@ Partial Class frmMain ' Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" - Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredLow_Flow.Text = "Low_Flow" Me.mnuStructuredLow_Flow.Visible = False ' 'mnuStructuredLow_FlowDefine ' Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" - Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(177, 34) + Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(117, 22) Me.mnuStructuredLow_FlowDefine.Text = "Define..." ' 'mnuStructuredSurvival ' Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" - Me.mnuStructuredSurvival.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredSurvival.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredSurvival.Text = "Survival" ' 'mnuStructuredSurvivalDefine ' Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" - Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(177, 34) + Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(117, 22) Me.mnuStructuredSurvivalDefine.Text = "Define..." ' 'mnuStructuredTimeSeries ' Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" - Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredTimeSeries.Text = "Time Series" Me.mnuStructuredTimeSeries.Visible = False ' 'mnuStructuredTimeSeriesDefine ' Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" - Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesDefine.Text = "Define..." ' 'ToolStripSeparator60 ' Me.ToolStripSeparator60.Name = "ToolStripSeparator60" - Me.ToolStripSeparator60.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator60.Size = New System.Drawing.Size(116, 6) ' 'mnuStructuredTimeSeriesDescribe ' Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" - Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesDescribe.Text = "Describe" ' 'mnuStructuredTimeSeriesDescribeOneVariable ' Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" - Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesDescribeOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesDescribeGeneral ' Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" - Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesDescribeGeneral.Text = "General..." ' 'ToolStripSeparator61 ' Me.ToolStripSeparator61.Name = "ToolStripSeparator61" - Me.ToolStripSeparator61.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator61.Size = New System.Drawing.Size(116, 6) ' 'mnuStructuredTimeSeriesModel ' Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" - Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesModel.Text = "Model" ' 'mnuStructuredTimeSeriesModelOneVariable ' Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesModelOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesModelGeneral ' Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesModelGeneral.Text = "General..." ' 'ToolStripSeparator62 ' Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - Me.ToolStripSeparator62.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6) ' 'ToolStripSeparator63 ' Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - Me.ToolStripSeparator63.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6) ' 'mnuStructuredClimatic ' Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - Me.mnuStructuredClimatic.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredClimatic.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredClimatic.Text = "Climatic..." Me.mnuStructuredClimatic.Visible = False ' 'mnuStructuredProcurement ' Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - Me.mnuStructuredProcurement.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredProcurement.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredProcurement.Text = "Procurement..." Me.mnuStructuredProcurement.Visible = False ' 'mnuStructuredOptionByContext ' Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredOptionByContext.Text = "Options by Context..." Me.mnuStructuredOptionByContext.Visible = False ' 'mnuStructuredSurvey ' Me.mnuStructuredSurvey.Name = "mnuStructuredSurvey" - Me.mnuStructuredSurvey.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredSurvey.Text = "Survey" Me.mnuStructuredSurvey.Visible = False ' @@ -4455,424 +4442,424 @@ Partial Class frmMain ' Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI}) Me.mnuProcurement.Name = "mnuProcurement" - Me.mnuProcurement.Size = New System.Drawing.Size(129, 29) + Me.mnuProcurement.Size = New System.Drawing.Size(88, 22) Me.mnuProcurement.Text = "Procurement" ' 'mnuProcurementOpenFromLibrary ' Me.mnuProcurementOpenFromLibrary.Name = "mnuProcurementOpenFromLibrary" - Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementOpenFromLibrary.Text = "Open From Library..." ' 'mnuProcurementDefineData ' Me.mnuProcurementDefineData.Name = "mnuProcurementDefineData" - Me.mnuProcurementDefineData.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDefineData.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDefineData.Text = "Define Procurement Data..." ' 'mnuProcurementPrepare ' Me.mnuProcurementPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementPrepareFilterByCountry, Me.ToolStripSeparator42, Me.mnuProcurementPrepareDefineContractValueCategories, Me.mnuProcurementPrepareRecodeNumericIntoQuantiles, Me.mnuProcurementPrepareSetFactorReferenceLevel, Me.mnuProcurementPrepareUseAwardDate, Me.ToolStripSeparator43, Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther, Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther, Me.mnuProcurementPrepareMergeAdditionalData}) Me.mnuProcurementPrepare.Name = "mnuProcurementPrepare" - Me.mnuProcurementPrepare.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementPrepare.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementPrepare.Text = "Prepare" ' 'mnuProcurementPrepareFilterByCountry ' Me.mnuProcurementPrepareFilterByCountry.Name = "mnuProcurementPrepareFilterByCountry" - Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareFilterByCountry.Text = "Filter by Country (or other)..." ' 'ToolStripSeparator42 ' Me.ToolStripSeparator42.Name = "ToolStripSeparator42" - Me.ToolStripSeparator42.Size = New System.Drawing.Size(536, 6) + Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareDefineContractValueCategories ' Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories" - Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareDefineContractValueCategories.Text = "Define Contract Value Categories..." ' 'mnuProcurementPrepareRecodeNumericIntoQuantiles ' Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Name = "mnuProcurementPrepareRecodeNumericIntoQuantiles" - Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Text = "Recode Numeric into Quantiles..." ' 'mnuProcurementPrepareSetFactorReferenceLevel ' Me.mnuProcurementPrepareSetFactorReferenceLevel.Name = "mnuProcurementPrepareSetFactorReferenceLevel" - Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSetFactorReferenceLevel.Text = "Set Factor Reference Level..." ' 'mnuProcurementPrepareUseAwardDate ' Me.mnuProcurementPrepareUseAwardDate.Name = "mnuProcurementPrepareUseAwardDate" - Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareUseAwardDate.Text = "Use Award Date (or other)..." ' 'ToolStripSeparator43 ' Me.ToolStripSeparator43.Name = "ToolStripSeparator43" - Me.ToolStripSeparator43.Size = New System.Drawing.Size(536, 6) + Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareSummariseRedFlagsByCountryorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Text = "Summarise Red Flags by Country (or other)..." ' 'mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Text = "Summarise Red Flags by Country and Year (or other)..." ' 'mnuProcurementPrepareMergeAdditionalData ' Me.mnuProcurementPrepareMergeAdditionalData.Name = "mnuProcurementPrepareMergeAdditionalData" - Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuProcurementDescribe ' Me.mnuProcurementDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeOneVariableSummarise, Me.mnuProcurementDescribeOneVariableGraph, Me.ToolStripSeparator44, Me.mnuProcurementDescribeCategorical, Me.mnuProcurementDescribeNumeric}) Me.mnuProcurementDescribe.Name = "mnuProcurementDescribe" - Me.mnuProcurementDescribe.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDescribe.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDescribe.Text = "Describe" ' 'mnuProcurementDescribeOneVariableSummarise ' Me.mnuProcurementDescribeOneVariableSummarise.Name = "mnuProcurementDescribeOneVariableSummarise" - Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuProcurementDescribeOneVariableGraph ' Me.mnuProcurementDescribeOneVariableGraph.Name = "mnuProcurementDescribeOneVariableGraph" - Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeOneVariableGraph.Text = "One Variable Graph..." ' 'ToolStripSeparator44 ' Me.ToolStripSeparator44.Name = "ToolStripSeparator44" - Me.ToolStripSeparator44.Size = New System.Drawing.Size(316, 6) + Me.ToolStripSeparator44.Size = New System.Drawing.Size(208, 6) ' 'mnuProcurementDescribeCategorical ' Me.mnuProcurementDescribeCategorical.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeCategoricalOneVarFreq, Me.mnuProcurementDescribeCategoricalTwoVarFreq, Me.ToolStripSeparator52, Me.mnuProcurementDescribeCategoricalBarCharts, Me.mnuProcurementDescribeCategoricalMosaic, Me.mnuProcurementDescribeCategoricalTreemap, Me.DisplayTopNToolStripMenuItem}) Me.mnuProcurementDescribeCategorical.Name = "mnuProcurementDescribeCategorical" - Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeCategorical.Text = "Categorical" ' 'mnuProcurementDescribeCategoricalOneVarFreq ' Me.mnuProcurementDescribeCategoricalOneVarFreq.Name = "mnuProcurementDescribeCategoricalOneVarFreq" - Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalOneVarFreq.Text = "One Variable Frequencies..." ' 'mnuProcurementDescribeCategoricalTwoVarFreq ' Me.mnuProcurementDescribeCategoricalTwoVarFreq.Name = "mnuProcurementDescribeCategoricalTwoVarFreq" - Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalTwoVarFreq.Text = "Two Variable Frequencies by Sector (or other)..." ' 'ToolStripSeparator52 ' Me.ToolStripSeparator52.Name = "ToolStripSeparator52" - Me.ToolStripSeparator52.Size = New System.Drawing.Size(479, 6) + Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6) ' 'mnuProcurementDescribeCategoricalBarCharts ' Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts" - Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalBarCharts.Text = "Bar Chart..." ' 'mnuProcurementDescribeCategoricalMosaic ' Me.mnuProcurementDescribeCategoricalMosaic.Name = "mnuProcurementDescribeCategoricalMosaic" - Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalMosaic.Text = "Mosaic Plot..." ' 'mnuProcurementDescribeCategoricalTreemap ' Me.mnuProcurementDescribeCategoricalTreemap.Name = "mnuProcurementDescribeCategoricalTreemap" - Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalTreemap.Text = "Treemap..." ' 'DisplayTopNToolStripMenuItem ' Me.DisplayTopNToolStripMenuItem.Name = "DisplayTopNToolStripMenuItem" - Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(482, 34) + Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(319, 22) Me.DisplayTopNToolStripMenuItem.Text = "Display Top N..." ' 'mnuProcurementDescribeNumeric ' Me.mnuProcurementDescribeNumeric.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeNumericBoxplot, Me.HistogramToolStripMenuItem, Me.ToolStripSeparator53, Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers}) Me.mnuProcurementDescribeNumeric.Name = "mnuProcurementDescribeNumeric" - Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeNumeric.Text = "Numeric" ' 'mnuProcurementDescribeNumericBoxplot ' Me.mnuProcurementDescribeNumericBoxplot.Name = "mnuProcurementDescribeNumericBoxplot" - Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(389, 34) + Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(258, 22) Me.mnuProcurementDescribeNumericBoxplot.Text = "Boxplot..." ' 'HistogramToolStripMenuItem ' Me.HistogramToolStripMenuItem.Name = "HistogramToolStripMenuItem" - Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(389, 34) + Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(258, 22) Me.HistogramToolStripMenuItem.Text = "Histogram..." ' 'ToolStripSeparator53 ' Me.ToolStripSeparator53.Name = "ToolStripSeparator53" - Me.ToolStripSeparator53.Size = New System.Drawing.Size(386, 6) + Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6) ' 'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers ' Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers" - Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(389, 34) + Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(258, 22) Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Text = "Correlations (Red Flags or others)..." ' 'mnuProcurementMapping ' Me.mnuProcurementMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementMappingMapCountryValues}) Me.mnuProcurementMapping.Name = "mnuProcurementMapping" - Me.mnuProcurementMapping.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementMapping.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementMapping.Text = "Mapping" ' 'mnuProcurementMappingMapCountryValues ' Me.mnuProcurementMappingMapCountryValues.Name = "mnuProcurementMappingMapCountryValues" - Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(285, 34) + Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(189, 22) Me.mnuProcurementMappingMapCountryValues.Text = "Map Country Values..." ' 'mnuProcurementModel ' Me.mnuProcurementModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementModelDefineCorruption, Me.mnuProcurementModelFitModelToolStripMenuItem}) Me.mnuProcurementModel.Name = "mnuProcurementModel" - Me.mnuProcurementModel.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementModel.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementModel.Text = "Model" ' 'mnuProcurementModelDefineCorruption ' Me.mnuProcurementModelDefineCorruption.Name = "mnuProcurementModelDefineCorruption" - Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(351, 34) + Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(233, 22) Me.mnuProcurementModelDefineCorruption.Text = "Define Corruption Indicators..." ' 'mnuProcurementModelFitModelToolStripMenuItem ' Me.mnuProcurementModelFitModelToolStripMenuItem.Name = "mnuProcurementModelFitModelToolStripMenuItem" - Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(351, 34) + Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(233, 22) Me.mnuProcurementModelFitModelToolStripMenuItem.Text = "Fit Model..." ' 'ToolStripSeparator45 ' Me.ToolStripSeparator45.Name = "ToolStripSeparator45" - Me.ToolStripSeparator45.Size = New System.Drawing.Size(324, 6) + Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6) ' 'mnuProcurementDefineRedFlags ' Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags" - Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDefineRedFlags.Text = "Define Red Flag Variables..." ' 'mnuProcurementUseCRI ' Me.mnuProcurementUseCRI.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementCTFVCalculateCRI, Me.mnuProcurementUseCRISummariseCRIbyCountry}) Me.mnuProcurementUseCRI.Name = "mnuProcurementUseCRI" - Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementUseCRI.Text = "Corruption Risk Index (CRI)" ' 'mnuProcurementCTFVCalculateCRI ' Me.mnuProcurementCTFVCalculateCRI.Name = "mnuProcurementCTFVCalculateCRI" - Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(418, 34) + Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(278, 22) Me.mnuProcurementCTFVCalculateCRI.Text = "Define Corruption Risk Index (CRI)..." ' 'mnuProcurementUseCRISummariseCRIbyCountry ' Me.mnuProcurementUseCRISummariseCRIbyCountry.Name = "mnuProcurementUseCRISummariseCRIbyCountry" - Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(418, 34) + Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(278, 22) Me.mnuProcurementUseCRISummariseCRIbyCountry.Text = "Summarise CRI by Country (or other)..." ' 'mnuOptionsByContext ' Me.mnuOptionsByContext.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckData, Me.mnuOptionsByContextDefine, Me.mnuOptionsByContextPrepare, Me.mnuOptionsByContextDescribe, Me.mnuOptionsByContextModel, Me.mnuOptionsByContextCropModel}) Me.mnuOptionsByContext.Name = "mnuOptionsByContext" - Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 29) + Me.mnuOptionsByContext.Size = New System.Drawing.Size(84, 22) Me.mnuOptionsByContext.Text = "Experiments" ' 'mnuOptionsByContextCheckData ' Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" - Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows ' Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" - Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' Me.mnuOptionsByContextCheckDataCompareColumns.Name = "mnuOptionsByContextCheckDataCompareColumns" - Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataCompareColumns.Text = "Compare Columns..." ' 'ToolStripSeparator47 ' Me.ToolStripSeparator47.Name = "ToolStripSeparator47" - Me.ToolStripSeparator47.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6) ' 'mnuOptionsByContextCheckDataOneVariableSummarise ' Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise" - Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuOptionsByContextCheckDataOneVariableGraph ' Me.mnuOptionsByContextCheckDataOneVariableGraph.Name = "mnuOptionsByContextCheckDataOneVariableGraph" - Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuOptionsByContextCheckDataOneVariableFrequencies ' Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Name = "mnuOptionsByContextCheckDataOneVariableFrequencies" - Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'mnuOptionsByContextDefine ' Me.mnuOptionsByContextDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDefineOnStation, Me.mnuOptionsByContextDefineOnFarm}) Me.mnuOptionsByContextDefine.Name = "mnuOptionsByContextDefine" - Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation ' Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" - Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(222, 34) + Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(147, 22) Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..." ' 'mnuOptionsByContextDefineOnFarm ' Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm" - Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(222, 34) + Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(147, 22) Me.mnuOptionsByContextDefineOnFarm.Text = "On - Farm..." ' 'mnuOptionsByContextPrepare ' Me.mnuOptionsByContextPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions, Me.ToolStripSeparator48, Me.mnuOptionsByContextMergeAdditionalData, Me.mnuOptionsByContextPrepareStack, Me.mnuOptionsByContextPrepareUnstack}) Me.mnuOptionsByContextPrepare.Name = "mnuOptionsByContextPrepare" - Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions ' Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Name = "mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions" - Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Text = "Calculate Difference Between Options..." ' 'ToolStripSeparator48 ' Me.ToolStripSeparator48.Name = "ToolStripSeparator48" - Me.ToolStripSeparator48.Size = New System.Drawing.Size(418, 6) + Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6) ' 'mnuOptionsByContextMergeAdditionalData ' Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData" - Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuOptionsByContextPrepareStack ' Me.mnuOptionsByContextPrepareStack.Name = "mnuOptionsByContextPrepareStack" - Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareStack.Text = "Stack (Pivot Longer)..." ' 'mnuOptionsByContextPrepareUnstack ' Me.mnuOptionsByContextPrepareUnstack.Name = "mnuOptionsByContextPrepareUnstack" - Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuOptionsByContextDescribe ' Me.mnuOptionsByContextDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDescribeCompareTwoTreatments, Me.mnuOptionsByContextDescribeCompareMultipleTreatments, Me.mnuOptionsByContextDescribeBoxplot}) Me.mnuOptionsByContextDescribe.Name = "mnuOptionsByContextDescribe" - Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments ' Me.mnuOptionsByContextDescribeCompareTwoTreatments.Name = "mnuOptionsByContextDescribeCompareTwoTreatments" - Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeCompareTwoTreatments.Text = "Compare Two Options..." ' 'mnuOptionsByContextDescribeCompareMultipleTreatments ' Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Enabled = False Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Name = "mnuOptionsByContextDescribeCompareMultipleTreatments" - Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Text = "Compare Multiple Options..." ' 'mnuOptionsByContextDescribeBoxplot ' Me.mnuOptionsByContextDescribeBoxplot.Name = "mnuOptionsByContextDescribeBoxplot" - Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeBoxplot.Text = "Boxplot..." ' 'mnuOptionsByContextModel ' Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel}) Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel" - Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel ' Me.mnuOptionsByContextModelFitModel.Name = "mnuOptionsByContextModelFitModel" - Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(265, 34) + Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextModelFitModel.Text = "Fit Model..." ' 'mnuOptionsByContextGeneralFitModel ' Me.mnuOptionsByContextGeneralFitModel.Name = "mnuOptionsByContextGeneralFitModel" - Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(265, 34) + Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextGeneralFitModel.Text = "General Fit Model..." ' 'mnuOptionsByContextCropModel ' Me.mnuOptionsByContextCropModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCropModelApsimxExamples}) Me.mnuOptionsByContextCropModel.Name = "mnuOptionsByContextCropModel" - Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextCropModel.Text = "Crop Model" ' 'mnuOptionsByContextCropModelApsimxExamples ' Me.mnuOptionsByContextCropModelApsimxExamples.Name = "mnuOptionsByContextCropModelApsimxExamples" - Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(264, 34) + Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextCropModelApsimxExamples.Text = "Apsimx Examples..." ' 'mnuTools ' Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsLoadOptions, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" - Me.mnuTools.Size = New System.Drawing.Size(69, 29) + Me.mnuTools.Size = New System.Drawing.Size(46, 22) Me.mnuTools.Text = "Tools" ' 'mnuToolsRunRCode ' Me.mnuToolsRunRCode.Enabled = False Me.mnuToolsRunRCode.Name = "mnuToolsRunRCode" - Me.mnuToolsRunRCode.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRunRCode.Tag = "Run_R_Code..." Me.mnuToolsRunRCode.Text = "Run R Code..." ' @@ -4880,7 +4867,7 @@ Partial Class frmMain ' Me.mnuToolsRestartR.Enabled = False Me.mnuToolsRestartR.Name = "mnuToolsRestartR" - Me.mnuToolsRestartR.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRestartR.Tag = "Restart_R" Me.mnuToolsRestartR.Text = "Restart R" ' @@ -4888,27 +4875,27 @@ Partial Class frmMain ' Me.mnuToolsCheckForUpdates.Enabled = False Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates" - Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(198, 22) Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates..." Me.mnuToolsCheckForUpdates.Text = "Check for Updates..." ' 'mnuToolsClearOutputWindow ' Me.mnuToolsClearOutputWindow.Name = "mnuToolsClearOutputWindow" - Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(198, 22) Me.mnuToolsClearOutputWindow.Tag = "Clear_Output_Window..." Me.mnuToolsClearOutputWindow.Text = "Clear Output Window..." ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(295, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(195, 6) ' 'mnuToolsSaveCurrentOptions ' Me.mnuToolsSaveCurrentOptions.Enabled = False Me.mnuToolsSaveCurrentOptions.Name = "mnuToolsSaveCurrentOptions" - Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' @@ -4916,20 +4903,20 @@ Partial Class frmMain ' Me.mnuToolsLoadOptions.Enabled = False Me.mnuToolsLoadOptions.Name = "mnuToolsLoadOptions" - Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsLoadOptions.Tag = "Load_Options..." Me.mnuToolsLoadOptions.Text = "Load Options..." ' 'mnuToolsInstallRPackage ' Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage" - Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(198, 22) Me.mnuToolsInstallRPackage.Text = "Install R Package..." ' 'mnuToolsOptions ' Me.mnuToolsOptions.Name = "mnuToolsOptions" - Me.mnuToolsOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' @@ -4943,8 +4930,7 @@ Partial Class frmMain ' Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill - Me.splOverall.Location = New System.Drawing.Point(0, 72) - Me.splOverall.Margin = New System.Windows.Forms.Padding(4) + Me.splOverall.Location = New System.Drawing.Point(0, 61) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -4957,9 +4943,9 @@ Partial Class frmMain ' Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) - Me.splOverall.Size = New System.Drawing.Size(1251, 619) - Me.splOverall.SplitterDistance = 259 - Me.splOverall.SplitterWidth = 8 + Me.splOverall.Size = New System.Drawing.Size(834, 399) + Me.splOverall.SplitterDistance = 166 + Me.splOverall.SplitterWidth = 5 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -4967,7 +4953,6 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) - Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -4979,9 +4964,9 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - Me.splExtraWindows.Size = New System.Drawing.Size(1251, 259) - Me.splExtraWindows.SplitterDistance = 381 - Me.splExtraWindows.SplitterWidth = 8 + Me.splExtraWindows.Size = New System.Drawing.Size(834, 166) + Me.splExtraWindows.SplitterDistance = 254 + Me.splExtraWindows.SplitterWidth = 5 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -4989,7 +4974,6 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) - Me.splMetadata.Margin = New System.Windows.Forms.Padding(4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -5000,9 +4984,9 @@ Partial Class frmMain ' Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) - Me.splMetadata.Size = New System.Drawing.Size(381, 259) - Me.splMetadata.SplitterDistance = 106 - Me.splMetadata.SplitterWidth = 8 + Me.splMetadata.Size = New System.Drawing.Size(254, 166) + Me.splMetadata.SplitterDistance = 70 + Me.splMetadata.SplitterWidth = 5 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -5012,9 +4996,9 @@ Partial Class frmMain Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrColumnMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(106, 259) + Me.ucrColumnMeta.Size = New System.Drawing.Size(70, 166) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5023,9 +5007,9 @@ Partial Class frmMain Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataFrameMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(267, 259) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 166) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5034,9 +5018,9 @@ Partial Class frmMain Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrScriptWindow.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) - Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(862, 259) + Me.ucrScriptWindow.Size = New System.Drawing.Size(575, 166) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5046,7 +5030,6 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) - Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5058,9 +5041,9 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - Me.splDataOutput.Size = New System.Drawing.Size(1251, 352) - Me.splDataOutput.SplitterDistance = 576 - Me.splDataOutput.SplitterWidth = 8 + Me.splDataOutput.Size = New System.Drawing.Size(834, 228) + Me.splDataOutput.SplitterDistance = 384 + Me.splDataOutput.SplitterWidth = 5 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5070,9 +5053,9 @@ Partial Class frmMain Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) - Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(576, 352) + Me.ucrDataViewer.Size = New System.Drawing.Size(384, 228) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5082,9 +5065,9 @@ Partial Class frmMain Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrOutput.Location = New System.Drawing.Point(0, 0) - Me.ucrOutput.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(667, 352) + Me.ucrOutput.Size = New System.Drawing.Size(445, 228) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5124,9 +5107,9 @@ Partial Class frmMain ' 'frmMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(1251, 723) + Me.ClientSize = New System.Drawing.Size(834, 482) Me.Controls.Add(Me.splOverall) Me.Controls.Add(Me.stsStrip) Me.Controls.Add(Me.Tool_strip) @@ -5134,7 +5117,6 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar - Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "frmMain" Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized @@ -5744,9 +5726,8 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator70 As ToolStripSeparator Friend WithEvents mnuClimaticCheckDataCheckStationLocations As ToolStripMenuItem Friend WithEvents mnuClimaticFileImportfromClimateDataStore As ToolStripMenuItem - Friend WithEvents mnuEditPasteNewDataFrame As ToolStripMenuItem + Friend WithEvents mnuEditPasteNewCols As ToolStripMenuItem Friend WithEvents mnuTbLan As ToolStripButton - Friend WithEvents mnuPasteSpecial As ToolStripMenuItem Friend WithEvents mnuLastGraph As ToolStripSplitButton Friend WithEvents mnuRViewer As ToolStripMenuItem Friend WithEvents mnuploty As ToolStripMenuItem diff --git a/instat/frmMain.resx b/instat/frmMain.resx index e679779467e..c73bcdce42b 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S @@ -162,7 +162,7 @@ iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 UExQ92oSqkVXopsuEsymXbRYCkVtgkJtVfpY+Eh1YaWWdiOJWdgWbWmlG000kTxujMnp+cY5ZnLyu7nn NXPPuZkPPpLce+b7nd/3hXtn5p6ZW8VyBIs8vICRhxcw8vACRh5ewMjDCxh5eAEjDy9gGIU3OjrKmpub WXV1NauqqsppSPgHH+GnCbTDe/bsGauvrycnk9OM8PPp06exw+rQCm9kZITV1dWRE8hpR/g6PDwcO60G diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d4704961478..dc541d980d2 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2343,8 +2343,8 @@ Public Class frmMain dlgImportERA5Data.ShowDialog() End Sub - Private Sub mnuEditPasteNewDataFrame_Click(sender As Object, e As EventArgs) Handles mnuEditPasteNewDataFrame.Click - dlgPasteNewDataFrame.ShowDialog() + Private Sub mnuEditPasteNewCols_Click(sender As Object, e As EventArgs) Handles mnuEditPasteNewCols.Click + dlgPasteNewColumns.ShowDialog() End Sub Private Sub mnuTbLan_Click(sender As Object, e As EventArgs) Handles mnuTbLan.Click diff --git a/instat/instat.vbproj b/instat/instat.vbproj index b850753f663..8f51bf47a24 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -491,12 +491,6 @@ Form - - dlgPasteNewDataFrame.vb - - - Form - dlgPasteSpecial.vb @@ -3069,9 +3063,6 @@ dlgPasteNewColumns.vb - - dlgPasteNewDataFrame.vb - dlgPasteSpecial.vb From 498f4405e27609cb13923ad7bf4ab5c233113de4 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 25 Jul 2023 19:33:27 +0300 Subject: [PATCH 06/39] ammended comment --- instat/dlgPasteNewColumns.vb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index 6a222e53917..5b04c7c2a45 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -90,12 +90,11 @@ Public Class dlgPasteNewColumns clsReadClipBoardDataRFunction.SetPackageName("clipr") clsReadClipBoardDataRFunction.SetRCommand("read_clip_tbl") - 'todo. change to false - clsReadClipBoardDataRFunction.AddParameter("header", "FALSE", iPosition:=1) + clsReadClipBoardDataRFunction.AddParameter("header", "TRUE", iPosition:=1) clsImportColsToExistingDFRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") clsImportColsToExistingDFRFunction.AddParameter("col_data", clsRFunctionParameter:=clsReadClipBoardDataRFunction, iPosition:=1) - clsImportColsToExistingDFRFunction.AddParameter("use_col_name_as_prefix", strParameterValue:="TRUE", iPosition:=2) + 'clsImportColsToExistingDFRFunction.AddParameter("use_col_name_as_prefix", strParameterValue:="TRUE", iPosition:=2) ucrBase.clsRsyntax.SetBaseRFunction(clsReadClipBoardDataRFunction) From d4e353519ea90b596a71d532359b1b8b693f2407 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 27 Jul 2023 16:28:48 +0300 Subject: [PATCH 07/39] fixed some bugs --- instat/Model/Output/clsOutputElement.vb | 6 ++++- instat/UserControl/ucrOutputPage.vb | 2 +- instat/dlgPasteNewColumns.Designer.vb | 13 ++++----- instat/dlgPasteNewColumns.vb | 35 ++++++++----------------- 4 files changed, 24 insertions(+), 32 deletions(-) diff --git a/instat/Model/Output/clsOutputElement.vb b/instat/Model/Output/clsOutputElement.vb index 8fbb663af65..5f3241352a4 100644 --- a/instat/Model/Output/clsOutputElement.vb +++ b/instat/Model/Output/clsOutputElement.vb @@ -85,11 +85,15 @@ Public Class clsOutputElement _strOutput = strOutput End Sub - ''' + ''' ''' Gets formatted R Script, split into R Script Elements ''' ''' Public ReadOnly Property FormattedRScript As List(Of clsRScriptElement) + + 'todo. + 'this function may end up being called multiple times. For long scripts initialising clsRScript And getting tokens takes lot of time. You can test this effect by pasting new data frame that has many columns. + 'should the operation of getting tokens be done just once then stored to be reused f need be? Get Dim _lstRScriptElements As New List(Of clsRScriptElement) Try diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index e1328bbaee6..50d49de8c82 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -133,7 +133,7 @@ Public Class ucrOutputPage 'whether it's just a script output 'todo. temporary fix. Output element should always have an R script - If outputElement.FormattedRScript IsNot Nothing Then + If outputElement.Script IsNot Nothing Then AddNewScript(outputElement) End If diff --git a/instat/dlgPasteNewColumns.Designer.vb b/instat/dlgPasteNewColumns.Designer.vb index f2f8f9d4109..f3d34ef3dbb 100644 --- a/instat/dlgPasteNewColumns.Designer.vb +++ b/instat/dlgPasteNewColumns.Designer.vb @@ -45,7 +45,7 @@ Partial Class dlgPasteNewColumns Me.ucrDFSelected.AutoSize = True Me.ucrDFSelected.bDropUnusedFilterLevels = False Me.ucrDFSelected.bUseCurrentFilter = True - Me.ucrDFSelected.Location = New System.Drawing.Point(5, 269) + Me.ucrDFSelected.Location = New System.Drawing.Point(5, 261) Me.ucrDFSelected.Margin = New System.Windows.Forms.Padding(0) Me.ucrDFSelected.Name = "ucrDFSelected" Me.ucrDFSelected.Size = New System.Drawing.Size(177, 50) @@ -71,11 +71,12 @@ Partial Class dlgPasteNewColumns ' 'lblConfirmText ' + Me.lblConfirmText.AutoSize = True Me.lblConfirmText.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblConfirmText.Location = New System.Drawing.Point(328, 262) + Me.lblConfirmText.Location = New System.Drawing.Point(277, 280) Me.lblConfirmText.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblConfirmText.Name = "lblConfirmText" - Me.lblConfirmText.Size = New System.Drawing.Size(249, 68) + Me.lblConfirmText.Size = New System.Drawing.Size(200, 13) Me.lblConfirmText.TabIndex = 35 Me.lblConfirmText.Text = "Click Ok to paste data to new data frame" ' @@ -132,7 +133,7 @@ Partial Class dlgPasteNewColumns Me.ucrSaveNewDFName.Location = New System.Drawing.Point(5, 269) Me.ucrSaveNewDFName.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveNewDFName.Name = "ucrSaveNewDFName" - Me.ucrSaveNewDFName.Size = New System.Drawing.Size(276, 24) + Me.ucrSaveNewDFName.Size = New System.Drawing.Size(263, 24) Me.ucrSaveNewDFName.TabIndex = 30 ' 'ucrNudPreviewLines @@ -162,7 +163,7 @@ Partial Class dlgPasteNewColumns ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(62, 339) + Me.ucrBase.Location = New System.Drawing.Point(62, 320) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 31 @@ -214,7 +215,7 @@ Partial Class dlgPasteNewColumns Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(585, 396) + Me.ClientSize = New System.Drawing.Size(585, 376) Me.Controls.Add(Me.rdoColumns) Me.Controls.Add(Me.rdoDataFrame) Me.Controls.Add(Me.ucrPnl) diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index 5b04c7c2a45..00f62c72d1c 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -58,6 +58,7 @@ Public Class dlgPasteNewColumns ucrChkRowHeader.SetText("First row is header") ucrChkRowHeader.SetParameter(New RParameter("header", 1)) + ucrChkRowHeader.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrNudPreviewLines.SetMinMax(iNewMin:=10, iNewMax:=1000) '---------------------------- @@ -152,27 +153,7 @@ Public Class dlgPasteNewColumns 'try to show preview the data only frmMain.clsGrids.FillSheet(dfTemp, "temp", grdDataPreview, bIncludeDataTypes:=False, iColMax:=frmMain.clsGrids.iMaxCols) - lblConfirmText.Text = "Number of columns: " & dfTemp.ColumnCount & Environment.NewLine & - "Number of rows: " & dfTemp.RowCount & Environment.NewLine - - If rdoDataFrame.Checked Then - lblConfirmText.Text = lblConfirmText.Text & "Click Ok to paste data to new data frame." - ElseIf rdoColumns.Checked Then - 'validate allowed number of rows - If dfTemp.RowCount < ucrDFSelected.iDataFrameLength Then - lblConfirmText.Text = lblConfirmText.Text & "Too few rows to paste into this data frame. This data frame requires " & ucrDFSelected.iDataFrameLength & " rows." - 'please note, we could allow few rows to be pasted. we can do that ammending add columns R code - 'but as stated in issue #5991 by Danny this is unlikely to be the correct solution. - 'Left here for reference - 'lblConfirmText.Text = lblConfirmText.Text & Environment.NewLine & (ucrDataFrameSelected.iDataFrameLength - dfTemp.RowCount) & " missing values will be added." - Return False - ElseIf dfTemp.RowCount > ucrDFSelected.iDataFrameLength Then - lblConfirmText.Text = lblConfirmText.Text & "Too many rows to paste into this data frame. This data frame requires " & ucrDFSelected.iDataFrameLength & " rows." - Return False - Else - lblConfirmText.Text = lblConfirmText.Text & "Click Ok to paste data to selected data frame." - End If - End If + lblConfirmText.Text = If(rdoDataFrame.Checked, lblConfirmText.Text & "Click Ok to paste data to new data frame.", "Click Ok to paste data to selected data frame.") lblConfirmText.ForeColor = Color.Green panelNoDataPreview.Visible = False Return True @@ -206,7 +187,7 @@ Public Class dlgPasteNewColumns End If If bValidatePasteData Then - TestOkEnabled() + TestOkEnabled(bValidateCopiedData:=False) End If End Sub @@ -215,10 +196,16 @@ Public Class dlgPasteNewColumns TestOkEnabled() End Sub - Private Sub ucrControls_ControlContentsChanged(ucrchangedControl As ucrCore) Handles ucrChkRowHeader.ControlContentsChanged, ucrDFSelected.ControlContentsChanged, ucrSaveNewDFName.ControlContentsChanged, ucrNudPreviewLines.ControlContentsChanged + Private Sub ucrPreviewControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkRowHeader.ControlValueChanged, ucrNudPreviewLines.ControlValueChanged + If bValidatePasteData Then + TestOkEnabled(bValidateCopiedData:=ucrChangedControl IsNot ucrNudPreviewLines) + End If + End Sub + + Private Sub ucrControls_ControlContentsChanged(ucrchangedControl As ucrCore) Handles ucrDFSelected.ControlContentsChanged, ucrSaveNewDFName.ControlContentsChanged If bValidatePasteData Then 'disabled unnecessary validation of copied data because it may take long for large datasets - TestOkEnabled(bValidateCopiedData:=ucrchangedControl IsNot ucrSaveNewDFName AndAlso ucrchangedControl IsNot ucrNudPreviewLines) + TestOkEnabled(bValidateCopiedData:=ucrchangedControl IsNot ucrSaveNewDFName AndAlso ucrchangedControl IsNot ucrDFSelected) End If End Sub From abc5fc7b662f564fc2ecb3c3d64db9411e64dc07 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 28 Jul 2023 14:15:46 +0300 Subject: [PATCH 08/39] ammended keeping ofexisting columns --- instat/dlgPasteNewColumns.Designer.vb | 29 +++++++++++++------ instat/dlgPasteNewColumns.vb | 29 +++++++++++-------- instat/frmMain.Designer.vb | 16 +++++----- instat/frmMain.vb | 2 +- instat/static/InstatObject/R/data_object_R6.R | 5 +--- 5 files changed, 47 insertions(+), 34 deletions(-) diff --git a/instat/dlgPasteNewColumns.Designer.vb b/instat/dlgPasteNewColumns.Designer.vb index f3d34ef3dbb..89a03e9d4a6 100644 --- a/instat/dlgPasteNewColumns.Designer.vb +++ b/instat/dlgPasteNewColumns.Designer.vb @@ -37,6 +37,7 @@ Partial Class dlgPasteNewColumns Me.rdoColumns = New System.Windows.Forms.RadioButton() Me.rdoDataFrame = New System.Windows.Forms.RadioButton() Me.ucrPnl = New instat.UcrPanel() + Me.ucrChkKeepExstingCols = New instat.ucrCheck() Me.panelNoDataPreview.SuspendLayout() Me.SuspendLayout() ' @@ -45,7 +46,7 @@ Partial Class dlgPasteNewColumns Me.ucrDFSelected.AutoSize = True Me.ucrDFSelected.bDropUnusedFilterLevels = False Me.ucrDFSelected.bUseCurrentFilter = True - Me.ucrDFSelected.Location = New System.Drawing.Point(5, 261) + Me.ucrDFSelected.Location = New System.Drawing.Point(5, 265) Me.ucrDFSelected.Margin = New System.Windows.Forms.Padding(0) Me.ucrDFSelected.Name = "ucrDFSelected" Me.ucrDFSelected.Size = New System.Drawing.Size(177, 50) @@ -71,12 +72,11 @@ Partial Class dlgPasteNewColumns ' 'lblConfirmText ' - Me.lblConfirmText.AutoSize = True Me.lblConfirmText.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblConfirmText.Location = New System.Drawing.Point(277, 280) + Me.lblConfirmText.Location = New System.Drawing.Point(358, 269) Me.lblConfirmText.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblConfirmText.Name = "lblConfirmText" - Me.lblConfirmText.Size = New System.Drawing.Size(200, 13) + Me.lblConfirmText.Size = New System.Drawing.Size(219, 48) Me.lblConfirmText.TabIndex = 35 Me.lblConfirmText.Text = "Click Ok to paste data to new data frame" ' @@ -163,7 +163,7 @@ Partial Class dlgPasteNewColumns ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(62, 320) + Me.ucrBase.Location = New System.Drawing.Point(62, 325) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 31 @@ -181,7 +181,7 @@ Partial Class dlgPasteNewColumns Me.rdoColumns.Size = New System.Drawing.Size(99, 27) Me.rdoColumns.TabIndex = 39 Me.rdoColumns.TabStop = True - Me.rdoColumns.Text = "As Columns" + Me.rdoColumns.Text = "Columns" Me.rdoColumns.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoColumns.UseVisualStyleBackColor = True ' @@ -198,7 +198,7 @@ Partial Class dlgPasteNewColumns Me.rdoDataFrame.Size = New System.Drawing.Size(105, 27) Me.rdoDataFrame.TabIndex = 38 Me.rdoDataFrame.TabStop = True - Me.rdoDataFrame.Text = "As Data Frame" + Me.rdoDataFrame.Text = "Data Frame" Me.rdoDataFrame.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoDataFrame.UseVisualStyleBackColor = True ' @@ -210,12 +210,22 @@ Partial Class dlgPasteNewColumns Me.ucrPnl.Size = New System.Drawing.Size(286, 29) Me.ucrPnl.TabIndex = 37 ' + 'ucrChkKeepExstingCols + ' + Me.ucrChkKeepExstingCols.AutoSize = True + Me.ucrChkKeepExstingCols.Checked = False + Me.ucrChkKeepExstingCols.Location = New System.Drawing.Point(170, 287) + Me.ucrChkKeepExstingCols.Name = "ucrChkKeepExstingCols" + Me.ucrChkKeepExstingCols.Size = New System.Drawing.Size(183, 23) + Me.ucrChkKeepExstingCols.TabIndex = 40 + ' 'dlgPasteNewColumns ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(585, 376) + Me.ClientSize = New System.Drawing.Size(585, 383) + Me.Controls.Add(Me.ucrChkKeepExstingCols) Me.Controls.Add(Me.rdoColumns) Me.Controls.Add(Me.rdoDataFrame) Me.Controls.Add(Me.ucrPnl) @@ -234,7 +244,7 @@ Partial Class dlgPasteNewColumns Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "dlgPasteNewColumns" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Paste Data" + Me.Text = "Paste New" Me.panelNoDataPreview.ResumeLayout(False) Me.panelNoDataPreview.PerformLayout() Me.ResumeLayout(False) @@ -257,4 +267,5 @@ Partial Class dlgPasteNewColumns Friend WithEvents rdoColumns As RadioButton Friend WithEvents rdoDataFrame As RadioButton Friend WithEvents ucrPnl As UcrPanel + Friend WithEvents ucrChkKeepExstingCols As ucrCheck End Class diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index 00f62c72d1c..e6f4503e6b6 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -45,8 +45,8 @@ Public Class dlgPasteNewColumns End Sub Private Sub InitialiseDialog() - 'todo. attach the help id later - 'ucrBase.iHelpTopicID = + + ucrBase.iHelpTopicID = 160 '---------------------------- ucrPnl.AddRadioButton(rdoDataFrame) @@ -54,7 +54,7 @@ Public Class dlgPasteNewColumns ucrPnl.AddFunctionNamesCondition(rdoDataFrame, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data", bNewIsPositive:=False) ucrPnl.AddFunctionNamesCondition(rdoColumns, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data", bNewIsPositive:=True) ucrPnl.AddToLinkedControls(ucrSaveNewDFName, {rdoDataFrame}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnl.AddToLinkedControls(ucrDFSelected, {rdoColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnl.AddToLinkedControls({ucrDFSelected, ucrChkKeepExstingCols}, {rdoColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkRowHeader.SetText("First row is header") ucrChkRowHeader.SetParameter(New RParameter("header", 1)) @@ -76,6 +76,10 @@ Public Class dlgPasteNewColumns ucrDFSelected.SetText("Paste copied data to:") ucrDFSelected.SetParameter(New RParameter("data_name", 0)) ucrDFSelected.SetParameterIsString() + + ucrChkKeepExstingCols.SetText("Keep existing columns") + ucrChkKeepExstingCols.SetParameter(New RParameter("use_col_name_as_prefix", 2)) + ucrChkKeepExstingCols.SetValuesCheckedAndUnchecked("TRUE", "FALSE") '---------------------------- ucrNudPreviewLines.Minimum = 10 @@ -91,11 +95,11 @@ Public Class dlgPasteNewColumns clsReadClipBoardDataRFunction.SetPackageName("clipr") clsReadClipBoardDataRFunction.SetRCommand("read_clip_tbl") - clsReadClipBoardDataRFunction.AddParameter("header", "TRUE", iPosition:=1) + clsReadClipBoardDataRFunction.AddParameter("header", strParameterValue:="TRUE", iPosition:=1) clsImportColsToExistingDFRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") clsImportColsToExistingDFRFunction.AddParameter("col_data", clsRFunctionParameter:=clsReadClipBoardDataRFunction, iPosition:=1) - 'clsImportColsToExistingDFRFunction.AddParameter("use_col_name_as_prefix", strParameterValue:="TRUE", iPosition:=2) + clsImportColsToExistingDFRFunction.AddParameter("use_col_name_as_prefix", strParameterValue:="TRUE", iPosition:=2) ucrBase.clsRsyntax.SetBaseRFunction(clsReadClipBoardDataRFunction) @@ -103,9 +107,12 @@ Public Class dlgPasteNewColumns Private Sub SetRCodeForControls(bReset As Boolean) ucrChkRowHeader.SetRCode(clsReadClipBoardDataRFunction, bReset) - ucrDFSelected.SetRCode(clsImportColsToExistingDFRFunction, bReset) + ucrSaveNewDFName.SetRCode(clsReadClipBoardDataRFunction, bReset) + ucrDFSelected.SetRCode(clsImportColsToExistingDFRFunction, bReset) + ucrChkKeepExstingCols.SetRCode(clsImportColsToExistingDFRFunction, bReset) + ucrPnl.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) End Sub @@ -144,7 +151,6 @@ Public Class dlgPasteNewColumns Dim clsTempReadClipBoardDataRFunction As RFunction = clsReadClipBoardDataRFunction.Clone() - clsTempReadClipBoardDataRFunction.AddParameter("nrows", ucrNudPreviewLines.Value) 'limit the rows to those set in the ucrNudPreviewLines control clsTempReadClipBoardDataRFunction.RemoveAssignTo() 'remove assign to before getting the script Dim dfTemp As DataFrame = frmMain.clsRLink.RunInternalScriptGetValue(clsTempReadClipBoardDataRFunction.ToScript(), bSilent:=True)?.AsDataFrame If dfTemp Is Nothing OrElse dfTemp.RowCount = 0 Then @@ -152,8 +158,8 @@ Public Class dlgPasteNewColumns End If 'try to show preview the data only - frmMain.clsGrids.FillSheet(dfTemp, "temp", grdDataPreview, bIncludeDataTypes:=False, iColMax:=frmMain.clsGrids.iMaxCols) - lblConfirmText.Text = If(rdoDataFrame.Checked, lblConfirmText.Text & "Click Ok to paste data to new data frame.", "Click Ok to paste data to selected data frame.") + frmMain.clsGrids.FillSheet(dfTemp, "temp", grdDataPreview, bIncludeDataTypes:=False, iColMax:=frmMain.clsGrids.iMaxCols, iRowMax:=ucrNudPreviewLines.Value) + lblConfirmText.Text = "Columns: " & dfTemp.ColumnCount & " | Rows: " & dfTemp.RowCount & Environment.NewLine & "Click Ok to paste data." lblConfirmText.ForeColor = Color.Green panelNoDataPreview.Visible = False Return True @@ -202,10 +208,10 @@ Public Class dlgPasteNewColumns End If End Sub - Private Sub ucrControls_ControlContentsChanged(ucrchangedControl As ucrCore) Handles ucrDFSelected.ControlContentsChanged, ucrSaveNewDFName.ControlContentsChanged + Private Sub ucrControls_ControlContentsChanged(ucrchangedControl As ucrCore) Handles ucrDFSelected.ControlContentsChanged, ucrSaveNewDFName.ControlContentsChanged, ucrChkKeepExstingCols.ControlContentsChanged If bValidatePasteData Then 'disabled unnecessary validation of copied data because it may take long for large datasets - TestOkEnabled(bValidateCopiedData:=ucrchangedControl IsNot ucrSaveNewDFName AndAlso ucrchangedControl IsNot ucrDFSelected) + TestOkEnabled(bValidateCopiedData:=ucrchangedControl IsNot ucrSaveNewDFName AndAlso ucrchangedControl IsNot ucrDFSelected AndAlso ucrchangedControl IsNot ucrChkKeepExstingCols) End If End Sub @@ -218,5 +224,4 @@ Public Class dlgPasteNewColumns TestOkEnabled() End Sub - End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 8ad33f43b2f..91dd6e25ae0 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -370,7 +370,7 @@ Partial Class frmMain Me.mnuEditCopy = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditCopySpecial = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditPaste = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuEditPasteNewCols = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditPasteNew = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditWordwrap = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditSelectAll = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator71 = New System.Windows.Forms.ToolStripSeparator() @@ -2880,7 +2880,7 @@ Partial Class frmMain ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditFindNext, Me.mnuEditReplace, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuEditPasteNewCols, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditFindNext, Me.mnuEditReplace, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) Me.mnuEdit.Name = "mnuEdit" Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" @@ -2944,12 +2944,12 @@ Partial Class frmMain Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' - 'mnuEditPasteNewCols + 'mnuEditPasteNew ' - Me.mnuEditPasteNewCols.Name = "mnuEditPasteNewCols" - Me.mnuEditPasteNewCols.Size = New System.Drawing.Size(207, 22) - Me.mnuEditPasteNewCols.Tag = "Paste" - Me.mnuEditPasteNewCols.Text = "Paste New Columns" + Me.mnuEditPasteNew.Name = "mnuEditPasteNew" + Me.mnuEditPasteNew.Size = New System.Drawing.Size(207, 22) + Me.mnuEditPasteNew.Tag = "Paste" + Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' @@ -5726,7 +5726,7 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator70 As ToolStripSeparator Friend WithEvents mnuClimaticCheckDataCheckStationLocations As ToolStripMenuItem Friend WithEvents mnuClimaticFileImportfromClimateDataStore As ToolStripMenuItem - Friend WithEvents mnuEditPasteNewCols As ToolStripMenuItem + Friend WithEvents mnuEditPasteNew As ToolStripMenuItem Friend WithEvents mnuTbLan As ToolStripButton Friend WithEvents mnuLastGraph As ToolStripSplitButton Friend WithEvents mnuRViewer As ToolStripMenuItem diff --git a/instat/frmMain.vb b/instat/frmMain.vb index dc541d980d2..3c5b06b5d99 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2343,7 +2343,7 @@ Public Class frmMain dlgImportERA5Data.ShowDialog() End Sub - Private Sub mnuEditPasteNewCols_Click(sender As Object, e As EventArgs) Handles mnuEditPasteNewCols.Click + Private Sub mnuEditPasteNew_Click(sender As Object, e As EventArgs) Handles mnuEditPasteNew.Click dlgPasteNewColumns.ShowDialog() End Sub diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index cfd4b6926fc..d439204ce75 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -630,9 +630,6 @@ DataSheet$set("public", "add_columns_to_data", function(col_name = "", col_data, use_col_name_as_prefix = TRUE } } - if(use_col_name_as_prefix && length(col_name) > 1) { - stop("Cannot use col_name as prefix when col_name is a vector.") - } if(length(col_name) != num_cols) { use_col_name_as_prefix = TRUE @@ -653,7 +650,7 @@ DataSheet$set("public", "add_columns_to_data", function(col_name = "", col_data, if(require_correct_length) stop("Length of new column must be divisible by the length of the data frame") else curr_col <- rep(curr_col, length.out = self$get_data_frame_length()) } - if(use_col_name_as_prefix) curr_col_name = self$get_next_default_column_name(col_name) + if(use_col_name_as_prefix) curr_col_name = self$get_next_default_column_name(col_name[[i]]) else curr_col_name = col_name[[i]] curr_col_name <- make.names(iconv(curr_col_name, to = "ASCII//TRANSLIT", sub = ".")) new_col_names <- c(new_col_names, curr_col_name) From 18114227335bf1b87edebe3289c09db86862de37 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 28 Jul 2023 15:18:50 +0300 Subject: [PATCH 09/39] changed R function --- instat/dlgPasteNewColumns.vb | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index e6f4503e6b6..b0793b06617 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -19,7 +19,7 @@ Public Class dlgPasteNewColumns Private bFirstLoad As Boolean = True Private bReset As Boolean = True 'Private clsImportColsToNewDFRFunction, clsImportNewDataListRFunction As New RFunction - Private clsReadClipBoardDataRFunction As New RFunction + Private clsReadDataDataRFunction As New RFunction Private clsImportColsToExistingDFRFunction As RFunction 'used to prevent TestOkEnabled from being called multiple times when loading the dialog. Private bValidatePasteData As Boolean = False @@ -53,11 +53,11 @@ Public Class dlgPasteNewColumns ucrPnl.AddRadioButton(rdoColumns) ucrPnl.AddFunctionNamesCondition(rdoDataFrame, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data", bNewIsPositive:=False) ucrPnl.AddFunctionNamesCondition(rdoColumns, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data", bNewIsPositive:=True) - ucrPnl.AddToLinkedControls(ucrSaveNewDFName, {rdoDataFrame}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnl.AddToLinkedControls({ucrDFSelected, ucrChkKeepExstingCols}, {rdoColumns}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnl.AddToLinkedControls(ucrSaveNewDFName, {rdoDataFrame}, bNewLinkedAddRemoveParameter:=False, bNewLinkedHideIfParameterMissing:=True) + ucrPnl.AddToLinkedControls({ucrDFSelected, ucrChkKeepExstingCols}, {rdoColumns}, bNewLinkedAddRemoveParameter:=False, bNewLinkedHideIfParameterMissing:=True) ucrChkRowHeader.SetText("First row is header") - ucrChkRowHeader.SetParameter(New RParameter("header", 1)) + ucrChkRowHeader.SetParameter(New RParameter("col_names", 1)) ucrChkRowHeader.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrNudPreviewLines.SetMinMax(iNewMin:=10, iNewMax:=1000) @@ -87,28 +87,28 @@ Public Class dlgPasteNewColumns Private Sub SetDefaults() clsImportColsToExistingDFRFunction = New RFunction - clsReadClipBoardDataRFunction = New RFunction + clsReadDataDataRFunction = New RFunction ucrNudPreviewLines.Value = 10 ucrSaveNewDFName.Reset() ucrDFSelected.Reset() - clsReadClipBoardDataRFunction.SetPackageName("clipr") - clsReadClipBoardDataRFunction.SetRCommand("read_clip_tbl") - clsReadClipBoardDataRFunction.AddParameter("header", strParameterValue:="TRUE", iPosition:=1) + clsReadDataDataRFunction.SetPackageName("readr") + clsReadDataDataRFunction.SetRCommand("read_delim") + clsReadDataDataRFunction.AddParameter("col_names", strParameterValue:="TRUE", iPosition:=1) clsImportColsToExistingDFRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") - clsImportColsToExistingDFRFunction.AddParameter("col_data", clsRFunctionParameter:=clsReadClipBoardDataRFunction, iPosition:=1) + clsImportColsToExistingDFRFunction.AddParameter("col_data", clsRFunctionParameter:=clsReadDataDataRFunction, iPosition:=1) clsImportColsToExistingDFRFunction.AddParameter("use_col_name_as_prefix", strParameterValue:="TRUE", iPosition:=2) - ucrBase.clsRsyntax.SetBaseRFunction(clsReadClipBoardDataRFunction) + ucrBase.clsRsyntax.SetBaseRFunction(clsReadDataDataRFunction) End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrChkRowHeader.SetRCode(clsReadClipBoardDataRFunction, bReset) + ucrChkRowHeader.SetRCode(clsReadDataDataRFunction, bReset) - ucrSaveNewDFName.SetRCode(clsReadClipBoardDataRFunction, bReset) + ucrSaveNewDFName.SetRCode(clsReadDataDataRFunction, bReset) ucrDFSelected.SetRCode(clsImportColsToExistingDFRFunction, bReset) ucrChkKeepExstingCols.SetRCode(clsImportColsToExistingDFRFunction, bReset) @@ -127,10 +127,9 @@ Public Class dlgPasteNewColumns Dim arrStrTemp() As String = clipBoardText.Split(New String() {Environment.NewLine}, StringSplitOptions.None) If arrStrTemp.Length > 1000 Then MsgBox("Requested clipboard data has more than 1000 rows. Only a maximum of 1000 rows can be pasted") - clsReadClipBoardDataRFunction.AddParameter("x", Chr(34) & "" & Chr(34), iPosition:=0) - Else - clsReadClipBoardDataRFunction.AddParameter("x", Chr(34) & clipBoardText & Chr(34), iPosition:=0) + clipBoardText = "" End If + clsReadDataDataRFunction.AddParameter("file", Chr(34) & clipBoardText & Chr(34), iPosition:=0) Catch ex As Exception 'this error could be due to large clipboard data MsgBox("Requested clipboard operation did not succeed. Large data detected") @@ -149,7 +148,7 @@ Public Class dlgPasteNewColumns lblConfirmText.Text = "" lblConfirmText.ForeColor = Color.Red - Dim clsTempReadClipBoardDataRFunction As RFunction = clsReadClipBoardDataRFunction.Clone() + Dim clsTempReadClipBoardDataRFunction As RFunction = clsReadDataDataRFunction.Clone() clsTempReadClipBoardDataRFunction.RemoveAssignTo() 'remove assign to before getting the script Dim dfTemp As DataFrame = frmMain.clsRLink.RunInternalScriptGetValue(clsTempReadClipBoardDataRFunction.ToScript(), bSilent:=True)?.AsDataFrame @@ -186,9 +185,9 @@ Public Class dlgPasteNewColumns Private Sub ucrPnl_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnl.ControlValueChanged If rdoDataFrame.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsReadClipBoardDataRFunction) + ucrBase.clsRsyntax.SetBaseRFunction(clsReadDataDataRFunction) ElseIf rdoColumns.Checked Then - clsReadClipBoardDataRFunction.SetAssignToObject("data") + clsReadDataDataRFunction.SetAssignToObject("data") ucrBase.clsRsyntax.SetBaseRFunction(clsImportColsToExistingDFRFunction) End If From 5a40deb988e01e1930ee2e356cb5be49932fa1d2 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 28 Jul 2023 15:34:44 +0300 Subject: [PATCH 10/39] design change --- instat/dlgPasteNewColumns.Designer.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instat/dlgPasteNewColumns.Designer.vb b/instat/dlgPasteNewColumns.Designer.vb index 89a03e9d4a6..a2760572e76 100644 --- a/instat/dlgPasteNewColumns.Designer.vb +++ b/instat/dlgPasteNewColumns.Designer.vb @@ -73,10 +73,10 @@ Partial Class dlgPasteNewColumns 'lblConfirmText ' Me.lblConfirmText.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblConfirmText.Location = New System.Drawing.Point(358, 269) + Me.lblConfirmText.Location = New System.Drawing.Point(358, 271) Me.lblConfirmText.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblConfirmText.Name = "lblConfirmText" - Me.lblConfirmText.Size = New System.Drawing.Size(219, 48) + Me.lblConfirmText.Size = New System.Drawing.Size(219, 46) Me.lblConfirmText.TabIndex = 35 Me.lblConfirmText.Text = "Click Ok to paste data to new data frame" ' @@ -163,7 +163,7 @@ Partial Class dlgPasteNewColumns ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(62, 325) + Me.ucrBase.Location = New System.Drawing.Point(62, 323) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 31 From 4ca0d4113b92c4fd58e404c96b51c5bcf03a709d Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 8 Aug 2023 23:02:36 +0300 Subject: [PATCH 11/39] resolved comments --- instat/dlgPasteNewColumns.vb | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index b0793b06617..069350313b3 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -18,8 +18,7 @@ Imports instat.Translations Public Class dlgPasteNewColumns Private bFirstLoad As Boolean = True Private bReset As Boolean = True - 'Private clsImportColsToNewDFRFunction, clsImportNewDataListRFunction As New RFunction - Private clsReadDataDataRFunction As New RFunction + Private clsReadDataRFunction As New RFunction Private clsImportColsToExistingDFRFunction As RFunction 'used to prevent TestOkEnabled from being called multiple times when loading the dialog. Private bValidatePasteData As Boolean = False @@ -87,28 +86,28 @@ Public Class dlgPasteNewColumns Private Sub SetDefaults() clsImportColsToExistingDFRFunction = New RFunction - clsReadDataDataRFunction = New RFunction + clsReadDataRFunction = New RFunction ucrNudPreviewLines.Value = 10 ucrSaveNewDFName.Reset() ucrDFSelected.Reset() - clsReadDataDataRFunction.SetPackageName("readr") - clsReadDataDataRFunction.SetRCommand("read_delim") - clsReadDataDataRFunction.AddParameter("col_names", strParameterValue:="TRUE", iPosition:=1) + clsReadDataRFunction.SetPackageName("readr") + clsReadDataRFunction.SetRCommand("read_delim") + clsReadDataRFunction.AddParameter("col_names", strParameterValue:="TRUE", iPosition:=1) clsImportColsToExistingDFRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") - clsImportColsToExistingDFRFunction.AddParameter("col_data", clsRFunctionParameter:=clsReadDataDataRFunction, iPosition:=1) + clsImportColsToExistingDFRFunction.AddParameter("col_data", clsRFunctionParameter:=clsReadDataRFunction, iPosition:=1) clsImportColsToExistingDFRFunction.AddParameter("use_col_name_as_prefix", strParameterValue:="TRUE", iPosition:=2) - ucrBase.clsRsyntax.SetBaseRFunction(clsReadDataDataRFunction) + ucrBase.clsRsyntax.SetBaseRFunction(clsReadDataRFunction) End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrChkRowHeader.SetRCode(clsReadDataDataRFunction, bReset) + ucrChkRowHeader.SetRCode(clsReadDataRFunction, bReset) - ucrSaveNewDFName.SetRCode(clsReadDataDataRFunction, bReset) + ucrSaveNewDFName.SetRCode(clsReadDataRFunction, bReset) ucrDFSelected.SetRCode(clsImportColsToExistingDFRFunction, bReset) ucrChkKeepExstingCols.SetRCode(clsImportColsToExistingDFRFunction, bReset) @@ -129,7 +128,7 @@ Public Class dlgPasteNewColumns MsgBox("Requested clipboard data has more than 1000 rows. Only a maximum of 1000 rows can be pasted") clipBoardText = "" End If - clsReadDataDataRFunction.AddParameter("file", Chr(34) & clipBoardText & Chr(34), iPosition:=0) + clsReadDataRFunction.AddParameter("file", Chr(34) & clipBoardText & Chr(34), iPosition:=0) Catch ex As Exception 'this error could be due to large clipboard data MsgBox("Requested clipboard operation did not succeed. Large data detected") @@ -148,7 +147,7 @@ Public Class dlgPasteNewColumns lblConfirmText.Text = "" lblConfirmText.ForeColor = Color.Red - Dim clsTempReadClipBoardDataRFunction As RFunction = clsReadDataDataRFunction.Clone() + Dim clsTempReadClipBoardDataRFunction As RFunction = clsReadDataRFunction.Clone() clsTempReadClipBoardDataRFunction.RemoveAssignTo() 'remove assign to before getting the script Dim dfTemp As DataFrame = frmMain.clsRLink.RunInternalScriptGetValue(clsTempReadClipBoardDataRFunction.ToScript(), bSilent:=True)?.AsDataFrame @@ -156,7 +155,7 @@ Public Class dlgPasteNewColumns Return False End If - 'try to show preview the data only + 'preview data frmMain.clsGrids.FillSheet(dfTemp, "temp", grdDataPreview, bIncludeDataTypes:=False, iColMax:=frmMain.clsGrids.iMaxCols, iRowMax:=ucrNudPreviewLines.Value) lblConfirmText.Text = "Columns: " & dfTemp.ColumnCount & " | Rows: " & dfTemp.RowCount & Environment.NewLine & "Click Ok to paste data." lblConfirmText.ForeColor = Color.Green @@ -185,9 +184,9 @@ Public Class dlgPasteNewColumns Private Sub ucrPnl_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnl.ControlValueChanged If rdoDataFrame.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsReadDataDataRFunction) + ucrBase.clsRsyntax.SetBaseRFunction(clsReadDataRFunction) ElseIf rdoColumns.Checked Then - clsReadDataDataRFunction.SetAssignToObject("data") + clsReadDataRFunction.SetAssignToObject("data") ucrBase.clsRsyntax.SetBaseRFunction(clsImportColsToExistingDFRFunction) End If From 8708a7ae799dea89216b29041b57e623e23214b1 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 8 Aug 2023 23:10:27 +0300 Subject: [PATCH 12/39] removed conflicts --- instat/frmMain.Designer.vb | 147 +++++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 64 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 91dd6e25ae0..9beca326202 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -66,17 +66,17 @@ Partial Class frmMain Me.ToolStripSeparator26 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeSpecificMapPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificDotPlot = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator27 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeSpecificMosaic = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificCummulativeDistribution = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificParallelCoordinatePlot = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeGraphGraphics = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTables = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeGeneralColumnSummaries = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeGeneralPivotTable = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator27 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeGeneralTabulation = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeGeneralGraphics = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuDescribeGeneralUseSummaries = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeGeneralTables = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeMultivariate = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeMultivariateCorrelations = New System.Windows.Forms.ToolStripMenuItem() @@ -370,7 +370,8 @@ Partial Class frmMain Me.mnuEditCopy = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditCopySpecial = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditPaste = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuEditPasteNew = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuPasteSpecial = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditPasteNewDataFrame = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditWordwrap = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditSelectAll = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator71 = New System.Windows.Forms.ToolStripSeparator() @@ -680,6 +681,7 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -713,7 +715,7 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' @@ -766,7 +768,7 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' @@ -826,9 +828,9 @@ Partial Class frmMain ' 'mnuDescribeSpecificTablesGraphs ' - Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.ToolStripSeparator27, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) + Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot, Me.ToolStripSeparator38, Me.mnuDescribeGraphGraphics}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' @@ -893,11 +895,6 @@ Partial Class frmMain Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False ' - 'ToolStripSeparator27 - ' - Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(206, 6) - ' 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" @@ -918,34 +915,44 @@ Partial Class frmMain Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' + 'mnuDescribeGraphGraphics + ' + Me.mnuDescribeGraphGraphics.Name = "mnuDescribeGraphGraphics" + Me.mnuDescribeGraphGraphics.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeGraphGraphics.Text = "Graphics..." + ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" ' 'mnuDescribeGeneral ' - Me.mnuDescribeGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneralColumnSummaries, Me.mnuDescribeGeneralTabulation, Me.mnuDescribeGeneralGraphics, Me.ToolStripSeparator38, Me.mnuDescribeGeneralUseSummaries}) + Me.mnuDescribeGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneralPivotTable, Me.ToolStripSeparator27, Me.mnuDescribeGeneralTabulation, Me.mnuDescribeGeneralGraphics, Me.mnuDescribeGeneralTables}) Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneral.Tag = "General" Me.mnuDescribeGeneral.Text = "General" ' - 'mnuDescribeGeneralColumnSummaries + 'mnuDescribeGeneralPivotTable + ' + Me.mnuDescribeGeneralPivotTable.Name = "mnuDescribeGeneralPivotTable" + Me.mnuDescribeGeneralPivotTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralPivotTable.Text = "Pivot Table..." ' - Me.mnuDescribeGeneralColumnSummaries.Name = "mnuDescribeGeneralColumnSummaries" - Me.mnuDescribeGeneralColumnSummaries.Size = New System.Drawing.Size(188, 22) - Me.mnuDescribeGeneralColumnSummaries.Tag = "Column_Summaries..." - Me.mnuDescribeGeneralColumnSummaries.Text = "Column Summaries..." + 'ToolStripSeparator27 + ' + Me.ToolStripSeparator27.Name = "ToolStripSeparator27" + Me.ToolStripSeparator27.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeGeneralTabulation ' Me.mnuDescribeGeneralTabulation.Enabled = False Me.mnuDescribeGeneralTabulation.Name = "mnuDescribeGeneralTabulation" - Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(188, 22) + Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneralTabulation.Tag = "Tabulation..." Me.mnuDescribeGeneralTabulation.Text = "Tabulation..." Me.mnuDescribeGeneralTabulation.Visible = False @@ -953,31 +960,26 @@ Partial Class frmMain 'mnuDescribeGeneralGraphics ' Me.mnuDescribeGeneralGraphics.Name = "mnuDescribeGeneralGraphics" - Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(188, 22) + Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneralGraphics.Tag = "Graphics..." Me.mnuDescribeGeneralGraphics.Text = "Graphics..." ' - 'ToolStripSeparator38 - ' - Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(185, 6) - ' - 'mnuDescribeGeneralUseSummaries + 'mnuDescribeGeneralTables ' - Me.mnuDescribeGeneralUseSummaries.Name = "mnuDescribeGeneralUseSummaries" - Me.mnuDescribeGeneralUseSummaries.Size = New System.Drawing.Size(188, 22) - Me.mnuDescribeGeneralUseSummaries.Text = "Use Summaries..." + Me.mnuDescribeGeneralTables.Name = "mnuDescribeGeneralTables" + Me.mnuDescribeGeneralTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralTables.Text = "Tables..." ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(175, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations @@ -1009,38 +1011,38 @@ Partial Class frmMain 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(175, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel @@ -2880,7 +2882,7 @@ Partial Class frmMain ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditFindNext, Me.mnuEditReplace, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditFindNext, Me.mnuEditReplace, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuPasteSpecial, Me.mnuEditPasteNewDataFrame, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) Me.mnuEdit.Name = "mnuEdit" Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" @@ -2890,7 +2892,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(207, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(244, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2898,14 +2900,14 @@ Partial Class frmMain ' Me.mnuEditFindNext.Enabled = False Me.mnuEditFindNext.Name = "mnuEditFindNext" - Me.mnuEditFindNext.Size = New System.Drawing.Size(207, 22) + Me.mnuEditFindNext.Size = New System.Drawing.Size(244, 22) Me.mnuEditFindNext.Text = "Find Next" ' 'mnuEditReplace ' Me.mnuEditReplace.Enabled = False Me.mnuEditReplace.Name = "mnuEditReplace" - Me.mnuEditReplace.Size = New System.Drawing.Size(207, 22) + Me.mnuEditReplace.Size = New System.Drawing.Size(244, 22) Me.mnuEditReplace.Tag = "Replace" Me.mnuEditReplace.Text = "Replace" ' @@ -2913,7 +2915,7 @@ Partial Class frmMain ' Me.mnuEditCut.Name = "mnuEditCut" Me.mnuEditCut.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.X), System.Windows.Forms.Keys) - Me.mnuEditCut.Size = New System.Drawing.Size(207, 22) + Me.mnuEditCut.Size = New System.Drawing.Size(244, 22) Me.mnuEditCut.Tag = "Cut" Me.mnuEditCut.Text = "Cut" ' @@ -2921,7 +2923,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(207, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(244, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2931,7 +2933,7 @@ Partial Class frmMain Me.mnuEditCopySpecial.Name = "mnuEditCopySpecial" Me.mnuEditCopySpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopySpecial.Size = New System.Drawing.Size(207, 22) + Me.mnuEditCopySpecial.Size = New System.Drawing.Size(244, 22) Me.mnuEditCopySpecial.Tag = "Copy_Special" Me.mnuEditCopySpecial.Text = "Copy Special" Me.mnuEditCopySpecial.Visible = False @@ -2940,40 +2942,51 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(207, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(244, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' - 'mnuEditPasteNew + 'mnuPasteSpecial ' - Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(207, 22) - Me.mnuEditPasteNew.Tag = "Paste" - Me.mnuEditPasteNew.Text = "Paste New" + Me.mnuPasteSpecial.Enabled = False + Me.mnuPasteSpecial.Name = "mnuPasteSpecial" + Me.mnuPasteSpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ + Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) + Me.mnuPasteSpecial.Size = New System.Drawing.Size(244, 22) + Me.mnuPasteSpecial.Tag = "Paste" + Me.mnuPasteSpecial.Text = "Paste New Columns" + Me.mnuPasteSpecial.Visible = False + ' + 'mnuEditPasteNewDataFrame + ' + Me.mnuEditPasteNewDataFrame.Name = "mnuEditPasteNewDataFrame" + Me.mnuEditPasteNewDataFrame.Size = New System.Drawing.Size(244, 22) + Me.mnuEditPasteNewDataFrame.Tag = "Paste" + Me.mnuEditPasteNewDataFrame.Text = "Paste New Data Frame" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(207, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(244, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(207, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(244, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(204, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(241, 6) ' 'mnuEditScript ' Me.mnuEditScript.Name = "mnuEditScript" - Me.mnuEditScript.Size = New System.Drawing.Size(207, 22) + Me.mnuEditScript.Size = New System.Drawing.Size(244, 22) Me.mnuEditScript.Text = "Script" ' 'stsStrip @@ -4059,7 +4072,6 @@ Partial Class frmMain ' 'mnuPrepareDataReshapeRandomSplit ' - Me.mnuPrepareDataReshapeRandomSplit.Enabled = False Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." @@ -5105,6 +5117,11 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' + 'ToolStripSeparator38 + ' + Me.ToolStripSeparator38.Name = "ToolStripSeparator38" + Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5287,7 +5304,6 @@ Partial Class frmMain Friend WithEvents mnuDescribeTwoVariablesTabulate As ToolStripMenuItem Friend WithEvents mnuDescribeTwoVariablesGraph As ToolStripMenuItem Friend WithEvents mnuDescribeGeneral As ToolStripMenuItem - Friend WithEvents mnuDescribeGeneralColumnSummaries As ToolStripMenuItem Friend WithEvents mnuDescribeGeneralTabulation As ToolStripMenuItem Friend WithEvents mnuDescribeGeneralGraphics As ToolStripMenuItem Friend WithEvents mnuDescribeSpecificTablesGraphs As ToolStripMenuItem @@ -5512,8 +5528,6 @@ Partial Class frmMain Friend WithEvents mnuFileExportExportRWorkspace As ToolStripMenuItem Friend WithEvents mnuFileExportExportGraphAsImage As ToolStripMenuItem Friend WithEvents mnuFileExportExportRObjectsToolStripMenuItem As ToolStripMenuItem - Friend WithEvents mnuDescribeGeneralUseSummaries As ToolStripMenuItem - Friend WithEvents ToolStripSeparator38 As ToolStripSeparator Friend WithEvents mnuClimaticDescribeWindSpeedDirectionWindRose As ToolStripMenuItem Friend WithEvents mnuDescribeSpecificCummulativeDistribution As ToolStripMenuItem Friend WithEvents mnuProcurementUseCRISummariseCRIbyCountry As ToolStripMenuItem @@ -5726,12 +5740,12 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator70 As ToolStripSeparator Friend WithEvents mnuClimaticCheckDataCheckStationLocations As ToolStripMenuItem Friend WithEvents mnuClimaticFileImportfromClimateDataStore As ToolStripMenuItem - Friend WithEvents mnuEditPasteNew As ToolStripMenuItem + Friend WithEvents mnuEditPasteNewDataFrame As ToolStripMenuItem Friend WithEvents mnuTbLan As ToolStripButton + Friend WithEvents mnuPasteSpecial As ToolStripMenuItem Friend WithEvents mnuLastGraph As ToolStripSplitButton Friend WithEvents mnuRViewer As ToolStripMenuItem Friend WithEvents mnuploty As ToolStripMenuItem - Friend WithEvents ToolStripSeparator27 As ToolStripSeparator Friend WithEvents ToolStripSeparator71 As ToolStripSeparator Friend WithEvents mnuEditScript As ToolStripMenuItem Friend WithEvents mnuPrepareDataFrameSelectColumns As ToolStripMenuItem @@ -5798,4 +5812,9 @@ Partial Class frmMain Friend WithEvents mnuExamineEditDataDailyDataEditing As ToolStripMenuItem Friend WithEvents mnuExamineEditDataCompareColumns As ToolStripMenuItem Friend WithEvents mnuStructuredSurvey As ToolStripMenuItem + Friend WithEvents mnuDescribeGraphGraphics As ToolStripMenuItem + Friend WithEvents mnuDescribeGeneralPivotTable As ToolStripMenuItem + Friend WithEvents ToolStripSeparator27 As ToolStripSeparator + Friend WithEvents mnuDescribeGeneralTables As ToolStripMenuItem + Friend WithEvents ToolStripSeparator38 As ToolStripSeparator End Class From 3c20a376fa4972c7afe330c3248680c70d474240 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 8 Aug 2023 23:16:10 +0300 Subject: [PATCH 13/39] made changes to frmMain --- instat/frmMain.Designer.vb | 99 +++++++++++++++++--------------------- instat/frmMain.vb | 21 +++++--- 2 files changed, 56 insertions(+), 64 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 9beca326202..31dc7fb7dcb 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -69,6 +69,7 @@ Partial Class frmMain Me.mnuDescribeSpecificMosaic = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificCummulativeDistribution = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificParallelCoordinatePlot = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeGraphGraphics = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTables = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() @@ -370,8 +371,7 @@ Partial Class frmMain Me.mnuEditCopy = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditCopySpecial = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditPaste = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuPasteSpecial = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuEditPasteNewDataFrame = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditPasteNew = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditWordwrap = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditSelectAll = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator71 = New System.Windows.Forms.ToolStripSeparator() @@ -681,7 +681,6 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -715,7 +714,7 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' @@ -768,7 +767,7 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' @@ -830,7 +829,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot, Me.ToolStripSeparator38, Me.mnuDescribeGraphGraphics}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' @@ -915,6 +914,11 @@ Partial Class frmMain Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' + 'ToolStripSeparator38 + ' + Me.ToolStripSeparator38.Name = "ToolStripSeparator38" + Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) + ' 'mnuDescribeGraphGraphics ' Me.mnuDescribeGraphGraphics.Name = "mnuDescribeGraphGraphics" @@ -924,7 +928,7 @@ Partial Class frmMain 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" @@ -933,26 +937,26 @@ Partial Class frmMain ' Me.mnuDescribeGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneralPivotTable, Me.ToolStripSeparator27, Me.mnuDescribeGeneralTabulation, Me.mnuDescribeGeneralGraphics, Me.mnuDescribeGeneralTables}) Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeGeneral.Tag = "General" Me.mnuDescribeGeneral.Text = "General" ' 'mnuDescribeGeneralPivotTable ' Me.mnuDescribeGeneralPivotTable.Name = "mnuDescribeGeneralPivotTable" - Me.mnuDescribeGeneralPivotTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralPivotTable.Size = New System.Drawing.Size(140, 22) Me.mnuDescribeGeneralPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(137, 6) ' 'mnuDescribeGeneralTabulation ' Me.mnuDescribeGeneralTabulation.Enabled = False Me.mnuDescribeGeneralTabulation.Name = "mnuDescribeGeneralTabulation" - Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(140, 22) Me.mnuDescribeGeneralTabulation.Tag = "Tabulation..." Me.mnuDescribeGeneralTabulation.Text = "Tabulation..." Me.mnuDescribeGeneralTabulation.Visible = False @@ -960,26 +964,26 @@ Partial Class frmMain 'mnuDescribeGeneralGraphics ' Me.mnuDescribeGeneralGraphics.Name = "mnuDescribeGeneralGraphics" - Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(140, 22) Me.mnuDescribeGeneralGraphics.Tag = "Graphics..." Me.mnuDescribeGeneralGraphics.Text = "Graphics..." ' 'mnuDescribeGeneralTables ' Me.mnuDescribeGeneralTables.Name = "mnuDescribeGeneralTables" - Me.mnuDescribeGeneralTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralTables.Size = New System.Drawing.Size(140, 22) Me.mnuDescribeGeneralTables.Text = "Tables..." ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(175, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations @@ -1011,38 +1015,38 @@ Partial Class frmMain 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(175, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel @@ -2882,7 +2886,7 @@ Partial Class frmMain ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditFindNext, Me.mnuEditReplace, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuPasteSpecial, Me.mnuEditPasteNewDataFrame, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditFindNext, Me.mnuEditReplace, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) Me.mnuEdit.Name = "mnuEdit" Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" @@ -2892,7 +2896,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(244, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(207, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2900,14 +2904,14 @@ Partial Class frmMain ' Me.mnuEditFindNext.Enabled = False Me.mnuEditFindNext.Name = "mnuEditFindNext" - Me.mnuEditFindNext.Size = New System.Drawing.Size(244, 22) + Me.mnuEditFindNext.Size = New System.Drawing.Size(207, 22) Me.mnuEditFindNext.Text = "Find Next" ' 'mnuEditReplace ' Me.mnuEditReplace.Enabled = False Me.mnuEditReplace.Name = "mnuEditReplace" - Me.mnuEditReplace.Size = New System.Drawing.Size(244, 22) + Me.mnuEditReplace.Size = New System.Drawing.Size(207, 22) Me.mnuEditReplace.Tag = "Replace" Me.mnuEditReplace.Text = "Replace" ' @@ -2915,7 +2919,7 @@ Partial Class frmMain ' Me.mnuEditCut.Name = "mnuEditCut" Me.mnuEditCut.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.X), System.Windows.Forms.Keys) - Me.mnuEditCut.Size = New System.Drawing.Size(244, 22) + Me.mnuEditCut.Size = New System.Drawing.Size(207, 22) Me.mnuEditCut.Tag = "Cut" Me.mnuEditCut.Text = "Cut" ' @@ -2923,7 +2927,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(244, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(207, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2933,7 +2937,7 @@ Partial Class frmMain Me.mnuEditCopySpecial.Name = "mnuEditCopySpecial" Me.mnuEditCopySpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopySpecial.Size = New System.Drawing.Size(244, 22) + Me.mnuEditCopySpecial.Size = New System.Drawing.Size(207, 22) Me.mnuEditCopySpecial.Tag = "Copy_Special" Me.mnuEditCopySpecial.Text = "Copy Special" Me.mnuEditCopySpecial.Visible = False @@ -2942,51 +2946,40 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(244, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(207, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' - 'mnuPasteSpecial + 'mnuEditPasteNew ' - Me.mnuPasteSpecial.Enabled = False - Me.mnuPasteSpecial.Name = "mnuPasteSpecial" - Me.mnuPasteSpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ - Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuPasteSpecial.Size = New System.Drawing.Size(244, 22) - Me.mnuPasteSpecial.Tag = "Paste" - Me.mnuPasteSpecial.Text = "Paste New Columns" - Me.mnuPasteSpecial.Visible = False - ' - 'mnuEditPasteNewDataFrame - ' - Me.mnuEditPasteNewDataFrame.Name = "mnuEditPasteNewDataFrame" - Me.mnuEditPasteNewDataFrame.Size = New System.Drawing.Size(244, 22) - Me.mnuEditPasteNewDataFrame.Tag = "Paste" - Me.mnuEditPasteNewDataFrame.Text = "Paste New Data Frame" + Me.mnuEditPasteNew.Name = "mnuEditPasteNew" + Me.mnuEditPasteNew.Size = New System.Drawing.Size(207, 22) + Me.mnuEditPasteNew.Tag = "Paste" + Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(244, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(207, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(244, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(207, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(241, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(204, 6) ' 'mnuEditScript ' Me.mnuEditScript.Name = "mnuEditScript" - Me.mnuEditScript.Size = New System.Drawing.Size(244, 22) + Me.mnuEditScript.Size = New System.Drawing.Size(207, 22) Me.mnuEditScript.Text = "Script" ' 'stsStrip @@ -5117,11 +5110,6 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'ToolStripSeparator38 - ' - Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5740,9 +5728,8 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator70 As ToolStripSeparator Friend WithEvents mnuClimaticCheckDataCheckStationLocations As ToolStripMenuItem Friend WithEvents mnuClimaticFileImportfromClimateDataStore As ToolStripMenuItem - Friend WithEvents mnuEditPasteNewDataFrame As ToolStripMenuItem + Friend WithEvents mnuEditPasteNew As ToolStripMenuItem Friend WithEvents mnuTbLan As ToolStripButton - Friend WithEvents mnuPasteSpecial As ToolStripMenuItem Friend WithEvents mnuLastGraph As ToolStripSplitButton Friend WithEvents mnuRViewer As ToolStripMenuItem Friend WithEvents mnuploty As ToolStripMenuItem diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 3c5b06b5d99..250c8403934 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1124,7 +1124,6 @@ Public Class frmMain dlgEndOfRainsSeason.ShowDialog() End Sub - Private Sub mnuDescribeSpecificScatterPlot_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificPointPlot.Click dlgScatterPlot.ShowDialog() End Sub @@ -1173,10 +1172,6 @@ Public Class frmMain dlgCompareModels.ShowDialog() End Sub - Private Sub mnuDescribeGeneralColumnSummaries_Click(sender As Object, e As EventArgs) Handles mnuDescribeGeneralColumnSummaries.Click - dlgColumnStats.ShowDialog() - End Sub - Private Sub mnuOrganiseColumnUseDate_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnDateUseDate.Click dlgUseDate.ShowDialog() End Sub @@ -1505,9 +1500,6 @@ Public Class frmMain dlgExportRObjects.ShowDialog() End Sub - Private Sub FrequencyTablesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuDescribeGeneralUseSummaries.Click - dlgSummaryBarOrPieChart.ShowDialog() - End Sub Private Sub mnuClimaticPrepareClimaticSummaries_Click(sender As Object, e As EventArgs) Handles mnuClimaticPrepareClimaticSummaries.Click dlgClimaticSummary.ShowDialog() End Sub @@ -2519,4 +2511,17 @@ Public Class frmMain Private Sub mnuStructuredSurvey_Click(sender As Object, e As EventArgs) Handles mnuStructuredSurvey.Click dlgSurvey.ShowDialog() End Sub + + Private Sub PivotTableToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuDescribeGeneralPivotTable.Click + dlgThreeVariablePivotTable.enumPivotMode = dlgThreeVariablePivotTable.PivotMode.Describe + dlgThreeVariablePivotTable.ShowDialog() + End Sub + + Private Sub mnuDescribeGraphGraphics_Click(sender As Object, e As EventArgs) Handles mnuDescribeGraphGraphics.Click + dlgGeneralForGraphics.ShowDialog() + End Sub + + Private Sub mnuDescribeGeneralTables_Click(sender As Object, e As EventArgs) Handles mnuDescribeGeneralTables.Click + dlgSummaryTables.ShowDialog() + End Sub End Class From c51f460af2831450d7781d86c38ad6710f1d8a91 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 8 Aug 2023 23:19:31 +0300 Subject: [PATCH 14/39] frmMain designer reset --- instat/frmMain.Designer.vb | 99 +++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 43 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 31dc7fb7dcb..9beca326202 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -69,7 +69,6 @@ Partial Class frmMain Me.mnuDescribeSpecificMosaic = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificCummulativeDistribution = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificParallelCoordinatePlot = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeGraphGraphics = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTables = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() @@ -371,7 +370,8 @@ Partial Class frmMain Me.mnuEditCopy = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditCopySpecial = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditPaste = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuEditPasteNew = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuPasteSpecial = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditPasteNewDataFrame = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditWordwrap = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditSelectAll = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator71 = New System.Windows.Forms.ToolStripSeparator() @@ -681,6 +681,7 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -714,7 +715,7 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' @@ -767,7 +768,7 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' @@ -829,7 +830,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot, Me.ToolStripSeparator38, Me.mnuDescribeGraphGraphics}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' @@ -914,11 +915,6 @@ Partial Class frmMain Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' - 'ToolStripSeparator38 - ' - Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) - ' 'mnuDescribeGraphGraphics ' Me.mnuDescribeGraphGraphics.Name = "mnuDescribeGraphGraphics" @@ -928,7 +924,7 @@ Partial Class frmMain 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" @@ -937,26 +933,26 @@ Partial Class frmMain ' Me.mnuDescribeGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneralPivotTable, Me.ToolStripSeparator27, Me.mnuDescribeGeneralTabulation, Me.mnuDescribeGeneralGraphics, Me.mnuDescribeGeneralTables}) Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneral.Tag = "General" Me.mnuDescribeGeneral.Text = "General" ' 'mnuDescribeGeneralPivotTable ' Me.mnuDescribeGeneralPivotTable.Name = "mnuDescribeGeneralPivotTable" - Me.mnuDescribeGeneralPivotTable.Size = New System.Drawing.Size(140, 22) + Me.mnuDescribeGeneralPivotTable.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneralPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(137, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeGeneralTabulation ' Me.mnuDescribeGeneralTabulation.Enabled = False Me.mnuDescribeGeneralTabulation.Name = "mnuDescribeGeneralTabulation" - Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(140, 22) + Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneralTabulation.Tag = "Tabulation..." Me.mnuDescribeGeneralTabulation.Text = "Tabulation..." Me.mnuDescribeGeneralTabulation.Visible = False @@ -964,26 +960,26 @@ Partial Class frmMain 'mnuDescribeGeneralGraphics ' Me.mnuDescribeGeneralGraphics.Name = "mnuDescribeGeneralGraphics" - Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(140, 22) + Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneralGraphics.Tag = "Graphics..." Me.mnuDescribeGeneralGraphics.Text = "Graphics..." ' 'mnuDescribeGeneralTables ' Me.mnuDescribeGeneralTables.Name = "mnuDescribeGeneralTables" - Me.mnuDescribeGeneralTables.Size = New System.Drawing.Size(140, 22) + Me.mnuDescribeGeneralTables.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneralTables.Text = "Tables..." ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(175, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations @@ -1015,38 +1011,38 @@ Partial Class frmMain 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(175, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel @@ -2886,7 +2882,7 @@ Partial Class frmMain ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditFindNext, Me.mnuEditReplace, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditFindNext, Me.mnuEditReplace, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuPasteSpecial, Me.mnuEditPasteNewDataFrame, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) Me.mnuEdit.Name = "mnuEdit" Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" @@ -2896,7 +2892,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(207, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(244, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2904,14 +2900,14 @@ Partial Class frmMain ' Me.mnuEditFindNext.Enabled = False Me.mnuEditFindNext.Name = "mnuEditFindNext" - Me.mnuEditFindNext.Size = New System.Drawing.Size(207, 22) + Me.mnuEditFindNext.Size = New System.Drawing.Size(244, 22) Me.mnuEditFindNext.Text = "Find Next" ' 'mnuEditReplace ' Me.mnuEditReplace.Enabled = False Me.mnuEditReplace.Name = "mnuEditReplace" - Me.mnuEditReplace.Size = New System.Drawing.Size(207, 22) + Me.mnuEditReplace.Size = New System.Drawing.Size(244, 22) Me.mnuEditReplace.Tag = "Replace" Me.mnuEditReplace.Text = "Replace" ' @@ -2919,7 +2915,7 @@ Partial Class frmMain ' Me.mnuEditCut.Name = "mnuEditCut" Me.mnuEditCut.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.X), System.Windows.Forms.Keys) - Me.mnuEditCut.Size = New System.Drawing.Size(207, 22) + Me.mnuEditCut.Size = New System.Drawing.Size(244, 22) Me.mnuEditCut.Tag = "Cut" Me.mnuEditCut.Text = "Cut" ' @@ -2927,7 +2923,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(207, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(244, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2937,7 +2933,7 @@ Partial Class frmMain Me.mnuEditCopySpecial.Name = "mnuEditCopySpecial" Me.mnuEditCopySpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopySpecial.Size = New System.Drawing.Size(207, 22) + Me.mnuEditCopySpecial.Size = New System.Drawing.Size(244, 22) Me.mnuEditCopySpecial.Tag = "Copy_Special" Me.mnuEditCopySpecial.Text = "Copy Special" Me.mnuEditCopySpecial.Visible = False @@ -2946,40 +2942,51 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(207, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(244, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' - 'mnuEditPasteNew + 'mnuPasteSpecial ' - Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(207, 22) - Me.mnuEditPasteNew.Tag = "Paste" - Me.mnuEditPasteNew.Text = "Paste New" + Me.mnuPasteSpecial.Enabled = False + Me.mnuPasteSpecial.Name = "mnuPasteSpecial" + Me.mnuPasteSpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ + Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) + Me.mnuPasteSpecial.Size = New System.Drawing.Size(244, 22) + Me.mnuPasteSpecial.Tag = "Paste" + Me.mnuPasteSpecial.Text = "Paste New Columns" + Me.mnuPasteSpecial.Visible = False + ' + 'mnuEditPasteNewDataFrame + ' + Me.mnuEditPasteNewDataFrame.Name = "mnuEditPasteNewDataFrame" + Me.mnuEditPasteNewDataFrame.Size = New System.Drawing.Size(244, 22) + Me.mnuEditPasteNewDataFrame.Tag = "Paste" + Me.mnuEditPasteNewDataFrame.Text = "Paste New Data Frame" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(207, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(244, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(207, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(244, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(204, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(241, 6) ' 'mnuEditScript ' Me.mnuEditScript.Name = "mnuEditScript" - Me.mnuEditScript.Size = New System.Drawing.Size(207, 22) + Me.mnuEditScript.Size = New System.Drawing.Size(244, 22) Me.mnuEditScript.Text = "Script" ' 'stsStrip @@ -5110,6 +5117,11 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' + 'ToolStripSeparator38 + ' + Me.ToolStripSeparator38.Name = "ToolStripSeparator38" + Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5728,8 +5740,9 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator70 As ToolStripSeparator Friend WithEvents mnuClimaticCheckDataCheckStationLocations As ToolStripMenuItem Friend WithEvents mnuClimaticFileImportfromClimateDataStore As ToolStripMenuItem - Friend WithEvents mnuEditPasteNew As ToolStripMenuItem + Friend WithEvents mnuEditPasteNewDataFrame As ToolStripMenuItem Friend WithEvents mnuTbLan As ToolStripButton + Friend WithEvents mnuPasteSpecial As ToolStripMenuItem Friend WithEvents mnuLastGraph As ToolStripSplitButton Friend WithEvents mnuRViewer As ToolStripMenuItem Friend WithEvents mnuploty As ToolStripMenuItem From 5ecbdca451fa789cfef388b1ccda8d630bae9589 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 8 Aug 2023 23:24:11 +0300 Subject: [PATCH 15/39] designer changes --- instat/frmMain.Designer.vb | 99 +++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 56 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 9beca326202..31dc7fb7dcb 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -69,6 +69,7 @@ Partial Class frmMain Me.mnuDescribeSpecificMosaic = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificCummulativeDistribution = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificParallelCoordinatePlot = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeGraphGraphics = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTables = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() @@ -370,8 +371,7 @@ Partial Class frmMain Me.mnuEditCopy = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditCopySpecial = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditPaste = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuPasteSpecial = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuEditPasteNewDataFrame = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditPasteNew = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditWordwrap = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditSelectAll = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator71 = New System.Windows.Forms.ToolStripSeparator() @@ -681,7 +681,6 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -715,7 +714,7 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' @@ -768,7 +767,7 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' @@ -830,7 +829,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot, Me.ToolStripSeparator38, Me.mnuDescribeGraphGraphics}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' @@ -915,6 +914,11 @@ Partial Class frmMain Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' + 'ToolStripSeparator38 + ' + Me.ToolStripSeparator38.Name = "ToolStripSeparator38" + Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) + ' 'mnuDescribeGraphGraphics ' Me.mnuDescribeGraphGraphics.Name = "mnuDescribeGraphGraphics" @@ -924,7 +928,7 @@ Partial Class frmMain 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" @@ -933,26 +937,26 @@ Partial Class frmMain ' Me.mnuDescribeGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneralPivotTable, Me.ToolStripSeparator27, Me.mnuDescribeGeneralTabulation, Me.mnuDescribeGeneralGraphics, Me.mnuDescribeGeneralTables}) Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeGeneral.Tag = "General" Me.mnuDescribeGeneral.Text = "General" ' 'mnuDescribeGeneralPivotTable ' Me.mnuDescribeGeneralPivotTable.Name = "mnuDescribeGeneralPivotTable" - Me.mnuDescribeGeneralPivotTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralPivotTable.Size = New System.Drawing.Size(140, 22) Me.mnuDescribeGeneralPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(137, 6) ' 'mnuDescribeGeneralTabulation ' Me.mnuDescribeGeneralTabulation.Enabled = False Me.mnuDescribeGeneralTabulation.Name = "mnuDescribeGeneralTabulation" - Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(140, 22) Me.mnuDescribeGeneralTabulation.Tag = "Tabulation..." Me.mnuDescribeGeneralTabulation.Text = "Tabulation..." Me.mnuDescribeGeneralTabulation.Visible = False @@ -960,26 +964,26 @@ Partial Class frmMain 'mnuDescribeGeneralGraphics ' Me.mnuDescribeGeneralGraphics.Name = "mnuDescribeGeneralGraphics" - Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(140, 22) Me.mnuDescribeGeneralGraphics.Tag = "Graphics..." Me.mnuDescribeGeneralGraphics.Text = "Graphics..." ' 'mnuDescribeGeneralTables ' Me.mnuDescribeGeneralTables.Name = "mnuDescribeGeneralTables" - Me.mnuDescribeGeneralTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralTables.Size = New System.Drawing.Size(140, 22) Me.mnuDescribeGeneralTables.Text = "Tables..." ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(175, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations @@ -1011,38 +1015,38 @@ Partial Class frmMain 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(175, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel @@ -2882,7 +2886,7 @@ Partial Class frmMain ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditFindNext, Me.mnuEditReplace, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuPasteSpecial, Me.mnuEditPasteNewDataFrame, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditFindNext, Me.mnuEditReplace, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) Me.mnuEdit.Name = "mnuEdit" Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" @@ -2892,7 +2896,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(244, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(207, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2900,14 +2904,14 @@ Partial Class frmMain ' Me.mnuEditFindNext.Enabled = False Me.mnuEditFindNext.Name = "mnuEditFindNext" - Me.mnuEditFindNext.Size = New System.Drawing.Size(244, 22) + Me.mnuEditFindNext.Size = New System.Drawing.Size(207, 22) Me.mnuEditFindNext.Text = "Find Next" ' 'mnuEditReplace ' Me.mnuEditReplace.Enabled = False Me.mnuEditReplace.Name = "mnuEditReplace" - Me.mnuEditReplace.Size = New System.Drawing.Size(244, 22) + Me.mnuEditReplace.Size = New System.Drawing.Size(207, 22) Me.mnuEditReplace.Tag = "Replace" Me.mnuEditReplace.Text = "Replace" ' @@ -2915,7 +2919,7 @@ Partial Class frmMain ' Me.mnuEditCut.Name = "mnuEditCut" Me.mnuEditCut.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.X), System.Windows.Forms.Keys) - Me.mnuEditCut.Size = New System.Drawing.Size(244, 22) + Me.mnuEditCut.Size = New System.Drawing.Size(207, 22) Me.mnuEditCut.Tag = "Cut" Me.mnuEditCut.Text = "Cut" ' @@ -2923,7 +2927,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(244, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(207, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2933,7 +2937,7 @@ Partial Class frmMain Me.mnuEditCopySpecial.Name = "mnuEditCopySpecial" Me.mnuEditCopySpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopySpecial.Size = New System.Drawing.Size(244, 22) + Me.mnuEditCopySpecial.Size = New System.Drawing.Size(207, 22) Me.mnuEditCopySpecial.Tag = "Copy_Special" Me.mnuEditCopySpecial.Text = "Copy Special" Me.mnuEditCopySpecial.Visible = False @@ -2942,51 +2946,40 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(244, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(207, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' - 'mnuPasteSpecial + 'mnuEditPasteNew ' - Me.mnuPasteSpecial.Enabled = False - Me.mnuPasteSpecial.Name = "mnuPasteSpecial" - Me.mnuPasteSpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ - Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuPasteSpecial.Size = New System.Drawing.Size(244, 22) - Me.mnuPasteSpecial.Tag = "Paste" - Me.mnuPasteSpecial.Text = "Paste New Columns" - Me.mnuPasteSpecial.Visible = False - ' - 'mnuEditPasteNewDataFrame - ' - Me.mnuEditPasteNewDataFrame.Name = "mnuEditPasteNewDataFrame" - Me.mnuEditPasteNewDataFrame.Size = New System.Drawing.Size(244, 22) - Me.mnuEditPasteNewDataFrame.Tag = "Paste" - Me.mnuEditPasteNewDataFrame.Text = "Paste New Data Frame" + Me.mnuEditPasteNew.Name = "mnuEditPasteNew" + Me.mnuEditPasteNew.Size = New System.Drawing.Size(207, 22) + Me.mnuEditPasteNew.Tag = "Paste" + Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(244, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(207, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(244, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(207, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(241, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(204, 6) ' 'mnuEditScript ' Me.mnuEditScript.Name = "mnuEditScript" - Me.mnuEditScript.Size = New System.Drawing.Size(244, 22) + Me.mnuEditScript.Size = New System.Drawing.Size(207, 22) Me.mnuEditScript.Text = "Script" ' 'stsStrip @@ -5117,11 +5110,6 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'ToolStripSeparator38 - ' - Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5740,9 +5728,8 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator70 As ToolStripSeparator Friend WithEvents mnuClimaticCheckDataCheckStationLocations As ToolStripMenuItem Friend WithEvents mnuClimaticFileImportfromClimateDataStore As ToolStripMenuItem - Friend WithEvents mnuEditPasteNewDataFrame As ToolStripMenuItem + Friend WithEvents mnuEditPasteNew As ToolStripMenuItem Friend WithEvents mnuTbLan As ToolStripButton - Friend WithEvents mnuPasteSpecial As ToolStripMenuItem Friend WithEvents mnuLastGraph As ToolStripSplitButton Friend WithEvents mnuRViewer As ToolStripMenuItem Friend WithEvents mnuploty As ToolStripMenuItem From b9cecb21cfe421f8b5e5cb372488972fa1ce7fe2 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 8 Aug 2023 23:53:13 +0300 Subject: [PATCH 16/39] fixed bug --- instat/dlgPasteNewColumns.vb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index 069350313b3..edc6c800a29 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -50,9 +50,9 @@ Public Class dlgPasteNewColumns '---------------------------- ucrPnl.AddRadioButton(rdoDataFrame) ucrPnl.AddRadioButton(rdoColumns) - ucrPnl.AddFunctionNamesCondition(rdoDataFrame, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data", bNewIsPositive:=False) + ucrPnl.AddFunctionNamesCondition(rdoDataFrame, "read_delim", bNewIsPositive:=True) ucrPnl.AddFunctionNamesCondition(rdoColumns, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data", bNewIsPositive:=True) - ucrPnl.AddToLinkedControls(ucrSaveNewDFName, {rdoDataFrame}, bNewLinkedAddRemoveParameter:=False, bNewLinkedHideIfParameterMissing:=True) + 'ucrPnl.AddToLinkedControls(ucrSaveNewDFName, {rdoDataFrame}, bNewLinkedAddRemoveParameter:=False) ucrPnl.AddToLinkedControls({ucrDFSelected, ucrChkKeepExstingCols}, {rdoColumns}, bNewLinkedAddRemoveParameter:=False, bNewLinkedHideIfParameterMissing:=True) ucrChkRowHeader.SetText("First row is header") @@ -184,10 +184,13 @@ Public Class dlgPasteNewColumns Private Sub ucrPnl_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnl.ControlValueChanged If rdoDataFrame.Checked Then + clsReadDataRFunction.RemoveAssignTo() ucrBase.clsRsyntax.SetBaseRFunction(clsReadDataRFunction) + ucrSaveNewDFName.Visible = True 'todo. can this be done through the custom panel control? ElseIf rdoColumns.Checked Then clsReadDataRFunction.SetAssignToObject("data") ucrBase.clsRsyntax.SetBaseRFunction(clsImportColsToExistingDFRFunction) + ucrSaveNewDFName.Visible = False 'todo. can this be done through the custom panel control? End If If bValidatePasteData Then From e11ff13b2d3812b196a0bd76e2fd873eba233ab4 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 8 Aug 2023 23:53:33 +0300 Subject: [PATCH 17/39] ixed bug --- instat/dlgPasteNewColumns.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index edc6c800a29..f84d8e3f22c 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -187,6 +187,7 @@ Public Class dlgPasteNewColumns clsReadDataRFunction.RemoveAssignTo() ucrBase.clsRsyntax.SetBaseRFunction(clsReadDataRFunction) ucrSaveNewDFName.Visible = True 'todo. can this be done through the custom panel control? + ucrSaveNewDFName.Reset() ElseIf rdoColumns.Checked Then clsReadDataRFunction.SetAssignToObject("data") ucrBase.clsRsyntax.SetBaseRFunction(clsImportColsToExistingDFRFunction) From 653187f62ee72ddc92d9b73d17a035bd4d6571ab Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 29 Sep 2023 08:28:03 +0300 Subject: [PATCH 18/39] more changes --- instat/frmMain.Designer.vb | 11 +---------- instat/frmMain.vb | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 512361325c2..6de16cb3829 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -362,7 +362,6 @@ Partial Class frmMain Me.mnuEditCopy = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditCopySpecial = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditPaste = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuEditPasteNew = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditWordwrap = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditSelectAll = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator71 = New System.Windows.Forms.ToolStripSeparator() @@ -2841,7 +2840,7 @@ Partial Class frmMain ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuPasteSpecial, Me.mnuEditPasteNewDataFrame, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) Me.mnuEdit.Name = "mnuEdit" Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" @@ -2882,13 +2881,6 @@ Partial Class frmMain Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' - 'mnuEditPasteNew - ' - Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(207, 22) - Me.mnuEditPasteNew.Tag = "Paste" - Me.mnuEditPasteNew.Text = "Paste New" - ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" @@ -5686,7 +5678,6 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator70 As ToolStripSeparator Friend WithEvents mnuClimaticCheckDataCheckStationLocations As ToolStripMenuItem Friend WithEvents mnuClimaticFileImportfromClimateDataStore As ToolStripMenuItem - Friend WithEvents mnuEditPasteNew As ToolStripMenuItem Friend WithEvents mnuTbLan As ToolStripButton Friend WithEvents mnuLastGraph As ToolStripSplitButton Friend WithEvents mnuRViewer As ToolStripMenuItem diff --git a/instat/frmMain.vb b/instat/frmMain.vb index bcabc0de211..c6c0f40a655 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2389,7 +2389,7 @@ Public Class frmMain dlgImportERA5Data.ShowDialog() End Sub - Private Sub mnuEditPasteNew_Click(sender As Object, e As EventArgs) Handles mnuEditPasteNew.Click + Private Sub mnuEditPasteNew_Click(sender As Object, e As EventArgs) dlgPasteNewColumns.ShowDialog() End Sub From d432ef1798802a28705916acc7957206d09de24c Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 29 Sep 2023 08:44:10 +0300 Subject: [PATCH 19/39] dsiabled paste option and added paste new --- instat/frmMain.Designer.vb | 17 +++++++++++++---- instat/frmMain.vb | 8 ++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 6de16cb3829..cbe7a79a458 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -362,6 +362,7 @@ Partial Class frmMain Me.mnuEditCopy = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditCopySpecial = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditPaste = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuEditPasteNew = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditWordwrap = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditSelectAll = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator71 = New System.Windows.Forms.ToolStripSeparator() @@ -2840,7 +2841,7 @@ Partial Class frmMain ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) Me.mnuEdit.Name = "mnuEdit" Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" @@ -2875,12 +2876,19 @@ Partial Class frmMain ' 'mnuEditPaste ' + Me.mnuEditPaste.Enabled = False Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) Me.mnuEditPaste.Size = New System.Drawing.Size(207, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' + 'mnuEditPasteNew + ' + Me.mnuEditPasteNew.Name = "mnuEditPasteNew" + Me.mnuEditPasteNew.Size = New System.Drawing.Size(207, 22) + Me.mnuEditPasteNew.Text = "Paste New" + ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" @@ -3047,21 +3055,21 @@ Partial Class frmMain ' Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuOutputWindow.Name = "mnuOutputWindow" - Me.mnuOutputWindow.Size = New System.Drawing.Size(180, 22) + Me.mnuOutputWindow.Size = New System.Drawing.Size(178, 22) Me.mnuOutputWindow.Text = "Show Output" ' 'mnuShowRCommand ' Me.mnuShowRCommand.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuShowRCommand.Name = "mnuShowRCommand" - Me.mnuShowRCommand.Size = New System.Drawing.Size(180, 22) + Me.mnuShowRCommand.Size = New System.Drawing.Size(178, 22) Me.mnuShowRCommand.Text = "Show R Commands" ' 'mnuIncludeComments ' Me.mnuIncludeComments.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuIncludeComments.Name = "mnuIncludeComments" - Me.mnuIncludeComments.Size = New System.Drawing.Size(180, 22) + Me.mnuIncludeComments.Size = New System.Drawing.Size(178, 22) Me.mnuIncludeComments.Text = "Show Comments" ' 'ToolStripSeparator74 @@ -5758,4 +5766,5 @@ Partial Class frmMain Friend WithEvents mnuPrepareCheckDataPivotTable As ToolStripMenuItem Friend WithEvents ToolStripSeparator50 As ToolStripSeparator + Friend WithEvents mnuEditPasteNew As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index c6c0f40a655..b630c4de567 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2389,10 +2389,6 @@ Public Class frmMain dlgImportERA5Data.ShowDialog() End Sub - Private Sub mnuEditPasteNew_Click(sender As Object, e As EventArgs) - dlgPasteNewColumns.ShowDialog() - End Sub - Private Sub mnuTbLan_Click(sender As Object, e As EventArgs) Handles mnuTbLan.Click If strCurrLang <> "en-GB" Then strCurrLang = "en-GB" @@ -2418,6 +2414,10 @@ Public Class frmMain End If End Sub + Private Sub mnuEditPasteNew_Click(sender As Object, e As EventArgs) Handles mnuEditPasteNew.Click + dlgPasteNewColumns.ShowDialog() + End Sub + Private Sub mnuEditScript_Click(sender As Object, e As EventArgs) Handles mnuEditScript.Click dlgScript.ShowDialog() End Sub From 28b13ab2d9a3867a2bcccfbf4b73d2872479bcee Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 2 Oct 2023 13:18:24 +0300 Subject: [PATCH 20/39] more changes --- instat/dlgPasteNewColumns.vb | 23 +++++++++++++++-------- instat/frmMain.Designer.vb | 1 - instat/frmMain.vb | 13 ++++++++++++- instat/ucrDataView.Designer.vb | 31 ++++--------------------------- instat/ucrDataView.vb | 9 ++------- 5 files changed, 33 insertions(+), 44 deletions(-) diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index f84d8e3f22c..7cbfd14392b 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -50,13 +50,12 @@ Public Class dlgPasteNewColumns '---------------------------- ucrPnl.AddRadioButton(rdoDataFrame) ucrPnl.AddRadioButton(rdoColumns) - ucrPnl.AddFunctionNamesCondition(rdoDataFrame, "read_delim", bNewIsPositive:=True) + ucrPnl.AddFunctionNamesCondition(rdoDataFrame, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data", bNewIsPositive:=False) ucrPnl.AddFunctionNamesCondition(rdoColumns, frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data", bNewIsPositive:=True) - 'ucrPnl.AddToLinkedControls(ucrSaveNewDFName, {rdoDataFrame}, bNewLinkedAddRemoveParameter:=False) ucrPnl.AddToLinkedControls({ucrDFSelected, ucrChkKeepExstingCols}, {rdoColumns}, bNewLinkedAddRemoveParameter:=False, bNewLinkedHideIfParameterMissing:=True) ucrChkRowHeader.SetText("First row is header") - ucrChkRowHeader.SetParameter(New RParameter("col_names", 1)) + ucrChkRowHeader.SetParameter(New RParameter("header", 1)) ucrChkRowHeader.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrNudPreviewLines.SetMinMax(iNewMin:=10, iNewMax:=1000) @@ -92,15 +91,21 @@ Public Class dlgPasteNewColumns ucrSaveNewDFName.Reset() ucrDFSelected.Reset() - clsReadDataRFunction.SetPackageName("readr") - clsReadDataRFunction.SetRCommand("read_delim") - clsReadDataRFunction.AddParameter("col_names", strParameterValue:="TRUE", iPosition:=1) + 'todo. some clip data values work well with read_delim R function. + 'taht's why readr references have been left here for future testing and reference. + + 'clsReadDataRFunction.SetPackageName("readr") + 'clsReadDataRFunction.SetRCommand("read_delim") + 'clsReadDataRFunction.AddParameter("col_names", strParameterValue:="TRUE", iPosition:=1) + + clsReadDataRFunction.SetPackageName("clipr") + clsReadDataRFunction.SetRCommand("read_clip_tbl") + clsReadDataRFunction.AddParameter("header", strParameterValue:="TRUE", iPosition:=1) clsImportColsToExistingDFRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") clsImportColsToExistingDFRFunction.AddParameter("col_data", clsRFunctionParameter:=clsReadDataRFunction, iPosition:=1) clsImportColsToExistingDFRFunction.AddParameter("use_col_name_as_prefix", strParameterValue:="TRUE", iPosition:=2) - ucrBase.clsRsyntax.SetBaseRFunction(clsReadDataRFunction) End Sub @@ -128,7 +133,7 @@ Public Class dlgPasteNewColumns MsgBox("Requested clipboard data has more than 1000 rows. Only a maximum of 1000 rows can be pasted") clipBoardText = "" End If - clsReadDataRFunction.AddParameter("file", Chr(34) & clipBoardText & Chr(34), iPosition:=0) + clsReadDataRFunction.AddParameter("x", Chr(34) & clipBoardText & Chr(34), iPosition:=0) Catch ex As Exception 'this error could be due to large clipboard data MsgBox("Requested clipboard operation did not succeed. Large data detected") @@ -194,6 +199,8 @@ Public Class dlgPasteNewColumns ucrSaveNewDFName.Visible = False 'todo. can this be done through the custom panel control? End If + + If bValidatePasteData Then TestOkEnabled(bValidateCopiedData:=False) End If diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index cbe7a79a458..71b1e446e2a 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -2876,7 +2876,6 @@ Partial Class frmMain ' 'mnuEditPaste ' - Me.mnuEditPaste.Enabled = False Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) Me.mnuEditPaste.Size = New System.Drawing.Size(207, 22) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index b630c4de567..920d73f687e 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2414,6 +2414,18 @@ Public Class frmMain End If End Sub + Private Sub mnuEditPaste_Click(sender As Object, e As EventArgs) Handles mnuEditPaste.Click + If ctrActive.Equals(ucrDataViewer) Then + ucrDataViewer.PasteValuesToDataFrame() + ElseIf ctrActive.Equals(ucrColumnMeta) Then + 'todo + ElseIf ctrActive.Equals(ucrDataFrameMeta) Then + 'todo + ElseIf ctrActive.Equals(ucrScriptWindow) Then + ucrScriptWindow.PasteText() + End If + End Sub + Private Sub mnuEditPasteNew_Click(sender As Object, e As EventArgs) Handles mnuEditPasteNew.Click dlgPasteNewColumns.ShowDialog() End Sub @@ -2568,5 +2580,4 @@ Public Class frmMain dlgThreeVariablePivotTable.enumPivotMode = dlgThreeVariablePivotTable.PivotMode.Describe dlgThreeVariablePivotTable.ShowDialog() End Sub - End Class diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index 7d6281e9dd9..4f7047f131e 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -49,7 +49,6 @@ Partial Class ucrDataView Me.ToolStripSeparator13 = New System.Windows.Forms.ToolStripSeparator() Me.mnuEditCell2 = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDeleteCells2 = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuPaste = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItem2 = New System.Windows.Forms.ToolStripSeparator() Me.mnuConvertToFactor = New System.Windows.Forms.ToolStripMenuItem() Me.mnuCovertToOrderedFactors = New System.Windows.Forms.ToolStripMenuItem() @@ -75,8 +74,6 @@ Partial Class ucrDataView Me.ToolStripSeparator14 = New System.Windows.Forms.ToolStripSeparator() Me.mnuEditCell = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDeleteCells = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuCellPasteRange = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.mnuConvertToFact = New System.Windows.Forms.ToolStripMenuItem() Me.mnuConvertToOrderedFactor = New System.Windows.Forms.ToolStripMenuItem() @@ -166,9 +163,9 @@ Partial Class ucrDataView 'columnContextMenuStrip ' Me.columnContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.columnContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnRename, Me.mnuDuplicateColumn, Me.mnuReorderColumns, Me.mnuInsertColsBefore, Me.mnuInsertColsAfter, Me.mnuDeleteCol, Me.ToolStripSeparator13, Me.mnuEditCell2, Me.mnuDeleteCells2, Me.mnuPaste, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator1, Me.mnuLevelsLabels, Me.toolStripMenuItem21, Me.mnuSort, Me.mnuColumnAddComment, Me.mnuColumnFilterRows, Me.mnuColumnContextColumnSelection, Me.mnuColumnContextRemoveCurrentColumnSelection, Me.mnuClearColumnFilter, Me.ToolStripSeparator8, Me.mnuHelp}) + Me.columnContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnRename, Me.mnuDuplicateColumn, Me.mnuReorderColumns, Me.mnuInsertColsBefore, Me.mnuInsertColsAfter, Me.mnuDeleteCol, Me.ToolStripSeparator13, Me.mnuEditCell2, Me.mnuDeleteCells2, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator1, Me.mnuLevelsLabels, Me.toolStripMenuItem21, Me.mnuSort, Me.mnuColumnAddComment, Me.mnuColumnFilterRows, Me.mnuColumnContextColumnSelection, Me.mnuColumnContextRemoveCurrentColumnSelection, Me.mnuClearColumnFilter, Me.ToolStripSeparator8, Me.mnuHelp}) Me.columnContextMenuStrip.Name = "columnContextMenuStrip" - Me.columnContextMenuStrip.Size = New System.Drawing.Size(215, 518) + Me.columnContextMenuStrip.Size = New System.Drawing.Size(215, 496) ' 'mnuColumnRename ' @@ -225,12 +222,6 @@ Partial Class ucrDataView Me.mnuDeleteCells2.Size = New System.Drawing.Size(214, 22) Me.mnuDeleteCells2.Text = "Delete Cell(s)" ' - 'mnuPaste - ' - Me.mnuPaste.Name = "mnuPaste" - Me.mnuPaste.Size = New System.Drawing.Size(214, 22) - Me.mnuPaste.Text = "Paste" - ' 'toolStripMenuItem2 ' Me.toolStripMenuItem2.Name = "toolStripMenuItem2" @@ -332,9 +323,9 @@ Partial Class ucrDataView 'cellContextMenuStrip ' Me.cellContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.cellContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuRenameColumn, Me.mnuDuplColumn, Me.mnuReorderColumn, Me.mnuDeleteCol2, Me.ToolStripSeparator14, Me.mnuEditCell, Me.mnuDeleteCells, Me.ToolStripSeparator3, Me.mnuCellPasteRange, Me.ToolStripSeparator5, Me.mnuConvertToFact, Me.mnuConvertToOrderedFactor, Me.mnuConvertToCharacter, Me.mnuConvertToLogic, Me.mnuConvertToNumeric, Me.ToolStripSeparator6, Me.mnuLabelsLevel, Me.ToolStripSeparator7, Me.mnuSorts, Me.mnuComment, Me.mnuFilterRows, Me.mnuCellContextColumnSelection, Me.mnuCellContextRemoveCurrentColumnSelection, Me.mnuRemoveCurrentFilters, Me.ToolStripSeparator9, Me.mnuHelp1}) + Me.cellContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuRenameColumn, Me.mnuDuplColumn, Me.mnuReorderColumn, Me.mnuDeleteCol2, Me.ToolStripSeparator14, Me.mnuEditCell, Me.mnuDeleteCells, Me.ToolStripSeparator5, Me.mnuConvertToFact, Me.mnuConvertToOrderedFactor, Me.mnuConvertToCharacter, Me.mnuConvertToLogic, Me.mnuConvertToNumeric, Me.ToolStripSeparator6, Me.mnuLabelsLevel, Me.ToolStripSeparator7, Me.mnuSorts, Me.mnuComment, Me.mnuFilterRows, Me.mnuCellContextColumnSelection, Me.mnuCellContextRemoveCurrentColumnSelection, Me.mnuRemoveCurrentFilters, Me.ToolStripSeparator9, Me.mnuHelp1}) Me.cellContextMenuStrip.Name = "cellContextMenuStrip" - Me.cellContextMenuStrip.Size = New System.Drawing.Size(215, 480) + Me.cellContextMenuStrip.Size = New System.Drawing.Size(215, 452) ' 'mnuRenameColumn ' @@ -378,17 +369,6 @@ Partial Class ucrDataView Me.mnuDeleteCells.Size = New System.Drawing.Size(214, 22) Me.mnuDeleteCells.Text = "Delete Cell(s)" ' - 'ToolStripSeparator3 - ' - Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(211, 6) - ' - 'mnuCellPasteRange - ' - Me.mnuCellPasteRange.Name = "mnuCellPasteRange" - Me.mnuCellPasteRange.Size = New System.Drawing.Size(214, 22) - Me.mnuCellPasteRange.Text = "Paste" - ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" @@ -1093,7 +1073,6 @@ Partial Class ucrDataView Friend WithEvents mnuLevelsLabels As ToolStripMenuItem Friend WithEvents ToolStripSeparator1 As ToolStripSeparator Friend WithEvents mnuReorderColumns As ToolStripMenuItem - Friend WithEvents ToolStripSeparator3 As ToolStripSeparator Friend WithEvents mnuRenameColumn As ToolStripMenuItem Friend WithEvents mnuDuplColumn As ToolStripMenuItem Friend WithEvents mnuReorderColumn As ToolStripMenuItem @@ -1112,8 +1091,6 @@ Partial Class ucrDataView Friend WithEvents mnuComment As ToolStripMenuItem Friend WithEvents mnuColumnAddComment As ToolStripMenuItem Friend WithEvents mnuBottomAddComment As ToolStripMenuItem - Private WithEvents mnuPaste As ToolStripMenuItem - Friend WithEvents mnuCellPasteRange As ToolStripMenuItem Friend WithEvents TblPanPageDisplay As TableLayoutPanel Friend WithEvents lblColLast As Label Friend WithEvents lblRowBack As Label diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index b0e2760b91b..d1395766637 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -65,7 +65,6 @@ Public Class ucrDataView mnuInsertColsBefore.Visible = False mnuInsertColsAfter.Visible = False - mnuPaste.Visible = False autoTranslate(Me) If RuntimeInformation.IsOSPlatform(OSPlatform.Linux) Then @@ -790,24 +789,20 @@ Public Class ucrDataView dlgAddComment.ShowDialog() End Sub - Private Sub mnuPaste_Click(sender As Object, e As EventArgs) Handles mnuPaste.Click - PasteValuesToDataFrame() - End Sub - '''' '''' event raised on menu toolstrip click '''' paste data starting from selected cells '''' '''' '''' - Private Sub mnuCellPasteRange_Click(sender As Object, e As EventArgs) Handles mnuCellPasteRange.Click + Private Sub mnuCellPasteRange_Click(sender As Object, e As EventArgs) PasteValuesToDataFrame() End Sub ''' ''' pastes data from clipboard to data view ''' - Private Sub PasteValuesToDataFrame() + Public Sub PasteValuesToDataFrame() Dim strClipBoardText As String = My.Computer.Clipboard.GetText If String.IsNullOrEmpty(strClipBoardText) Then MsgBox("No data available for pasting.", MsgBoxStyle.Information, "No Data") From fafcc4910645e40e1161bad12345b65f3f485451 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 2 Oct 2023 13:33:59 +0300 Subject: [PATCH 21/39] forces the save control to reset --- instat/dlgPasteNewColumns.vb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index 7cbfd14392b..3a173a56355 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -197,10 +197,9 @@ Public Class dlgPasteNewColumns clsReadDataRFunction.SetAssignToObject("data") ucrBase.clsRsyntax.SetBaseRFunction(clsImportColsToExistingDFRFunction) ucrSaveNewDFName.Visible = False 'todo. can this be done through the custom panel control? + ucrSaveNewDFName.SetName("") 'forces the save control to not include import function End If - - If bValidatePasteData Then TestOkEnabled(bValidateCopiedData:=False) End If From 2f2a2d5fd1ec9061eb93b39a253245b80b10eeac Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 2 Oct 2023 13:47:08 +0300 Subject: [PATCH 22/39] deleted paste special dialog and removed unnecessary spaces --- instat/dlgPasteNewColumns.vb | 4 +- instat/dlgPasteSpecial.Designer.vb | 52 ------------- instat/dlgPasteSpecial.resx | 120 ----------------------------- instat/dlgPasteSpecial.vb | 5 -- instat/instat.vbproj | 9 --- 5 files changed, 1 insertion(+), 189 deletions(-) delete mode 100644 instat/dlgPasteSpecial.Designer.vb delete mode 100644 instat/dlgPasteSpecial.resx delete mode 100644 instat/dlgPasteSpecial.vb diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index 3a173a56355..a36e2745c4e 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -44,7 +44,6 @@ Public Class dlgPasteNewColumns End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 160 '---------------------------- @@ -92,8 +91,7 @@ Public Class dlgPasteNewColumns ucrDFSelected.Reset() 'todo. some clip data values work well with read_delim R function. - 'taht's why readr references have been left here for future testing and reference. - + 'that's why readr references have been left here for future testing and reference. 'clsReadDataRFunction.SetPackageName("readr") 'clsReadDataRFunction.SetRCommand("read_delim") 'clsReadDataRFunction.AddParameter("col_names", strParameterValue:="TRUE", iPosition:=1) diff --git a/instat/dlgPasteSpecial.Designer.vb b/instat/dlgPasteSpecial.Designer.vb deleted file mode 100644 index eee66821a29..00000000000 --- a/instat/dlgPasteSpecial.Designer.vb +++ /dev/null @@ -1,52 +0,0 @@ - _ -Partial Class dlgPasteSpecial - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - _ - Private Sub InitializeComponent() - Me.UcrCheck1 = New instat.ucrCheck() - Me.SuspendLayout() - ' - 'UcrCheck1 - ' - Me.UcrCheck1.AutoSize = True - Me.UcrCheck1.Checked = False - Me.UcrCheck1.Location = New System.Drawing.Point(172, 48) - Me.UcrCheck1.Name = "UcrCheck1" - Me.UcrCheck1.Size = New System.Drawing.Size(100, 23) - Me.UcrCheck1.TabIndex = 0 - ' - 'dlgPasteSpecial - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(545, 196) - Me.Controls.Add(Me.UcrCheck1) - Me.Name = "dlgPasteSpecial" - Me.Text = "dlgPasteSpecial" - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents UcrCheck1 As ucrCheck -End Class diff --git a/instat/dlgPasteSpecial.resx b/instat/dlgPasteSpecial.resx deleted file mode 100644 index 1af7de150c9..00000000000 --- a/instat/dlgPasteSpecial.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/instat/dlgPasteSpecial.vb b/instat/dlgPasteSpecial.vb deleted file mode 100644 index b518e796823..00000000000 --- a/instat/dlgPasteSpecial.vb +++ /dev/null @@ -1,5 +0,0 @@ -Public Class dlgPasteSpecial - Private Sub dlgPasteSpecial_Load(sender As Object, e As EventArgs) Handles MyBase.Load - - End Sub -End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 8f51bf47a24..1d5045c78be 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -491,12 +491,6 @@ Form - - dlgPasteSpecial.vb - - - Form - dlgScript.vb @@ -3063,9 +3057,6 @@ dlgPasteNewColumns.vb - - dlgPasteSpecial.vb - dlgRandomSplit.vb From 0911838dddb2c68c367cd42b520be6019cd28d9c Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 19 Oct 2023 09:24:01 +0100 Subject: [PATCH 23/39] minor change --- instat/dlgUnstack.resx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/instat/dlgUnstack.resx b/instat/dlgUnstack.resx index f224c2811a5..b31205480f7 100644 --- a/instat/dlgUnstack.resx +++ b/instat/dlgUnstack.resx @@ -352,7 +352,7 @@ 4, 4, 4, 4 - 120, 23 + 135, 23 26 @@ -373,7 +373,7 @@ True - 154, 279 + 172, 279 50, 20 @@ -526,7 +526,7 @@ 9, 412 - 405, 52 + 408, 52 15 @@ -642,9 +642,6 @@ 18 - - NoControl - CenterScreen From 928993fbe28521b062ded906bba50290a680f33d Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 19 Oct 2023 11:41:49 +0200 Subject: [PATCH 24/39] Fixed minor bug in ClsDatabook --- instat/Model/DataFrame/clsDataBook.vb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/instat/Model/DataFrame/clsDataBook.vb b/instat/Model/DataFrame/clsDataBook.vb index c73978347c4..1e7b9a24456 100644 --- a/instat/Model/DataFrame/clsDataBook.vb +++ b/instat/Model/DataFrame/clsDataBook.vb @@ -155,11 +155,7 @@ Public Class clsDataBook End If 'if data not refreshed successfully, remove the data frame from the data book If Not dataFrame.RefreshData() Then - MessageBox.Show("Error: Could not retrieve data frame:" & strDataFrameName & " from R" & - Environment.NewLine & "Data displayed in spreadsheet may not be up to date." & - Environment.NewLine & "We strongly suggest restarting R-Instat before continuing.", - "Cannot retrieve data", MessageBoxButtons.OK, MessageBoxIcon.Warning) - _lstDataFrames.Remove(dataFrame) + DeleteDataFrames(strDataFrameName) End If Next If lstOfCurrentRDataFrameNames.Count = _lstDataFrames.Count Then @@ -189,5 +185,12 @@ Public Class clsDataBook Return listOfDataFrames End Function + Private Sub DeleteDataFrames(strDataName As String) + Dim clsDeleteFunction As New RFunction + clsDeleteFunction.SetRCommand(_RLink.strInstatDataObject & "$delete_dataframes") + clsDeleteFunction.AddParameter("data_names", Chr(34) & strDataName & Chr(34)) + _RLink.RunScript(clsDeleteFunction.ToScript(), strComment:="Delete DataFrame(s)") + End Sub + End Class From a4dcb9c000080bc19810afa6acb86750f81a31b1 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 19 Oct 2023 11:55:20 +0200 Subject: [PATCH 25/39] code changes --- instat/Model/DataFrame/clsDataBook.vb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/instat/Model/DataFrame/clsDataBook.vb b/instat/Model/DataFrame/clsDataBook.vb index 1e7b9a24456..5413d730253 100644 --- a/instat/Model/DataFrame/clsDataBook.vb +++ b/instat/Model/DataFrame/clsDataBook.vb @@ -155,6 +155,11 @@ Public Class clsDataBook End If 'if data not refreshed successfully, remove the data frame from the data book If Not dataFrame.RefreshData() Then + MessageBox.Show("Error: Could not retrieve data frame:" & strDataFrameName & " from R" & + Environment.NewLine & "Data displayed in spreadsheet may not be up to date." & + Environment.NewLine & "We strongly suggest restarting R-Instat before continuing.", + "Cannot retrieve data", MessageBoxButtons.OK, MessageBoxIcon.Warning) + _lstDataFrames.Remove(dataFrame) DeleteDataFrames(strDataFrameName) End If Next From 50005bb260c9440d36c1eae6fdd75a9070797f04 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 20 Oct 2023 09:41:06 +0200 Subject: [PATCH 26/39] Changed the warning message for R data --- instat/Model/DataFrame/clsDataBook.vb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/instat/Model/DataFrame/clsDataBook.vb b/instat/Model/DataFrame/clsDataBook.vb index 5413d730253..7db48e8e05f 100644 --- a/instat/Model/DataFrame/clsDataBook.vb +++ b/instat/Model/DataFrame/clsDataBook.vb @@ -155,10 +155,8 @@ Public Class clsDataBook End If 'if data not refreshed successfully, remove the data frame from the data book If Not dataFrame.RefreshData() Then - MessageBox.Show("Error: Could not retrieve data frame:" & strDataFrameName & " from R" & - Environment.NewLine & "Data displayed in spreadsheet may not be up to date." & - Environment.NewLine & "We strongly suggest restarting R-Instat before continuing.", - "Cannot retrieve data", MessageBoxButtons.OK, MessageBoxIcon.Warning) + MessageBox.Show("Error: Sorry R-Instat can not retrieve the: " & strDataFrameName & " data from R.", + Environment.NewLine, MessageBoxButtons.OK, MessageBoxIcon.Warning) _lstDataFrames.Remove(dataFrame) DeleteDataFrames(strDataFrameName) End If From b01a3c1e525a2295c8a6bd59040dc14b90c7def8 Mon Sep 17 00:00:00 2001 From: n-thony Date: Mon, 23 Oct 2023 08:52:15 +0300 Subject: [PATCH 27/39] minor bug fixes in Find Dialogue --- .../UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 27f08883b3b..648c7193873 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -309,10 +309,12 @@ Public Class ucrDataViewReoGrid ' Check if the row index is within the valid range If rowNumber >= 0 AndAlso rowNumber < currWorkSheet.RowCount Then If bApplyToRows Then - ' Apply the row style to the entire row - currWorkSheet.Cells(rowNumber, colIndex).Style.BackColor = color + For i As Integer = 0 To currWorkSheet.ColumnCount - 1 + ' Apply the row style to the entire row + currWorkSheet.Cells(rowNumber, i).Style.BackColor = color + Next Else - currWorkSheet.SetRangeStyles(New RangePosition(rowNumber, 0, 1, colIndex), rowStyle) + currWorkSheet.Cells(rowNumber, colIndex).Style.BackColor = color End If End If Next From 8f449407e26b5fc29736d293dd600ec6ab43243e Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 23 Oct 2023 11:02:47 +0200 Subject: [PATCH 28/39] Code changes --- instat/Model/DataFrame/clsDataBook.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/Model/DataFrame/clsDataBook.vb b/instat/Model/DataFrame/clsDataBook.vb index 7db48e8e05f..4e54241552e 100644 --- a/instat/Model/DataFrame/clsDataBook.vb +++ b/instat/Model/DataFrame/clsDataBook.vb @@ -156,7 +156,7 @@ Public Class clsDataBook 'if data not refreshed successfully, remove the data frame from the data book If Not dataFrame.RefreshData() Then MessageBox.Show("Error: Sorry R-Instat can not retrieve the: " & strDataFrameName & " data from R.", - Environment.NewLine, MessageBoxButtons.OK, MessageBoxIcon.Warning) + "Cannot retrieve data", MessageBoxButtons.OK, MessageBoxIcon.Warning) _lstDataFrames.Remove(dataFrame) DeleteDataFrames(strDataFrameName) End If From e74f04a5dae8ab22b80238ac8976b97da2abaf8c Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 23 Oct 2023 12:48:09 +0200 Subject: [PATCH 29/39] Fixed small bug in Column summaries sub-dialog --- instat/sdgProportionsPercentages.vb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/instat/sdgProportionsPercentages.vb b/instat/sdgProportionsPercentages.vb index 127bc79914a..60545783f86 100644 --- a/instat/sdgProportionsPercentages.vb +++ b/instat/sdgProportionsPercentages.vb @@ -52,8 +52,7 @@ Public Class sdgProportionsPercentages ucrChkProportionsPercentages.SetRDefault(Chr(34) & "none" & Chr(34)) ucrChkProportionsPercentages.SetText("Calculate Proportions or Percentages") - ucrPnlBY.AddToLinkedControls(ucrReceiverByFactor, objValues:={rdoByFactors}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlBY.AddToLinkedControls(ucrChkDisplayAsDecimal, objValues:={rdoByFactors}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlBY.AddToLinkedControls({ucrReceiverByFactor, ucrChkDisplayAsDecimal}, objValues:={rdoByFactors}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkProportionsPercentages.AddToLinkedControls(ucrPnlBY, objValues:={True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=rdoByFactors) ucrChkProportionsPercentages.AddToLinkedControls(ucrSelectorProportionsPercentiles, objValues:={True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlBY.AddToLinkedControls(ucrReceiverColumn, objValues:={rdoByColumn}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) From 185036702ea09a4920eb92474b7a137159a79a09 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 23 Oct 2023 16:44:02 +0100 Subject: [PATCH 30/39] fixed minor develloper bug --- instat/dlgName.vb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/instat/dlgName.vb b/instat/dlgName.vb index 42867ffbe32..224e7aa5a69 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -95,8 +95,10 @@ Public Class dlgName ucrPnlCase.AddRadioButton(rdoReplace, "stringr::str_replace") ucrPnlSelectData.SetParameter(New RParameter("data", 0)) - ucrPnlSelectData.AddRadioButton(rdoWholeDataFrame, "x") - ucrPnlSelectData.AddRadioButton(rdoSelectedColumn, "y") + ucrPnlSelectData.AddRadioButton(rdoWholeDataFrame) + ucrPnlSelectData.AddRadioButton(rdoSelectedColumn) + ucrPnlSelectData.AddParameterValuesCondition(rdoWholeDataFrame, "checked", "whole") + ucrPnlSelectData.AddParameterValuesCondition(rdoSelectedColumn, "checked", "selected") ucrReceiverColumns.SetParameter(New RParameter(".cols", 6)) ucrReceiverColumns.Selector = ucrSelectVariables @@ -179,7 +181,7 @@ Public Class dlgName clsNewLabelDataframeFunction.SetRCommand("data.frame") clsDummyFunction.AddParameter("checked", "FALSE", iPosition:=0) - clsDummyFunction.AddParameter("data", "x", iPosition:=1) + clsDummyFunction.AddParameter("checked", "whole", iPosition:=1) clsDefaultRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$rename_column_in_data") clsDefaultRFunction.AddParameter("type", Chr(34) & "single" & Chr(34), iPosition:=4) From 82f7789ee1dc894257013d08fab0ffaa302572cb Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 23 Oct 2023 16:53:57 +0100 Subject: [PATCH 31/39] minor change --- instat/dlgName.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgName.vb b/instat/dlgName.vb index 224e7aa5a69..8d049242001 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -221,11 +221,11 @@ Public Class dlgName If bReset Then ucrPnlCase.SetRCode(clsDefaultRFunction, bReset) ucrInputReplace.SetRCode(clsDefaultRFunction, bReset) + ucrChkIncludeVariable.SetRCode(clsDummyFunction, bReset) End If ucrInputCase.SetRCode(clsDefaultRFunction, bReset) ucrNudAbbreviate.SetRCode(clsDefaultRFunction, bReset) ucrPnlOptions.SetRCode(clsDefaultRFunction, bReset) - ucrChkIncludeVariable.SetRCode(clsDummyFunction, bReset) ucrInputBy.SetRCode(clsDefaultRFunction, bReset) ucrPnlSelectData.SetRCode(clsDummyFunction, bReset) End Sub From e0726439d2217d8d6457f8658bff24b833cefbaf Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 25 Oct 2023 10:23:29 +0300 Subject: [PATCH 32/39] design changers --- instat/frmMain.Designer.vb | 58 +++++++++++--------------------------- 1 file changed, 16 insertions(+), 42 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index eb654f3555d..569780b40b2 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -360,7 +360,6 @@ Partial Class frmMain Me.mnuEdit = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditFind = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditCopy = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuEditCopySpecial = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditPaste = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditPasteNew = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditWordwrap = New System.Windows.Forms.ToolStripMenuItem() @@ -2841,7 +2840,7 @@ Partial Class frmMain ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) Me.mnuEdit.Name = "mnuEdit" Me.mnuEdit.Size = New System.Drawing.Size(58, 29) Me.mnuEdit.Tag = "Edit" @@ -2851,7 +2850,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(366, 34) + Me.mnuEditFind.Size = New System.Drawing.Size(270, 34) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2859,70 +2858,47 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(366, 34) + Me.mnuEditCopy.Size = New System.Drawing.Size(270, 34) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' - 'mnuEditCopySpecial - ' - Me.mnuEditCopySpecial.Enabled = False - Me.mnuEditCopySpecial.Name = "mnuEditCopySpecial" - Me.mnuEditCopySpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ - Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopySpecial.Size = New System.Drawing.Size(366, 34) - Me.mnuEditCopySpecial.Tag = "Copy_Special" - Me.mnuEditCopySpecial.Text = "Copy Special" - Me.mnuEditCopySpecial.Visible = False - ' 'mnuEditPaste ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(366, 34) + Me.mnuEditPaste.Size = New System.Drawing.Size(270, 34) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' - Me.mnuPasteSpecial.Enabled = False - Me.mnuPasteSpecial.Name = "mnuPasteSpecial" - Me.mnuPasteSpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ - Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuPasteSpecial.Size = New System.Drawing.Size(366, 34) - Me.mnuPasteSpecial.Tag = "Paste" - Me.mnuPasteSpecial.Text = "Paste New Columns" - Me.mnuPasteSpecial.Visible = False - ' - 'mnuEditPasteNewDataFrame - ' - Me.mnuEditPasteNewDataFrame.Name = "mnuEditPasteNewDataFrame" - Me.mnuEditPasteNewDataFrame.Size = New System.Drawing.Size(366, 34) - Me.mnuEditPasteNewDataFrame.Tag = "Paste" - Me.mnuEditPasteNewDataFrame.Text = "Paste New Data Frame" + Me.mnuEditPasteNew.Name = "mnuEditPasteNew" + Me.mnuEditPasteNew.Size = New System.Drawing.Size(270, 34) + Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(366, 34) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(270, 34) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(366, 34) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(270, 34) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(363, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(267, 6) ' 'mnuEditScript ' Me.mnuEditScript.Name = "mnuEditScript" - Me.mnuEditScript.Size = New System.Drawing.Size(366, 34) + Me.mnuEditScript.Size = New System.Drawing.Size(270, 34) Me.mnuEditScript.Text = "Script" ' 'stsStrip @@ -3230,7 +3206,6 @@ Partial Class frmMain Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" - Me.mnuBar.Padding = New System.Windows.Forms.Padding(6, 2, 0, 2) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True Me.mnuBar.Size = New System.Drawing.Size(1251, 33) @@ -4913,7 +4888,7 @@ Partial Class frmMain Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill Me.splOverall.Location = New System.Drawing.Point(0, 72) - Me.splOverall.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splOverall.Margin = New System.Windows.Forms.Padding(4) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -4936,7 +4911,7 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) - Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -4958,7 +4933,7 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) - Me.splMetadata.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splMetadata.Margin = New System.Windows.Forms.Padding(4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -5015,7 +4990,7 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) - Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5103,7 +5078,7 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "frmMain" Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized @@ -5169,7 +5144,6 @@ Partial Class frmMain Friend WithEvents mnuFIleExit As ToolStripMenuItem Friend WithEvents mnuEdit As ToolStripMenuItem Friend WithEvents mnuEditCopy As ToolStripMenuItem - Friend WithEvents mnuEditCopySpecial As ToolStripMenuItem Friend WithEvents mnuEditPaste As ToolStripMenuItem Friend WithEvents mnuEditSelectAll As ToolStripMenuItem Friend WithEvents mnuEditFind As ToolStripMenuItem From 8e1ea5c9f9c3cad62e233a4f10dda40cc0075ab7 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 25 Oct 2023 10:33:15 +0300 Subject: [PATCH 33/39] removed redundant event --- instat/ucrDataView.vb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 839b8b87e27..908a73a9fcd 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -790,16 +790,6 @@ Public Class ucrDataView dlgAddComment.ShowDialog() End Sub - '''' - '''' event raised on menu toolstrip click - '''' paste data starting from selected cells - '''' - '''' - '''' - Private Sub mnuCellPasteRange_Click(sender As Object, e As EventArgs) - PasteValuesToDataFrame() - End Sub - ''' ''' pastes data from clipboard to data view ''' From 3625d719609bde17179997a267b57e3310392f92 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 25 Oct 2023 09:39:48 +0200 Subject: [PATCH 34/39] Update instat/dlgPasteNewColumns.vb Co-authored-by: lloyddewit <57253949+lloyddewit@users.noreply.github.com> --- instat/dlgPasteNewColumns.vb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index a36e2745c4e..45c2d313be3 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -174,14 +174,13 @@ Public Class dlgPasteNewColumns Private Sub TestOkEnabled(Optional bValidateCopiedData As Boolean = True) Dim enableOK As Boolean = False - If rdoDataFrame.Checked Then + If bValidateCopiedData Then + enableOK = ValidateAndPreviewCopiedData() + ElseIf rdoDataFrame.Checked Then enableOK = ucrSaveNewDFName.IsComplete() ElseIf rdoColumns.Checked Then enableOK = Not String.IsNullOrEmpty(ucrDFSelected.strCurrDataFrame) End If - If bValidateCopiedData Then - enableOK = ValidateAndPreviewCopiedData() - End If ucrBase.OKEnabled(enableOK) End Sub From e9d69185b270defef8cdea5bc2597a30db1ced3a Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 25 Oct 2023 10:41:18 +0300 Subject: [PATCH 35/39] made changes to test ok --- instat/dlgPasteNewColumns.vb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index 45c2d313be3..a36e2745c4e 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -174,13 +174,14 @@ Public Class dlgPasteNewColumns Private Sub TestOkEnabled(Optional bValidateCopiedData As Boolean = True) Dim enableOK As Boolean = False - If bValidateCopiedData Then - enableOK = ValidateAndPreviewCopiedData() - ElseIf rdoDataFrame.Checked Then + If rdoDataFrame.Checked Then enableOK = ucrSaveNewDFName.IsComplete() ElseIf rdoColumns.Checked Then enableOK = Not String.IsNullOrEmpty(ucrDFSelected.strCurrDataFrame) End If + If bValidateCopiedData Then + enableOK = ValidateAndPreviewCopiedData() + End If ucrBase.OKEnabled(enableOK) End Sub From d8ff25afe4a375bbba554a81f9debe3ef98f05a3 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 25 Oct 2023 10:44:08 +0300 Subject: [PATCH 36/39] renamed r function object --- instat/dlgPasteNewColumns.vb | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/instat/dlgPasteNewColumns.vb b/instat/dlgPasteNewColumns.vb index a36e2745c4e..00457514b89 100644 --- a/instat/dlgPasteNewColumns.vb +++ b/instat/dlgPasteNewColumns.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class dlgPasteNewColumns Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsReadDataRFunction As New RFunction + Private clsReadClipDataRFunction As New RFunction Private clsImportColsToExistingDFRFunction As RFunction 'used to prevent TestOkEnabled from being called multiple times when loading the dialog. Private bValidatePasteData As Boolean = False @@ -84,7 +84,7 @@ Public Class dlgPasteNewColumns Private Sub SetDefaults() clsImportColsToExistingDFRFunction = New RFunction - clsReadDataRFunction = New RFunction + clsReadClipDataRFunction = New RFunction ucrNudPreviewLines.Value = 10 ucrSaveNewDFName.Reset() @@ -92,25 +92,25 @@ Public Class dlgPasteNewColumns 'todo. some clip data values work well with read_delim R function. 'that's why readr references have been left here for future testing and reference. - 'clsReadDataRFunction.SetPackageName("readr") - 'clsReadDataRFunction.SetRCommand("read_delim") - 'clsReadDataRFunction.AddParameter("col_names", strParameterValue:="TRUE", iPosition:=1) + 'clsReadClipDataRFunction.SetPackageName("readr") + 'clsReadClipDataRFunction.SetRCommand("read_delim") + 'clsReadClipDataRFunction.AddParameter("col_names", strParameterValue:="TRUE", iPosition:=1) - clsReadDataRFunction.SetPackageName("clipr") - clsReadDataRFunction.SetRCommand("read_clip_tbl") - clsReadDataRFunction.AddParameter("header", strParameterValue:="TRUE", iPosition:=1) + clsReadClipDataRFunction.SetPackageName("clipr") + clsReadClipDataRFunction.SetRCommand("read_clip_tbl") + clsReadClipDataRFunction.AddParameter("header", strParameterValue:="TRUE", iPosition:=1) clsImportColsToExistingDFRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") - clsImportColsToExistingDFRFunction.AddParameter("col_data", clsRFunctionParameter:=clsReadDataRFunction, iPosition:=1) + clsImportColsToExistingDFRFunction.AddParameter("col_data", clsRFunctionParameter:=clsReadClipDataRFunction, iPosition:=1) clsImportColsToExistingDFRFunction.AddParameter("use_col_name_as_prefix", strParameterValue:="TRUE", iPosition:=2) - ucrBase.clsRsyntax.SetBaseRFunction(clsReadDataRFunction) + ucrBase.clsRsyntax.SetBaseRFunction(clsReadClipDataRFunction) End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrChkRowHeader.SetRCode(clsReadDataRFunction, bReset) + ucrChkRowHeader.SetRCode(clsReadClipDataRFunction, bReset) - ucrSaveNewDFName.SetRCode(clsReadDataRFunction, bReset) + ucrSaveNewDFName.SetRCode(clsReadClipDataRFunction, bReset) ucrDFSelected.SetRCode(clsImportColsToExistingDFRFunction, bReset) ucrChkKeepExstingCols.SetRCode(clsImportColsToExistingDFRFunction, bReset) @@ -131,7 +131,7 @@ Public Class dlgPasteNewColumns MsgBox("Requested clipboard data has more than 1000 rows. Only a maximum of 1000 rows can be pasted") clipBoardText = "" End If - clsReadDataRFunction.AddParameter("x", Chr(34) & clipBoardText & Chr(34), iPosition:=0) + clsReadClipDataRFunction.AddParameter("x", Chr(34) & clipBoardText & Chr(34), iPosition:=0) Catch ex As Exception 'this error could be due to large clipboard data MsgBox("Requested clipboard operation did not succeed. Large data detected") @@ -150,7 +150,7 @@ Public Class dlgPasteNewColumns lblConfirmText.Text = "" lblConfirmText.ForeColor = Color.Red - Dim clsTempReadClipBoardDataRFunction As RFunction = clsReadDataRFunction.Clone() + Dim clsTempReadClipBoardDataRFunction As RFunction = clsReadClipDataRFunction.Clone() clsTempReadClipBoardDataRFunction.RemoveAssignTo() 'remove assign to before getting the script Dim dfTemp As DataFrame = frmMain.clsRLink.RunInternalScriptGetValue(clsTempReadClipBoardDataRFunction.ToScript(), bSilent:=True)?.AsDataFrame @@ -187,12 +187,12 @@ Public Class dlgPasteNewColumns Private Sub ucrPnl_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnl.ControlValueChanged If rdoDataFrame.Checked Then - clsReadDataRFunction.RemoveAssignTo() - ucrBase.clsRsyntax.SetBaseRFunction(clsReadDataRFunction) + clsReadClipDataRFunction.RemoveAssignTo() + ucrBase.clsRsyntax.SetBaseRFunction(clsReadClipDataRFunction) ucrSaveNewDFName.Visible = True 'todo. can this be done through the custom panel control? ucrSaveNewDFName.Reset() ElseIf rdoColumns.Checked Then - clsReadDataRFunction.SetAssignToObject("data") + clsReadClipDataRFunction.SetAssignToObject("data") ucrBase.clsRsyntax.SetBaseRFunction(clsImportColsToExistingDFRFunction) ucrSaveNewDFName.Visible = False 'todo. can this be done through the custom panel control? ucrSaveNewDFName.SetName("") 'forces the save control to not include import function From 4f0a1b4630b892f6a13ef62f565df0fc0e5ec0e4 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 25 Oct 2023 11:56:59 +0200 Subject: [PATCH 37/39] Code changes --- instat/sdgProportionsPercentages.vb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/instat/sdgProportionsPercentages.vb b/instat/sdgProportionsPercentages.vb index 60545783f86..160fc0a2832 100644 --- a/instat/sdgProportionsPercentages.vb +++ b/instat/sdgProportionsPercentages.vb @@ -82,4 +82,10 @@ Public Class sdgProportionsPercentages ucrReceiverColumn.SetMeAsReceiver() End If End Sub + + Private Sub ucrChkProportionsPercentages_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkProportionsPercentages.ControlContentsChanged + If ucrChkProportionsPercentages.Checked Then + rdoByFactors.Checked = True + End If + End Sub End Class \ No newline at end of file From 9bb34cd91d839d271473619be79d8de2ae866abb Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 25 Oct 2023 12:55:29 +0200 Subject: [PATCH 38/39] Added the moderndive package to R-Instat --- instat/static/InstatObject/R/install_packages.R | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/static/InstatObject/R/install_packages.R b/instat/static/InstatObject/R/install_packages.R index cebadbae238..f3af4aef9b6 100644 --- a/instat/static/InstatObject/R/install_packages.R +++ b/instat/static/InstatObject/R/install_packages.R @@ -167,6 +167,7 @@ pkgs <- "formattable", #A 'ggplot2' extension that allows text to follow curved paths. "geomtextpath", + "moderndive", "collapse" ) pkgList <- pkgDep(pkgs, type="win.binary", repos = "https://cran.rstudio.com/", suggests = FALSE, includeBasePkgs = FALSE, Rversion = r_version) From b57574772aa29bbb61dd2e379e7da7bd7617e013 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 25 Oct 2023 15:45:51 +0200 Subject: [PATCH 39/39] Update instat/sdgProportionsPercentages.vb Co-authored-by: patowhiz --- instat/sdgProportionsPercentages.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instat/sdgProportionsPercentages.vb b/instat/sdgProportionsPercentages.vb index 160fc0a2832..2432df90623 100644 --- a/instat/sdgProportionsPercentages.vb +++ b/instat/sdgProportionsPercentages.vb @@ -84,8 +84,10 @@ Public Class sdgProportionsPercentages End Sub Private Sub ucrChkProportionsPercentages_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkProportionsPercentages.ControlContentsChanged + 'temporarily fixes issue #8588 If ucrChkProportionsPercentages.Checked Then rdoByFactors.Checked = True End If End Sub + End Class \ No newline at end of file