From 12d45c31572da665bf2796e0c8a17e53775a2d66 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:17:36 +0100 Subject: [PATCH 01/99] Added New Restore backup Dialog --- instat/dlgRestoreBackup.Designer.vb | 281 ++++++++++++++++++++++++++++ instat/dlgRestoreBackup.resx | 120 ++++++++++++ instat/dlgRestoreBackup.vb | 3 + instat/frmMain.Designer.vb | 25 ++- instat/frmMain.vb | 4 + instat/instat.vbproj | 9 + 6 files changed, 432 insertions(+), 10 deletions(-) create mode 100644 instat/dlgRestoreBackup.Designer.vb create mode 100644 instat/dlgRestoreBackup.resx create mode 100644 instat/dlgRestoreBackup.vb diff --git a/instat/dlgRestoreBackup.Designer.vb b/instat/dlgRestoreBackup.Designer.vb new file mode 100644 index 00000000000..2d0acfedb43 --- /dev/null +++ b/instat/dlgRestoreBackup.Designer.vb @@ -0,0 +1,281 @@ + _ +Partial Class dlgRestoreBackup + 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.grpSavingOptions = New System.Windows.Forms.GroupBox() + Me.lblBackupDataDetected = New System.Windows.Forms.Label() + Me.lblBackupLogDetected = New System.Windows.Forms.Label() + Me.cmdSaveLog = New System.Windows.Forms.Button() + Me.ucrInputSavedPathInternalLog = New instat.ucrInputTextBox() + Me.lblBackupInternalLogDetected = New System.Windows.Forms.Label() + Me.lblInternalLogSavedTo = New System.Windows.Forms.Label() + Me.cmdSaveInternalLog = New System.Windows.Forms.Button() + Me.ucrInputSavedPathLog = New instat.ucrInputTextBox() + Me.cmdSaveData = New System.Windows.Forms.Button() + Me.lblLogSavedTo = New System.Windows.Forms.Label() + Me.lblDataSavedTo = New System.Windows.Forms.Label() + Me.ucrInputSavedPathData = New instat.ucrInputTextBox() + Me.grpEndChoice = New System.Windows.Forms.GroupBox() + Me.cmdRunLog = New System.Windows.Forms.Button() + Me.cmdNewSession = New System.Windows.Forms.Button() + Me.cmdLoadData = New System.Windows.Forms.Button() + Me.ucrChkSendInternalLog = New instat.ucrCheck() + Me.ucrBase = New instat.ucrButtons() + Me.grpSavingOptions.SuspendLayout() + Me.grpEndChoice.SuspendLayout() + Me.SuspendLayout() + ' + 'grpSavingOptions + ' + Me.grpSavingOptions.Controls.Add(Me.lblBackupDataDetected) + Me.grpSavingOptions.Controls.Add(Me.lblBackupLogDetected) + Me.grpSavingOptions.Controls.Add(Me.cmdSaveLog) + Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathInternalLog) + Me.grpSavingOptions.Controls.Add(Me.lblBackupInternalLogDetected) + Me.grpSavingOptions.Controls.Add(Me.lblInternalLogSavedTo) + Me.grpSavingOptions.Controls.Add(Me.cmdSaveInternalLog) + Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathLog) + Me.grpSavingOptions.Controls.Add(Me.cmdSaveData) + Me.grpSavingOptions.Controls.Add(Me.lblLogSavedTo) + Me.grpSavingOptions.Controls.Add(Me.lblDataSavedTo) + Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathData) + Me.grpSavingOptions.Location = New System.Drawing.Point(12, 31) + Me.grpSavingOptions.Name = "grpSavingOptions" + Me.grpSavingOptions.Size = New System.Drawing.Size(877, 154) + Me.grpSavingOptions.TabIndex = 20 + Me.grpSavingOptions.TabStop = False + Me.grpSavingOptions.Text = "Saving Options" + ' + 'lblBackupDataDetected + ' + Me.lblBackupDataDetected.AutoSize = True + Me.lblBackupDataDetected.Location = New System.Drawing.Point(11, 29) + Me.lblBackupDataDetected.Name = "lblBackupDataDetected" + Me.lblBackupDataDetected.Size = New System.Drawing.Size(136, 13) + Me.lblBackupDataDetected.TabIndex = 8 + Me.lblBackupDataDetected.Text = "Backup Data File Detected" + ' + 'lblBackupLogDetected + ' + Me.lblBackupLogDetected.AutoSize = True + Me.lblBackupLogDetected.Location = New System.Drawing.Point(11, 76) + Me.lblBackupLogDetected.Name = "lblBackupLogDetected" + Me.lblBackupLogDetected.Size = New System.Drawing.Size(131, 13) + Me.lblBackupLogDetected.TabIndex = 4 + Me.lblBackupLogDetected.Text = "Backup Log File Detected" + ' + 'cmdSaveLog + ' + Me.cmdSaveLog.Location = New System.Drawing.Point(261, 68) + Me.cmdSaveLog.Name = "cmdSaveLog" + Me.cmdSaveLog.Size = New System.Drawing.Size(241, 29) + Me.cmdSaveLog.TabIndex = 5 + Me.cmdSaveLog.Text = "Save Backup Log..." + Me.cmdSaveLog.UseVisualStyleBackColor = True + ' + 'ucrInputSavedPathInternalLog + ' + Me.ucrInputSavedPathInternalLog.AddQuotesIfUnrecognised = True + Me.ucrInputSavedPathInternalLog.AutoSize = True + Me.ucrInputSavedPathInternalLog.IsMultiline = False + Me.ucrInputSavedPathInternalLog.IsReadOnly = False + Me.ucrInputSavedPathInternalLog.Location = New System.Drawing.Point(605, 123) + Me.ucrInputSavedPathInternalLog.Name = "ucrInputSavedPathInternalLog" + Me.ucrInputSavedPathInternalLog.Size = New System.Drawing.Size(258, 21) + Me.ucrInputSavedPathInternalLog.TabIndex = 16 + ' + 'lblBackupInternalLogDetected + ' + Me.lblBackupInternalLogDetected.AutoSize = True + Me.lblBackupInternalLogDetected.Location = New System.Drawing.Point(11, 123) + Me.lblBackupInternalLogDetected.Name = "lblBackupInternalLogDetected" + Me.lblBackupInternalLogDetected.Size = New System.Drawing.Size(169, 13) + Me.lblBackupInternalLogDetected.TabIndex = 6 + Me.lblBackupInternalLogDetected.Text = "Backup Internal Log File Detected" + ' + 'lblInternalLogSavedTo + ' + Me.lblInternalLogSavedTo.AutoSize = True + Me.lblInternalLogSavedTo.Location = New System.Drawing.Point(509, 125) + Me.lblInternalLogSavedTo.Name = "lblInternalLogSavedTo" + Me.lblInternalLogSavedTo.Size = New System.Drawing.Size(55, 13) + Me.lblInternalLogSavedTo.TabIndex = 15 + Me.lblInternalLogSavedTo.Text = "Saving at:" + ' + 'cmdSaveInternalLog + ' + Me.cmdSaveInternalLog.Location = New System.Drawing.Point(262, 115) + Me.cmdSaveInternalLog.Name = "cmdSaveInternalLog" + Me.cmdSaveInternalLog.Size = New System.Drawing.Size(240, 29) + Me.cmdSaveInternalLog.TabIndex = 7 + Me.cmdSaveInternalLog.Text = "Save Backup Internal Log..." + Me.cmdSaveInternalLog.UseVisualStyleBackColor = True + ' + 'ucrInputSavedPathLog + ' + Me.ucrInputSavedPathLog.AddQuotesIfUnrecognised = True + Me.ucrInputSavedPathLog.AutoSize = True + Me.ucrInputSavedPathLog.IsMultiline = False + Me.ucrInputSavedPathLog.IsReadOnly = False + Me.ucrInputSavedPathLog.Location = New System.Drawing.Point(604, 76) + Me.ucrInputSavedPathLog.Name = "ucrInputSavedPathLog" + Me.ucrInputSavedPathLog.Size = New System.Drawing.Size(258, 21) + Me.ucrInputSavedPathLog.TabIndex = 14 + ' + 'cmdSaveData + ' + Me.cmdSaveData.Location = New System.Drawing.Point(262, 21) + Me.cmdSaveData.Name = "cmdSaveData" + Me.cmdSaveData.Size = New System.Drawing.Size(240, 29) + Me.cmdSaveData.TabIndex = 9 + Me.cmdSaveData.Text = "Save Backup Data..." + Me.cmdSaveData.UseVisualStyleBackColor = True + ' + 'lblLogSavedTo + ' + Me.lblLogSavedTo.AutoSize = True + Me.lblLogSavedTo.Location = New System.Drawing.Point(509, 78) + Me.lblLogSavedTo.Name = "lblLogSavedTo" + Me.lblLogSavedTo.Size = New System.Drawing.Size(55, 13) + Me.lblLogSavedTo.TabIndex = 13 + Me.lblLogSavedTo.Text = "Saving at:" + ' + 'lblDataSavedTo + ' + Me.lblDataSavedTo.AutoSize = True + Me.lblDataSavedTo.Location = New System.Drawing.Point(508, 29) + Me.lblDataSavedTo.Name = "lblDataSavedTo" + Me.lblDataSavedTo.Size = New System.Drawing.Size(55, 13) + Me.lblDataSavedTo.TabIndex = 11 + Me.lblDataSavedTo.Text = "Saving at:" + ' + 'ucrInputSavedPathData + ' + Me.ucrInputSavedPathData.AddQuotesIfUnrecognised = True + Me.ucrInputSavedPathData.AutoSize = True + Me.ucrInputSavedPathData.IsMultiline = False + Me.ucrInputSavedPathData.IsReadOnly = False + Me.ucrInputSavedPathData.Location = New System.Drawing.Point(604, 27) + Me.ucrInputSavedPathData.Name = "ucrInputSavedPathData" + Me.ucrInputSavedPathData.Size = New System.Drawing.Size(258, 21) + Me.ucrInputSavedPathData.TabIndex = 12 + ' + 'grpEndChoice + ' + Me.grpEndChoice.Controls.Add(Me.cmdRunLog) + Me.grpEndChoice.Controls.Add(Me.cmdNewSession) + Me.grpEndChoice.Controls.Add(Me.cmdLoadData) + Me.grpEndChoice.Location = New System.Drawing.Point(131, 221) + Me.grpEndChoice.Name = "grpEndChoice" + Me.grpEndChoice.Size = New System.Drawing.Size(602, 66) + Me.grpEndChoice.TabIndex = 23 + Me.grpEndChoice.TabStop = False + Me.grpEndChoice.Text = "Choose one of the following to proceed" + ' + 'cmdRunLog + ' + Me.cmdRunLog.Location = New System.Drawing.Point(11, 24) + Me.cmdRunLog.Name = "cmdRunLog" + Me.cmdRunLog.Size = New System.Drawing.Size(190, 29) + Me.cmdRunLog.TabIndex = 1 + Me.cmdRunLog.Text = "Run Backup Log" + Me.cmdRunLog.UseVisualStyleBackColor = True + ' + 'cmdNewSession + ' + Me.cmdNewSession.Location = New System.Drawing.Point(415, 24) + Me.cmdNewSession.Name = "cmdNewSession" + Me.cmdNewSession.Size = New System.Drawing.Size(181, 29) + Me.cmdNewSession.TabIndex = 2 + Me.cmdNewSession.Text = "Start New Session" + Me.cmdNewSession.UseVisualStyleBackColor = True + ' + 'cmdLoadData + ' + Me.cmdLoadData.Location = New System.Drawing.Point(213, 24) + Me.cmdLoadData.Name = "cmdLoadData" + Me.cmdLoadData.Size = New System.Drawing.Size(195, 29) + Me.cmdLoadData.TabIndex = 3 + Me.cmdLoadData.Text = "Load Backup Data" + Me.cmdLoadData.UseVisualStyleBackColor = True + ' + 'ucrChkSendInternalLog + ' + Me.ucrChkSendInternalLog.AutoSize = True + Me.ucrChkSendInternalLog.Checked = False + Me.ucrChkSendInternalLog.Location = New System.Drawing.Point(36, 195) + Me.ucrChkSendInternalLog.Name = "ucrChkSendInternalLog" + Me.ucrChkSendInternalLog.Size = New System.Drawing.Size(266, 23) + Me.ucrChkSendInternalLog.TabIndex = 21 + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(208, 298) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 24 + ' + 'dlgRestoreBackup + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(901, 359) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.grpEndChoice) + Me.Controls.Add(Me.ucrChkSendInternalLog) + Me.Controls.Add(Me.grpSavingOptions) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgRestoreBackup" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Restore Backup" + Me.grpSavingOptions.ResumeLayout(False) + Me.grpSavingOptions.PerformLayout() + Me.grpEndChoice.ResumeLayout(False) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents grpSavingOptions As GroupBox + Friend WithEvents lblBackupDataDetected As Label + Friend WithEvents lblBackupLogDetected As Label + Friend WithEvents cmdSaveLog As Button + Friend WithEvents ucrInputSavedPathInternalLog As ucrInputTextBox + Friend WithEvents lblBackupInternalLogDetected As Label + Friend WithEvents lblInternalLogSavedTo As Label + Friend WithEvents cmdSaveInternalLog As Button + Friend WithEvents ucrInputSavedPathLog As ucrInputTextBox + Friend WithEvents cmdSaveData As Button + Friend WithEvents lblLogSavedTo As Label + Friend WithEvents lblDataSavedTo As Label + Friend WithEvents ucrInputSavedPathData As ucrInputTextBox + Friend WithEvents grpEndChoice As GroupBox + Friend WithEvents cmdRunLog As Button + Friend WithEvents cmdNewSession As Button + Friend WithEvents cmdLoadData As Button + Friend WithEvents ucrChkSendInternalLog As ucrCheck + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgRestoreBackup.resx b/instat/dlgRestoreBackup.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgRestoreBackup.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb new file mode 100644 index 00000000000..de722e1c01f --- /dev/null +++ b/instat/dlgRestoreBackup.vb @@ -0,0 +1,3 @@ +Public Class dlgRestoreBackup + +End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 9a8750bf72f..0785938e55c 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -680,6 +680,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.mnuEditUndo = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -2875,7 +2876,7 @@ Partial Class frmMain ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.mnuEditUndo}) Me.mnuEdit.Name = "mnuEdit" Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" @@ -2885,7 +2886,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(167, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(180, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2893,7 +2894,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(167, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(180, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2901,27 +2902,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(180, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(180, 22) Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(180, 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(167, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(180, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -5085,6 +5086,12 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' + 'mnuEditUndo + ' + Me.mnuEditUndo.Name = "mnuEditUndo" + Me.mnuEditUndo.Size = New System.Drawing.Size(180, 22) + Me.mnuEditUndo.Text = "Undo" + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5098,9 +5105,6 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + - My.Application.Info.Version.Minor.ToString + "." + - My.Application.Info.Version.Build.ToString Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) @@ -5782,4 +5786,5 @@ Partial Class frmMain Friend WithEvents mnuViewSwapDataAndScript As ToolStripMenuItem Friend WithEvents mnuClimaticExamineEditDataVisualiseData As ToolStripMenuItem Friend WithEvents ToolStripSeparator27 As ToolStripSeparator + Friend WithEvents mnuEditUndo As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 4b8d4749022..080ed9126df 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2548,6 +2548,10 @@ Public Class frmMain dlgWordwrap.ShowDialog() End Sub + Private Sub mnuEditUndo_Click(sender As Object, e As EventArgs) Handles mnuEditUndo.Click + dlgRestoreBackup.ShowDialog() + End Sub + Private Sub mnuPrepareColumnTextSearch_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnTextSearch.Click dlgSearch.ShowDialog() End Sub diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 305340244de..be946fcd29a 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -269,6 +269,12 @@ Form + + dlgRestoreBackup.vb + + + Form + dlgSeasonalGraph.vb @@ -3110,6 +3116,9 @@ dlgRandomSplit.vb + + dlgRestoreBackup.vb + dlgScript.vb From 1e930a943d9625f05ab38f3a4fb88a8353377434 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:18:49 +0100 Subject: [PATCH 02/99] Added the Restore Backup code --- instat/dlgRestoreBackup.Designer.vb | 20 +-- instat/dlgRestoreBackup.vb | 217 +++++++++++++++++++++++++++- 2 files changed, 226 insertions(+), 11 deletions(-) diff --git a/instat/dlgRestoreBackup.Designer.vb b/instat/dlgRestoreBackup.Designer.vb index 2d0acfedb43..0889d783b76 100644 --- a/instat/dlgRestoreBackup.Designer.vb +++ b/instat/dlgRestoreBackup.Designer.vb @@ -37,7 +37,7 @@ Partial Class dlgRestoreBackup Me.ucrInputSavedPathData = New instat.ucrInputTextBox() Me.grpEndChoice = New System.Windows.Forms.GroupBox() Me.cmdRunLog = New System.Windows.Forms.Button() - Me.cmdNewSession = New System.Windows.Forms.Button() + Me.cmdCloseSession = New System.Windows.Forms.Button() Me.cmdLoadData = New System.Windows.Forms.Button() Me.ucrChkSendInternalLog = New instat.ucrCheck() Me.ucrBase = New instat.ucrButtons() @@ -183,7 +183,7 @@ Partial Class dlgRestoreBackup 'grpEndChoice ' Me.grpEndChoice.Controls.Add(Me.cmdRunLog) - Me.grpEndChoice.Controls.Add(Me.cmdNewSession) + Me.grpEndChoice.Controls.Add(Me.cmdCloseSession) Me.grpEndChoice.Controls.Add(Me.cmdLoadData) Me.grpEndChoice.Location = New System.Drawing.Point(131, 221) Me.grpEndChoice.Name = "grpEndChoice" @@ -201,14 +201,14 @@ Partial Class dlgRestoreBackup Me.cmdRunLog.Text = "Run Backup Log" Me.cmdRunLog.UseVisualStyleBackColor = True ' - 'cmdNewSession + 'cmdCloseSession ' - Me.cmdNewSession.Location = New System.Drawing.Point(415, 24) - Me.cmdNewSession.Name = "cmdNewSession" - Me.cmdNewSession.Size = New System.Drawing.Size(181, 29) - Me.cmdNewSession.TabIndex = 2 - Me.cmdNewSession.Text = "Start New Session" - Me.cmdNewSession.UseVisualStyleBackColor = True + Me.cmdCloseSession.Location = New System.Drawing.Point(415, 24) + Me.cmdCloseSession.Name = "cmdCloseSession" + Me.cmdCloseSession.Size = New System.Drawing.Size(181, 29) + Me.cmdCloseSession.TabIndex = 2 + Me.cmdCloseSession.Text = "Close" + Me.cmdCloseSession.UseVisualStyleBackColor = True ' 'cmdLoadData ' @@ -274,7 +274,7 @@ Partial Class dlgRestoreBackup Friend WithEvents ucrInputSavedPathData As ucrInputTextBox Friend WithEvents grpEndChoice As GroupBox Friend WithEvents cmdRunLog As Button - Friend WithEvents cmdNewSession As Button + Friend WithEvents cmdCloseSession As Button Friend WithEvents cmdLoadData As Button Friend WithEvents ucrChkSendInternalLog As ucrCheck Friend WithEvents ucrBase As ucrButtons diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index de722e1c01f..47cbadf36b4 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -1,3 +1,218 @@ -Public Class dlgRestoreBackup +' 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 instat.Translations +Imports System.IO + +Public Class dlgRestoreBackup + Private strScript As String + Public strAutoSavedLogScript As String + Private strLoadDateFilePath As String + Public strAutoSavedDataFilePaths() As String + Public strAutoSavedLogFilePaths() As String + Public strAutoSavedInternalLogFilePaths() As String + Private bUserClose As Boolean = True + Public strAutoSaveDataFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_data_auto_save") + Public strAutoSaveLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_log_auto_save") + Public strAutoSaveInternalLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_debug_log_auto_save") + + + Private Sub dlgRestoreBackup_Load(sender As Object, e As EventArgs) Handles MyBase.Load + 'temporary - not yet implemented + ucrChkSendInternalLog.Visible = False + + If (Directory.Exists(strAutoSaveLogFolderPath)) Then + strAutoSavedLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveLogFolderPath).ToArray + End If + If Directory.Exists(strAutoSaveDataFolderPath) Then + strAutoSavedDataFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveDataFolderPath).ToArray + End If + If (Directory.Exists(strAutoSaveInternalLogFolderPath)) Then + strAutoSavedInternalLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveInternalLogFolderPath).ToArray + End If + + ucrBase.OKEnabled(False) + ucrBase.contextMenuStripToScript.Enabled = False + + ucrChkSendInternalLog.SetText("Send Debugging Log to R-Instat Team") + strScript = "" + strLoadDateFilePath = "" + If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 Then + lblBackupDataDetected.Text = "Backup Data File Detected" + cmdSaveData.Enabled = True + cmdLoadData.Enabled = True + Else + lblBackupDataDetected.Text = "No Backup Data File Detected" + cmdSaveData.Enabled = False + cmdLoadData.Enabled = False + End If + If strAutoSavedLogFilePaths IsNot Nothing AndAlso strAutoSavedLogFilePaths.Count > 0 Then + lblBackupLogDetected.Text = "Backup Log File Detected" + cmdSaveLog.Enabled = True + cmdRunLog.Enabled = True + Else + lblBackupLogDetected.Text = "No Backup Log File Detected" + cmdSaveLog.Enabled = False + cmdRunLog.Enabled = False + End If + If strAutoSavedInternalLogFilePaths IsNot Nothing AndAlso strAutoSavedInternalLogFilePaths.Count > 0 Then + lblBackupInternalLogDetected.Text = "Backup Debugging Log File Detected" + cmdSaveInternalLog.Enabled = True + ucrChkSendInternalLog.Visible = False + ucrChkSendInternalLog.Checked = False + Else + lblBackupInternalLogDetected.Text = "No Backup Debugging Log File Detected" + cmdSaveInternalLog.Enabled = False + ucrChkSendInternalLog.Visible = False + ucrChkSendInternalLog.Checked = False + End If + ucrInputSavedPathData.IsReadOnly = True + ucrInputSavedPathInternalLog.IsReadOnly = True + ucrInputSavedPathLog.IsReadOnly = True + + cmdCloseSession.Enabled = True + autoTranslate(Me) + End Sub + + Public Function GetScript() As String + Return strScript + End Function + + Public Function GetDataFilePath() As String + Return strLoadDateFilePath + End Function + + Private Sub cmdSaveData_Click(sender As Object, e As EventArgs) Handles cmdSaveData.Click + Using dlgSave As New SaveFileDialog + dlgSave.Title = "Save Data File" + dlgSave.Filter = "RDS Data file (*.RDS)|*.RDS" + If dlgSave.ShowDialog() = DialogResult.OK Then + ucrInputSavedPathData.SetName(dlgSave.FileName) + Else + ucrInputSavedPathData.SetName("") + End If + End Using + End Sub + + Private Sub cmdSaveLog_Click(sender As Object, e As EventArgs) Handles cmdSaveLog.Click + Using dlgSave As New SaveFileDialog + dlgSave.Title = "Save Log File" + dlgSave.Filter = "R script file (*.R)|*.R" + If dlgSave.ShowDialog() = DialogResult.OK Then + ucrInputSavedPathLog.SetName(dlgSave.FileName) + Else + ucrInputSavedPathLog.SetName("") + End If + End Using + End Sub + + Private Sub cmdSaveDebuggingLog_Click(sender As Object, e As EventArgs) Handles cmdSaveInternalLog.Click + Using dlgSave As New SaveFileDialog + dlgSave.Title = "Save Debugging Log File" + dlgSave.Filter = "R script file (*.R)|*.R" + If dlgSave.ShowDialog() = DialogResult.OK Then + ucrInputSavedPathInternalLog.SetName(dlgSave.FileName) + Else + ucrInputSavedPathInternalLog.SetName("") + End If + End Using + End Sub + + Private Sub SaveFiles() + If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedDataFilePaths(0)) Then + Try + If Not ucrInputSavedPathData.IsEmpty() Then + File.Copy(strAutoSavedDataFilePaths(0), ucrInputSavedPathData.GetText(), True) + End If + Catch ex As Exception + MsgBox("Could not copy and/or delete data file." & Environment.NewLine & ex.Message, "Error copying/deleting file") + End Try + End If + If strAutoSavedLogFilePaths IsNot Nothing AndAlso strAutoSavedLogFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedLogFilePaths(0)) Then + Try + If Not ucrInputSavedPathLog.IsEmpty() Then + File.Copy(strAutoSavedLogFilePaths(0), ucrInputSavedPathLog.GetText(), True) + End If + Catch ex As Exception + MsgBox("Could not copy and/or delete log file." & Environment.NewLine & ex.Message, "Error copying/deleting file") + End Try + End If + If strAutoSavedInternalLogFilePaths IsNot Nothing AndAlso strAutoSavedInternalLogFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedInternalLogFilePaths(0)) Then + Try + If Not ucrInputSavedPathInternalLog.IsEmpty() Then + File.Copy(strAutoSavedInternalLogFilePaths(0), ucrInputSavedPathInternalLog.GetText(), True) + End If + Catch ex As Exception + MsgBox("Could not copy and/or delete internal log file." & Environment.NewLine & ex.Message, "Error copying/deleting file") + End Try + End If + End Sub + + Private Sub cmdRunLog_Click(sender As Object, e As EventArgs) Handles cmdRunLog.Click + If MsgBox("Are you sure you are finished?" & Environment.NewLine & "You cannot return to this dialog after leaving and any unsaved recovered files will be lost." & Environment.NewLine & "Warning: running the log file can fail if files have been moved.", MessageBoxButtons.YesNo, "Are you sure you are finished?") = MsgBoxResult.Yes Then + SaveFiles() + If File.Exists(strAutoSavedLogFilePaths(0)) Then + Try + strScript = File.ReadAllText(strAutoSavedLogFilePaths(0)) + Catch ex As Exception + MsgBox("Could not read log file." & Environment.NewLine & ex.Message, "Cannot read file") + strScript = "" + End Try + End If + bUserClose = False + Close() + End If + End Sub + + Private Sub cmdLoadData_Click(sender As Object, e As EventArgs) Handles cmdLoadData.Click + If MsgBox("Are you sure you are finished?" & Environment.NewLine & "You cannot return to this dialog after leaving and any unsaved recovered files will be lost.", MessageBoxButtons.YesNo, "Are you finished?") = MsgBoxResult.Yes Then + SaveFiles() + strLoadDateFilePath = strAutoSavedDataFilePaths(0) + bUserClose = False + Close() + End If + End Sub + + Private Sub cmdCloseSession_Click(sender As Object, e As EventArgs) Handles cmdCloseSession.Click + If MsgBox("Are you sure you are finished?" & Environment.NewLine & "You cannot return to this dialog after leaving and any unsaved recovered files will be lost.", MessageBoxButtons.YesNo, "Are you finished?") = MsgBoxResult.Yes Then + SaveFiles() + bUserClose = False + Close() + End If + End Sub + + Private Sub dlgRestoreBackup_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing + If bUserClose Then + If MsgBox("Are you sure you are finished?" & Environment.NewLine & "You cannot return to this dialog after leaving and any unsaved recovered files will be lost.", MessageBoxButtons.YesNo, "Are you finished?") = MsgBoxResult.No Then + e.Cancel = True + End If + End If + DeleteTempFiles() + End Sub + + Private Sub DeleteTempFiles() + ' No longer needed as now done after closing + 'If strAutoSavedInternalLogFilePaths IsNot Nothing AndAlso strAutoSavedInternalLogFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedInternalLogFilePaths(0)) Then + ' File.Delete(strAutoSavedInternalLogFilePaths(0)) + 'End If + 'If strAutoSavedLogFilePaths IsNot Nothing AndAlso strAutoSavedLogFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedLogFilePaths(0)) Then + ' File.Delete(strAutoSavedLogFilePaths(0)) + 'End If + 'If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedDataFilePaths(0)) Then + ' File.Delete(strAutoSavedDataFilePaths(0)) + 'End If + End Sub End Class \ No newline at end of file From 50e1ccb91601326153b100e5e0a197c06da6781f Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:43:01 +0100 Subject: [PATCH 03/99] Design Changes --- instat/dlgRestoreBackup.Designer.vb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/instat/dlgRestoreBackup.Designer.vb b/instat/dlgRestoreBackup.Designer.vb index 0889d783b76..d564016be76 100644 --- a/instat/dlgRestoreBackup.Designer.vb +++ b/instat/dlgRestoreBackup.Designer.vb @@ -240,8 +240,9 @@ Partial Class dlgRestoreBackup ' 'dlgRestoreBackup ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + 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(901, 359) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.grpEndChoice) From 06e23046cd4c2017104dd0e9255f00ae8e19f908 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 21 Feb 2024 09:57:14 +0100 Subject: [PATCH 04/99] Code Changes --- instat/frmMain.Designer.vb | 1323 +++++++++++++++++------------------- instat/frmMain.resx | 4 +- instat/frmMain.vb | 2 +- 3 files changed, 644 insertions(+), 685 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 764f20bd1d9..1010108565e 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -664,7 +664,7 @@ Partial Class frmMain Me.mnuToolsClearOutputWindow = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.mnuToolsSaveCurrentOptions = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuToolsLoadOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuToolsRestoreBackup = New System.Windows.Forms.ToolStripMenuItem() Me.mnuToolsInstallRPackage = New System.Windows.Forms.ToolStripMenuItem() Me.mnuToolsOptions = New System.Windows.Forms.ToolStripMenuItem() Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -682,7 +682,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.mnuEditUndo = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -708,7 +707,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, 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(81, 24) + Me.mnuDescribe.Size = New System.Drawing.Size(64, 22) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -716,25 +715,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(226, 26) + 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(194, 26) + 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(191, 6) + Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(194, 26) + 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" @@ -742,26 +741,26 @@ Partial Class frmMain 'mnuDescribeOneVariableGraph ' Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph" - Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(194, 26) + 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(191, 6) + Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(194, 26) + 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(194, 26) + Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -769,26 +768,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(226, 26) + 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(254, 26) + 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(251, 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(254, 26) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables" @@ -796,19 +795,19 @@ Partial Class frmMain 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(254, 26) + 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(251, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(254, 26) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' @@ -816,14 +815,14 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Name = "mnuDescribeTwoThreeVariablesTwoWayFrequencies" - Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(254, 26) + 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(254, 26) + Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Text = "Three-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.ToolTipText = "Table or Graph" ' @@ -831,25 +830,25 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneral, Me.ToolStripSeparator38, Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(226, 26) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' 'mnuDescribeGeneral ' Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(257, 26) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeGeneral.Text = "General..." ' 'ToolStripSeparator38 ' Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(254, 6) + Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) ' 'mnuDescribeSpecificBarPieChart ' Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart" - Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(257, 26) + 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" @@ -857,7 +856,7 @@ Partial Class frmMain 'mnuDescribeSpecificBoxplotJitterViolinPlot ' Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot" - Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(257, 26) + 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" @@ -865,7 +864,7 @@ Partial Class frmMain 'mnuDescribeSpecificHistogramDensityFrequencyPlot ' Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot" - Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(257, 26) + 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" @@ -873,7 +872,7 @@ Partial Class frmMain 'mnuDescribeSpecificPointPlot ' Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot" - Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(257, 26) + Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..." Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..." Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot" @@ -881,7 +880,7 @@ Partial Class frmMain 'mnuDescribeSpecificLineSmoothPlot ' Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot" - Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(257, 26) + 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" @@ -889,12 +888,12 @@ Partial Class frmMain 'ToolStripSeparator26 ' Me.ToolStripSeparator26.Name = "ToolStripSeparator26" - Me.ToolStripSeparator26.Size = New System.Drawing.Size(254, 6) + Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6) ' 'mnuDescribeSpecificMapPlot ' Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot" - Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(257, 26) + Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..." Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map" ' @@ -902,7 +901,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificDotPlot.Enabled = False Me.mnuDescribeSpecificDotPlot.Name = "mnuDescribeSpecificDotPlot" - Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(257, 26) + Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificDotPlot.Tag = "Dotplot..." Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False @@ -910,27 +909,27 @@ Partial Class frmMain 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" - Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(257, 26) + 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(257, 26) + 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(257, 26) + 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(226, 26) + 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" @@ -938,83 +937,83 @@ Partial Class frmMain 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(223, 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(226, 26) + 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(250, 26) + 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(250, 26) + 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(250, 26) + 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(250, 26) + 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(223, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(175, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(226, 26) + 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(226, 26) + 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(226, 26) + 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(226, 26) + 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(226, 26) + 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(66, 24) + Me.mnuModel.Size = New System.Drawing.Size(53, 22) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1022,168 +1021,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(252, 26) + 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(221, 26) + 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(221, 26) + 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(221, 26) + 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(249, 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(252, 26) + 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(284, 26) + 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(284, 26) + 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(284, 26) + 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(284, 26) + 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(281, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelGeneral ' Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral" - Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(284, 26) + 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(284, 26) + 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(281, 6) + Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelHypothesisTestsKeyboard ' Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard" - Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(284, 26) + 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(284, 26) + 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(252, 26) + 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(186, 26) + 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(252, 26) + 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(246, 26) + 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(246, 26) + 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(243, 6) + Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelGlance ' Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance" - Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(246, 26) + 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(246, 26) + 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(246, 26) + 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(243, 6) + Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelUseModelKeyboard ' Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard" - Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(246, 26) + Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..." ' 'mnuModelOtherOneVariable @@ -1191,14 +1190,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(252, 26) + 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(204, 26) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1206,7 +1205,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(204, 26) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1214,7 +1213,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(204, 26) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1222,7 +1221,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(204, 26) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -1231,7 +1230,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(252, 26) + Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" ' @@ -1239,7 +1238,7 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples" - Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(328, 26) + Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..." Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..." ' @@ -1247,21 +1246,21 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData" - Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(328, 26) + 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(328, 26) + 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(328, 26) + Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..." ' @@ -1269,14 +1268,14 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples" - Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(328, 26) + 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(328, 26) + 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..." ' @@ -1285,7 +1284,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(252, 26) + Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" ' @@ -1293,21 +1292,21 @@ Partial Class frmMain ' Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups" - Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(320, 26) + 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(320, 26) + 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(320, 26) + Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test" Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..." ' @@ -1316,7 +1315,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(252, 26) + Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" ' @@ -1324,7 +1323,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral" - Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(206, 26) + Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..." Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..." ' @@ -1332,7 +1331,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralRegression.Enabled = False Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression" - Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(206, 26) + Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralRegression.Tag = "Regression..." Me.mnuModelOtherGeneralRegression.Text = "Regression..." ' @@ -1340,7 +1339,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralLogLinear.Enabled = False Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear" - Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(206, 26) + Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' @@ -1348,7 +1347,7 @@ Partial Class frmMain ' Me.mnuClimaticExamine.Enabled = False Me.mnuClimaticExamine.Name = "mnuClimaticExamine" - Me.mnuClimaticExamine.Size = New System.Drawing.Size(267, 26) + Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticExamine.Tag = "Examine" Me.mnuClimaticExamine.Text = "Examine..." Me.mnuClimaticExamine.Visible = False @@ -1357,7 +1356,7 @@ Partial Class frmMain ' Me.mnuClimaticProcess.Enabled = False Me.mnuClimaticProcess.Name = "mnuClimaticProcess" - Me.mnuClimaticProcess.Size = New System.Drawing.Size(267, 26) + Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticProcess.Tag = "Process" Me.mnuClimaticProcess.Text = "Process..." Me.mnuClimaticProcess.Visible = False @@ -1366,7 +1365,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(267, 26) + Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticEvaporation.Tag = "Evaporation" Me.mnuClimaticEvaporation.Text = "Evaporation" Me.mnuClimaticEvaporation.Visible = False @@ -1375,7 +1374,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationSite.Enabled = False Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite" - Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(153, 26) + Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationSite.Tag = "Site" Me.mnuClimaticEvaporationSite.Text = "Site..." ' @@ -1383,7 +1382,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationPenman.Enabled = False Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman" - Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(153, 26) + Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationPenman.Tag = "Penman" Me.mnuClimaticEvaporationPenman.Text = "Penman..." ' @@ -1391,7 +1390,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(267, 26) + Me.mnuClimaticCrop.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCrop.Tag = "Crop" Me.mnuClimaticCrop.Text = "Crop" Me.mnuClimaticCrop.Visible = False @@ -1400,21 +1399,21 @@ Partial Class frmMain ' Me.mnuClimaticCropCropCoefficients.Enabled = False Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients" - Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(261, 26) + 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(261, 26) + 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(267, 26) + Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticHeatSum.Tag = "Heat_Sum" Me.mnuClimaticHeatSum.Text = "Heat Sum..." Me.mnuClimaticHeatSum.Visible = False @@ -1423,7 +1422,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.mnuViewSwapDataAndScript}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(55, 24) + Me.mnuView.Size = New System.Drawing.Size(44, 22) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1431,7 +1430,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(270, 26) + Me.mnuViewDataView.Size = New System.Drawing.Size(213, 22) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1439,21 +1438,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(270, 26) + Me.mnuViewOutput.Size = New System.Drawing.Size(213, 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(270, 26) + Me.mnuViewLogScript.Size = New System.Drawing.Size(213, 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(270, 26) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1461,7 +1460,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(270, 26) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1469,19 +1468,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(270, 26) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(210, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(270, 26) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1489,7 +1488,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(270, 26) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1497,137 +1496,137 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(270, 26) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(210, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(270, 26) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(213, 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(270, 26) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuViewSwapDataAndScript ' Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript" - Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(270, 26) + Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22) Me.mnuViewSwapDataAndScript.Text = "Swap Data and Log/Script" ' '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(55, 24) + 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(259, 26) + 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(259, 26) + 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(259, 26) + 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(256, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(206, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(259, 26) + 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(259, 26) + 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(259, 26) + 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(259, 26) + 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(259, 26) + 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(259, 26) + 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(259, 26) + 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(259, 26) + 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(256, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(206, 6) ' 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(259, 26) + 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(264, 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.mnuExamineEditData, Me.mnuClimaticTidyandExamine, 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(77, 24) + Me.mnuClimatic.Size = New System.Drawing.Size(63, 22) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' @@ -1635,293 +1634,293 @@ 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.mnuClimaticFileExportToClimpact}) Me.mnuClimaticFile.Name = "mnuClimaticFile" - Me.mnuClimaticFile.Size = New System.Drawing.Size(267, 26) + 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(354, 26) + 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(354, 26) + 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(354, 26) + 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(354, 26) + 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(354, 26) + 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(351, 6) + Me.ToolStripSeparator20.Size = New System.Drawing.Size(279, 6) ' 'mnuClimateFileImportfromClimSoft ' Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft" - Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(354, 26) + 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(354, 26) + 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(354, 26) + 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(351, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" - Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(354, 26) + 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(354, 26) + 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(354, 26) + Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' 'mnuClimaticFileExportToClimpact ' Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact" - Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(354, 26) + Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(264, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) ' 'mnuExamineEditData ' Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticExamineEditDataVisualiseData, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator27, Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns}) Me.mnuExamineEditData.Name = "mnuExamineEditData" - Me.mnuExamineEditData.Size = New System.Drawing.Size(267, 26) + Me.mnuExamineEditData.Size = New System.Drawing.Size(212, 22) Me.mnuExamineEditData.Text = "Examine/Edit Data" ' 'mnuClimaticExamineEditDataVisualiseData ' Me.mnuClimaticExamineEditDataVisualiseData.Name = "mnuClimaticExamineEditDataVisualiseData" - Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(268, 26) + Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(215, 22) Me.mnuClimaticExamineEditDataVisualiseData.Text = "Visualise Data..." ' 'mnuExamineEditDataPivotTable ' Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" - Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(268, 26) + Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(265, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(212, 6) ' 'mnuExamineEditDataOneVariableSummarise ' Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" - Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(268, 26) + 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(268, 26) + 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(268, 26) + 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(265, 6) + Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6) ' 'mnuExamineEditDataSetupForDataEditing ' Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" - Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(268, 26) + 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(268, 26) + 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(268, 26) + Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." ' 'mnuClimaticTidyandExamine ' Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineTidyDailyData, Me.ToolStripSeparator71, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.mnuClimaticTidyandExamineNonNumericCases, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText, Me.ToolStripSeparator80, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyDataKey}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" - Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(267, 26) + Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticTidyandExamine.Text = "Tidy Data" ' 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(243, 26) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(240, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(243, 26) + 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(243, 26) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(243, 26) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(240, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(243, 26) + 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(243, 26) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(240, 6) + Me.ToolStripSeparator80.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(243, 26) + 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(243, 26) + 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(243, 26) + 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(243, 26) + 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(240, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(243, 26) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' '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(267, 26) + 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(203, 26) + 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(203, 26) + 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(203, 26) + 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(203, 26) + 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(203, 26) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -1929,169 +1928,169 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(203, 26) + 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(267, 26) + 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(267, 26) + 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(258, 26) + 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(258, 26) + 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(255, 6) + Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataFillMissingValues ' Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues" - Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(258, 26) + 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(258, 26) + 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(258, 26) + 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(258, 26) + 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(255, 6) + Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataHomogenization ' Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization" - Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(258, 26) + 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(258, 26) + 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.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(267, 26) + 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(232, 26) + 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(232, 26) + 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(229, 6) + Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimaticSummaries ' Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(232, 26) + 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(232, 26) + 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(232, 26) + 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(232, 26) + 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(232, 26) + 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(232, 26) + 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(229, 6) + Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimdex ' Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex" - Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(232, 26) + Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareClimdex.Text = "Climdex..." ' 'ToolStripSeparator51 ' Me.ToolStripSeparator51.Name = "ToolStripSeparator51" - Me.ToolStripSeparator51.Size = New System.Drawing.Size(229, 6) + Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareEvapotranspiration ' Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration" - Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(232, 26) + 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(232, 26) + Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSummary.Text = "Summary..." Me.mnuClimaticPrepareSummary.Visible = False ' @@ -2099,7 +2098,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareNewWorksheet.Enabled = False Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet" - Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(232, 26) + Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet" Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..." Me.mnuClimaticPrepareNewWorksheet.Visible = False @@ -2108,7 +2107,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareImportDailyData.Enabled = False Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData" - Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(232, 26) + 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 @@ -2117,7 +2116,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareMakeFactor.Enabled = False Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor" - Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(232, 26) + Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor" Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..." Me.mnuClimaticPrepareMakeFactor.Visible = False @@ -2126,7 +2125,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareShiftDailyData.Enabled = False Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData" - Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(232, 26) + 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 @@ -2135,7 +2134,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareUnstackDailyData.Enabled = False Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData" - Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(232, 26) + 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 @@ -2144,7 +2143,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareStackDailyData.Enabled = False Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData" - Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(232, 26) + 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 @@ -2152,363 +2151,363 @@ Partial Class frmMain 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" - Me.ToolStripSeparator30.Size = New System.Drawing.Size(264, 6) + Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" - Me.mnuClimaticDescribe.Size = New System.Drawing.Size(267, 26) + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDescribe.Text = "Describe" ' 'mnuClimaticDescribeSummarise23Variables ' Me.mnuClimaticDescribeSummarise23Variables.Name = "mnuClimaticDescribeSummarise23Variables" - Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(264, 26) + Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSummarise23Variables.Text = "Summarise 2/3 Variables..." ' 'mnuClimaticDescribeGraph23Variables ' Me.mnuClimaticDescribeGraph23Variables.Name = "mnuClimaticDescribeGraph23Variables" - Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(264, 26) + Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeGraph23Variables.Text = "Graph 2/3 Variables..." ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(261, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6) ' 'mnuClimaticDescribeSPISPEI ' Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI" - Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(264, 26) + Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSPISPEI.Text = "SPI/SPEI..." ' 'mnuClimaticDescribeClimograph ' Me.mnuClimaticDescribeClimograph.Enabled = False Me.mnuClimaticDescribeClimograph.Name = "mnuClimaticDescribeClimograph" - Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(264, 26) + Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeClimograph.Text = "Climograph..." ' 'mnuClimaticDescribeTrendGraph ' Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph" - Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(264, 26) + Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..." ' 'mnuClimaticDescribeSeasonalGraph ' Me.mnuClimaticDescribeSeasonalGraph.Enabled = False Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" - Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(264, 26) + Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." ' 'mnuClimaticDescribeIDF ' Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF" - Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(264, 26) + Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeIDF.Text = "IDF..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(261, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) ' 'mnuClimaticDescribeWindRose ' Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose" - Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(264, 26) + Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeWindPollutionRose ' Me.mnuClimaticDescribeWindPollutionRose.Name = "mnuClimaticDescribeWindPollutionRose" - Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(264, 26) + Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuClimaticDescribeOtherRosePlots ' Me.mnuClimaticDescribeOtherRosePlots.Name = "mnuClimaticDescribeOtherRosePlots" - Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(264, 26) + Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeOtherRosePlots.Text = "Other Rose Plots..." ' '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(267, 26) + 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(207, 26) + 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(207, 26) + 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(207, 26) + 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(207, 26) + 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(207, 26) + 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(207, 26) + 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.mnuClimaticPICSAGeneralGrap, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" - Me.mnuClimaticPICSA.Size = New System.Drawing.Size(267, 26) + 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(303, 26) + 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(303, 26) + Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' 'mnuClimaticPICSAGeneralGrap ' Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap" - Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(303, 26) + Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..." ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" - Me.ToolStripSeparator73.Size = New System.Drawing.Size(300, 6) + Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticPICSACumExeedenceGraph ' Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph" - Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(303, 26) + 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(303, 26) + 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(267, 26) + 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(288, 26) + 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(288, 26) + 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(267, 26) + 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(244, 26) + 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(244, 26) + 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(241, 6) + Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6) ' 'mnuClimaticCompareCorrelations ' Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations" - Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(244, 26) + 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(244, 26) + 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(244, 26) + 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(244, 26) + 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(244, 26) + 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(244, 26) + 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(244, 26) + 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(267, 26) + 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(258, 26) + 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(258, 26) + 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(267, 26) + 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(222, 26) + 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(222, 26) + 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(222, 26) + 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(264, 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(267, 26) + 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(303, 26) + 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(303, 26) + 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(300, 6) + Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticSCFSupportCorrelations ' Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations" - Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(303, 26) + 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(303, 26) + 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(303, 26) + 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(303, 26) + 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(267, 26) + Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods" Me.mnuClimaticClimateMethods.Text = "Climate Methods" Me.mnuClimaticClimateMethods.Visible = False @@ -2517,7 +2516,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(247, 26) + Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation" Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation" ' @@ -2525,7 +2524,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain" - Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(279, 26) + Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..." ' @@ -2533,7 +2532,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain" - Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(279, 26) + Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..." ' @@ -2541,7 +2540,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(279, 26) + Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month" Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..." ' @@ -2549,7 +2548,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular" - Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(279, 26) + Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular" Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..." ' @@ -2557,7 +2556,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(279, 26) + Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month" Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..." ' @@ -2565,7 +2564,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(279, 26) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily" Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..." ' @@ -2573,7 +2572,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(279, 26) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year" Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..." ' @@ -2581,7 +2580,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal" - Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(279, 26) + Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total" Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..." ' @@ -2589,7 +2588,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength" - Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(279, 26) + Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length" Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..." ' @@ -2597,7 +2596,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA" - Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(279, 26) + Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA" Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..." ' @@ -2605,7 +2604,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents" - Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(279, 26) + Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events" Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..." ' @@ -2613,7 +2612,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData" - Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(279, 26) + Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data" Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..." ' @@ -2621,7 +2620,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable" - Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(279, 26) + Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table" Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..." ' @@ -2629,7 +2628,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries" - Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(279, 26) + Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries" Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..." ' @@ -2637,7 +2636,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD" - Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(279, 26) + Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT" Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..." ' @@ -2645,7 +2644,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(247, 26) + Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics" Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics" ' @@ -2653,7 +2652,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot" - Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(270, 26) + Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot" Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..." ' @@ -2661,7 +2660,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot" - Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(270, 26) + Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot" Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..." ' @@ -2669,7 +2668,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues" - Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(270, 26) + Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values" Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..." ' @@ -2677,7 +2676,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram" - Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(270, 26) + Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram" Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..." ' @@ -2685,7 +2684,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance" - Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(270, 26) + Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence" Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..." ' @@ -2693,7 +2692,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot" - Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(270, 26) + Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot" Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..." ' @@ -2701,7 +2700,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory" - Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(270, 26) + Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory" Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..." ' @@ -2709,7 +2708,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall" - Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(270, 26) + Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall" Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..." ' @@ -2717,7 +2716,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount" - Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(270, 26) + Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count" Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..." ' @@ -2725,7 +2724,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries" - Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(270, 26) + Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries" Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..." ' @@ -2733,7 +2732,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose" - Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(270, 26) + Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose" Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..." ' @@ -2741,7 +2740,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines" - Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(270, 26) + Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22) Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines" Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..." ' @@ -2749,7 +2748,7 @@ Partial Class frmMain ' Me.mnuClmateMethodThreeSummaries.Enabled = False Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries" - Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(270, 26) + Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22) Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries" Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..." ' @@ -2757,7 +2756,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsModel.Enabled = False Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel" - Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(247, 26) + Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsModel.Tag = "Model" Me.mnuClimaticClimateMethodsModel.Text = "Model..." ' @@ -2765,7 +2764,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(247, 26) + Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional" Me.mnuClimaticClimateMethodsAdditional.Text = "Additional" ' @@ -2773,7 +2772,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT" - Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(259, 26) + Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT" Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..." ' @@ -2781,7 +2780,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics" - Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(259, 26) + Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics" Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..." ' @@ -2789,7 +2788,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(259, 26) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..." ' @@ -2797,7 +2796,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(259, 26) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..." ' @@ -2805,7 +2804,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance" - Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(259, 26) + Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance" Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..." ' @@ -2813,7 +2812,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsCreateClimateObject.Enabled = False Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject" - Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(247, 26) + Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22) Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' @@ -2821,7 +2820,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(289, 26) + Me.mnuFileSave.Size = New System.Drawing.Size(232, 22) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2829,32 +2828,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(289, 26) + 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(202, 26) + 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(202, 26) + 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(202, 26) + 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(202, 26) + Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsScriptAs.Text = "Save Script As..." ' 'mnuFilePrint @@ -2862,7 +2861,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(289, 26) + Me.mnuFilePrint.Size = New System.Drawing.Size(232, 22) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -2871,7 +2870,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(289, 26) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(232, 22) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -2879,20 +2878,20 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(286, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(229, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(289, 26) + 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.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.mnuEditUndo}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(49, 24) + Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' @@ -2900,11 +2899,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(180, 22) - - Me.mnuEditFind.Size = New System.Drawing.Size(241, 26) - + Me.mnuEditFind.Size = New System.Drawing.Size(192, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2912,11 +2907,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - - Me.mnuEditCopy.Size = New System.Drawing.Size(180, 22) - - Me.mnuEditCopy.Size = New System.Drawing.Size(241, 26) - + Me.mnuEditCopy.Size = New System.Drawing.Size(192, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2924,44 +2915,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - - Me.mnuEditPaste.Size = New System.Drawing.Size(180, 22) - - Me.mnuEditPaste.Size = New System.Drawing.Size(241, 26) - + Me.mnuEditPaste.Size = New System.Drawing.Size(192, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - - Me.mnuEditPasteNew.Size = New System.Drawing.Size(180, 22) - Me.mnuEditPasteNew.Text = "Paste New" - - Me.mnuEditPasteNew.Size = New System.Drawing.Size(241, 26) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(192, 22) Me.mnuEditPasteNew.Text = "Paste New Data Frame" - ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - - Me.mnuEditWordwrap.Size = New System.Drawing.Size(180, 22) - - Me.mnuEditWordwrap.Size = New System.Drawing.Size(241, 26) - + Me.mnuEditWordwrap.Size = New System.Drawing.Size(192, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - - Me.mnuEditSelectAll.Size = New System.Drawing.Size(180, 22) - - Me.mnuEditSelectAll.Size = New System.Drawing.Size(241, 26) - + Me.mnuEditSelectAll.Size = New System.Drawing.Size(192, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -2969,18 +2943,17 @@ Partial Class frmMain ' 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, 576) + Me.stsStrip.Location = New System.Drawing.Point(0, 460) Me.stsStrip.Name = "stsStrip" - Me.stsStrip.Padding = New System.Windows.Forms.Padding(1, 0, 18, 0) Me.stsStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional - Me.stsStrip.Size = New System.Drawing.Size(1042, 26) + 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(151, 20) + Me.tstatus.Size = New System.Drawing.Size(119, 17) Me.tstatus.Text = "No worksheet loaded" ' 'Tool_strip @@ -2989,12 +2962,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, 26) + 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, 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(1042, 37) + Me.Tool_strip.Size = New System.Drawing.Size(834, 37) Me.Tool_strip.TabIndex = 7 Me.Tool_strip.Text = "Tool" ' @@ -3036,27 +3009,27 @@ Partial Class frmMain ' Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveData.Name = "mnuSaveData" - Me.mnuSaveData.Size = New System.Drawing.Size(173, 26) + 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(173, 26) + 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(173, 26) + 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(173, 26) + Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22) Me.mnuSaveLog.Text = "Save Log" ' 'toolStripSeparator @@ -3107,21 +3080,21 @@ Partial Class frmMain ' Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuOutputWindow.Name = "mnuOutputWindow" - Me.mnuOutputWindow.Size = New System.Drawing.Size(220, 26) + 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(220, 26) + 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(220, 26) + Me.mnuIncludeComments.Size = New System.Drawing.Size(178, 22) Me.mnuIncludeComments.Text = "Show Comments" ' 'ToolStripSeparator74 @@ -3144,19 +3117,19 @@ Partial Class frmMain 'mnuNormalViewer ' Me.mnuNormalViewer.Name = "mnuNormalViewer" - Me.mnuNormalViewer.Size = New System.Drawing.Size(159, 26) + 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(159, 26) + 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(159, 26) + Me.mnuRViewer.Size = New System.Drawing.Size(128, 22) Me.mnuRViewer.Text = "R Viewer..." ' 'ToolStripSeparator75 @@ -3180,7 +3153,7 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(161, 26) + Me.mnuLogScript.Size = New System.Drawing.Size(129, 22) Me.mnuLogScript.Text = "Log/Script" ' 'mnuMetadata @@ -3199,14 +3172,14 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(254, 26) + 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(254, 26) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(202, 22) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' 'ToolStripSeparator76 @@ -3269,10 +3242,10 @@ 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(5, 1, 0, 1) + 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(1042, 26) + Me.mnuBar.Size = New System.Drawing.Size(834, 24) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' @@ -3280,7 +3253,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(46, 24) + Me.mnuFile.Size = New System.Drawing.Size(37, 22) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3288,7 +3261,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(289, 26) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(232, 22) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3296,33 +3269,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(289, 26) + 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(289, 26) + 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(286, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(229, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(289, 26) + 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(289, 26) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3330,7 +3303,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(289, 26) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3338,82 +3311,82 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(289, 26) + 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(289, 26) + 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(289, 26) + 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(289, 26) + 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(286, 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(289, 26) + 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(254, 26) + 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(254, 26) + 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(254, 26) + 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(254, 26) + 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(289, 26) + 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(286, 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(74, 24) + Me.mnuPrepare.Size = New System.Drawing.Size(59, 22) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -3421,105 +3394,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(226, 26) + 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(247, 26) + 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(247, 26) + 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(247, 26) + 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(247, 26) + 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(244, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameSort ' Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort" - Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(247, 26) + 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(247, 26) + 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(247, 26) + 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(247, 26) + 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(247, 26) + 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(244, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameReorderColumns ' Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns" - Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(247, 26) + 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(247, 26) + 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(247, 26) + 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(247, 26) + Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..." Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..." ' @@ -3527,7 +3500,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameProtectColumn.Enabled = False Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn" - Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(247, 26) + Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameProtectColumn.Tag = "..." Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False @@ -3535,7 +3508,7 @@ Partial Class frmMain 'mnuPrepareDataFrameHideColumns ' Me.mnuPrepareDataFrameHideColumns.Name = "mnuPrepareDataFrameHideColumns" - Me.mnuPrepareDataFrameHideColumns.Size = New System.Drawing.Size(247, 26) + Me.mnuPrepareDataFrameHideColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameHideColumns.Tag = "Hide_Columns..." Me.mnuPrepareDataFrameHideColumns.Text = "Hide/Show Columns..." ' @@ -3543,7 +3516,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns" - Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(247, 26) + Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..." Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..." Me.mnuPrepareDataFrameFreezeColumns.Visible = False @@ -3551,7 +3524,7 @@ Partial Class frmMain 'mnuPrepareDataframeColourByProperty ' Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty" - Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(247, 26) + Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..." ' 'mnuPrepareCheckData @@ -3559,107 +3532,107 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, 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(226, 26) + 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(307, 26) + Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..." ' 'mnuPrepareCheckDataPivotTable ' Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable" - Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(307, 26) + Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator50 ' Me.ToolStripSeparator50.Name = "ToolStripSeparator50" - Me.ToolStripSeparator50.Size = New System.Drawing.Size(304, 6) + Me.ToolStripSeparator50.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataDuplicates ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" - Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(307, 26) + 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(307, 26) + 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(307, 26) + 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(304, 6) + Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataBoxplot ' Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot" - Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(307, 26) + 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(307, 26) + 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(307, 26) + 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(307, 26) + 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(307, 26) + 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(304, 6) + Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataExportOpenRefine ' Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine" - Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(307, 26) + 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(307, 26) + 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(304, 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(307, 26) + Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22) Me.mnuPreparePrepareToShareJitter.Text = "Jitter..." Me.mnuPreparePrepareToShareJitter.Visible = False ' @@ -3667,25 +3640,25 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage" - Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(307, 26) + 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(307, 26) + 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(223, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(183, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(226, 26) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Column: Calculator..." ' @@ -3693,64 +3666,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(226, 26) + 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(250, 26) + 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(250, 26) + 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(247, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(250, 26) + 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(250, 26) + 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(250, 26) + 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(247, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(250, 26) + 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(250, 26) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' @@ -3758,105 +3731,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(226, 26) + 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(222, 26) + 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(222, 26) + 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(222, 26) + 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(219, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorRecodeFactor ' Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor" - Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(222, 26) + 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(222, 26) + 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(222, 26) + 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(219, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorLevelsLabels ' Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels" - Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(222, 26) + 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(222, 26) + 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(222, 26) + 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(222, 26) + 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(222, 26) + 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(219, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorFactorDataFrame ' Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame" - Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(222, 26) + Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame" Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..." ' @@ -3864,42 +3837,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(226, 26) + 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(188, 26) + 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(188, 26) + 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(188, 26) + 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(188, 26) + 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(188, 26) + Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextCombine.Tag = "Combine..." Me.mnuPrepareColumnTextCombine.Text = "Combine..." ' @@ -3907,7 +3880,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnTextMatch.Enabled = False Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch" - Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(188, 26) + Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextMatch.Tag = "Match..." Me.mnuPrepareColumnTextMatch.Text = "Match..." Me.mnuPrepareColumnTextMatch.Visible = False @@ -3915,7 +3888,7 @@ Partial Class frmMain 'mnuPrepareColumnTextDistance ' Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance" - Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(188, 26) + Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextDistance.Tag = "Distance..." Me.mnuPrepareColumnTextDistance.Text = "Distance..." ' @@ -3923,38 +3896,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(226, 26) + 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(203, 26) + 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(203, 26) + 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(203, 26) + 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(203, 26) + 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(203, 26) + Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..." Me.mnuPrepareColumnDateMakeTime.Visible = False ' @@ -3962,7 +3935,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDateUseTime.Enabled = False Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" - Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(203, 26) + Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateUseTime.Text = "Use Time..." Me.mnuPrepareColumnDateUseTime.Visible = False ' @@ -3970,169 +3943,169 @@ 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(226, 26) + 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(213, 26) + 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(210, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(213, 26) + 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(223, 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(226, 26) + 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(243, 26) + 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(243, 26) + 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(240, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareColumnReshapeStack ' Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack" - Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(243, 26) + 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(243, 26) + 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(243, 26) + 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(240, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareAppendDataFrame ' Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame" - Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(243, 26) + 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(243, 26) + 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(243, 26) + 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(243, 26) + 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(243, 26) + Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..." ' 'mnuPrepareDataReshapeRandomSplit ' Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" - Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(243, 26) + 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(223, 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(226, 26) + 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(256, 26) + 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(256, 26) + 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(256, 26) + 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(256, 26) + 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(256, 26) + 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(226, 26) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4140,7 +4113,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata" - Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(262, 26) + 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 @@ -4148,46 +4121,46 @@ Partial Class frmMain 'mnuPrepareDataObjectRenameDataFrame ' Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame" - Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(262, 26) + 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(262, 26) + 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(262, 26) + 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(262, 26) + 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(259, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6) ' 'mnuPrepareDataObjectHideDataframes ' Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes" - Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(262, 26) + 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(262, 26) + Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..." Me.mnuPrepareDataObjectMetadata.Text = "Metadata..." ' @@ -4195,7 +4168,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectRenameMetadata.Enabled = False Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata" - Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(262, 26) + Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Visible = False @@ -4204,7 +4177,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectReorderMetadata.Enabled = False Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata" - Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(262, 26) + Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Visible = False @@ -4213,7 +4186,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata" - Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(262, 26) + Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Visible = False @@ -4222,35 +4195,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(226, 26) + 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(155, 26) + 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(155, 26) + 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(155, 26) + 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(155, 26) + Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsDelete.Tag = "Delete..." Me.mnuPrepareRObjectsDelete.Text = "Delete..." ' @@ -4258,78 +4231,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(91, 24) + 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(228, 26) + 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(236, 26) + 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(236, 26) + 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(236, 26) + 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(233, 6) + Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularDensityPlot ' Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot" - Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(236, 26) + 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(233, 6) + Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularWindRose ' Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose" - Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(236, 26) + 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(236, 26) + 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(236, 26) + 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(233, 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(236, 26) + Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularCirclize.Text = "Circlize..." Me.mnuStructuredCircularCirclize.Visible = False ' @@ -4337,126 +4310,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(228, 26) + 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(145, 26) + 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(228, 26) + 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(145, 26) + 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(228, 26) + 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(150, 26) + 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(147, 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(150, 26) + 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(186, 26) + 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(186, 26) + 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(147, 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(150, 26) + 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(186, 26) + 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(186, 26) + 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(147, 6) + Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6) ' 'ToolStripSeparator63 ' Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - Me.ToolStripSeparator63.Size = New System.Drawing.Size(225, 6) + Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6) ' 'mnuStructuredClimatic ' Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - Me.mnuStructuredClimatic.Size = New System.Drawing.Size(228, 26) + 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(228, 26) + 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(228, 26) + 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(228, 26) + Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredSurvey.Text = "Survey" Me.mnuStructuredSurvey.Visible = False ' @@ -4464,424 +4437,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(107, 24) + 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(271, 26) + 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(271, 26) + 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(271, 26) + 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(445, 26) + 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(442, 6) + Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareDefineContractValueCategories ' Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories" - Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(445, 26) + 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(445, 26) + 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(445, 26) + 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(445, 26) + 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(442, 6) + Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareSummariseRedFlagsByCountryorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(445, 26) + 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(445, 26) + 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(445, 26) + 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(271, 26) + 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(263, 26) + 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(263, 26) + 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(260, 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(263, 26) + 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(401, 26) + 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(401, 26) + 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(398, 6) + Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6) ' 'mnuProcurementDescribeCategoricalBarCharts ' Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts" - Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(401, 26) + 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(401, 26) + 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(401, 26) + 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(401, 26) + 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(263, 26) + 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(322, 26) + 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(322, 26) + 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(319, 6) + Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6) ' 'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers ' Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers" - Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(322, 26) + 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(271, 26) + 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(232, 26) + 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(271, 26) + 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(289, 26) + 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(289, 26) + 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(268, 6) + Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6) ' 'mnuProcurementDefineRedFlags ' Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags" - Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(271, 26) + 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(271, 26) + 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(342, 26) + 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(342, 26) + 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(104, 24) + 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(171, 26) + 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(268, 26) + 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(268, 26) + 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(265, 6) + Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6) ' 'mnuOptionsByContextCheckDataOneVariableSummarise ' Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise" - Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(268, 26) + 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(268, 26) + 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(268, 26) + 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(171, 26) + 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(181, 26) + 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(181, 26) + 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(171, 26) + 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(352, 26) + 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(349, 6) + Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6) ' 'mnuOptionsByContextMergeAdditionalData ' Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData" - Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(352, 26) + 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(352, 26) + 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(352, 26) + 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(171, 26) + 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(277, 26) + 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(277, 26) + 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(277, 26) + 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(171, 26) + 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(219, 26) + 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(219, 26) + 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(171, 26) + 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(217, 26) + 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.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsRestoreBackup, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" - Me.mnuTools.Size = New System.Drawing.Size(58, 24) + 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(244, 26) + Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRunRCode.Tag = "Run_R_Code..." Me.mnuToolsRunRCode.Text = "Run R Code..." ' @@ -4889,55 +4862,54 @@ Partial Class frmMain ' Me.mnuToolsRestartR.Enabled = False Me.mnuToolsRestartR.Name = "mnuToolsRestartR" - Me.mnuToolsRestartR.Size = New System.Drawing.Size(244, 26) + Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRestartR.Tag = "Restart_R" Me.mnuToolsRestartR.Text = "Restart R" ' 'mnuToolsCheckForUpdates ' Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates" - Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(244, 26) + 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(244, 26) + 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(241, 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(244, 26) + Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' - 'mnuToolsLoadOptions + 'mnuToolsRestoreBackup ' - Me.mnuToolsLoadOptions.Enabled = False - Me.mnuToolsLoadOptions.Name = "mnuToolsLoadOptions" - Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(244, 26) - Me.mnuToolsLoadOptions.Tag = "Load_Options..." - Me.mnuToolsLoadOptions.Text = "Load Options..." + Me.mnuToolsRestoreBackup.Name = "mnuToolsRestoreBackup" + Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRestoreBackup.Tag = "Load_Options..." + Me.mnuToolsRestoreBackup.Text = "Restore Backup..." ' 'mnuToolsInstallRPackage ' Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage" - Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(244, 26) + 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(244, 26) + Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' @@ -4951,8 +4923,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, 63) - Me.splOverall.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splOverall.Location = New System.Drawing.Point(0, 61) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -4965,9 +4936,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(1042, 513) - Me.splOverall.SplitterDistance = 210 - Me.splOverall.SplitterWidth = 6 + Me.splOverall.Size = New System.Drawing.Size(834, 399) + Me.splOverall.SplitterDistance = 163 + Me.splOverall.SplitterWidth = 5 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -4975,7 +4946,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, 4, 4, 4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -4987,9 +4957,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(1042, 210) - Me.splExtraWindows.SplitterDistance = 317 - Me.splExtraWindows.SplitterWidth = 6 + Me.splExtraWindows.Size = New System.Drawing.Size(834, 163) + Me.splExtraWindows.SplitterDistance = 253 + Me.splExtraWindows.SplitterWidth = 5 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -4997,7 +4967,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, 4, 4, 4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -5008,9 +4977,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(317, 210) - Me.splMetadata.SplitterDistance = 87 - Me.splMetadata.SplitterWidth = 6 + Me.splMetadata.Size = New System.Drawing.Size(253, 163) + Me.splMetadata.SplitterDistance = 69 + Me.splMetadata.SplitterWidth = 5 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -5020,9 +4989,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(5, 6, 5, 6) + Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(87, 210) + Me.ucrColumnMeta.Size = New System.Drawing.Size(69, 163) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5031,9 +5000,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(5, 6, 5, 6) + Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(224, 210) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 163) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5042,9 +5011,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(5, 6, 5, 6) + Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(719, 210) + Me.ucrScriptWindow.Size = New System.Drawing.Size(576, 163) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5054,7 +5023,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, 4, 4, 4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5066,9 +5034,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(1042, 297) - Me.splDataOutput.SplitterDistance = 479 - Me.splDataOutput.SplitterWidth = 6 + Me.splDataOutput.Size = New System.Drawing.Size(834, 231) + Me.splDataOutput.SplitterDistance = 383 + Me.splDataOutput.SplitterWidth = 5 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5078,9 +5046,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(5, 6, 5, 6) + Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(479, 297) + Me.ucrDataViewer.Size = New System.Drawing.Size(383, 231) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5090,9 +5058,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(5, 6, 5, 6) + Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(557, 297) + Me.ucrOutput.Size = New System.Drawing.Size(446, 231) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5130,17 +5098,11 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'mnuEditUndo - ' - Me.mnuEditUndo.Name = "mnuEditUndo" - Me.mnuEditUndo.Size = New System.Drawing.Size(180, 22) - Me.mnuEditUndo.Text = "Undo" - ' 'frmMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(1042, 602) + Me.ClientSize = New System.Drawing.Size(834, 482) Me.Controls.Add(Me.splOverall) Me.Controls.Add(Me.stsStrip) Me.Controls.Add(Me.Tool_strip) @@ -5148,7 +5110,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, 4, 4, 4) Me.Name = "frmMain" Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized @@ -5343,7 +5304,7 @@ Partial Class frmMain Friend WithEvents mnuToolsClearOutputWindow As ToolStripMenuItem Friend WithEvents ToolStripSeparator5 As ToolStripSeparator Friend WithEvents mnuToolsSaveCurrentOptions As ToolStripMenuItem - Friend WithEvents mnuToolsLoadOptions As ToolStripMenuItem + Friend WithEvents mnuToolsRestoreBackup As ToolStripMenuItem Friend WithEvents ToolStripSeparator22 As ToolStripSeparator Friend WithEvents mnuModelOtherOneVariableGoodnessofFit As ToolStripMenuItem Friend WithEvents mnuHelpLicence As ToolStripMenuItem @@ -5835,8 +5796,6 @@ Partial Class frmMain Friend WithEvents mnuClimaticExamineEditDataVisualiseData As ToolStripMenuItem Friend WithEvents ToolStripSeparator27 As ToolStripSeparator - Friend WithEvents mnuEditUndo As ToolStripMenuItem - Friend WithEvents mnuClimaticPICSAGeneralGrap As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 8d8e283f660..c73bcdce42b 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S @@ -162,7 +162,7 @@ iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAjpSURBVHhe7V3LaxVXHE4EwQq+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 06979ef14af..d14d30b3eee 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2552,7 +2552,7 @@ Public Class frmMain dlgWordwrap.ShowDialog() End Sub - Private Sub mnuEditUndo_Click(sender As Object, e As EventArgs) Handles mnuEditUndo.Click + Private Sub mnuToolsRestoreBackup_Click(sender As Object, e As EventArgs) Handles mnuToolsRestoreBackup.Click dlgRestoreBackup.ShowDialog() End Sub From 488be3a1c0599cd161f1afc974225abf7688c533 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 26 Feb 2024 12:38:53 +0100 Subject: [PATCH 05/99] Removing Unused code --- instat/frmMain.Designer.vb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 5e6d0d599a8..7e5538cf4ab 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -4900,13 +4900,6 @@ Partial Class frmMain Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRestoreBackup.Tag = "Load_Options..." Me.mnuToolsRestoreBackup.Text = "Restore Backup..." - - Me.mnuToolsLoadOptions.Enabled = False - Me.mnuToolsLoadOptions.Name = "mnuToolsLoadOptions" - Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(198, 22) - Me.mnuToolsLoadOptions.Tag = "Load_Options..." - Me.mnuToolsLoadOptions.Text = "Load Options..." - ' 'mnuToolsInstallRPackage ' From 320346c0855a6624190fbb83eeca8e3a8f84f81c Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:47:19 +0100 Subject: [PATCH 06/99] added a function which works similar to the one used for autorecovery and commented out the function that always delete the backup log file when restarting R-instat --- instat/frmMain.vb | 125 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 118 insertions(+), 7 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 43d21ab28a5..f8af08e735f 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -478,14 +478,129 @@ Public Class frmMain '--------------------------------------- 'delete the recovery files - If strAutoSavedLogFilePaths.Length > 0 Then + 'This was done to prevent the previous autolog file from being overwritten by the new autolog file- Derrick + 'If strAutoSavedLogFilePaths.Length > 0 Then + ' Try + ' File.Delete(strAutoSavedLogFilePaths(0)) + ' Catch ex As Exception + ' MsgBox("Could not delete backup log file" & Environment.NewLine, "Error deleting file") + ' End Try + 'End If + + If strAutoSavedInternalLogFilePaths.Length > 0 Then Try - File.Delete(strAutoSavedLogFilePaths(0)) + For Each strFilePath As String In strAutoSavedInternalLogFilePaths + 'debug log is created when checking r version. + 'so always delete the previous session debug file only + If strFilePath <> clsRLink.strAutoSaveDebugLogFilePath Then + File.Delete(strFilePath) + End If + Next Catch ex As Exception - MsgBox("Could not delete backup log file" & Environment.NewLine, "Error deleting file") + MsgBox("Could not delete backup internal log file." & Environment.NewLine & ex.Message, "Error deleting file") End Try End If + If strAutoSavedDataFilePaths.Length > 0 Then + Try + File.Delete(strAutoSavedDataFilePaths(0)) + Catch ex As Exception + MsgBox("Could not delete back data file." & Environment.NewLine & ex.Message, "Error deleting file") + End Try + End If + '--------------------------------------- + + End Sub + Private Sub mnuToolsRestoreBackup_Click(sender As Object, e As EventArgs) Handles mnuToolsRestoreBackup.Click + Dim strRScripts As String = "" + Dim strDataFilePath As String = "" + dlgRestoreBackup.ShowDialog() + PromptRestoreData(strRScripts, strDataFilePath) + + 'if no script recovered then use the default R set up script + If String.IsNullOrEmpty(strRScripts) Then + strRScripts = "# Initialising R (e.g Loading R packages)" & Environment.NewLine & clsRLink.GetRSetupScript() + End If + + 'if data file recovered then add it as part of the initial R set up script + If Not String.IsNullOrEmpty(strDataFilePath) Then + strRScripts = strRScripts & Environment.NewLine & + "# Importing auto recovered data" & Environment.NewLine & + clsRLink.GetImportRDSRScript(strDataFilePath, False) + End If + + + 'execute the R-Instat set up R scripts + For Each strLine As String In strRScripts.Split({Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) + clsRLink.RunScript(strScript:=strLine.Trim(), bSeparateThread:=True, bSilent:=True) + Next + + 'as of 16/05/2023. clsDataBook depends on clsRLink.bInstatObjectExists property + 'to check if R object has been set up at R level. + + 'grids are only updated when clsRLink.bInstatObjectExists = True + If clsRLink.RunInternalScriptGetValue(strScript:="exists('" & clsRLink.strInstatDataObject & "')", + bSeparateThread:=True, bSilent:=True).AsCharacter(0) = "TRUE" Then + 'set R-Instat R object as exists if it has been set up in R level and refresh the grids + 'refreshing grids internally updates the .Net databook object as well. + clsRLink.bInstatObjectExists = True + UpdateAllGrids() + End If + End Sub + + Private Sub PromptRestoreData(ByRef strScript As String, ByRef strDataFilePath As String) + + 'if there is another R-Instat process in the machine then no need to check for autorecovery files + If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then + Return + End If + 'copy of the original code used for PromptAndSetAutoRecoveredPrevSessionData + Dim strAutoSavedLogFilePaths() As String = {} + Dim strAutoSavedInternalLogFilePaths() As String = {} + Dim strAutoSavedDataFilePaths() As String = {} + + If (Directory.Exists(strAutoSaveLogFolderPath)) Then + strAutoSavedLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveLogFolderPath).ToArray + End If + If Directory.Exists(strAutoSaveDataFolderPath) Then + strAutoSavedDataFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveDataFolderPath).ToArray + End If + If (Directory.Exists(strAutoSaveInternalLogFolderPath)) Then + strAutoSavedInternalLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveInternalLogFolderPath).ToArray + End If + + '--------------------------------------- + 'prompt user for recovery selection + If (strAutoSavedLogFilePaths.Length > 0 OrElse + strAutoSavedDataFilePaths.Length > 0) Then + + + dlgRestoreBackup.strAutoSavedLogFilePaths = strAutoSavedLogFilePaths + dlgRestoreBackup.strAutoSavedDataFilePaths = strAutoSavedDataFilePaths + dlgRestoreBackup.strAutoSavedInternalLogFilePaths = strAutoSavedInternalLogFilePaths + + + 'todo. the dialog design is meant to only return just one option; script, data file path or new session. + 'refactor the dialog to enforce the design + + 'get the R script from read file if selected by the user + strScript = dlgRestoreBackup.GetScript() + 'get the data file path if selected by the user + strDataFilePath = dlgRestoreBackup.GetDataFilePath() + End If + '--------------------------------------- + + '--------------------------------------- + 'delete the recovery files + 'This was done to prevent the previous autolog file from being overwritten by the new autolog file- Derrick + 'If strAutoSavedLogFilePaths.Length > 0 Then + ' Try + ' File.Delete(strAutoSavedLogFilePaths(0)) + ' Catch ex As Exception + ' MsgBox("Could not delete backup log file" & Environment.NewLine, "Error deleting file") + ' End Try + 'End If + If strAutoSavedInternalLogFilePaths.Length > 0 Then Try For Each strFilePath As String In strAutoSavedInternalLogFilePaths @@ -2552,10 +2667,6 @@ Public Class frmMain dlgWordwrap.ShowDialog() End Sub - Private Sub mnuToolsRestoreBackup_Click(sender As Object, e As EventArgs) Handles mnuToolsRestoreBackup.Click - dlgRestoreBackup.ShowDialog() - End Sub - Private Sub mnuPrepareColumnTextSearch_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnTextSearch.Click dlgSearch.ShowDialog() End Sub From 73d313ff8669bfba0c4db9857e5a0f5d05353d3b Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:50:54 +0100 Subject: [PATCH 07/99] Removing commented out code --- instat/frmMain.vb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index f8af08e735f..3b11e15e00c 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -591,15 +591,6 @@ Public Class frmMain '--------------------------------------- '--------------------------------------- - 'delete the recovery files - 'This was done to prevent the previous autolog file from being overwritten by the new autolog file- Derrick - 'If strAutoSavedLogFilePaths.Length > 0 Then - ' Try - ' File.Delete(strAutoSavedLogFilePaths(0)) - ' Catch ex As Exception - ' MsgBox("Could not delete backup log file" & Environment.NewLine, "Error deleting file") - ' End Try - 'End If If strAutoSavedInternalLogFilePaths.Length > 0 Then Try From f164b40d940766e37c80703f6d942ff7bf8a4a80 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:06:11 +0100 Subject: [PATCH 08/99] removing warning message --- instat/dlgRestoreBackup.vb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 47cbadf36b4..a005ecda9d3 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -162,9 +162,8 @@ Public Class dlgRestoreBackup End Sub Private Sub cmdRunLog_Click(sender As Object, e As EventArgs) Handles cmdRunLog.Click - If MsgBox("Are you sure you are finished?" & Environment.NewLine & "You cannot return to this dialog after leaving and any unsaved recovered files will be lost." & Environment.NewLine & "Warning: running the log file can fail if files have been moved.", MessageBoxButtons.YesNo, "Are you sure you are finished?") = MsgBoxResult.Yes Then - SaveFiles() - If File.Exists(strAutoSavedLogFilePaths(0)) Then + SaveFiles() + If File.Exists(strAutoSavedLogFilePaths(0)) Then Try strScript = File.ReadAllText(strAutoSavedLogFilePaths(0)) Catch ex As Exception @@ -174,7 +173,7 @@ Public Class dlgRestoreBackup End If bUserClose = False Close() - End If + End Sub Private Sub cmdLoadData_Click(sender As Object, e As EventArgs) Handles cmdLoadData.Click From f53c189f163a27e35504ccaf574667175c4b5ce0 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:10:44 +0100 Subject: [PATCH 09/99] Added the HelpIDno --- instat/dlgRestoreBackup.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index a005ecda9d3..e1376ff702c 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -31,6 +31,7 @@ Public Class dlgRestoreBackup Private Sub dlgRestoreBackup_Load(sender As Object, e As EventArgs) Handles MyBase.Load + ucrBase.iHelpTopicID = 411 'temporary - not yet implemented ucrChkSendInternalLog.Visible = False From 52eacf92d1c448d81f048bcc6e0d73f8b672e848 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 14 Mar 2024 10:44:33 +0100 Subject: [PATCH 10/99] Code Changes --- instat/dlgRestoreBackup.vb | 22 ++++++++-------------- instat/frmMain.vb | 14 +++++++------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index e1376ff702c..6a5a550a007 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -178,27 +178,21 @@ Public Class dlgRestoreBackup End Sub Private Sub cmdLoadData_Click(sender As Object, e As EventArgs) Handles cmdLoadData.Click - If MsgBox("Are you sure you are finished?" & Environment.NewLine & "You cannot return to this dialog after leaving and any unsaved recovered files will be lost.", MessageBoxButtons.YesNo, "Are you finished?") = MsgBoxResult.Yes Then - SaveFiles() - strLoadDateFilePath = strAutoSavedDataFilePaths(0) - bUserClose = False - Close() - End If + SaveFiles() + strLoadDateFilePath = strAutoSavedDataFilePaths(0) + bUserClose = False + Close() End Sub Private Sub cmdCloseSession_Click(sender As Object, e As EventArgs) Handles cmdCloseSession.Click - If MsgBox("Are you sure you are finished?" & Environment.NewLine & "You cannot return to this dialog after leaving and any unsaved recovered files will be lost.", MessageBoxButtons.YesNo, "Are you finished?") = MsgBoxResult.Yes Then - SaveFiles() - bUserClose = False - Close() - End If + SaveFiles() + bUserClose = False + Close() End Sub Private Sub dlgRestoreBackup_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing If bUserClose Then - If MsgBox("Are you sure you are finished?" & Environment.NewLine & "You cannot return to this dialog after leaving and any unsaved recovered files will be lost.", MessageBoxButtons.YesNo, "Are you finished?") = MsgBoxResult.No Then - e.Cancel = True - End If + e.Cancel = True End If DeleteTempFiles() End Sub diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 3b11e15e00c..f91e42778df 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -479,13 +479,13 @@ Public Class frmMain '--------------------------------------- 'delete the recovery files 'This was done to prevent the previous autolog file from being overwritten by the new autolog file- Derrick - 'If strAutoSavedLogFilePaths.Length > 0 Then - ' Try - ' File.Delete(strAutoSavedLogFilePaths(0)) - ' Catch ex As Exception - ' MsgBox("Could not delete backup log file" & Environment.NewLine, "Error deleting file") - ' End Try - 'End If + If strAutoSavedLogFilePaths.Length > 1 Then + Try + File.Delete(strAutoSavedLogFilePaths(1)) + Catch ex As Exception + MsgBox("Could not delete backup log file" & Environment.NewLine, "Error deleting file") + End Try + End If If strAutoSavedInternalLogFilePaths.Length > 0 Then Try From 2e80962772c1d324e32869a4876869c26e7caa40 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Tue, 2 Apr 2024 19:04:10 +0200 Subject: [PATCH 11/99] Enabling Save Backup for data files --- instat/frmMain.vb | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 1c3e527c0ad..12de135e7c7 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -501,9 +501,9 @@ Public Class frmMain End Try End If - If strAutoSavedDataFilePaths.Length > 0 Then + If strAutoSavedDataFilePaths.Length > 1 Then Try - File.Delete(strAutoSavedDataFilePaths(0)) + File.Delete(strAutoSavedDataFilePaths(1)) Catch ex As Exception MsgBox("Could not delete back data file." & Environment.NewLine & ex.Message, "Error deleting file") End Try @@ -554,7 +554,7 @@ Public Class frmMain If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then Return End If - 'copy of the original code used for PromptAndSetAutoRecoveredPrevSessionData + 'this is the copy of the original code used for PromptAndSetAutoRecoveredPrevSessionData function Dim strAutoSavedLogFilePaths() As String = {} Dim strAutoSavedInternalLogFilePaths() As String = {} Dim strAutoSavedDataFilePaths() As String = {} @@ -606,15 +606,6 @@ Public Class frmMain End Try End If - If strAutoSavedDataFilePaths.Length > 0 Then - Try - File.Delete(strAutoSavedDataFilePaths(0)) - Catch ex As Exception - MsgBox("Could not delete back data file." & Environment.NewLine & ex.Message, "Error deleting file") - End Try - End If - '--------------------------------------- - End Sub ''' From 2095c767d4bcd1a1d64181031085d37f1a983ea6 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 8 Apr 2024 12:17:56 +0200 Subject: [PATCH 12/99] Code Changes --- instat/dlgRestoreBackup.vb | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 6a5a550a007..26cc3ec81be 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -165,15 +165,15 @@ Public Class dlgRestoreBackup Private Sub cmdRunLog_Click(sender As Object, e As EventArgs) Handles cmdRunLog.Click SaveFiles() If File.Exists(strAutoSavedLogFilePaths(0)) Then - Try - strScript = File.ReadAllText(strAutoSavedLogFilePaths(0)) - Catch ex As Exception - MsgBox("Could not read log file." & Environment.NewLine & ex.Message, "Cannot read file") - strScript = "" - End Try - End If - bUserClose = False - Close() + Try + strScript = File.ReadAllText(strAutoSavedLogFilePaths(0)) + Catch ex As Exception + MsgBox("Could not read log file." & Environment.NewLine & ex.Message, "Cannot read file") + strScript = "" + End Try + End If + bUserClose = False + Close() End Sub @@ -190,23 +190,8 @@ Public Class dlgRestoreBackup Close() End Sub - Private Sub dlgRestoreBackup_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing - If bUserClose Then - e.Cancel = True - End If - DeleteTempFiles() + Private Sub cmdCancel_Click(sender As Object, e As EventArgs) Handles ucrBase.ClickClose + Close() End Sub - Private Sub DeleteTempFiles() - ' No longer needed as now done after closing - 'If strAutoSavedInternalLogFilePaths IsNot Nothing AndAlso strAutoSavedInternalLogFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedInternalLogFilePaths(0)) Then - ' File.Delete(strAutoSavedInternalLogFilePaths(0)) - 'End If - 'If strAutoSavedLogFilePaths IsNot Nothing AndAlso strAutoSavedLogFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedLogFilePaths(0)) Then - ' File.Delete(strAutoSavedLogFilePaths(0)) - 'End If - 'If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedDataFilePaths(0)) Then - ' File.Delete(strAutoSavedDataFilePaths(0)) - 'End If - End Sub End Class \ No newline at end of file From 96f5ce3307d75fb560165eb348f177b243141152 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 8 Apr 2024 13:48:21 +0300 Subject: [PATCH 13/99] Made code changes after review --- instat/frmMain.vb | 108 ++++------------------------------------------ 1 file changed, 8 insertions(+), 100 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 12de135e7c7..f939edf2c68 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -188,7 +188,7 @@ Public Class frmMain '--------------------------------------- 'execute R-Instat R set up scripts to set up R data book - ExecuteSetupRScriptsAndSetupRLinkAndDatabook() + ExecuteSetupRScriptsAndSetupRLinkAndDatabook(bOpenFromMenu:=False) 'execute R global options used by R-Instat R data book clsInstatOptions.ExecuteRGlobalOptions() '--------------------------------------- @@ -389,12 +389,12 @@ Public Class frmMain End If End Function - Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook() + Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook(Optional bOpenFromMenu = True) Dim strRScripts As String = "" Dim strDataFilePath As String = "" 'could either be a file path or a script - PromptAndSetAutoRecoveredPrevSessionData(strRScripts, strDataFilePath) + PromptAndSetAutoRecoveredPrevSessionData(strRScripts, strDataFilePath, bOpenFromMenu:=bOpenFromMenu) 'if no script recovered then use the default R set up script If String.IsNullOrEmpty(strRScripts) Then @@ -428,7 +428,7 @@ Public Class frmMain End Sub - Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, ByRef strDataFilePath As String) +Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, ByRef strDataFilePath As String, Optional bOpenFromMenu As Boolean = False) 'if there is another R-Instat process in the machine then no need to check for autorecovery files If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then @@ -456,10 +456,10 @@ Public Class frmMain '--------------------------------------- 'prompt user for recovery selection If (strAutoSavedLogFilePaths.Length > 0 OrElse - strAutoSavedDataFilePaths.Length > 0) AndAlso + strAutoSavedDataFilePaths.Length > 0) AndAlso (bOpenFromMenu OrElse MsgBox("We have detected that R-Instat may have closed unexpectedly last time." & Environment.NewLine & "Would you like to see auto recovery options?", - MessageBoxButtons.YesNo, "Auto Recovery") = MsgBoxResult.Yes Then + MessageBoxButtons.YesNo, "Auto Recovery") = MsgBoxResult.Yes) Then dlgAutoSaveRecovery.strAutoSavedLogFilePaths = strAutoSavedLogFilePaths dlgAutoSaveRecovery.strAutoSavedDataFilePaths = strAutoSavedDataFilePaths @@ -511,101 +511,9 @@ Public Class frmMain '--------------------------------------- End Sub + Private Sub mnuToolsRestoreBackup_Click(sender As Object, e As EventArgs) Handles mnuToolsRestoreBackup.Click - Dim strRScripts As String = "" - Dim strDataFilePath As String = "" - dlgRestoreBackup.ShowDialog() - PromptRestoreData(strRScripts, strDataFilePath) - - 'if no script recovered then use the default R set up script - If String.IsNullOrEmpty(strRScripts) Then - strRScripts = "# Initialising R (e.g Loading R packages)" & Environment.NewLine & clsRLink.GetRSetupScript() - End If - - 'if data file recovered then add it as part of the initial R set up script - If Not String.IsNullOrEmpty(strDataFilePath) Then - strRScripts = strRScripts & Environment.NewLine & - "# Importing auto recovered data" & Environment.NewLine & - clsRLink.GetImportRDSRScript(strDataFilePath, False) - End If - - - 'execute the R-Instat set up R scripts - For Each strLine As String In strRScripts.Split({Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) - clsRLink.RunScript(strScript:=strLine.Trim(), bSeparateThread:=True, bSilent:=True) - Next - - 'as of 16/05/2023. clsDataBook depends on clsRLink.bInstatObjectExists property - 'to check if R object has been set up at R level. - - 'grids are only updated when clsRLink.bInstatObjectExists = True - If clsRLink.RunInternalScriptGetValue(strScript:="exists('" & clsRLink.strInstatDataObject & "')", - bSeparateThread:=True, bSilent:=True).AsCharacter(0) = "TRUE" Then - 'set R-Instat R object as exists if it has been set up in R level and refresh the grids - 'refreshing grids internally updates the .Net databook object as well. - clsRLink.bInstatObjectExists = True - UpdateAllGrids() - End If - End Sub - - Private Sub PromptRestoreData(ByRef strScript As String, ByRef strDataFilePath As String) - - 'if there is another R-Instat process in the machine then no need to check for autorecovery files - If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then - Return - End If - 'this is the copy of the original code used for PromptAndSetAutoRecoveredPrevSessionData function - Dim strAutoSavedLogFilePaths() As String = {} - Dim strAutoSavedInternalLogFilePaths() As String = {} - Dim strAutoSavedDataFilePaths() As String = {} - - If (Directory.Exists(strAutoSaveLogFolderPath)) Then - strAutoSavedLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveLogFolderPath).ToArray - End If - If Directory.Exists(strAutoSaveDataFolderPath) Then - strAutoSavedDataFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveDataFolderPath).ToArray - End If - If (Directory.Exists(strAutoSaveInternalLogFolderPath)) Then - strAutoSavedInternalLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveInternalLogFolderPath).ToArray - End If - - '--------------------------------------- - 'prompt user for recovery selection - If (strAutoSavedLogFilePaths.Length > 0 OrElse - strAutoSavedDataFilePaths.Length > 0) Then - - - dlgRestoreBackup.strAutoSavedLogFilePaths = strAutoSavedLogFilePaths - dlgRestoreBackup.strAutoSavedDataFilePaths = strAutoSavedDataFilePaths - dlgRestoreBackup.strAutoSavedInternalLogFilePaths = strAutoSavedInternalLogFilePaths - - - 'todo. the dialog design is meant to only return just one option; script, data file path or new session. - 'refactor the dialog to enforce the design - - 'get the R script from read file if selected by the user - strScript = dlgRestoreBackup.GetScript() - 'get the data file path if selected by the user - strDataFilePath = dlgRestoreBackup.GetDataFilePath() - End If - '--------------------------------------- - - '--------------------------------------- - - If strAutoSavedInternalLogFilePaths.Length > 0 Then - Try - For Each strFilePath As String In strAutoSavedInternalLogFilePaths - 'debug log is created when checking r version. - 'so always delete the previous session debug file only - If strFilePath <> clsRLink.strAutoSaveDebugLogFilePath Then - File.Delete(strFilePath) - End If - Next - Catch ex As Exception - MsgBox("Could not delete backup internal log file." & Environment.NewLine & ex.Message, "Error deleting file") - End Try - End If - + ExecuteSetupRScriptsAndSetupRLinkAndDatabook() End Sub ''' From 9c8325e25108dbb5586ca0b90cc7c5cb89d900de Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 8 Apr 2024 14:29:20 +0300 Subject: [PATCH 14/99] minor code correction --- instat/frmMain.vb | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index f939edf2c68..d13c3106f79 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -188,7 +188,7 @@ Public Class frmMain '--------------------------------------- 'execute R-Instat R set up scripts to set up R data book - ExecuteSetupRScriptsAndSetupRLinkAndDatabook(bOpenFromMenu:=False) + 'ExecuteSetupRScriptsAndSetupRLinkAndDatabook() 'execute R global options used by R-Instat R data book clsInstatOptions.ExecuteRGlobalOptions() '--------------------------------------- @@ -389,12 +389,12 @@ Public Class frmMain End If End Function - Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook(Optional bOpenFromMenu = True) + Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook() Dim strRScripts As String = "" Dim strDataFilePath As String = "" 'could either be a file path or a script - PromptAndSetAutoRecoveredPrevSessionData(strRScripts, strDataFilePath, bOpenFromMenu:=bOpenFromMenu) + PromptAndSetAutoRecoveredPrevSessionData(strRScripts, strDataFilePath) 'if no script recovered then use the default R set up script If String.IsNullOrEmpty(strRScripts) Then @@ -428,7 +428,7 @@ Public Class frmMain End Sub -Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, ByRef strDataFilePath As String, Optional bOpenFromMenu As Boolean = False) +Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, ByRef strDataFilePath As String) 'if there is another R-Instat process in the machine then no need to check for autorecovery files If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then @@ -455,11 +455,8 @@ Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, '--------------------------------------- 'prompt user for recovery selection - If (strAutoSavedLogFilePaths.Length > 0 OrElse - strAutoSavedDataFilePaths.Length > 0) AndAlso (bOpenFromMenu OrElse - MsgBox("We have detected that R-Instat may have closed unexpectedly last time." & Environment.NewLine & - "Would you like to see auto recovery options?", - MessageBoxButtons.YesNo, "Auto Recovery") = MsgBoxResult.Yes) Then + If strAutoSavedLogFilePaths.Length > 0 OrElse + strAutoSavedDataFilePaths.Length > 0 Then dlgAutoSaveRecovery.strAutoSavedLogFilePaths = strAutoSavedLogFilePaths dlgAutoSaveRecovery.strAutoSavedDataFilePaths = strAutoSavedDataFilePaths From d5629b5e2649586518efd219bc80a0041cda5302 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 8 Apr 2024 15:00:50 +0300 Subject: [PATCH 15/99] minor code correction --- instat/frmMain.vb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d13c3106f79..5d2447494cf 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -188,7 +188,7 @@ Public Class frmMain '--------------------------------------- 'execute R-Instat R set up scripts to set up R data book - 'ExecuteSetupRScriptsAndSetupRLinkAndDatabook() + ExecuteSetupRScriptsAndSetupRLinkAndDatabook(bOpenFromMenu:=False) 'execute R global options used by R-Instat R data book clsInstatOptions.ExecuteRGlobalOptions() '--------------------------------------- @@ -389,12 +389,12 @@ Public Class frmMain End If End Function - Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook() +Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook(Optional bOpenFromMenu = True) Dim strRScripts As String = "" Dim strDataFilePath As String = "" 'could either be a file path or a script - PromptAndSetAutoRecoveredPrevSessionData(strRScripts, strDataFilePath) + PromptAndSetAutoRecoveredPrevSessionData(strRScripts, strDataFilePath, bOpenFromMenu:=bOpenFromMenu) 'if no script recovered then use the default R set up script If String.IsNullOrEmpty(strRScripts) Then @@ -428,7 +428,7 @@ Public Class frmMain End Sub -Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, ByRef strDataFilePath As String) +Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, ByRef strDataFilePath As String, Optional bOpenFromMenu As Boolean = False) 'if there is another R-Instat process in the machine then no need to check for autorecovery files If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then @@ -455,8 +455,11 @@ Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, '--------------------------------------- 'prompt user for recovery selection - If strAutoSavedLogFilePaths.Length > 0 OrElse - strAutoSavedDataFilePaths.Length > 0 Then +If (strAutoSavedLogFilePaths.Length > 0 OrElse + strAutoSavedDataFilePaths.Length > 0) AndAlso (bOpenFromMenu OrElse + MsgBox("We have detected that R-Instat may have closed unexpectedly last time." & Environment.NewLine & + "Would you like to see auto recovery options?", + MessageBoxButtons.YesNo, "Auto Recovery") = MsgBoxResult.Yes) Then dlgAutoSaveRecovery.strAutoSavedLogFilePaths = strAutoSavedLogFilePaths dlgAutoSaveRecovery.strAutoSavedDataFilePaths = strAutoSavedDataFilePaths From 1b3bf09aa74b7731f1f2689054a7ddaf48bfe837 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:21:44 +0200 Subject: [PATCH 16/99] Revert "minor code correction" This reverts commit d5629b5e2649586518efd219bc80a0041cda5302. --- instat/frmMain.vb | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 5d2447494cf..d13c3106f79 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -188,7 +188,7 @@ Public Class frmMain '--------------------------------------- 'execute R-Instat R set up scripts to set up R data book - ExecuteSetupRScriptsAndSetupRLinkAndDatabook(bOpenFromMenu:=False) + 'ExecuteSetupRScriptsAndSetupRLinkAndDatabook() 'execute R global options used by R-Instat R data book clsInstatOptions.ExecuteRGlobalOptions() '--------------------------------------- @@ -389,12 +389,12 @@ Public Class frmMain End If End Function -Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook(Optional bOpenFromMenu = True) + Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook() Dim strRScripts As String = "" Dim strDataFilePath As String = "" 'could either be a file path or a script - PromptAndSetAutoRecoveredPrevSessionData(strRScripts, strDataFilePath, bOpenFromMenu:=bOpenFromMenu) + PromptAndSetAutoRecoveredPrevSessionData(strRScripts, strDataFilePath) 'if no script recovered then use the default R set up script If String.IsNullOrEmpty(strRScripts) Then @@ -428,7 +428,7 @@ Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook(Optional bOpenFromMenu End Sub -Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, ByRef strDataFilePath As String, Optional bOpenFromMenu As Boolean = False) +Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, ByRef strDataFilePath As String) 'if there is another R-Instat process in the machine then no need to check for autorecovery files If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then @@ -455,11 +455,8 @@ Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, '--------------------------------------- 'prompt user for recovery selection -If (strAutoSavedLogFilePaths.Length > 0 OrElse - strAutoSavedDataFilePaths.Length > 0) AndAlso (bOpenFromMenu OrElse - MsgBox("We have detected that R-Instat may have closed unexpectedly last time." & Environment.NewLine & - "Would you like to see auto recovery options?", - MessageBoxButtons.YesNo, "Auto Recovery") = MsgBoxResult.Yes) Then + If strAutoSavedLogFilePaths.Length > 0 OrElse + strAutoSavedDataFilePaths.Length > 0 Then dlgAutoSaveRecovery.strAutoSavedLogFilePaths = strAutoSavedLogFilePaths dlgAutoSaveRecovery.strAutoSavedDataFilePaths = strAutoSavedDataFilePaths From bd5e0e8a4dd76b1abc7fd7d1f5ee07e16b103f2f Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:21:58 +0200 Subject: [PATCH 17/99] Revert "minor code correction" This reverts commit 9c8325e25108dbb5586ca0b90cc7c5cb89d900de. --- instat/frmMain.vb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d13c3106f79..f939edf2c68 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -188,7 +188,7 @@ Public Class frmMain '--------------------------------------- 'execute R-Instat R set up scripts to set up R data book - 'ExecuteSetupRScriptsAndSetupRLinkAndDatabook() + ExecuteSetupRScriptsAndSetupRLinkAndDatabook(bOpenFromMenu:=False) 'execute R global options used by R-Instat R data book clsInstatOptions.ExecuteRGlobalOptions() '--------------------------------------- @@ -389,12 +389,12 @@ Public Class frmMain End If End Function - Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook() + Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook(Optional bOpenFromMenu = True) Dim strRScripts As String = "" Dim strDataFilePath As String = "" 'could either be a file path or a script - PromptAndSetAutoRecoveredPrevSessionData(strRScripts, strDataFilePath) + PromptAndSetAutoRecoveredPrevSessionData(strRScripts, strDataFilePath, bOpenFromMenu:=bOpenFromMenu) 'if no script recovered then use the default R set up script If String.IsNullOrEmpty(strRScripts) Then @@ -428,7 +428,7 @@ Public Class frmMain End Sub -Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, ByRef strDataFilePath As String) +Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, ByRef strDataFilePath As String, Optional bOpenFromMenu As Boolean = False) 'if there is another R-Instat process in the machine then no need to check for autorecovery files If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then @@ -455,8 +455,11 @@ Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, '--------------------------------------- 'prompt user for recovery selection - If strAutoSavedLogFilePaths.Length > 0 OrElse - strAutoSavedDataFilePaths.Length > 0 Then + If (strAutoSavedLogFilePaths.Length > 0 OrElse + strAutoSavedDataFilePaths.Length > 0) AndAlso (bOpenFromMenu OrElse + MsgBox("We have detected that R-Instat may have closed unexpectedly last time." & Environment.NewLine & + "Would you like to see auto recovery options?", + MessageBoxButtons.YesNo, "Auto Recovery") = MsgBoxResult.Yes) Then dlgAutoSaveRecovery.strAutoSavedLogFilePaths = strAutoSavedLogFilePaths dlgAutoSaveRecovery.strAutoSavedDataFilePaths = strAutoSavedDataFilePaths From 34e355f0e4dfbc2b36d35a495c3a5a3532e2e456 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:22:07 +0200 Subject: [PATCH 18/99] Revert "Made code changes after review" This reverts commit 96f5ce3307d75fb560165eb348f177b243141152. --- instat/frmMain.vb | 108 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 100 insertions(+), 8 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index f939edf2c68..12de135e7c7 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -188,7 +188,7 @@ Public Class frmMain '--------------------------------------- 'execute R-Instat R set up scripts to set up R data book - ExecuteSetupRScriptsAndSetupRLinkAndDatabook(bOpenFromMenu:=False) + ExecuteSetupRScriptsAndSetupRLinkAndDatabook() 'execute R global options used by R-Instat R data book clsInstatOptions.ExecuteRGlobalOptions() '--------------------------------------- @@ -389,12 +389,12 @@ Public Class frmMain End If End Function - Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook(Optional bOpenFromMenu = True) + Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook() Dim strRScripts As String = "" Dim strDataFilePath As String = "" 'could either be a file path or a script - PromptAndSetAutoRecoveredPrevSessionData(strRScripts, strDataFilePath, bOpenFromMenu:=bOpenFromMenu) + PromptAndSetAutoRecoveredPrevSessionData(strRScripts, strDataFilePath) 'if no script recovered then use the default R set up script If String.IsNullOrEmpty(strRScripts) Then @@ -428,7 +428,7 @@ Public Class frmMain End Sub -Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, ByRef strDataFilePath As String, Optional bOpenFromMenu As Boolean = False) + Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, ByRef strDataFilePath As String) 'if there is another R-Instat process in the machine then no need to check for autorecovery files If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then @@ -456,10 +456,10 @@ Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, '--------------------------------------- 'prompt user for recovery selection If (strAutoSavedLogFilePaths.Length > 0 OrElse - strAutoSavedDataFilePaths.Length > 0) AndAlso (bOpenFromMenu OrElse + strAutoSavedDataFilePaths.Length > 0) AndAlso MsgBox("We have detected that R-Instat may have closed unexpectedly last time." & Environment.NewLine & "Would you like to see auto recovery options?", - MessageBoxButtons.YesNo, "Auto Recovery") = MsgBoxResult.Yes) Then + MessageBoxButtons.YesNo, "Auto Recovery") = MsgBoxResult.Yes Then dlgAutoSaveRecovery.strAutoSavedLogFilePaths = strAutoSavedLogFilePaths dlgAutoSaveRecovery.strAutoSavedDataFilePaths = strAutoSavedDataFilePaths @@ -511,9 +511,101 @@ Private Sub PromptAndSetAutoRecoveredPrevSessionData(ByRef strScript As String, '--------------------------------------- End Sub - Private Sub mnuToolsRestoreBackup_Click(sender As Object, e As EventArgs) Handles mnuToolsRestoreBackup.Click - ExecuteSetupRScriptsAndSetupRLinkAndDatabook() + Dim strRScripts As String = "" + Dim strDataFilePath As String = "" + dlgRestoreBackup.ShowDialog() + PromptRestoreData(strRScripts, strDataFilePath) + + 'if no script recovered then use the default R set up script + If String.IsNullOrEmpty(strRScripts) Then + strRScripts = "# Initialising R (e.g Loading R packages)" & Environment.NewLine & clsRLink.GetRSetupScript() + End If + + 'if data file recovered then add it as part of the initial R set up script + If Not String.IsNullOrEmpty(strDataFilePath) Then + strRScripts = strRScripts & Environment.NewLine & + "# Importing auto recovered data" & Environment.NewLine & + clsRLink.GetImportRDSRScript(strDataFilePath, False) + End If + + + 'execute the R-Instat set up R scripts + For Each strLine As String In strRScripts.Split({Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) + clsRLink.RunScript(strScript:=strLine.Trim(), bSeparateThread:=True, bSilent:=True) + Next + + 'as of 16/05/2023. clsDataBook depends on clsRLink.bInstatObjectExists property + 'to check if R object has been set up at R level. + + 'grids are only updated when clsRLink.bInstatObjectExists = True + If clsRLink.RunInternalScriptGetValue(strScript:="exists('" & clsRLink.strInstatDataObject & "')", + bSeparateThread:=True, bSilent:=True).AsCharacter(0) = "TRUE" Then + 'set R-Instat R object as exists if it has been set up in R level and refresh the grids + 'refreshing grids internally updates the .Net databook object as well. + clsRLink.bInstatObjectExists = True + UpdateAllGrids() + End If + End Sub + + Private Sub PromptRestoreData(ByRef strScript As String, ByRef strDataFilePath As String) + + 'if there is another R-Instat process in the machine then no need to check for autorecovery files + If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then + Return + End If + 'this is the copy of the original code used for PromptAndSetAutoRecoveredPrevSessionData function + Dim strAutoSavedLogFilePaths() As String = {} + Dim strAutoSavedInternalLogFilePaths() As String = {} + Dim strAutoSavedDataFilePaths() As String = {} + + If (Directory.Exists(strAutoSaveLogFolderPath)) Then + strAutoSavedLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveLogFolderPath).ToArray + End If + If Directory.Exists(strAutoSaveDataFolderPath) Then + strAutoSavedDataFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveDataFolderPath).ToArray + End If + If (Directory.Exists(strAutoSaveInternalLogFolderPath)) Then + strAutoSavedInternalLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveInternalLogFolderPath).ToArray + End If + + '--------------------------------------- + 'prompt user for recovery selection + If (strAutoSavedLogFilePaths.Length > 0 OrElse + strAutoSavedDataFilePaths.Length > 0) Then + + + dlgRestoreBackup.strAutoSavedLogFilePaths = strAutoSavedLogFilePaths + dlgRestoreBackup.strAutoSavedDataFilePaths = strAutoSavedDataFilePaths + dlgRestoreBackup.strAutoSavedInternalLogFilePaths = strAutoSavedInternalLogFilePaths + + + 'todo. the dialog design is meant to only return just one option; script, data file path or new session. + 'refactor the dialog to enforce the design + + 'get the R script from read file if selected by the user + strScript = dlgRestoreBackup.GetScript() + 'get the data file path if selected by the user + strDataFilePath = dlgRestoreBackup.GetDataFilePath() + End If + '--------------------------------------- + + '--------------------------------------- + + If strAutoSavedInternalLogFilePaths.Length > 0 Then + Try + For Each strFilePath As String In strAutoSavedInternalLogFilePaths + 'debug log is created when checking r version. + 'so always delete the previous session debug file only + If strFilePath <> clsRLink.strAutoSaveDebugLogFilePath Then + File.Delete(strFilePath) + End If + Next + Catch ex As Exception + MsgBox("Could not delete backup internal log file." & Environment.NewLine & ex.Message, "Error deleting file") + End Try + End If + End Sub ''' From 1625b8e1547e10e6313db0526301f97ec6e47278 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 9 Apr 2024 10:49:42 +0300 Subject: [PATCH 19/99] Added backup message --- instat/clsRLink.vb | 2 +- instat/frmMain.vb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index b5bae7a3a64..4a686600ca7 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -646,7 +646,7 @@ Public Class RLink ''' ''' The text to add to the save log file. '''-------------------------------------------------------------------------------------------- - Private Sub AppendToAutoSaveLog(strScript As String) + Public Sub AppendToAutoSaveLog(strScript As String) Dim strTempFile As String Dim i As Integer = 1 Try diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 12de135e7c7..0689d41e952 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1193,6 +1193,10 @@ Public Class frmMain End While strCurrentAutoSaveDataFilePath = Path.Combine(strAutoSaveDataFolderPath, strTempFile) End If + Dim strBackupMessage As String = $"##########{vbCrLf}## Backing up data and log files on: {DateTime.Now}{vbCrLf}##########" + Me.ucrScriptWindow.LogText(strBackupMessage) + clsRLink.AppendToAutoSaveLog(strBackupMessage) + clsSaveRDS.SetRCommand("saveRDS") clsSaveRDS.AddParameter("object", clsRLink.strInstatDataObject) clsSaveRDS.AddParameter("file", Chr(34) & strCurrentAutoSaveDataFilePath.Replace("\", "/") & Chr(34)) From 6b60c3b0d9a4d0d1ab563def29b132b263a9dc19 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 12 Apr 2024 18:21:57 +0300 Subject: [PATCH 20/99] Added checkbox to select/unselect items --- instat/UserControl/ucrOutputPage.vb | 9 +++++++ instat/UserControl/ucrOutputPages.resx | 18 ++++++------- instat/UserControl/ucrOutputPages.vb | 35 ++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 9 deletions(-) diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index 0d8972109b5..0213ed43b7c 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -115,6 +115,15 @@ Public Class ucrOutputPage Next End Sub + ''' + ''' Selects all check boxes on the page + ''' + Public Sub SelectAllCheckBoxes() + For Each checkbox In _checkBoxes + checkbox.Checked = True + Next + End Sub + ''' ''' Clears all outputs on the page ''' diff --git a/instat/UserControl/ucrOutputPages.resx b/instat/UserControl/ucrOutputPages.resx index 65c47d1077b..2b8649f804a 100644 --- a/instat/UserControl/ucrOutputPages.resx +++ b/instat/UserControl/ucrOutputPages.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -139,7 +139,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -154,7 +154,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -169,7 +169,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -184,7 +184,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -199,7 +199,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -214,7 +214,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -229,7 +229,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -244,7 +244,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc diff --git a/instat/UserControl/ucrOutputPages.vb b/instat/UserControl/ucrOutputPages.vb index 3be43868659..3e7564a0239 100644 --- a/instat/UserControl/ucrOutputPages.vb +++ b/instat/UserControl/ucrOutputPages.vb @@ -25,6 +25,7 @@ Public Class ucrOutputPages Private _outputLogger As clsOutputLogger Private _selectedOutputPage As ucrOutputPage Private _strSaveDirectory As String + Private checkBoxSelectAll As New CheckBox() Public Sub New() ' This call is required by the designer. @@ -153,6 +154,7 @@ Public Class ucrOutputPages tbMoveUp.Enabled = False End If tbRename.Enabled = _selectedOutputPage.BCanRename + UpdateSelectAllCheckBoxText() End Sub Private Sub RefreshPage() @@ -303,4 +305,37 @@ Public Class ucrOutputPages End If Next End Sub + + Private Sub SurroundingSub() + Dim checkBoxHost As ToolStripControlHost = New ToolStripControlHost(checkBoxSelectAll) + tsButtons.Items.Insert(0, checkBoxHost) + UpdateSelectAllCheckBoxText() + AddHandler checkBoxSelectAll.CheckedChanged, AddressOf selectAllCheckBox_CheckedChanged + End Sub + + Private Sub UpdateSelectAllCheckBoxText() + If _outputLogger Is Nothing Then + Exit Sub + End If + checkBoxSelectAll.Text = "" + Dim iCountElements = _selectedOutputPage.SelectedElements.Count + If _outputLogger.OutputElements.Count > iCountElements AndAlso iCountElements > 0 Then + checkBoxSelectAll.Text = iCountElements & " item(s) selected" + End If + End Sub + + Private Sub selectAllCheckBox_CheckedChanged(sender As Object, e As EventArgs) + ' Handle CheckBox checked changed event here + Dim cb As CheckBox = TryCast(sender, CheckBox) + If cb.Checked Then + _selectedOutputPage.SelectAllCheckBoxes() + Else + _selectedOutputPage.ClearAllCheckBoxes() + End If + EnableDisableTopButtons() + End Sub + + Private Sub ucrOutputPages_Load(sender As Object, e As EventArgs) Handles Me.Load + SurroundingSub() + End Sub End Class \ No newline at end of file From 9d7c9130369682c2b867ae51c2f7f236bf972598 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Sat, 13 Apr 2024 10:55:45 +0300 Subject: [PATCH 21/99] minor code correction --- instat/UserControl/ucrOutputPages.vb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/instat/UserControl/ucrOutputPages.vb b/instat/UserControl/ucrOutputPages.vb index 3e7564a0239..73352e54657 100644 --- a/instat/UserControl/ucrOutputPages.vb +++ b/instat/UserControl/ucrOutputPages.vb @@ -309,18 +309,23 @@ Public Class ucrOutputPages Private Sub SurroundingSub() Dim checkBoxHost As ToolStripControlHost = New ToolStripControlHost(checkBoxSelectAll) tsButtons.Items.Insert(0, checkBoxHost) - UpdateSelectAllCheckBoxText() - AddHandler checkBoxSelectAll.CheckedChanged, AddressOf selectAllCheckBox_CheckedChanged + AddHandler checkBoxSelectAll.Click, AddressOf selectAllCheckBox_CheckedChanged End Sub Private Sub UpdateSelectAllCheckBoxText() If _outputLogger Is Nothing Then Exit Sub End If - checkBoxSelectAll.Text = "" Dim iCountElements = _selectedOutputPage.SelectedElements.Count - If _outputLogger.OutputElements.Count > iCountElements AndAlso iCountElements > 0 Then + If iCountElements > 0 AndAlso _outputLogger.OutputElements.Count > iCountElements Then checkBoxSelectAll.Text = iCountElements & " item(s) selected" + checkBoxSelectAll.CheckState = CheckState.Indeterminate + ElseIf _outputLogger.OutputElements.Count = iCountElements Then + checkBoxSelectAll.Text = "Deselect All" + checkBoxSelectAll.CheckState = CheckState.Checked + Else + checkBoxSelectAll.Text = "Select All" + checkBoxSelectAll.CheckState = CheckState.Unchecked End If End Sub From b2c7d6020c3c54dde154c0127fac337744584f71 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Sat, 13 Apr 2024 12:03:28 +0300 Subject: [PATCH 22/99] Code improvement --- instat/Model/Output/clsOutputLogger.vb | 2 +- instat/UserControl/ucrOutputPage.vb | 2 -- instat/UserControl/ucrOutputPages.vb | 27 +++++++++++++++++--------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/instat/Model/Output/clsOutputLogger.vb b/instat/Model/Output/clsOutputLogger.vb index 25e04fc2083..9905d4c7ea3 100644 --- a/instat/Model/Output/clsOutputLogger.vb +++ b/instat/Model/Output/clsOutputLogger.vb @@ -110,7 +110,7 @@ Public Class clsOutputLogger 'add the output with it's R script as another output element outputElement.SetContent("", outputType, strOutput) - '_outputElements.Add(outputElement) + _outputElements.Add(outputElement) 'raise event for output pages RaiseEvent NewOutputAdded(outputElement, bDisplayOutputInExternalViewer) diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index 0213ed43b7c..05f4025b5e3 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -225,7 +225,6 @@ Public Class ucrOutputPage End Sub - Private Sub AddNewTextOutput(outputElement As clsOutputElement) Dim panel As Panel = AddElementPanel(outputElement) @@ -391,7 +390,6 @@ Public Class ucrOutputPage End Sub - ''' ''' Copies selected elements to clipboard ''' diff --git a/instat/UserControl/ucrOutputPages.vb b/instat/UserControl/ucrOutputPages.vb index 73352e54657..c82f70aa90d 100644 --- a/instat/UserControl/ucrOutputPages.vb +++ b/instat/UserControl/ucrOutputPages.vb @@ -316,17 +316,26 @@ Public Class ucrOutputPages If _outputLogger Is Nothing Then Exit Sub End If - Dim iCountElements = _selectedOutputPage.SelectedElements.Count - If iCountElements > 0 AndAlso _outputLogger.OutputElements.Count > iCountElements Then - checkBoxSelectAll.Text = iCountElements & " item(s) selected" - checkBoxSelectAll.CheckState = CheckState.Indeterminate - ElseIf _outputLogger.OutputElements.Count = iCountElements Then - checkBoxSelectAll.Text = "Deselect All" - checkBoxSelectAll.CheckState = CheckState.Checked + + Dim iCountOutputElements As Integer = 0 + If SelectedTab() = "Main" Then + iCountOutputElements = _outputLogger.OutputElements.Count Else - checkBoxSelectAll.Text = "Select All" - checkBoxSelectAll.CheckState = CheckState.Unchecked + iCountOutputElements = _outputLogger.GetFilteredList(SelectedTab).Output.Count End If + + Dim iSelectedElements = _selectedOutputPage.SelectedElements.Count + Select Case True + Case iSelectedElements > 0 AndAlso iCountOutputElements > iSelectedElements + checkBoxSelectAll.Text = $"{iSelectedElements} item(s) selected" + checkBoxSelectAll.CheckState = CheckState.Indeterminate + Case iCountOutputElements = iSelectedElements + checkBoxSelectAll.Text = "Deselect All" + checkBoxSelectAll.CheckState = CheckState.Checked + Case Else + checkBoxSelectAll.Text = "Select All" + checkBoxSelectAll.CheckState = CheckState.Unchecked + End Select End Sub Private Sub selectAllCheckBox_CheckedChanged(sender As Object, e As EventArgs) From c5c95a2ed9ffaeaa6c7c00c6a6a20548314df1b8 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Sat, 13 Apr 2024 12:49:32 +0300 Subject: [PATCH 23/99] minor addition --- instat/UserControl/ucrOutputPages.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/UserControl/ucrOutputPages.vb b/instat/UserControl/ucrOutputPages.vb index c82f70aa90d..f42c785f77f 100644 --- a/instat/UserControl/ucrOutputPages.vb +++ b/instat/UserControl/ucrOutputPages.vb @@ -85,6 +85,7 @@ Public Class ucrOutputPages Private Sub AddNewOutput(outputElement As clsOutputElement, bDisplayOutputInExternalViewer As Boolean) ucrMainOutputPage.AddNewOutput(outputElement, bDisplayOutputInExternalViewer) + UpdateSelectAllCheckBoxText() End Sub Private Sub AddNewOutputToTab(outputElement As clsOutputElement, tabName As String) From c49ec2823512a30bf421ea34277ec97079632aef Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Sat, 13 Apr 2024 17:23:41 +0300 Subject: [PATCH 24/99] added tooltip --- instat/UserControl/ucrOutputPages.vb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/instat/UserControl/ucrOutputPages.vb b/instat/UserControl/ucrOutputPages.vb index f42c785f77f..d026c64e3e9 100644 --- a/instat/UserControl/ucrOutputPages.vb +++ b/instat/UserControl/ucrOutputPages.vb @@ -310,6 +310,10 @@ Public Class ucrOutputPages Private Sub SurroundingSub() Dim checkBoxHost As ToolStripControlHost = New ToolStripControlHost(checkBoxSelectAll) tsButtons.Items.Insert(0, checkBoxHost) + + Dim ttcheckBoxSelectAll As New ToolTip + ttcheckBoxSelectAll.SetToolTip(checkBoxSelectAll, "Toggle selection for all elements") + AddHandler checkBoxSelectAll.Click, AddressOf selectAllCheckBox_CheckedChanged End Sub @@ -328,7 +332,7 @@ Public Class ucrOutputPages Dim iSelectedElements = _selectedOutputPage.SelectedElements.Count Select Case True Case iSelectedElements > 0 AndAlso iCountOutputElements > iSelectedElements - checkBoxSelectAll.Text = $"{iSelectedElements} item(s) selected" + checkBoxSelectAll.Text = $"{iSelectedElements} element(s)" checkBoxSelectAll.CheckState = CheckState.Indeterminate Case iCountOutputElements = iSelectedElements checkBoxSelectAll.Text = "Deselect All" @@ -341,8 +345,9 @@ Public Class ucrOutputPages Private Sub selectAllCheckBox_CheckedChanged(sender As Object, e As EventArgs) ' Handle CheckBox checked changed event here - Dim cb As CheckBox = TryCast(sender, CheckBox) - If cb.Checked Then + Dim checkBoxSelectAll As CheckBox = TryCast(sender, CheckBox) + + If checkBoxSelectAll.Checked Then _selectedOutputPage.SelectAllCheckBoxes() Else _selectedOutputPage.ClearAllCheckBoxes() From 4ed262731f408f4a702d37d3d6f77818e4a2f500 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Sun, 14 Apr 2024 15:26:49 +0300 Subject: [PATCH 25/99] cleaning code --- instat/UserControl/ucrOutputPages.vb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/instat/UserControl/ucrOutputPages.vb b/instat/UserControl/ucrOutputPages.vb index d026c64e3e9..8ff18f94120 100644 --- a/instat/UserControl/ucrOutputPages.vb +++ b/instat/UserControl/ucrOutputPages.vb @@ -39,6 +39,10 @@ Public Class ucrOutputPages EnableDisableTopButtons() End Sub + Private Sub ucrOutputPages_Load(sender As Object, e As EventArgs) Handles Me.Load + InitializeSelectAllCheckBox() + End Sub + ''' ''' Holds options. ''' ToDo InstatOptions should be able to be accessed from anywhere @@ -216,6 +220,7 @@ Public Class ucrOutputPages _outputLogger.AddOutputToFilteredList(element.Clone, strTabName) Next _selectedOutputPage.ClearAllCheckBoxes() + UpdateSelectAllCheckBoxText() End Sub Private Sub tbCopy_Click(sender As Object, e As EventArgs) Handles tbCopy.Click @@ -307,14 +312,14 @@ Public Class ucrOutputPages Next End Sub - Private Sub SurroundingSub() + Private Sub InitializeSelectAllCheckBox() Dim checkBoxHost As ToolStripControlHost = New ToolStripControlHost(checkBoxSelectAll) tsButtons.Items.Insert(0, checkBoxHost) Dim ttcheckBoxSelectAll As New ToolTip ttcheckBoxSelectAll.SetToolTip(checkBoxSelectAll, "Toggle selection for all elements") - AddHandler checkBoxSelectAll.Click, AddressOf selectAllCheckBox_CheckedChanged + AddHandler checkBoxSelectAll.Click, AddressOf checkBoxSelectAll_Click End Sub Private Sub UpdateSelectAllCheckBoxText() @@ -343,7 +348,7 @@ Public Class ucrOutputPages End Select End Sub - Private Sub selectAllCheckBox_CheckedChanged(sender As Object, e As EventArgs) + Private Sub checkBoxSelectAll_Click(sender As Object, e As EventArgs) ' Handle CheckBox checked changed event here Dim checkBoxSelectAll As CheckBox = TryCast(sender, CheckBox) @@ -355,7 +360,4 @@ Public Class ucrOutputPages EnableDisableTopButtons() End Sub - Private Sub ucrOutputPages_Load(sender As Object, e As EventArgs) Handles Me.Load - SurroundingSub() - End Sub End Class \ No newline at end of file From df63e90d4bb696aebdfe245ca5204bdbd677a32a Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 15 Apr 2024 12:02:22 +0300 Subject: [PATCH 26/99] minor text change --- instat/UserControl/ucrOutputPages.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/UserControl/ucrOutputPages.vb b/instat/UserControl/ucrOutputPages.vb index 8ff18f94120..177b8810071 100644 --- a/instat/UserControl/ucrOutputPages.vb +++ b/instat/UserControl/ucrOutputPages.vb @@ -337,7 +337,7 @@ Public Class ucrOutputPages Dim iSelectedElements = _selectedOutputPage.SelectedElements.Count Select Case True Case iSelectedElements > 0 AndAlso iCountOutputElements > iSelectedElements - checkBoxSelectAll.Text = $"{iSelectedElements} element(s)" + checkBoxSelectAll.Text = $"{iSelectedElements} item(s)" checkBoxSelectAll.CheckState = CheckState.Indeterminate Case iCountOutputElements = iSelectedElements checkBoxSelectAll.Text = "Deselect All" From 11f6b5726cf324069711b4c5e0725e5dfd90d1b0 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:42:05 +0200 Subject: [PATCH 27/99] Redesigning the Restore Backup dialogue with additional code changes --- instat/dlgRestoreBackup.Designer.vb | 189 ++++++++++++++-------------- instat/dlgRestoreBackup.vb | 83 +++++++----- 2 files changed, 147 insertions(+), 125 deletions(-) diff --git a/instat/dlgRestoreBackup.Designer.vb b/instat/dlgRestoreBackup.Designer.vb index d564016be76..13135605a76 100644 --- a/instat/dlgRestoreBackup.Designer.vb +++ b/instat/dlgRestoreBackup.Designer.vb @@ -23,11 +23,8 @@ Partial Class dlgRestoreBackup _ Private Sub InitializeComponent() Me.grpSavingOptions = New System.Windows.Forms.GroupBox() - Me.lblBackupDataDetected = New System.Windows.Forms.Label() - Me.lblBackupLogDetected = New System.Windows.Forms.Label() Me.cmdSaveLog = New System.Windows.Forms.Button() Me.ucrInputSavedPathInternalLog = New instat.ucrInputTextBox() - Me.lblBackupInternalLogDetected = New System.Windows.Forms.Label() Me.lblInternalLogSavedTo = New System.Windows.Forms.Label() Me.cmdSaveInternalLog = New System.Windows.Forms.Button() Me.ucrInputSavedPathLog = New instat.ucrInputTextBox() @@ -36,22 +33,25 @@ Partial Class dlgRestoreBackup Me.lblDataSavedTo = New System.Windows.Forms.Label() Me.ucrInputSavedPathData = New instat.ucrInputTextBox() Me.grpEndChoice = New System.Windows.Forms.GroupBox() - Me.cmdRunLog = New System.Windows.Forms.Button() - Me.cmdCloseSession = New System.Windows.Forms.Button() - Me.cmdLoadData = New System.Windows.Forms.Button() Me.ucrChkSendInternalLog = New instat.ucrCheck() Me.ucrBase = New instat.ucrButtons() + Me.ucrChkShowDataFile = New instat.ucrCheck() + Me.ucrChkShowLogFile = New instat.ucrCheck() + Me.ucrChkShowInternalLogFile = New instat.ucrCheck() + Me.rdoRunBackupLog = New System.Windows.Forms.RadioButton() + Me.rdoLoadBackupData = New System.Windows.Forms.RadioButton() + Me.rdoNeither = New System.Windows.Forms.RadioButton() Me.grpSavingOptions.SuspendLayout() Me.grpEndChoice.SuspendLayout() Me.SuspendLayout() ' 'grpSavingOptions ' - Me.grpSavingOptions.Controls.Add(Me.lblBackupDataDetected) - Me.grpSavingOptions.Controls.Add(Me.lblBackupLogDetected) + Me.grpSavingOptions.Controls.Add(Me.ucrChkShowInternalLogFile) + Me.grpSavingOptions.Controls.Add(Me.ucrChkShowLogFile) + Me.grpSavingOptions.Controls.Add(Me.ucrChkShowDataFile) Me.grpSavingOptions.Controls.Add(Me.cmdSaveLog) Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathInternalLog) - Me.grpSavingOptions.Controls.Add(Me.lblBackupInternalLogDetected) Me.grpSavingOptions.Controls.Add(Me.lblInternalLogSavedTo) Me.grpSavingOptions.Controls.Add(Me.cmdSaveInternalLog) Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathLog) @@ -61,36 +61,18 @@ Partial Class dlgRestoreBackup Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathData) Me.grpSavingOptions.Location = New System.Drawing.Point(12, 31) Me.grpSavingOptions.Name = "grpSavingOptions" - Me.grpSavingOptions.Size = New System.Drawing.Size(877, 154) + Me.grpSavingOptions.Size = New System.Drawing.Size(726, 154) Me.grpSavingOptions.TabIndex = 20 Me.grpSavingOptions.TabStop = False Me.grpSavingOptions.Text = "Saving Options" ' - 'lblBackupDataDetected - ' - Me.lblBackupDataDetected.AutoSize = True - Me.lblBackupDataDetected.Location = New System.Drawing.Point(11, 29) - Me.lblBackupDataDetected.Name = "lblBackupDataDetected" - Me.lblBackupDataDetected.Size = New System.Drawing.Size(136, 13) - Me.lblBackupDataDetected.TabIndex = 8 - Me.lblBackupDataDetected.Text = "Backup Data File Detected" - ' - 'lblBackupLogDetected - ' - Me.lblBackupLogDetected.AutoSize = True - Me.lblBackupLogDetected.Location = New System.Drawing.Point(11, 76) - Me.lblBackupLogDetected.Name = "lblBackupLogDetected" - Me.lblBackupLogDetected.Size = New System.Drawing.Size(131, 13) - Me.lblBackupLogDetected.TabIndex = 4 - Me.lblBackupLogDetected.Text = "Backup Log File Detected" - ' 'cmdSaveLog ' - Me.cmdSaveLog.Location = New System.Drawing.Point(261, 68) + Me.cmdSaveLog.Location = New System.Drawing.Point(228, 68) Me.cmdSaveLog.Name = "cmdSaveLog" - Me.cmdSaveLog.Size = New System.Drawing.Size(241, 29) + Me.cmdSaveLog.Size = New System.Drawing.Size(145, 29) Me.cmdSaveLog.TabIndex = 5 - Me.cmdSaveLog.Text = "Save Backup Log..." + Me.cmdSaveLog.Text = "Browse" Me.cmdSaveLog.UseVisualStyleBackColor = True ' 'ucrInputSavedPathInternalLog @@ -99,24 +81,15 @@ Partial Class dlgRestoreBackup Me.ucrInputSavedPathInternalLog.AutoSize = True Me.ucrInputSavedPathInternalLog.IsMultiline = False Me.ucrInputSavedPathInternalLog.IsReadOnly = False - Me.ucrInputSavedPathInternalLog.Location = New System.Drawing.Point(605, 123) + Me.ucrInputSavedPathInternalLog.Location = New System.Drawing.Point(447, 123) Me.ucrInputSavedPathInternalLog.Name = "ucrInputSavedPathInternalLog" Me.ucrInputSavedPathInternalLog.Size = New System.Drawing.Size(258, 21) Me.ucrInputSavedPathInternalLog.TabIndex = 16 ' - 'lblBackupInternalLogDetected - ' - Me.lblBackupInternalLogDetected.AutoSize = True - Me.lblBackupInternalLogDetected.Location = New System.Drawing.Point(11, 123) - Me.lblBackupInternalLogDetected.Name = "lblBackupInternalLogDetected" - Me.lblBackupInternalLogDetected.Size = New System.Drawing.Size(169, 13) - Me.lblBackupInternalLogDetected.TabIndex = 6 - Me.lblBackupInternalLogDetected.Text = "Backup Internal Log File Detected" - ' 'lblInternalLogSavedTo ' Me.lblInternalLogSavedTo.AutoSize = True - Me.lblInternalLogSavedTo.Location = New System.Drawing.Point(509, 125) + Me.lblInternalLogSavedTo.Location = New System.Drawing.Point(385, 125) Me.lblInternalLogSavedTo.Name = "lblInternalLogSavedTo" Me.lblInternalLogSavedTo.Size = New System.Drawing.Size(55, 13) Me.lblInternalLogSavedTo.TabIndex = 15 @@ -124,11 +97,11 @@ Partial Class dlgRestoreBackup ' 'cmdSaveInternalLog ' - Me.cmdSaveInternalLog.Location = New System.Drawing.Point(262, 115) + Me.cmdSaveInternalLog.Location = New System.Drawing.Point(229, 115) Me.cmdSaveInternalLog.Name = "cmdSaveInternalLog" - Me.cmdSaveInternalLog.Size = New System.Drawing.Size(240, 29) + Me.cmdSaveInternalLog.Size = New System.Drawing.Size(144, 29) Me.cmdSaveInternalLog.TabIndex = 7 - Me.cmdSaveInternalLog.Text = "Save Backup Internal Log..." + Me.cmdSaveInternalLog.Text = "Browse" Me.cmdSaveInternalLog.UseVisualStyleBackColor = True ' 'ucrInputSavedPathLog @@ -137,24 +110,24 @@ Partial Class dlgRestoreBackup Me.ucrInputSavedPathLog.AutoSize = True Me.ucrInputSavedPathLog.IsMultiline = False Me.ucrInputSavedPathLog.IsReadOnly = False - Me.ucrInputSavedPathLog.Location = New System.Drawing.Point(604, 76) + Me.ucrInputSavedPathLog.Location = New System.Drawing.Point(446, 76) Me.ucrInputSavedPathLog.Name = "ucrInputSavedPathLog" Me.ucrInputSavedPathLog.Size = New System.Drawing.Size(258, 21) Me.ucrInputSavedPathLog.TabIndex = 14 ' 'cmdSaveData ' - Me.cmdSaveData.Location = New System.Drawing.Point(262, 21) + Me.cmdSaveData.Location = New System.Drawing.Point(229, 21) Me.cmdSaveData.Name = "cmdSaveData" - Me.cmdSaveData.Size = New System.Drawing.Size(240, 29) + Me.cmdSaveData.Size = New System.Drawing.Size(144, 29) Me.cmdSaveData.TabIndex = 9 - Me.cmdSaveData.Text = "Save Backup Data..." + Me.cmdSaveData.Text = "Browse" Me.cmdSaveData.UseVisualStyleBackColor = True ' 'lblLogSavedTo ' Me.lblLogSavedTo.AutoSize = True - Me.lblLogSavedTo.Location = New System.Drawing.Point(509, 78) + Me.lblLogSavedTo.Location = New System.Drawing.Point(385, 78) Me.lblLogSavedTo.Name = "lblLogSavedTo" Me.lblLogSavedTo.Size = New System.Drawing.Size(55, 13) Me.lblLogSavedTo.TabIndex = 13 @@ -163,7 +136,7 @@ Partial Class dlgRestoreBackup 'lblDataSavedTo ' Me.lblDataSavedTo.AutoSize = True - Me.lblDataSavedTo.Location = New System.Drawing.Point(508, 29) + Me.lblDataSavedTo.Location = New System.Drawing.Point(384, 29) Me.lblDataSavedTo.Name = "lblDataSavedTo" Me.lblDataSavedTo.Size = New System.Drawing.Size(55, 13) Me.lblDataSavedTo.TabIndex = 11 @@ -175,50 +148,23 @@ Partial Class dlgRestoreBackup Me.ucrInputSavedPathData.AutoSize = True Me.ucrInputSavedPathData.IsMultiline = False Me.ucrInputSavedPathData.IsReadOnly = False - Me.ucrInputSavedPathData.Location = New System.Drawing.Point(604, 27) + Me.ucrInputSavedPathData.Location = New System.Drawing.Point(446, 27) Me.ucrInputSavedPathData.Name = "ucrInputSavedPathData" Me.ucrInputSavedPathData.Size = New System.Drawing.Size(258, 21) Me.ucrInputSavedPathData.TabIndex = 12 ' 'grpEndChoice ' - Me.grpEndChoice.Controls.Add(Me.cmdRunLog) - Me.grpEndChoice.Controls.Add(Me.cmdCloseSession) - Me.grpEndChoice.Controls.Add(Me.cmdLoadData) - Me.grpEndChoice.Location = New System.Drawing.Point(131, 221) + Me.grpEndChoice.Controls.Add(Me.rdoNeither) + Me.grpEndChoice.Controls.Add(Me.rdoLoadBackupData) + Me.grpEndChoice.Controls.Add(Me.rdoRunBackupLog) + Me.grpEndChoice.Location = New System.Drawing.Point(222, 221) Me.grpEndChoice.Name = "grpEndChoice" - Me.grpEndChoice.Size = New System.Drawing.Size(602, 66) + Me.grpEndChoice.Size = New System.Drawing.Size(394, 66) Me.grpEndChoice.TabIndex = 23 Me.grpEndChoice.TabStop = False Me.grpEndChoice.Text = "Choose one of the following to proceed" ' - 'cmdRunLog - ' - Me.cmdRunLog.Location = New System.Drawing.Point(11, 24) - Me.cmdRunLog.Name = "cmdRunLog" - Me.cmdRunLog.Size = New System.Drawing.Size(190, 29) - Me.cmdRunLog.TabIndex = 1 - Me.cmdRunLog.Text = "Run Backup Log" - Me.cmdRunLog.UseVisualStyleBackColor = True - ' - 'cmdCloseSession - ' - Me.cmdCloseSession.Location = New System.Drawing.Point(415, 24) - Me.cmdCloseSession.Name = "cmdCloseSession" - Me.cmdCloseSession.Size = New System.Drawing.Size(181, 29) - Me.cmdCloseSession.TabIndex = 2 - Me.cmdCloseSession.Text = "Close" - Me.cmdCloseSession.UseVisualStyleBackColor = True - ' - 'cmdLoadData - ' - Me.cmdLoadData.Location = New System.Drawing.Point(213, 24) - Me.cmdLoadData.Name = "cmdLoadData" - Me.cmdLoadData.Size = New System.Drawing.Size(195, 29) - Me.cmdLoadData.TabIndex = 3 - Me.cmdLoadData.Text = "Load Backup Data" - Me.cmdLoadData.UseVisualStyleBackColor = True - ' 'ucrChkSendInternalLog ' Me.ucrChkSendInternalLog.AutoSize = True @@ -238,12 +184,72 @@ Partial Class dlgRestoreBackup Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 24 ' + 'ucrChkShowDataFile + ' + Me.ucrChkShowDataFile.AutoSize = True + Me.ucrChkShowDataFile.Checked = False + Me.ucrChkShowDataFile.Location = New System.Drawing.Point(6, 25) + Me.ucrChkShowDataFile.Name = "ucrChkShowDataFile" + Me.ucrChkShowDataFile.Size = New System.Drawing.Size(216, 23) + Me.ucrChkShowDataFile.TabIndex = 25 + ' + 'ucrChkShowLogFile + ' + Me.ucrChkShowLogFile.AutoSize = True + Me.ucrChkShowLogFile.Checked = False + Me.ucrChkShowLogFile.Location = New System.Drawing.Point(6, 74) + Me.ucrChkShowLogFile.Name = "ucrChkShowLogFile" + Me.ucrChkShowLogFile.Size = New System.Drawing.Size(216, 23) + Me.ucrChkShowLogFile.TabIndex = 26 + ' + 'ucrChkShowInternalLogFile + ' + Me.ucrChkShowInternalLogFile.AutoSize = True + Me.ucrChkShowInternalLogFile.Checked = False + Me.ucrChkShowInternalLogFile.Location = New System.Drawing.Point(6, 117) + Me.ucrChkShowInternalLogFile.Name = "ucrChkShowInternalLogFile" + Me.ucrChkShowInternalLogFile.Size = New System.Drawing.Size(216, 23) + Me.ucrChkShowInternalLogFile.TabIndex = 27 + ' + 'rdoRunBackupLog + ' + Me.rdoRunBackupLog.AutoSize = True + Me.rdoRunBackupLog.Location = New System.Drawing.Point(25, 30) + Me.rdoRunBackupLog.Name = "rdoRunBackupLog" + Me.rdoRunBackupLog.Size = New System.Drawing.Size(106, 17) + Me.rdoRunBackupLog.TabIndex = 42 + Me.rdoRunBackupLog.TabStop = True + Me.rdoRunBackupLog.Text = "Run Backup Log" + Me.rdoRunBackupLog.UseVisualStyleBackColor = True + ' + 'rdoLoadBackupData + ' + Me.rdoLoadBackupData.AutoSize = True + Me.rdoLoadBackupData.Location = New System.Drawing.Point(151, 30) + Me.rdoLoadBackupData.Name = "rdoLoadBackupData" + Me.rdoLoadBackupData.Size = New System.Drawing.Size(115, 17) + Me.rdoLoadBackupData.TabIndex = 43 + Me.rdoLoadBackupData.TabStop = True + Me.rdoLoadBackupData.Text = "Load Backup Data" + Me.rdoLoadBackupData.UseVisualStyleBackColor = True + ' + 'rdoNeither + ' + Me.rdoNeither.AutoSize = True + Me.rdoNeither.Location = New System.Drawing.Point(297, 30) + Me.rdoNeither.Name = "rdoNeither" + Me.rdoNeither.Size = New System.Drawing.Size(59, 17) + Me.rdoNeither.TabIndex = 44 + Me.rdoNeither.TabStop = True + Me.rdoNeither.Text = "Neither" + Me.rdoNeither.UseVisualStyleBackColor = True + ' 'dlgRestoreBackup ' 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(901, 359) + Me.ClientSize = New System.Drawing.Size(748, 359) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.grpEndChoice) Me.Controls.Add(Me.ucrChkSendInternalLog) @@ -255,17 +261,15 @@ Partial Class dlgRestoreBackup Me.grpSavingOptions.ResumeLayout(False) Me.grpSavingOptions.PerformLayout() Me.grpEndChoice.ResumeLayout(False) + Me.grpEndChoice.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() End Sub Friend WithEvents grpSavingOptions As GroupBox - Friend WithEvents lblBackupDataDetected As Label - Friend WithEvents lblBackupLogDetected As Label Friend WithEvents cmdSaveLog As Button Friend WithEvents ucrInputSavedPathInternalLog As ucrInputTextBox - Friend WithEvents lblBackupInternalLogDetected As Label Friend WithEvents lblInternalLogSavedTo As Label Friend WithEvents cmdSaveInternalLog As Button Friend WithEvents ucrInputSavedPathLog As ucrInputTextBox @@ -274,9 +278,12 @@ Partial Class dlgRestoreBackup Friend WithEvents lblDataSavedTo As Label Friend WithEvents ucrInputSavedPathData As ucrInputTextBox Friend WithEvents grpEndChoice As GroupBox - Friend WithEvents cmdRunLog As Button - Friend WithEvents cmdCloseSession As Button - Friend WithEvents cmdLoadData As Button Friend WithEvents ucrChkSendInternalLog As ucrCheck Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrChkShowDataFile As ucrCheck + Friend WithEvents ucrChkShowInternalLogFile As ucrCheck + Friend WithEvents ucrChkShowLogFile As ucrCheck + Friend WithEvents rdoNeither As RadioButton + Friend WithEvents rdoLoadBackupData As RadioButton + Friend WithEvents rdoRunBackupLog As RadioButton End Class diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 26cc3ec81be..0a7107877a5 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -45,37 +45,37 @@ Public Class dlgRestoreBackup strAutoSavedInternalLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveInternalLogFolderPath).ToArray End If - ucrBase.OKEnabled(False) ucrBase.contextMenuStripToScript.Enabled = False ucrChkSendInternalLog.SetText("Send Debugging Log to R-Instat Team") + strScript = "" strLoadDateFilePath = "" If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 Then - lblBackupDataDetected.Text = "Backup Data File Detected" + ucrChkShowDataFile.SetText("Backup Data File Detected") cmdSaveData.Enabled = True - cmdLoadData.Enabled = True + rdoLoadBackupData.Enabled = True Else - lblBackupDataDetected.Text = "No Backup Data File Detected" + ucrChkShowDataFile.SetText("No Backup Data File Detected") cmdSaveData.Enabled = False - cmdLoadData.Enabled = False + rdoLoadBackupData.Enabled = False End If If strAutoSavedLogFilePaths IsNot Nothing AndAlso strAutoSavedLogFilePaths.Count > 0 Then - lblBackupLogDetected.Text = "Backup Log File Detected" + ucrChkShowLogFile.SetText("Backup Log File Detected") cmdSaveLog.Enabled = True - cmdRunLog.Enabled = True + rdoRunBackupLog.Enabled = True Else - lblBackupLogDetected.Text = "No Backup Log File Detected" + ucrChkShowLogFile.SetText("No Backup Log File Detected") cmdSaveLog.Enabled = False - cmdRunLog.Enabled = False + rdoRunBackupLog.Enabled = False End If If strAutoSavedInternalLogFilePaths IsNot Nothing AndAlso strAutoSavedInternalLogFilePaths.Count > 0 Then - lblBackupInternalLogDetected.Text = "Backup Debugging Log File Detected" + ucrChkShowInternalLogFile.SetText("Backup Debugging Log File Detected") cmdSaveInternalLog.Enabled = True ucrChkSendInternalLog.Visible = False ucrChkSendInternalLog.Checked = False Else - lblBackupInternalLogDetected.Text = "No Backup Debugging Log File Detected" + ucrChkShowInternalLogFile.SetText("No Backup Debugging Log File Detected") cmdSaveInternalLog.Enabled = False ucrChkSendInternalLog.Visible = False ucrChkSendInternalLog.Checked = False @@ -84,8 +84,9 @@ Public Class dlgRestoreBackup ucrInputSavedPathInternalLog.IsReadOnly = True ucrInputSavedPathLog.IsReadOnly = True - cmdCloseSession.Enabled = True + rdoNeither.Enabled = True autoTranslate(Me) + TestOKEnabled() End Sub Public Function GetScript() As String @@ -162,36 +163,50 @@ Public Class dlgRestoreBackup End If End Sub - Private Sub cmdRunLog_Click(sender As Object, e As EventArgs) Handles cmdRunLog.Click - SaveFiles() - If File.Exists(strAutoSavedLogFilePaths(0)) Then - Try - strScript = File.ReadAllText(strAutoSavedLogFilePaths(0)) - Catch ex As Exception - MsgBox("Could not read log file." & Environment.NewLine & ex.Message, "Cannot read file") - strScript = "" - End Try + Private Sub TestOKEnabled() + If rdoRunBackupLog.Checked OrElse rdoLoadBackupData.Checked OrElse rdoNeither.Checked Then + ucrBase.OKEnabled(True) + bUserClose = False + Else + ucrBase.OKEnabled(False) End If - bUserClose = False - Close() End Sub - Private Sub cmdLoadData_Click(sender As Object, e As EventArgs) Handles cmdLoadData.Click - SaveFiles() - strLoadDateFilePath = strAutoSavedDataFilePaths(0) - bUserClose = False - Close() + Private Sub ucrChkSendInternalLog_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkShowDataFile.ControlValueChanged, ucrInputSavedPathData.ControlValueChanged, + ucrInputSavedPathInternalLog.ControlValueChanged, ucrInputSavedPathLog.ControlValueChanged, ucrChkShowInternalLogFile.ControlValueChanged, ucrChkShowLogFile.ControlValueChanged + ucrInputSavedPathData.Visible = ucrChkShowDataFile.Checked + ucrInputSavedPathLog.Visible = ucrChkShowLogFile.Checked + ucrInputSavedPathInternalLog.Visible = ucrChkShowInternalLogFile.Checked End Sub - Private Sub cmdCloseSession_Click(sender As Object, e As EventArgs) Handles cmdCloseSession.Click - SaveFiles() - bUserClose = False - Close() + Private Sub rdoRunBackupLog_CheckedChanged(sender As Object, e As EventArgs) Handles rdoRunBackupLog.CheckedChanged + If rdoRunBackupLog.Checked Then + SaveFiles() + If File.Exists(strAutoSavedLogFilePaths(0)) Then + Try + strScript = File.ReadAllText(strAutoSavedLogFilePaths(0)) + Catch ex As Exception + MsgBox("Could not read log file." & Environment.NewLine & ex.Message, "Cannot read file") + strScript = "" + End Try + End If + End If + TestOKEnabled() End Sub - Private Sub cmdCancel_Click(sender As Object, e As EventArgs) Handles ucrBase.ClickClose - Close() + Private Sub rdoLoadBackupData_CheckedChanged(sender As Object, e As EventArgs) Handles rdoLoadBackupData.CheckedChanged + If rdoLoadBackupData.Checked Then + SaveFiles() + strLoadDateFilePath = strAutoSavedDataFilePaths(0) + bUserClose = False + End If + TestOKEnabled() End Sub + Private Sub rdoNeither_CheckedChanged(sender As Object, e As EventArgs) Handles rdoNeither.CheckedChanged + If rdoNeither.Checked Then + Close() + End If + End Sub End Class \ No newline at end of file From ba6b60d179df96c46cbcfc51ba25c4eec21036b9 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 17 Apr 2024 09:45:49 +0300 Subject: [PATCH 28/99] Added Shit Click --- instat/UserControl/ucrOutputPage.vb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index 05f4025b5e3..979ca89275d 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -22,6 +22,7 @@ Imports RInsightF461 ''' Public Class ucrOutputPage Private _checkBoxes As List(Of CheckBox) + Private lastCheckedCheckbox As CheckBox Private _bCanReOrder As Boolean Private _bCanRename As Boolean Private _bCanDelete As Boolean @@ -385,11 +386,11 @@ Public Class ucrOutputPage } panel.Controls.Add(checkBox) _checkBoxes.Add(checkBox) + AddHandler checkBox.CheckedChanged, AddressOf CheckBox_CheckedChanged AddHandler checkBox.Click, AddressOf checkButton_Click AddHandler checkBox.MouseLeave, AddressOf panelContents_MouseLeave End Sub - ''' ''' Copies selected elements to clipboard ''' @@ -485,7 +486,6 @@ Public Class ucrOutputPage Next End Sub - Private Sub SetRichTextBoxHeight(richTextBox As RichTextBox) richTextBox.Height = (richTextBox.GetLineFromCharIndex(richTextBox.Text.Length) + 1) * (richTextBox.Font.Height + richTextBox.Margin.Vertical) + 5 End Sub @@ -494,6 +494,18 @@ Public Class ucrOutputPage pictureBox.Height = pictureBox.Width / (pictureBox.Image.Width / pictureBox.Image.Height) End Sub + Private Sub CheckBox_CheckedChanged(sender As Object, e As EventArgs) + Dim currentCheckbox As CheckBox = DirectCast(sender, CheckBox) + If Control.ModifierKeys = Keys.Shift Then + Dim startIndex As Integer = _checkBoxes.IndexOf(currentCheckbox) + Dim endIndex As Integer = _checkBoxes.Count - 1 + For i As Integer = startIndex To endIndex + _checkBoxes(i).Checked = currentCheckbox.Checked + Next + End If + lastCheckedCheckbox = currentCheckbox + End Sub + Private Sub checkButton_Click(sender As Object, e As EventArgs) RaiseEvent RefreshContextButtons() End Sub From 02b8e6f2e47bbd292eaa437ad670d5e57df309a2 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 17 Apr 2024 12:44:00 +0300 Subject: [PATCH 29/99] code change on the selection range --- instat/UserControl/ucrOutputPage.vb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index 979ca89275d..ef473047f85 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -22,7 +22,7 @@ Imports RInsightF461 ''' Public Class ucrOutputPage Private _checkBoxes As List(Of CheckBox) - Private lastCheckedCheckbox As CheckBox + Private lastCheckedBox As CheckBox = Nothing Private _bCanReOrder As Boolean Private _bCanRename As Boolean Private _bCanDelete As Boolean @@ -225,7 +225,6 @@ Public Class ucrOutputPage End If End Sub - Private Sub AddNewTextOutput(outputElement As clsOutputElement) Dim panel As Panel = AddElementPanel(outputElement) @@ -495,15 +494,18 @@ Public Class ucrOutputPage End Sub Private Sub CheckBox_CheckedChanged(sender As Object, e As EventArgs) - Dim currentCheckbox As CheckBox = DirectCast(sender, CheckBox) - If Control.ModifierKeys = Keys.Shift Then - Dim startIndex As Integer = _checkBoxes.IndexOf(currentCheckbox) - Dim endIndex As Integer = _checkBoxes.Count - 1 - For i As Integer = startIndex To endIndex - _checkBoxes(i).Checked = currentCheckbox.Checked + Dim currentBox As CheckBox = DirectCast(sender, CheckBox) + + If lastCheckedBox IsNot Nothing AndAlso Control.ModifierKeys = Keys.Shift Then + Dim startIndex As Integer = _checkBoxes.IndexOf(lastCheckedBox) + Dim endIndex As Integer = _checkBoxes.IndexOf(currentBox) + + For i As Integer = Math.Min(startIndex, endIndex) To Math.Max(startIndex, endIndex) + _checkBoxes(i).Checked = True Next End If - lastCheckedCheckbox = currentCheckbox + + lastCheckedBox = currentBox End Sub Private Sub checkButton_Click(sender As Object, e As EventArgs) From 24b4147600b2c841ea4fa3020bfb1c2bf95d3657 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 17 Apr 2024 12:43:58 +0200 Subject: [PATCH 30/99] More code changes --- instat/dlgRestoreBackup.Designer.vb | 297 +++++++++++----------------- instat/dlgRestoreBackup.vb | 63 +----- 2 files changed, 128 insertions(+), 232 deletions(-) diff --git a/instat/dlgRestoreBackup.Designer.vb b/instat/dlgRestoreBackup.Designer.vb index 13135605a76..6e5c13ef2d0 100644 --- a/instat/dlgRestoreBackup.Designer.vb +++ b/instat/dlgRestoreBackup.Designer.vb @@ -23,184 +23,148 @@ Partial Class dlgRestoreBackup _ Private Sub InitializeComponent() Me.grpSavingOptions = New System.Windows.Forms.GroupBox() - Me.cmdSaveLog = New System.Windows.Forms.Button() - Me.ucrInputSavedPathInternalLog = New instat.ucrInputTextBox() - Me.lblInternalLogSavedTo = New System.Windows.Forms.Label() - Me.cmdSaveInternalLog = New System.Windows.Forms.Button() - Me.ucrInputSavedPathLog = New instat.ucrInputTextBox() - Me.cmdSaveData = New System.Windows.Forms.Button() - Me.lblLogSavedTo = New System.Windows.Forms.Label() - Me.lblDataSavedTo = New System.Windows.Forms.Label() - Me.ucrInputSavedPathData = New instat.ucrInputTextBox() Me.grpEndChoice = New System.Windows.Forms.GroupBox() - Me.ucrChkSendInternalLog = New instat.ucrCheck() + Me.rdoNeither = New System.Windows.Forms.RadioButton() + Me.rdoLoadBackupData = New System.Windows.Forms.RadioButton() + Me.rdoRunBackupLog = New System.Windows.Forms.RadioButton() Me.ucrBase = New instat.ucrButtons() - Me.ucrChkShowDataFile = New instat.ucrCheck() - Me.ucrChkShowLogFile = New instat.ucrCheck() + Me.ucrChkSendInternalLog = New instat.ucrCheck() + Me.ucrInputSavedPathInternalLog = New instat.ucrFilePath() + Me.ucrInputSavedPathLog = New instat.ucrFilePath() + Me.ucrInputSavedPathData = New instat.ucrFilePath() Me.ucrChkShowInternalLogFile = New instat.ucrCheck() - Me.rdoRunBackupLog = New System.Windows.Forms.RadioButton() - Me.rdoLoadBackupData = New System.Windows.Forms.RadioButton() - Me.rdoNeither = New System.Windows.Forms.RadioButton() + Me.ucrChkShowLogFile = New instat.ucrCheck() + Me.ucrChkShowDataFile = New instat.ucrCheck() Me.grpSavingOptions.SuspendLayout() Me.grpEndChoice.SuspendLayout() Me.SuspendLayout() ' 'grpSavingOptions ' - Me.grpSavingOptions.Controls.Add(Me.ucrChkShowInternalLogFile) - Me.grpSavingOptions.Controls.Add(Me.ucrChkShowLogFile) - Me.grpSavingOptions.Controls.Add(Me.ucrChkShowDataFile) - Me.grpSavingOptions.Controls.Add(Me.cmdSaveLog) Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathInternalLog) - Me.grpSavingOptions.Controls.Add(Me.lblInternalLogSavedTo) - Me.grpSavingOptions.Controls.Add(Me.cmdSaveInternalLog) Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathLog) - Me.grpSavingOptions.Controls.Add(Me.cmdSaveData) - Me.grpSavingOptions.Controls.Add(Me.lblLogSavedTo) - Me.grpSavingOptions.Controls.Add(Me.lblDataSavedTo) Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathData) - Me.grpSavingOptions.Location = New System.Drawing.Point(12, 31) + Me.grpSavingOptions.Controls.Add(Me.ucrChkShowInternalLogFile) + Me.grpSavingOptions.Controls.Add(Me.ucrChkShowLogFile) + Me.grpSavingOptions.Controls.Add(Me.ucrChkShowDataFile) + Me.grpSavingOptions.Location = New System.Drawing.Point(12, 16) Me.grpSavingOptions.Name = "grpSavingOptions" - Me.grpSavingOptions.Size = New System.Drawing.Size(726, 154) + Me.grpSavingOptions.Size = New System.Drawing.Size(604, 154) Me.grpSavingOptions.TabIndex = 20 Me.grpSavingOptions.TabStop = False Me.grpSavingOptions.Text = "Saving Options" ' - 'cmdSaveLog - ' - Me.cmdSaveLog.Location = New System.Drawing.Point(228, 68) - Me.cmdSaveLog.Name = "cmdSaveLog" - Me.cmdSaveLog.Size = New System.Drawing.Size(145, 29) - Me.cmdSaveLog.TabIndex = 5 - Me.cmdSaveLog.Text = "Browse" - Me.cmdSaveLog.UseVisualStyleBackColor = True - ' - 'ucrInputSavedPathInternalLog - ' - Me.ucrInputSavedPathInternalLog.AddQuotesIfUnrecognised = True - Me.ucrInputSavedPathInternalLog.AutoSize = True - Me.ucrInputSavedPathInternalLog.IsMultiline = False - Me.ucrInputSavedPathInternalLog.IsReadOnly = False - Me.ucrInputSavedPathInternalLog.Location = New System.Drawing.Point(447, 123) - Me.ucrInputSavedPathInternalLog.Name = "ucrInputSavedPathInternalLog" - Me.ucrInputSavedPathInternalLog.Size = New System.Drawing.Size(258, 21) - Me.ucrInputSavedPathInternalLog.TabIndex = 16 - ' - 'lblInternalLogSavedTo - ' - Me.lblInternalLogSavedTo.AutoSize = True - Me.lblInternalLogSavedTo.Location = New System.Drawing.Point(385, 125) - Me.lblInternalLogSavedTo.Name = "lblInternalLogSavedTo" - Me.lblInternalLogSavedTo.Size = New System.Drawing.Size(55, 13) - Me.lblInternalLogSavedTo.TabIndex = 15 - Me.lblInternalLogSavedTo.Text = "Saving at:" - ' - 'cmdSaveInternalLog - ' - Me.cmdSaveInternalLog.Location = New System.Drawing.Point(229, 115) - Me.cmdSaveInternalLog.Name = "cmdSaveInternalLog" - Me.cmdSaveInternalLog.Size = New System.Drawing.Size(144, 29) - Me.cmdSaveInternalLog.TabIndex = 7 - Me.cmdSaveInternalLog.Text = "Browse" - Me.cmdSaveInternalLog.UseVisualStyleBackColor = True - ' - 'ucrInputSavedPathLog - ' - Me.ucrInputSavedPathLog.AddQuotesIfUnrecognised = True - Me.ucrInputSavedPathLog.AutoSize = True - Me.ucrInputSavedPathLog.IsMultiline = False - Me.ucrInputSavedPathLog.IsReadOnly = False - Me.ucrInputSavedPathLog.Location = New System.Drawing.Point(446, 76) - Me.ucrInputSavedPathLog.Name = "ucrInputSavedPathLog" - Me.ucrInputSavedPathLog.Size = New System.Drawing.Size(258, 21) - Me.ucrInputSavedPathLog.TabIndex = 14 - ' - 'cmdSaveData - ' - Me.cmdSaveData.Location = New System.Drawing.Point(229, 21) - Me.cmdSaveData.Name = "cmdSaveData" - Me.cmdSaveData.Size = New System.Drawing.Size(144, 29) - Me.cmdSaveData.TabIndex = 9 - Me.cmdSaveData.Text = "Browse" - Me.cmdSaveData.UseVisualStyleBackColor = True - ' - 'lblLogSavedTo - ' - Me.lblLogSavedTo.AutoSize = True - Me.lblLogSavedTo.Location = New System.Drawing.Point(385, 78) - Me.lblLogSavedTo.Name = "lblLogSavedTo" - Me.lblLogSavedTo.Size = New System.Drawing.Size(55, 13) - Me.lblLogSavedTo.TabIndex = 13 - Me.lblLogSavedTo.Text = "Saving at:" - ' - 'lblDataSavedTo - ' - Me.lblDataSavedTo.AutoSize = True - Me.lblDataSavedTo.Location = New System.Drawing.Point(384, 29) - Me.lblDataSavedTo.Name = "lblDataSavedTo" - Me.lblDataSavedTo.Size = New System.Drawing.Size(55, 13) - Me.lblDataSavedTo.TabIndex = 11 - Me.lblDataSavedTo.Text = "Saving at:" - ' - 'ucrInputSavedPathData - ' - Me.ucrInputSavedPathData.AddQuotesIfUnrecognised = True - Me.ucrInputSavedPathData.AutoSize = True - Me.ucrInputSavedPathData.IsMultiline = False - Me.ucrInputSavedPathData.IsReadOnly = False - Me.ucrInputSavedPathData.Location = New System.Drawing.Point(446, 27) - Me.ucrInputSavedPathData.Name = "ucrInputSavedPathData" - Me.ucrInputSavedPathData.Size = New System.Drawing.Size(258, 21) - Me.ucrInputSavedPathData.TabIndex = 12 - ' 'grpEndChoice ' Me.grpEndChoice.Controls.Add(Me.rdoNeither) Me.grpEndChoice.Controls.Add(Me.rdoLoadBackupData) Me.grpEndChoice.Controls.Add(Me.rdoRunBackupLog) - Me.grpEndChoice.Location = New System.Drawing.Point(222, 221) + Me.grpEndChoice.Location = New System.Drawing.Point(136, 209) Me.grpEndChoice.Name = "grpEndChoice" - Me.grpEndChoice.Size = New System.Drawing.Size(394, 66) + Me.grpEndChoice.Size = New System.Drawing.Size(358, 66) Me.grpEndChoice.TabIndex = 23 Me.grpEndChoice.TabStop = False - Me.grpEndChoice.Text = "Choose one of the following to proceed" + Me.grpEndChoice.Text = "Choose one of the following" ' - 'ucrChkSendInternalLog + 'rdoNeither ' - Me.ucrChkSendInternalLog.AutoSize = True - Me.ucrChkSendInternalLog.Checked = False - Me.ucrChkSendInternalLog.Location = New System.Drawing.Point(36, 195) - Me.ucrChkSendInternalLog.Name = "ucrChkSendInternalLog" - Me.ucrChkSendInternalLog.Size = New System.Drawing.Size(266, 23) - Me.ucrChkSendInternalLog.TabIndex = 21 + Me.rdoNeither.AutoSize = True + Me.rdoNeither.Location = New System.Drawing.Point(272, 30) + Me.rdoNeither.Name = "rdoNeither" + Me.rdoNeither.Size = New System.Drawing.Size(59, 17) + Me.rdoNeither.TabIndex = 44 + Me.rdoNeither.TabStop = True + Me.rdoNeither.Text = "Neither" + Me.rdoNeither.UseVisualStyleBackColor = True + ' + 'rdoLoadBackupData + ' + Me.rdoLoadBackupData.AutoSize = True + Me.rdoLoadBackupData.Location = New System.Drawing.Point(138, 30) + Me.rdoLoadBackupData.Name = "rdoLoadBackupData" + Me.rdoLoadBackupData.Size = New System.Drawing.Size(115, 17) + Me.rdoLoadBackupData.TabIndex = 43 + Me.rdoLoadBackupData.TabStop = True + Me.rdoLoadBackupData.Text = "Load Backup Data" + Me.rdoLoadBackupData.UseVisualStyleBackColor = True + ' + 'rdoRunBackupLog + ' + Me.rdoRunBackupLog.AutoSize = True + Me.rdoRunBackupLog.Location = New System.Drawing.Point(25, 30) + Me.rdoRunBackupLog.Name = "rdoRunBackupLog" + Me.rdoRunBackupLog.Size = New System.Drawing.Size(106, 17) + Me.rdoRunBackupLog.TabIndex = 42 + Me.rdoRunBackupLog.TabStop = True + Me.rdoRunBackupLog.Text = "Run Backup Log" + Me.rdoRunBackupLog.UseVisualStyleBackColor = True ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(208, 298) + Me.ucrBase.Location = New System.Drawing.Point(111, 282) Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 24 ' - 'ucrChkShowDataFile + 'ucrChkSendInternalLog ' - Me.ucrChkShowDataFile.AutoSize = True - Me.ucrChkShowDataFile.Checked = False - Me.ucrChkShowDataFile.Location = New System.Drawing.Point(6, 25) - Me.ucrChkShowDataFile.Name = "ucrChkShowDataFile" - Me.ucrChkShowDataFile.Size = New System.Drawing.Size(216, 23) - Me.ucrChkShowDataFile.TabIndex = 25 + Me.ucrChkSendInternalLog.AutoSize = True + Me.ucrChkSendInternalLog.Checked = False + Me.ucrChkSendInternalLog.Location = New System.Drawing.Point(23, 177) + Me.ucrChkSendInternalLog.Name = "ucrChkSendInternalLog" + Me.ucrChkSendInternalLog.Size = New System.Drawing.Size(266, 23) + Me.ucrChkSendInternalLog.TabIndex = 21 ' - 'ucrChkShowLogFile + 'ucrInputSavedPathInternalLog ' - Me.ucrChkShowLogFile.AutoSize = True - Me.ucrChkShowLogFile.Checked = False - Me.ucrChkShowLogFile.Location = New System.Drawing.Point(6, 74) - Me.ucrChkShowLogFile.Name = "ucrChkShowLogFile" - Me.ucrChkShowLogFile.Size = New System.Drawing.Size(216, 23) - Me.ucrChkShowLogFile.TabIndex = 26 + Me.ucrInputSavedPathInternalLog.AutoSize = True + Me.ucrInputSavedPathInternalLog.DefaultFileSuggestionName = "" + Me.ucrInputSavedPathInternalLog.FilePath = "" + Me.ucrInputSavedPathInternalLog.FilePathBrowseText = "Browse" + Me.ucrInputSavedPathInternalLog.FilePathDialogFilter = "RDS Data file (*.RDS)|*.RDS" + Me.ucrInputSavedPathInternalLog.FilePathDialogTitle = "Save Data File" + Me.ucrInputSavedPathInternalLog.FilePathLabel = "Save As:" + Me.ucrInputSavedPathInternalLog.FolderBrowse = False + Me.ucrInputSavedPathInternalLog.Location = New System.Drawing.Point(244, 115) + Me.ucrInputSavedPathInternalLog.Name = "ucrInputSavedPathInternalLog" + Me.ucrInputSavedPathInternalLog.SelectedFileFilterIndex = 1 + Me.ucrInputSavedPathInternalLog.Size = New System.Drawing.Size(334, 34) + Me.ucrInputSavedPathInternalLog.TabIndex = 29 + ' + 'ucrInputSavedPathLog + ' + Me.ucrInputSavedPathLog.AutoSize = True + Me.ucrInputSavedPathLog.DefaultFileSuggestionName = "" + Me.ucrInputSavedPathLog.FilePath = "" + Me.ucrInputSavedPathLog.FilePathBrowseText = "Browse" + Me.ucrInputSavedPathLog.FilePathDialogFilter = "RDS Data file (*.RDS)|*.RDS" + Me.ucrInputSavedPathLog.FilePathDialogTitle = "Save Data File" + Me.ucrInputSavedPathLog.FilePathLabel = "Save As:" + Me.ucrInputSavedPathLog.FolderBrowse = False + Me.ucrInputSavedPathLog.Location = New System.Drawing.Point(244, 70) + Me.ucrInputSavedPathLog.Name = "ucrInputSavedPathLog" + Me.ucrInputSavedPathLog.SelectedFileFilterIndex = 1 + Me.ucrInputSavedPathLog.Size = New System.Drawing.Size(334, 34) + Me.ucrInputSavedPathLog.TabIndex = 28 + ' + 'ucrInputSavedPathData + ' + Me.ucrInputSavedPathData.AutoSize = True + Me.ucrInputSavedPathData.DefaultFileSuggestionName = "" + Me.ucrInputSavedPathData.FilePath = "" + Me.ucrInputSavedPathData.FilePathBrowseText = "Browse" + Me.ucrInputSavedPathData.FilePathDialogFilter = "RDS Data file (*.RDS)|*.RDS" + Me.ucrInputSavedPathData.FilePathDialogTitle = "Save Data File" + Me.ucrInputSavedPathData.FilePathLabel = "Save As:" + Me.ucrInputSavedPathData.FolderBrowse = False + Me.ucrInputSavedPathData.Location = New System.Drawing.Point(244, 21) + Me.ucrInputSavedPathData.Name = "ucrInputSavedPathData" + Me.ucrInputSavedPathData.SelectedFileFilterIndex = 1 + Me.ucrInputSavedPathData.Size = New System.Drawing.Size(334, 34) + Me.ucrInputSavedPathData.TabIndex = 25 ' 'ucrChkShowInternalLogFile ' @@ -211,45 +175,30 @@ Partial Class dlgRestoreBackup Me.ucrChkShowInternalLogFile.Size = New System.Drawing.Size(216, 23) Me.ucrChkShowInternalLogFile.TabIndex = 27 ' - 'rdoRunBackupLog - ' - Me.rdoRunBackupLog.AutoSize = True - Me.rdoRunBackupLog.Location = New System.Drawing.Point(25, 30) - Me.rdoRunBackupLog.Name = "rdoRunBackupLog" - Me.rdoRunBackupLog.Size = New System.Drawing.Size(106, 17) - Me.rdoRunBackupLog.TabIndex = 42 - Me.rdoRunBackupLog.TabStop = True - Me.rdoRunBackupLog.Text = "Run Backup Log" - Me.rdoRunBackupLog.UseVisualStyleBackColor = True - ' - 'rdoLoadBackupData + 'ucrChkShowLogFile ' - Me.rdoLoadBackupData.AutoSize = True - Me.rdoLoadBackupData.Location = New System.Drawing.Point(151, 30) - Me.rdoLoadBackupData.Name = "rdoLoadBackupData" - Me.rdoLoadBackupData.Size = New System.Drawing.Size(115, 17) - Me.rdoLoadBackupData.TabIndex = 43 - Me.rdoLoadBackupData.TabStop = True - Me.rdoLoadBackupData.Text = "Load Backup Data" - Me.rdoLoadBackupData.UseVisualStyleBackColor = True + Me.ucrChkShowLogFile.AutoSize = True + Me.ucrChkShowLogFile.Checked = False + Me.ucrChkShowLogFile.Location = New System.Drawing.Point(6, 74) + Me.ucrChkShowLogFile.Name = "ucrChkShowLogFile" + Me.ucrChkShowLogFile.Size = New System.Drawing.Size(216, 23) + Me.ucrChkShowLogFile.TabIndex = 26 ' - 'rdoNeither + 'ucrChkShowDataFile ' - Me.rdoNeither.AutoSize = True - Me.rdoNeither.Location = New System.Drawing.Point(297, 30) - Me.rdoNeither.Name = "rdoNeither" - Me.rdoNeither.Size = New System.Drawing.Size(59, 17) - Me.rdoNeither.TabIndex = 44 - Me.rdoNeither.TabStop = True - Me.rdoNeither.Text = "Neither" - Me.rdoNeither.UseVisualStyleBackColor = True + Me.ucrChkShowDataFile.AutoSize = True + Me.ucrChkShowDataFile.Checked = False + Me.ucrChkShowDataFile.Location = New System.Drawing.Point(6, 25) + Me.ucrChkShowDataFile.Name = "ucrChkShowDataFile" + Me.ucrChkShowDataFile.Size = New System.Drawing.Size(216, 23) + Me.ucrChkShowDataFile.TabIndex = 25 ' 'dlgRestoreBackup ' 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(748, 359) + Me.ClientSize = New System.Drawing.Size(627, 340) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.grpEndChoice) Me.Controls.Add(Me.ucrChkSendInternalLog) @@ -268,15 +217,6 @@ Partial Class dlgRestoreBackup End Sub Friend WithEvents grpSavingOptions As GroupBox - Friend WithEvents cmdSaveLog As Button - Friend WithEvents ucrInputSavedPathInternalLog As ucrInputTextBox - Friend WithEvents lblInternalLogSavedTo As Label - Friend WithEvents cmdSaveInternalLog As Button - Friend WithEvents ucrInputSavedPathLog As ucrInputTextBox - Friend WithEvents cmdSaveData As Button - Friend WithEvents lblLogSavedTo As Label - Friend WithEvents lblDataSavedTo As Label - Friend WithEvents ucrInputSavedPathData As ucrInputTextBox Friend WithEvents grpEndChoice As GroupBox Friend WithEvents ucrChkSendInternalLog As ucrCheck Friend WithEvents ucrBase As ucrButtons @@ -286,4 +226,7 @@ Partial Class dlgRestoreBackup Friend WithEvents rdoNeither As RadioButton Friend WithEvents rdoLoadBackupData As RadioButton Friend WithEvents rdoRunBackupLog As RadioButton + Friend WithEvents ucrInputSavedPathData As ucrFilePath + Friend WithEvents ucrInputSavedPathLog As ucrFilePath + Friend WithEvents ucrInputSavedPathInternalLog As ucrFilePath End Class diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 0a7107877a5..319aa032bf6 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -34,6 +34,10 @@ Public Class dlgRestoreBackup ucrBase.iHelpTopicID = 411 'temporary - not yet implemented ucrChkSendInternalLog.Visible = False + ucrInputSavedPathData.Visible = ucrChkShowDataFile.Checked + ucrInputSavedPathLog.Visible = ucrChkShowLogFile.Checked + ucrInputSavedPathInternalLog.Visible = ucrChkShowInternalLogFile.Checked + rdoNeither.Checked = True If (Directory.Exists(strAutoSaveLogFolderPath)) Then strAutoSavedLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveLogFolderPath).ToArray @@ -53,36 +57,27 @@ Public Class dlgRestoreBackup strLoadDateFilePath = "" If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 Then ucrChkShowDataFile.SetText("Backup Data File Detected") - cmdSaveData.Enabled = True rdoLoadBackupData.Enabled = True Else ucrChkShowDataFile.SetText("No Backup Data File Detected") - cmdSaveData.Enabled = False rdoLoadBackupData.Enabled = False End If If strAutoSavedLogFilePaths IsNot Nothing AndAlso strAutoSavedLogFilePaths.Count > 0 Then ucrChkShowLogFile.SetText("Backup Log File Detected") - cmdSaveLog.Enabled = True rdoRunBackupLog.Enabled = True Else ucrChkShowLogFile.SetText("No Backup Log File Detected") - cmdSaveLog.Enabled = False rdoRunBackupLog.Enabled = False End If If strAutoSavedInternalLogFilePaths IsNot Nothing AndAlso strAutoSavedInternalLogFilePaths.Count > 0 Then ucrChkShowInternalLogFile.SetText("Backup Debugging Log File Detected") - cmdSaveInternalLog.Enabled = True ucrChkSendInternalLog.Visible = False ucrChkSendInternalLog.Checked = False Else ucrChkShowInternalLogFile.SetText("No Backup Debugging Log File Detected") - cmdSaveInternalLog.Enabled = False ucrChkSendInternalLog.Visible = False ucrChkSendInternalLog.Checked = False End If - ucrInputSavedPathData.IsReadOnly = True - ucrInputSavedPathInternalLog.IsReadOnly = True - ucrInputSavedPathLog.IsReadOnly = True rdoNeither.Enabled = True autoTranslate(Me) @@ -97,47 +92,11 @@ Public Class dlgRestoreBackup Return strLoadDateFilePath End Function - Private Sub cmdSaveData_Click(sender As Object, e As EventArgs) Handles cmdSaveData.Click - Using dlgSave As New SaveFileDialog - dlgSave.Title = "Save Data File" - dlgSave.Filter = "RDS Data file (*.RDS)|*.RDS" - If dlgSave.ShowDialog() = DialogResult.OK Then - ucrInputSavedPathData.SetName(dlgSave.FileName) - Else - ucrInputSavedPathData.SetName("") - End If - End Using - End Sub - - Private Sub cmdSaveLog_Click(sender As Object, e As EventArgs) Handles cmdSaveLog.Click - Using dlgSave As New SaveFileDialog - dlgSave.Title = "Save Log File" - dlgSave.Filter = "R script file (*.R)|*.R" - If dlgSave.ShowDialog() = DialogResult.OK Then - ucrInputSavedPathLog.SetName(dlgSave.FileName) - Else - ucrInputSavedPathLog.SetName("") - End If - End Using - End Sub - - Private Sub cmdSaveDebuggingLog_Click(sender As Object, e As EventArgs) Handles cmdSaveInternalLog.Click - Using dlgSave As New SaveFileDialog - dlgSave.Title = "Save Debugging Log File" - dlgSave.Filter = "R script file (*.R)|*.R" - If dlgSave.ShowDialog() = DialogResult.OK Then - ucrInputSavedPathInternalLog.SetName(dlgSave.FileName) - Else - ucrInputSavedPathInternalLog.SetName("") - End If - End Using - End Sub - Private Sub SaveFiles() If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedDataFilePaths(0)) Then Try If Not ucrInputSavedPathData.IsEmpty() Then - File.Copy(strAutoSavedDataFilePaths(0), ucrInputSavedPathData.GetText(), True) + File.Copy(strAutoSavedDataFilePaths(0), ucrInputSavedPathData.FilePath(), True) End If Catch ex As Exception MsgBox("Could not copy and/or delete data file." & Environment.NewLine & ex.Message, "Error copying/deleting file") @@ -146,7 +105,7 @@ Public Class dlgRestoreBackup If strAutoSavedLogFilePaths IsNot Nothing AndAlso strAutoSavedLogFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedLogFilePaths(0)) Then Try If Not ucrInputSavedPathLog.IsEmpty() Then - File.Copy(strAutoSavedLogFilePaths(0), ucrInputSavedPathLog.GetText(), True) + File.Copy(strAutoSavedLogFilePaths(0), ucrInputSavedPathLog.FilePath(), True) End If Catch ex As Exception MsgBox("Could not copy and/or delete log file." & Environment.NewLine & ex.Message, "Error copying/deleting file") @@ -155,7 +114,7 @@ Public Class dlgRestoreBackup If strAutoSavedInternalLogFilePaths IsNot Nothing AndAlso strAutoSavedInternalLogFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedInternalLogFilePaths(0)) Then Try If Not ucrInputSavedPathInternalLog.IsEmpty() Then - File.Copy(strAutoSavedInternalLogFilePaths(0), ucrInputSavedPathInternalLog.GetText(), True) + File.Copy(strAutoSavedInternalLogFilePaths(0), ucrInputSavedPathInternalLog.FilePath(), True) End If Catch ex As Exception MsgBox("Could not copy and/or delete internal log file." & Environment.NewLine & ex.Message, "Error copying/deleting file") @@ -173,8 +132,7 @@ Public Class dlgRestoreBackup End Sub - Private Sub ucrChkSendInternalLog_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkShowDataFile.ControlValueChanged, ucrInputSavedPathData.ControlValueChanged, - ucrInputSavedPathInternalLog.ControlValueChanged, ucrInputSavedPathLog.ControlValueChanged, ucrChkShowInternalLogFile.ControlValueChanged, ucrChkShowLogFile.ControlValueChanged + Private Sub ucrChkShowDataFile_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkShowDataFile.ControlValueChanged, ucrChkShowInternalLogFile.ControlValueChanged, ucrChkShowLogFile.ControlValueChanged ucrInputSavedPathData.Visible = ucrChkShowDataFile.Checked ucrInputSavedPathLog.Visible = ucrChkShowLogFile.Checked ucrInputSavedPathInternalLog.Visible = ucrChkShowInternalLogFile.Checked @@ -204,9 +162,4 @@ Public Class dlgRestoreBackup TestOKEnabled() End Sub - Private Sub rdoNeither_CheckedChanged(sender As Object, e As EventArgs) Handles rdoNeither.CheckedChanged - If rdoNeither.Checked Then - Close() - End If - End Sub End Class \ No newline at end of file From a32dcebebf5d0d9778df00f1e8721fdf18b100ca Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 17 Apr 2024 18:11:55 +0300 Subject: [PATCH 31/99] added the possibility to deselect checkboxes in between --- instat/UserControl/ucrOutputPage.vb | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index ef473047f85..b05936d9d0b 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -500,14 +500,34 @@ Public Class ucrOutputPage Dim startIndex As Integer = _checkBoxes.IndexOf(lastCheckedBox) Dim endIndex As Integer = _checkBoxes.IndexOf(currentBox) + ' Toggle check state for checkboxes between startIndex and endIndex For i As Integer = Math.Min(startIndex, endIndex) To Math.Max(startIndex, endIndex) - _checkBoxes(i).Checked = True + _checkBoxes(i).Checked = currentBox.Checked Next End If lastCheckedBox = currentBox End Sub + Private Sub CheckBox_MouseDown(sender As Object, e As MouseEventArgs) + Dim currentBox As CheckBox = DirectCast(sender, CheckBox) + + If e.Button = MouseButtons.Left AndAlso Control.ModifierKeys = Keys.Shift Then + ' Deselect all checkboxes between lastCheckedBox and currentBox + Dim startIndex As Integer = _checkBoxes.IndexOf(lastCheckedBox) + Dim endIndex As Integer = _checkBoxes.IndexOf(currentBox) + + For i As Integer = Math.Min(startIndex, endIndex) + 1 To Math.Max(startIndex, endIndex) - 1 + _checkBoxes(i).Checked = False + Next + ElseIf currentBox.Checked AndAlso Not Control.ModifierKeys = Keys.Shift Then + ' Deselect the current checkbox if already checked without Shift key + currentBox.Checked = False + End If + + lastCheckedBox = currentBox + End Sub + Private Sub checkButton_Click(sender As Object, e As EventArgs) RaiseEvent RefreshContextButtons() End Sub From f01fb1bc47cef2eb27249dd2dd94bff760f4bc10 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 18 Apr 2024 12:57:53 +0200 Subject: [PATCH 32/99] Code Changes --- instat/dlgRestoreBackup.Designer.vb | 162 ++++++++++++++-------------- instat/dlgRestoreBackup.vb | 52 ++++++++- 2 files changed, 132 insertions(+), 82 deletions(-) diff --git a/instat/dlgRestoreBackup.Designer.vb b/instat/dlgRestoreBackup.Designer.vb index 6e5c13ef2d0..36f80c846b2 100644 --- a/instat/dlgRestoreBackup.Designer.vb +++ b/instat/dlgRestoreBackup.Designer.vb @@ -23,18 +23,18 @@ Partial Class dlgRestoreBackup _ Private Sub InitializeComponent() Me.grpSavingOptions = New System.Windows.Forms.GroupBox() - Me.grpEndChoice = New System.Windows.Forms.GroupBox() - Me.rdoNeither = New System.Windows.Forms.RadioButton() - Me.rdoLoadBackupData = New System.Windows.Forms.RadioButton() - Me.rdoRunBackupLog = New System.Windows.Forms.RadioButton() - Me.ucrBase = New instat.ucrButtons() - Me.ucrChkSendInternalLog = New instat.ucrCheck() Me.ucrInputSavedPathInternalLog = New instat.ucrFilePath() Me.ucrInputSavedPathLog = New instat.ucrFilePath() Me.ucrInputSavedPathData = New instat.ucrFilePath() Me.ucrChkShowInternalLogFile = New instat.ucrCheck() Me.ucrChkShowLogFile = New instat.ucrCheck() Me.ucrChkShowDataFile = New instat.ucrCheck() + Me.grpEndChoice = New System.Windows.Forms.GroupBox() + Me.rdoNeither = New System.Windows.Forms.RadioButton() + Me.rdoLoadBackupData = New System.Windows.Forms.RadioButton() + Me.rdoRunBackupLog = New System.Windows.Forms.RadioButton() + Me.ucrBase = New instat.ucrButtons() + Me.ucrChkSendInternalLog = New instat.ucrCheck() Me.grpSavingOptions.SuspendLayout() Me.grpEndChoice.SuspendLayout() Me.SuspendLayout() @@ -54,84 +54,20 @@ Partial Class dlgRestoreBackup Me.grpSavingOptions.TabStop = False Me.grpSavingOptions.Text = "Saving Options" ' - 'grpEndChoice - ' - Me.grpEndChoice.Controls.Add(Me.rdoNeither) - Me.grpEndChoice.Controls.Add(Me.rdoLoadBackupData) - Me.grpEndChoice.Controls.Add(Me.rdoRunBackupLog) - Me.grpEndChoice.Location = New System.Drawing.Point(136, 209) - Me.grpEndChoice.Name = "grpEndChoice" - Me.grpEndChoice.Size = New System.Drawing.Size(358, 66) - Me.grpEndChoice.TabIndex = 23 - Me.grpEndChoice.TabStop = False - Me.grpEndChoice.Text = "Choose one of the following" - ' - 'rdoNeither - ' - Me.rdoNeither.AutoSize = True - Me.rdoNeither.Location = New System.Drawing.Point(272, 30) - Me.rdoNeither.Name = "rdoNeither" - Me.rdoNeither.Size = New System.Drawing.Size(59, 17) - Me.rdoNeither.TabIndex = 44 - Me.rdoNeither.TabStop = True - Me.rdoNeither.Text = "Neither" - Me.rdoNeither.UseVisualStyleBackColor = True - ' - 'rdoLoadBackupData - ' - Me.rdoLoadBackupData.AutoSize = True - Me.rdoLoadBackupData.Location = New System.Drawing.Point(138, 30) - Me.rdoLoadBackupData.Name = "rdoLoadBackupData" - Me.rdoLoadBackupData.Size = New System.Drawing.Size(115, 17) - Me.rdoLoadBackupData.TabIndex = 43 - Me.rdoLoadBackupData.TabStop = True - Me.rdoLoadBackupData.Text = "Load Backup Data" - Me.rdoLoadBackupData.UseVisualStyleBackColor = True - ' - 'rdoRunBackupLog - ' - Me.rdoRunBackupLog.AutoSize = True - Me.rdoRunBackupLog.Location = New System.Drawing.Point(25, 30) - Me.rdoRunBackupLog.Name = "rdoRunBackupLog" - Me.rdoRunBackupLog.Size = New System.Drawing.Size(106, 17) - Me.rdoRunBackupLog.TabIndex = 42 - Me.rdoRunBackupLog.TabStop = True - Me.rdoRunBackupLog.Text = "Run Backup Log" - Me.rdoRunBackupLog.UseVisualStyleBackColor = True - ' - 'ucrBase - ' - Me.ucrBase.AutoSize = True - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(111, 282) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) - Me.ucrBase.TabIndex = 24 - ' - 'ucrChkSendInternalLog - ' - Me.ucrChkSendInternalLog.AutoSize = True - Me.ucrChkSendInternalLog.Checked = False - Me.ucrChkSendInternalLog.Location = New System.Drawing.Point(23, 177) - Me.ucrChkSendInternalLog.Name = "ucrChkSendInternalLog" - Me.ucrChkSendInternalLog.Size = New System.Drawing.Size(266, 23) - Me.ucrChkSendInternalLog.TabIndex = 21 - ' 'ucrInputSavedPathInternalLog ' Me.ucrInputSavedPathInternalLog.AutoSize = True Me.ucrInputSavedPathInternalLog.DefaultFileSuggestionName = "" Me.ucrInputSavedPathInternalLog.FilePath = "" Me.ucrInputSavedPathInternalLog.FilePathBrowseText = "Browse" - Me.ucrInputSavedPathInternalLog.FilePathDialogFilter = "RDS Data file (*.RDS)|*.RDS" - Me.ucrInputSavedPathInternalLog.FilePathDialogTitle = "Save Data File" + Me.ucrInputSavedPathInternalLog.FilePathDialogFilter = "R file (*.R)|*.R" + Me.ucrInputSavedPathInternalLog.FilePathDialogTitle = "Save R File" Me.ucrInputSavedPathInternalLog.FilePathLabel = "Save As:" Me.ucrInputSavedPathInternalLog.FolderBrowse = False - Me.ucrInputSavedPathInternalLog.Location = New System.Drawing.Point(244, 115) + Me.ucrInputSavedPathInternalLog.Location = New System.Drawing.Point(222, 115) Me.ucrInputSavedPathInternalLog.Name = "ucrInputSavedPathInternalLog" Me.ucrInputSavedPathInternalLog.SelectedFileFilterIndex = 1 - Me.ucrInputSavedPathInternalLog.Size = New System.Drawing.Size(334, 34) + Me.ucrInputSavedPathInternalLog.Size = New System.Drawing.Size(380, 34) Me.ucrInputSavedPathInternalLog.TabIndex = 29 ' 'ucrInputSavedPathLog @@ -140,14 +76,14 @@ Partial Class dlgRestoreBackup Me.ucrInputSavedPathLog.DefaultFileSuggestionName = "" Me.ucrInputSavedPathLog.FilePath = "" Me.ucrInputSavedPathLog.FilePathBrowseText = "Browse" - Me.ucrInputSavedPathLog.FilePathDialogFilter = "RDS Data file (*.RDS)|*.RDS" - Me.ucrInputSavedPathLog.FilePathDialogTitle = "Save Data File" + Me.ucrInputSavedPathLog.FilePathDialogFilter = "R file (*.R)|*.R" + Me.ucrInputSavedPathLog.FilePathDialogTitle = "Save R File" Me.ucrInputSavedPathLog.FilePathLabel = "Save As:" Me.ucrInputSavedPathLog.FolderBrowse = False - Me.ucrInputSavedPathLog.Location = New System.Drawing.Point(244, 70) + Me.ucrInputSavedPathLog.Location = New System.Drawing.Point(222, 70) Me.ucrInputSavedPathLog.Name = "ucrInputSavedPathLog" Me.ucrInputSavedPathLog.SelectedFileFilterIndex = 1 - Me.ucrInputSavedPathLog.Size = New System.Drawing.Size(334, 34) + Me.ucrInputSavedPathLog.Size = New System.Drawing.Size(380, 34) Me.ucrInputSavedPathLog.TabIndex = 28 ' 'ucrInputSavedPathData @@ -160,10 +96,10 @@ Partial Class dlgRestoreBackup Me.ucrInputSavedPathData.FilePathDialogTitle = "Save Data File" Me.ucrInputSavedPathData.FilePathLabel = "Save As:" Me.ucrInputSavedPathData.FolderBrowse = False - Me.ucrInputSavedPathData.Location = New System.Drawing.Point(244, 21) + Me.ucrInputSavedPathData.Location = New System.Drawing.Point(222, 25) Me.ucrInputSavedPathData.Name = "ucrInputSavedPathData" Me.ucrInputSavedPathData.SelectedFileFilterIndex = 1 - Me.ucrInputSavedPathData.Size = New System.Drawing.Size(334, 34) + Me.ucrInputSavedPathData.Size = New System.Drawing.Size(380, 34) Me.ucrInputSavedPathData.TabIndex = 25 ' 'ucrChkShowInternalLogFile @@ -188,11 +124,75 @@ Partial Class dlgRestoreBackup ' Me.ucrChkShowDataFile.AutoSize = True Me.ucrChkShowDataFile.Checked = False - Me.ucrChkShowDataFile.Location = New System.Drawing.Point(6, 25) + Me.ucrChkShowDataFile.Location = New System.Drawing.Point(6, 31) Me.ucrChkShowDataFile.Name = "ucrChkShowDataFile" Me.ucrChkShowDataFile.Size = New System.Drawing.Size(216, 23) Me.ucrChkShowDataFile.TabIndex = 25 ' + 'grpEndChoice + ' + Me.grpEndChoice.Controls.Add(Me.rdoNeither) + Me.grpEndChoice.Controls.Add(Me.rdoLoadBackupData) + Me.grpEndChoice.Controls.Add(Me.rdoRunBackupLog) + Me.grpEndChoice.Location = New System.Drawing.Point(136, 209) + Me.grpEndChoice.Name = "grpEndChoice" + Me.grpEndChoice.Size = New System.Drawing.Size(358, 66) + Me.grpEndChoice.TabIndex = 23 + Me.grpEndChoice.TabStop = False + Me.grpEndChoice.Text = "Choose one of the following" + ' + 'rdoNeither + ' + Me.rdoNeither.AutoSize = True + Me.rdoNeither.Location = New System.Drawing.Point(272, 30) + Me.rdoNeither.Name = "rdoNeither" + Me.rdoNeither.Size = New System.Drawing.Size(59, 17) + Me.rdoNeither.TabIndex = 44 + Me.rdoNeither.TabStop = True + Me.rdoNeither.Text = "Neither" + Me.rdoNeither.UseVisualStyleBackColor = True + ' + 'rdoLoadBackupData + ' + Me.rdoLoadBackupData.AutoSize = True + Me.rdoLoadBackupData.Location = New System.Drawing.Point(138, 30) + Me.rdoLoadBackupData.Name = "rdoLoadBackupData" + Me.rdoLoadBackupData.Size = New System.Drawing.Size(115, 17) + Me.rdoLoadBackupData.TabIndex = 43 + Me.rdoLoadBackupData.TabStop = True + Me.rdoLoadBackupData.Text = "Load Backup Data" + Me.rdoLoadBackupData.UseVisualStyleBackColor = True + ' + 'rdoRunBackupLog + ' + Me.rdoRunBackupLog.AutoSize = True + Me.rdoRunBackupLog.Location = New System.Drawing.Point(25, 30) + Me.rdoRunBackupLog.Name = "rdoRunBackupLog" + Me.rdoRunBackupLog.Size = New System.Drawing.Size(106, 17) + Me.rdoRunBackupLog.TabIndex = 42 + Me.rdoRunBackupLog.TabStop = True + Me.rdoRunBackupLog.Text = "Run Backup Log" + Me.rdoRunBackupLog.UseVisualStyleBackColor = True + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(111, 282) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 24 + ' + 'ucrChkSendInternalLog + ' + Me.ucrChkSendInternalLog.AutoSize = True + Me.ucrChkSendInternalLog.Checked = False + Me.ucrChkSendInternalLog.Location = New System.Drawing.Point(23, 177) + Me.ucrChkSendInternalLog.Name = "ucrChkSendInternalLog" + Me.ucrChkSendInternalLog.Size = New System.Drawing.Size(266, 23) + Me.ucrChkSendInternalLog.TabIndex = 21 + ' 'dlgRestoreBackup ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 319aa032bf6..139840d426b 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -28,9 +28,15 @@ Public Class dlgRestoreBackup Public strAutoSaveDataFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_data_auto_save") Public strAutoSaveLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_log_auto_save") Public strAutoSaveInternalLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_debug_log_auto_save") - + Private bReset As Boolean = True Private Sub dlgRestoreBackup_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bReset Then + SetDefaults() + End If + SetRCodeForControls(bReset) + ReopenDialog() + bReset = False ucrBase.iHelpTopicID = 411 'temporary - not yet implemented ucrChkSendInternalLog.Visible = False @@ -58,16 +64,24 @@ Public Class dlgRestoreBackup If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 Then ucrChkShowDataFile.SetText("Backup Data File Detected") rdoLoadBackupData.Enabled = True + ucrInputSavedPathData.Enabled = True + ucrChkShowDataFile.Enabled = True Else ucrChkShowDataFile.SetText("No Backup Data File Detected") rdoLoadBackupData.Enabled = False + ucrInputSavedPathData.Enabled = False + ucrChkShowDataFile.Enabled = False End If If strAutoSavedLogFilePaths IsNot Nothing AndAlso strAutoSavedLogFilePaths.Count > 0 Then ucrChkShowLogFile.SetText("Backup Log File Detected") rdoRunBackupLog.Enabled = True + ucrInputSavedPathLog.Enabled = True + ucrChkShowLogFile.Enabled = True Else ucrChkShowLogFile.SetText("No Backup Log File Detected") rdoRunBackupLog.Enabled = False + ucrInputSavedPathLog.Enabled = False + ucrChkShowLogFile.Enabled = False End If If strAutoSavedInternalLogFilePaths IsNot Nothing AndAlso strAutoSavedInternalLogFilePaths.Count > 0 Then ucrChkShowInternalLogFile.SetText("Backup Debugging Log File Detected") @@ -92,6 +106,15 @@ Public Class dlgRestoreBackup Return strLoadDateFilePath End Function + Private Sub SetDefaults() + ReopenDialog() + End Sub + + Private Sub SetRCodeForControls(bReset As Boolean) + ucrInputSavedPathData.SetPathControlRcode(ucrBase.clsRsyntax.clsBaseFunction, bReset) + ucrInputSavedPathLog.SetPathControlRcode(ucrBase.clsRsyntax.clsBaseFunction, bReset) + TestOKEnabled() + End Sub Private Sub SaveFiles() If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedDataFilePaths(0)) Then Try @@ -162,4 +185,31 @@ Public Class dlgRestoreBackup TestOKEnabled() End Sub + Private Sub GetLogPath() + frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathLog.FilePath, "\", "/")) + End Sub + + Private Sub GetDataPath() + frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathData.FilePath, "\", "/")) + End Sub + + Private Sub ucrInputSavedPathData_Leave(sender As Object, e As EventArgs) Handles ucrInputSavedPathData.Leave + GetDataPath() + End Sub + + Private Sub ucrInputSavedPathLog_Leave(sender As Object, e As EventArgs) Handles ucrInputSavedPathLog.Leave + GetLogPath() + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + End Sub + + Private Sub ReopenDialog() + ucrChkShowDataFile.Checked = False + ucrChkShowInternalLogFile.Checked = False + ucrChkShowLogFile.Checked = False + rdoNeither.Checked = True + End Sub End Class \ No newline at end of file From 3f567dd492455d5551a141caaf8efca8455b402f Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 18 Apr 2024 13:11:53 +0200 Subject: [PATCH 33/99] code changes --- instat/dlgRestoreBackup.vb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 139840d426b..1d42f81d7df 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -108,6 +108,10 @@ Public Class dlgRestoreBackup Private Sub SetDefaults() ReopenDialog() + rdoNeither.Checked = True + ucrInputSavedPathData.IsEmpty() + ucrInputSavedPathLog.IsEmpty() + ucrInputSavedPathInternalLog.IsEmpty() End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -210,6 +214,5 @@ Public Class dlgRestoreBackup ucrChkShowDataFile.Checked = False ucrChkShowInternalLogFile.Checked = False ucrChkShowLogFile.Checked = False - rdoNeither.Checked = True End Sub End Class \ No newline at end of file From 06f0d6b8ee78218720314bc6388f468321e881be Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 18 Apr 2024 13:15:53 +0200 Subject: [PATCH 34/99] Final Fixes for the reset --- instat/dlgRestoreBackup.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 1d42f81d7df..98fe8570fd7 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -112,6 +112,8 @@ Public Class dlgRestoreBackup ucrInputSavedPathData.IsEmpty() ucrInputSavedPathLog.IsEmpty() ucrInputSavedPathInternalLog.IsEmpty() + rdoRunBackupLog.Refresh() + rdoLoadBackupData.Refresh() End Sub Private Sub SetRCodeForControls(bReset As Boolean) From b8958663f9257fc3865e4a663579b38306898031 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 19 Apr 2024 08:52:41 +0300 Subject: [PATCH 35/99] minor code change --- instat/UserControl/ucrOutputPages.vb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/instat/UserControl/ucrOutputPages.vb b/instat/UserControl/ucrOutputPages.vb index 177b8810071..4c24a2b9e4c 100644 --- a/instat/UserControl/ucrOutputPages.vb +++ b/instat/UserControl/ucrOutputPages.vb @@ -247,6 +247,7 @@ Public Class ucrOutputPages Else RefreshPage() End If + UpdateSelectAllCheckBoxText() End Sub ''' @@ -334,18 +335,20 @@ Public Class ucrOutputPages iCountOutputElements = _outputLogger.GetFilteredList(SelectedTab).Output.Count End If + checkBoxSelectAll.Enabled = iCountOutputElements > 0 Dim iSelectedElements = _selectedOutputPage.SelectedElements.Count Select Case True Case iSelectedElements > 0 AndAlso iCountOutputElements > iSelectedElements checkBoxSelectAll.Text = $"{iSelectedElements} item(s)" checkBoxSelectAll.CheckState = CheckState.Indeterminate - Case iCountOutputElements = iSelectedElements + Case iSelectedElements > 0 AndAlso iCountOutputElements = iSelectedElements checkBoxSelectAll.Text = "Deselect All" checkBoxSelectAll.CheckState = CheckState.Checked Case Else checkBoxSelectAll.Text = "Select All" checkBoxSelectAll.CheckState = CheckState.Unchecked End Select + End Sub Private Sub checkBoxSelectAll_Click(sender As Object, e As EventArgs) From af37f9e08e71deac9a633efe5dec38865bf064a8 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 22 Apr 2024 09:16:19 +0300 Subject: [PATCH 36/99] change --- instat/dlgCalculator.vb | 4 +- instat/ucrCalculator.Designer.vb | 3300 ++++++++++++++++-------------- instat/ucrCalculator.vb | 10 +- 3 files changed, 1755 insertions(+), 1559 deletions(-) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index 16e9351e19a..73f2c715b79 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -27,7 +27,7 @@ Public Class dlgCalculator Private iBasicWidth As Integer Private strDefaultKeyboard As String ' Note: This list needs to be updated when a new keyboard is added. - Private strKeyboards() As String = {"Maths", "Logical and Symbols", "Summary", "Text/Strings (Character Columns)", "Factor", "Probability", "Dates/Times", "Transform", "Circular", "Wakefield", "Modifier", "Symbols", "HydroGOF", "Integer", "Complex", "List"} + Private strKeyboards() As String = {"Basic", "Maths", "Logical and Symbols", "Transform", "Summary", "Probability", "Factor", "Text/Strings (Character Columns)", "Dates/Times", "Circular", "Wakefield", "Goodness of Fit", "List", "Complex", "Integer"} Private Sub dlgCalculator_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -192,7 +192,7 @@ Public Class dlgCalculator Me.Width = iBasicWidth * 1.39 Case "Symbols" Me.Width = iBasicWidth * 2.56 - Case "hydroGOF" + Case "Goodness of Fit" Me.Width = iBasicWidth * 1.27 ucrBase.iHelpTopicID = 598 Case "Integer" diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 06205839228..f0a25ed9e37 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -86,6 +86,7 @@ Partial Class ucrCalculator Me.cmdMdy = New System.Windows.Forms.Button() Me.cmdYmd = New System.Windows.Forms.Button() Me.cmdLeap = New System.Windows.Forms.Button() + Me.cmdRHelp = New instat.ucrSplitButton() Me.ContextMenuStripDate = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateLubridateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateHmsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -123,6 +124,7 @@ Partial Class ucrCalculator Me.cmdGCD = New System.Windows.Forms.Button() Me.cmdGeneratePrimes = New System.Windows.Forms.Button() Me.cmdNthPrime = New System.Windows.Forms.Button() + Me.cmdIntegerRHelp = New instat.ucrSplitButton() Me.ContextMenuStripInteger = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.GmpToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DescToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -145,6 +147,7 @@ Partial Class ucrCalculator Me.cmdIsPrime = New System.Windows.Forms.Button() Me.cmdBigZ = New System.Windows.Forms.Button() Me.grpFactor = New System.Windows.Forms.GroupBox() + Me.cmdTransformHelp = New instat.ucrSplitButton() Me.ContextMenuStripFactor = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FactorForcatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdShuffle = New System.Windows.Forms.Button() @@ -168,6 +171,7 @@ Partial Class ucrCalculator Me.cmdFactor = New System.Windows.Forms.Button() Me.cmdAnon = New System.Windows.Forms.Button() Me.grpHydroGOF = New System.Windows.Forms.GroupBox() + Me.cmdHydroHelp = New instat.ucrSplitButton() Me.ContextMenuStripHydroGOF = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.HydroGOFToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdVE = New System.Windows.Forms.Button() @@ -221,7 +225,7 @@ Partial Class ucrCalculator Me.cmdWakefieldLower = New System.Windows.Forms.Button() Me.cmdLanguage = New System.Windows.Forms.Button() Me.cmdIq = New System.Windows.Forms.Button() - Me.cmdInternet_Browser = New System.Windows.Forms.Button() + Me.cmdid = New System.Windows.Forms.Button() Me.cmdGrade_Level = New System.Windows.Forms.Button() Me.cmdEye = New System.Windows.Forms.Button() Me.cmdEmployment = New System.Windows.Forms.Button() @@ -248,6 +252,7 @@ Partial Class ucrCalculator Me.cmdGroup = New System.Windows.Forms.Button() Me.cmdGrade = New System.Windows.Forms.Button() Me.grpMaths = New System.Windows.Forms.GroupBox() + Me.cmdMathsHelp = New instat.ucrSplitButton() Me.ContextMenuStripMaths = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MathsBaseStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MathsStatsStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -281,6 +286,7 @@ Partial Class ucrCalculator Me.cmdwhichmax = New System.Windows.Forms.Button() Me.cmdwheremax = New System.Windows.Forms.Button() Me.cmdwhichmin = New System.Windows.Forms.Button() + Me.cmdSummaryRHelp = New instat.ucrSplitButton() Me.ContextMenuStripSummary = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.StatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -334,6 +340,7 @@ Partial Class ucrCalculator Me.cmdFreqLength = New System.Windows.Forms.Button() Me.grpProbabilty = New System.Windows.Forms.GroupBox() Me.cmdPascal = New System.Windows.Forms.Button() + Me.cmdProbRHelp = New instat.ucrSplitButton() Me.ContextMenuStripProbability = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ProbStatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ProbBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -382,6 +389,7 @@ Partial Class ucrCalculator Me.cmdDecimals = New System.Windows.Forms.Button() Me.cmdMASSFractions = New System.Windows.Forms.Button() Me.cmdScale = New System.Windows.Forms.Button() + Me.cmdTransformRHelp = New instat.ucrSplitButton() Me.ContextMenuStripTransform = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -420,6 +428,7 @@ Partial Class ucrCalculator Me.cmdCalcRepelicationFunction = New System.Windows.Forms.Button() Me.cmdCalcSequenceFunction = New System.Windows.Forms.Button() Me.cmdCalcConcantenateFunction = New System.Windows.Forms.Button() + Me.cmdLogicalHelp = New instat.ucrSplitButton() Me.ContextMenuStripLogical = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.LogBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LogDplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -483,6 +492,7 @@ Partial Class ucrCalculator Me.cmdSquishb = New System.Windows.Forms.Button() Me.ttCalculator = New System.Windows.Forms.ToolTip(Me.components) Me.grpCircular = New System.Windows.Forms.GroupBox() + Me.cmdCircularHelp = New instat.ucrSplitButton() Me.ContextMenuStripCircular = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CircularToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdCircular = New System.Windows.Forms.Button() @@ -528,6 +538,7 @@ Partial Class ucrCalculator Me.cmdComplexAcos = New System.Windows.Forms.Button() Me.cmdAsComplex = New System.Windows.Forms.Button() Me.cmdComplexi = New System.Windows.Forms.Button() + Me.cmdComplexRHelp = New instat.ucrSplitButton() Me.cmdComplexTanH = New System.Windows.Forms.Button() Me.cmdComplexTan = New System.Windows.Forms.Button() Me.cmdComplexPi = New System.Windows.Forms.Button() @@ -618,17 +629,6 @@ Partial Class ucrCalculator Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() - Me.cmdLogicalHelp = New instat.ucrSplitButton() - Me.cmdRHelp = New instat.ucrSplitButton() - Me.cmdHydroHelp = New instat.ucrSplitButton() - Me.cmdTransformHelp = New instat.ucrSplitButton() - Me.cmdCircularHelp = New instat.ucrSplitButton() - Me.cmdMathsHelp = New instat.ucrSplitButton() - Me.cmdProbRHelp = New instat.ucrSplitButton() - Me.cmdIntegerRHelp = New instat.ucrSplitButton() - Me.cmdComplexRHelp = New instat.ucrSplitButton() - Me.cmdSummaryRHelp = New instat.ucrSplitButton() - Me.cmdTransformRHelp = New instat.ucrSplitButton() Me.grpBasic.SuspendLayout Me.grpDates.SuspendLayout Me.ContextMenuStripDate.SuspendLayout @@ -670,10 +670,10 @@ Partial Class ucrCalculator ' Me.lblExpression.AutoSize = True Me.lblExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExpression.Location = New System.Drawing.Point(8, 12) + Me.lblExpression.Location = New System.Drawing.Point(6, 10) Me.lblExpression.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblExpression.Name = "lblExpression" - Me.lblExpression.Size = New System.Drawing.Size(77, 16) + Me.lblExpression.Size = New System.Drawing.Size(61, 13) Me.lblExpression.TabIndex = 119 Me.lblExpression.Tag = "Expression" Me.lblExpression.Text = "Expression:" @@ -682,9 +682,10 @@ Partial Class ucrCalculator ' Me.chkShowParameters.AutoSize = True Me.chkShowParameters.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.chkShowParameters.Location = New System.Drawing.Point(88, 52) + Me.chkShowParameters.Location = New System.Drawing.Point(70, 42) + Me.chkShowParameters.Margin = New System.Windows.Forms.Padding(2) Me.chkShowParameters.Name = "chkShowParameters" - Me.chkShowParameters.Size = New System.Drawing.Size(135, 20) + Me.chkShowParameters.Size = New System.Drawing.Size(109, 17) Me.chkShowParameters.TabIndex = 181 Me.chkShowParameters.Text = "Show Parameters" Me.chkShowParameters.UseVisualStyleBackColor = True @@ -710,11 +711,11 @@ Partial Class ucrCalculator Me.grpBasic.Controls.Add(Me.cmd2) Me.grpBasic.Controls.Add(Me.cmd0) Me.grpBasic.Controls.Add(Me.cmd1) - Me.grpBasic.Location = New System.Drawing.Point(278, 87) - Me.grpBasic.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpBasic.Location = New System.Drawing.Point(222, 70) + Me.grpBasic.Margin = New System.Windows.Forms.Padding(2) Me.grpBasic.Name = "grpBasic" - Me.grpBasic.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpBasic.Size = New System.Drawing.Size(257, 168) + Me.grpBasic.Padding = New System.Windows.Forms.Padding(2) + Me.grpBasic.Size = New System.Drawing.Size(206, 134) Me.grpBasic.TabIndex = 179 Me.grpBasic.TabStop = False Me.grpBasic.Text = "Basic" @@ -722,10 +723,10 @@ Partial Class ucrCalculator 'cmdClear ' Me.cmdClear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClear.Location = New System.Drawing.Point(188, 88) - Me.cmdClear.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdClear.Location = New System.Drawing.Point(150, 70) + Me.cmdClear.Margin = New System.Windows.Forms.Padding(2) Me.cmdClear.Name = "cmdClear" - Me.cmdClear.Size = New System.Drawing.Size(62, 75) + Me.cmdClear.Size = New System.Drawing.Size(50, 60) Me.cmdClear.TabIndex = 190 Me.cmdClear.Text = "Clear" Me.cmdClear.UseVisualStyleBackColor = True @@ -734,10 +735,10 @@ Partial Class ucrCalculator ' Me.cmdComma.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.cmdComma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComma.Location = New System.Drawing.Point(3, 125) - Me.cmdComma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComma.Location = New System.Drawing.Point(2, 100) + Me.cmdComma.Margin = New System.Windows.Forms.Padding(2) Me.cmdComma.Name = "cmdComma" - Me.cmdComma.Size = New System.Drawing.Size(48, 38) + Me.cmdComma.Size = New System.Drawing.Size(38, 30) Me.cmdComma.TabIndex = 138 Me.cmdComma.Text = "," Me.cmdComma.UseVisualStyleBackColor = True @@ -745,10 +746,10 @@ Partial Class ucrCalculator 'cmdBrackets ' Me.cmdBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrackets.Location = New System.Drawing.Point(97, 125) - Me.cmdBrackets.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdBrackets.Location = New System.Drawing.Point(78, 100) + Me.cmdBrackets.Margin = New System.Windows.Forms.Padding(2) Me.cmdBrackets.Name = "cmdBrackets" - Me.cmdBrackets.Size = New System.Drawing.Size(48, 38) + Me.cmdBrackets.Size = New System.Drawing.Size(38, 30) Me.cmdBrackets.TabIndex = 136 Me.cmdBrackets.Text = "( )" Me.cmdBrackets.UseVisualStyleBackColor = True @@ -757,10 +758,10 @@ Partial Class ucrCalculator ' Me.cmdPower.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdPower.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPower.Location = New System.Drawing.Point(188, 52) - Me.cmdPower.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPower.Location = New System.Drawing.Point(150, 42) + Me.cmdPower.Margin = New System.Windows.Forms.Padding(2) Me.cmdPower.Name = "cmdPower" - Me.cmdPower.Size = New System.Drawing.Size(62, 38) + Me.cmdPower.Size = New System.Drawing.Size(50, 30) Me.cmdPower.TabIndex = 133 Me.cmdPower.Text = "^" Me.cmdPower.UseVisualStyleBackColor = True @@ -769,10 +770,10 @@ Partial Class ucrCalculator ' Me.cmdDivide.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdDivide.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDivide.Location = New System.Drawing.Point(142, 17) - Me.cmdDivide.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDivide.Location = New System.Drawing.Point(114, 14) + Me.cmdDivide.Margin = New System.Windows.Forms.Padding(2) Me.cmdDivide.Name = "cmdDivide" - Me.cmdDivide.Size = New System.Drawing.Size(48, 38) + Me.cmdDivide.Size = New System.Drawing.Size(38, 30) Me.cmdDivide.TabIndex = 131 Me.cmdDivide.Text = "/" Me.cmdDivide.UseVisualStyleBackColor = True @@ -781,10 +782,10 @@ Partial Class ucrCalculator ' Me.cmdPlus.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdPlus.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlus.Location = New System.Drawing.Point(142, 125) - Me.cmdPlus.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPlus.Location = New System.Drawing.Point(114, 100) + Me.cmdPlus.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlus.Name = "cmdPlus" - Me.cmdPlus.Size = New System.Drawing.Size(48, 38) + Me.cmdPlus.Size = New System.Drawing.Size(38, 30) Me.cmdPlus.TabIndex = 130 Me.cmdPlus.Text = "+" Me.cmdPlus.UseVisualStyleBackColor = True @@ -793,10 +794,10 @@ Partial Class ucrCalculator ' Me.cmdMinus.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdMinus.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMinus.Location = New System.Drawing.Point(142, 88) - Me.cmdMinus.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMinus.Location = New System.Drawing.Point(114, 70) + Me.cmdMinus.Margin = New System.Windows.Forms.Padding(2) Me.cmdMinus.Name = "cmdMinus" - Me.cmdMinus.Size = New System.Drawing.Size(48, 38) + Me.cmdMinus.Size = New System.Drawing.Size(38, 30) Me.cmdMinus.TabIndex = 129 Me.cmdMinus.Text = "-" Me.cmdMinus.UseVisualStyleBackColor = True @@ -805,10 +806,10 @@ Partial Class ucrCalculator ' Me.cmdMultiply.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdMultiply.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMultiply.Location = New System.Drawing.Point(142, 52) - Me.cmdMultiply.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMultiply.Location = New System.Drawing.Point(114, 42) + Me.cmdMultiply.Margin = New System.Windows.Forms.Padding(2) Me.cmdMultiply.Name = "cmdMultiply" - Me.cmdMultiply.Size = New System.Drawing.Size(48, 38) + Me.cmdMultiply.Size = New System.Drawing.Size(38, 30) Me.cmdMultiply.TabIndex = 128 Me.cmdMultiply.Text = "*" Me.cmdMultiply.UseVisualStyleBackColor = True @@ -817,10 +818,10 @@ Partial Class ucrCalculator ' Me.cmdDot.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdDot.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDot.Location = New System.Drawing.Point(188, 17) - Me.cmdDot.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDot.Location = New System.Drawing.Point(150, 14) + Me.cmdDot.Margin = New System.Windows.Forms.Padding(2) Me.cmdDot.Name = "cmdDot" - Me.cmdDot.Size = New System.Drawing.Size(62, 38) + Me.cmdDot.Size = New System.Drawing.Size(50, 30) Me.cmdDot.TabIndex = 127 Me.cmdDot.Text = "." Me.cmdDot.UseVisualStyleBackColor = True @@ -828,10 +829,10 @@ Partial Class ucrCalculator 'cmd9 ' Me.cmd9.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd9.Location = New System.Drawing.Point(97, 17) - Me.cmd9.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd9.Location = New System.Drawing.Point(78, 14) + Me.cmd9.Margin = New System.Windows.Forms.Padding(2) Me.cmd9.Name = "cmd9" - Me.cmd9.Size = New System.Drawing.Size(48, 38) + Me.cmd9.Size = New System.Drawing.Size(38, 30) Me.cmd9.TabIndex = 126 Me.cmd9.Text = "9" Me.cmd9.UseVisualStyleBackColor = True @@ -839,10 +840,10 @@ Partial Class ucrCalculator 'cmd8 ' Me.cmd8.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd8.Location = New System.Drawing.Point(50, 17) - Me.cmd8.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd8.Location = New System.Drawing.Point(40, 14) + Me.cmd8.Margin = New System.Windows.Forms.Padding(2) Me.cmd8.Name = "cmd8" - Me.cmd8.Size = New System.Drawing.Size(48, 38) + Me.cmd8.Size = New System.Drawing.Size(38, 30) Me.cmd8.TabIndex = 125 Me.cmd8.Text = "8" Me.cmd8.UseVisualStyleBackColor = True @@ -850,10 +851,10 @@ Partial Class ucrCalculator 'cmd7 ' Me.cmd7.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd7.Location = New System.Drawing.Point(3, 17) - Me.cmd7.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd7.Location = New System.Drawing.Point(2, 14) + Me.cmd7.Margin = New System.Windows.Forms.Padding(2) Me.cmd7.Name = "cmd7" - Me.cmd7.Size = New System.Drawing.Size(48, 38) + Me.cmd7.Size = New System.Drawing.Size(38, 30) Me.cmd7.TabIndex = 124 Me.cmd7.Text = "7" Me.cmd7.UseVisualStyleBackColor = True @@ -861,10 +862,10 @@ Partial Class ucrCalculator 'cmd6 ' Me.cmd6.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd6.Location = New System.Drawing.Point(97, 52) - Me.cmd6.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd6.Location = New System.Drawing.Point(78, 42) + Me.cmd6.Margin = New System.Windows.Forms.Padding(2) Me.cmd6.Name = "cmd6" - Me.cmd6.Size = New System.Drawing.Size(48, 38) + Me.cmd6.Size = New System.Drawing.Size(38, 30) Me.cmd6.TabIndex = 123 Me.cmd6.Text = "6" Me.cmd6.UseVisualStyleBackColor = True @@ -872,10 +873,10 @@ Partial Class ucrCalculator 'cmd5 ' Me.cmd5.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd5.Location = New System.Drawing.Point(50, 52) - Me.cmd5.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd5.Location = New System.Drawing.Point(40, 42) + Me.cmd5.Margin = New System.Windows.Forms.Padding(2) Me.cmd5.Name = "cmd5" - Me.cmd5.Size = New System.Drawing.Size(48, 38) + Me.cmd5.Size = New System.Drawing.Size(38, 30) Me.cmd5.TabIndex = 122 Me.cmd5.Text = "5" Me.cmd5.UseVisualStyleBackColor = True @@ -883,10 +884,10 @@ Partial Class ucrCalculator 'cmd4 ' Me.cmd4.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd4.Location = New System.Drawing.Point(3, 52) - Me.cmd4.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd4.Location = New System.Drawing.Point(2, 42) + Me.cmd4.Margin = New System.Windows.Forms.Padding(2) Me.cmd4.Name = "cmd4" - Me.cmd4.Size = New System.Drawing.Size(48, 38) + Me.cmd4.Size = New System.Drawing.Size(38, 30) Me.cmd4.TabIndex = 121 Me.cmd4.Text = "4" Me.cmd4.UseVisualStyleBackColor = True @@ -894,10 +895,10 @@ Partial Class ucrCalculator 'cmd3 ' Me.cmd3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd3.Location = New System.Drawing.Point(97, 88) - Me.cmd3.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd3.Location = New System.Drawing.Point(78, 70) + Me.cmd3.Margin = New System.Windows.Forms.Padding(2) Me.cmd3.Name = "cmd3" - Me.cmd3.Size = New System.Drawing.Size(48, 38) + Me.cmd3.Size = New System.Drawing.Size(38, 30) Me.cmd3.TabIndex = 120 Me.cmd3.Text = "3" Me.cmd3.UseVisualStyleBackColor = True @@ -905,10 +906,10 @@ Partial Class ucrCalculator 'cmd2 ' Me.cmd2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd2.Location = New System.Drawing.Point(50, 88) - Me.cmd2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd2.Location = New System.Drawing.Point(40, 70) + Me.cmd2.Margin = New System.Windows.Forms.Padding(2) Me.cmd2.Name = "cmd2" - Me.cmd2.Size = New System.Drawing.Size(48, 38) + Me.cmd2.Size = New System.Drawing.Size(38, 30) Me.cmd2.TabIndex = 119 Me.cmd2.Text = "2" Me.cmd2.UseVisualStyleBackColor = True @@ -916,10 +917,10 @@ Partial Class ucrCalculator 'cmd0 ' Me.cmd0.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd0.Location = New System.Drawing.Point(50, 125) - Me.cmd0.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd0.Location = New System.Drawing.Point(40, 100) + Me.cmd0.Margin = New System.Windows.Forms.Padding(2) Me.cmd0.Name = "cmd0" - Me.cmd0.Size = New System.Drawing.Size(48, 38) + Me.cmd0.Size = New System.Drawing.Size(38, 30) Me.cmd0.TabIndex = 118 Me.cmd0.Text = "0" Me.cmd0.UseVisualStyleBackColor = True @@ -927,10 +928,10 @@ Partial Class ucrCalculator 'cmd1 ' Me.cmd1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd1.Location = New System.Drawing.Point(3, 88) - Me.cmd1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd1.Location = New System.Drawing.Point(2, 70) + Me.cmd1.Margin = New System.Windows.Forms.Padding(2) Me.cmd1.Name = "cmd1" - Me.cmd1.Size = New System.Drawing.Size(48, 38) + Me.cmd1.Size = New System.Drawing.Size(38, 30) Me.cmd1.TabIndex = 117 Me.cmd1.Text = "1" Me.cmd1.UseVisualStyleBackColor = True @@ -962,10 +963,12 @@ Partial Class ucrCalculator Me.grpDates.Controls.Add(Me.cmdYmd) Me.grpDates.Controls.Add(Me.cmdLeap) Me.grpDates.Controls.Add(Me.cmdRHelp) - Me.grpDates.Location = New System.Drawing.Point(542, 78) + Me.grpDates.Location = New System.Drawing.Point(434, 62) + Me.grpDates.Margin = New System.Windows.Forms.Padding(2) Me.grpDates.Name = "grpDates" + Me.grpDates.Padding = New System.Windows.Forms.Padding(2) Me.grpDates.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.grpDates.Size = New System.Drawing.Size(315, 291) + Me.grpDates.Size = New System.Drawing.Size(252, 233) Me.grpDates.TabIndex = 188 Me.grpDates.TabStop = False Me.grpDates.Text = "Dates/Times" @@ -973,9 +976,10 @@ Partial Class ucrCalculator 'cmdYmdHms ' Me.cmdYmdHms.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmdHms.Location = New System.Drawing.Point(6, 91) + Me.cmdYmdHms.Location = New System.Drawing.Point(5, 73) + Me.cmdYmdHms.Margin = New System.Windows.Forms.Padding(2) Me.cmdYmdHms.Name = "cmdYmdHms" - Me.cmdYmdHms.Size = New System.Drawing.Size(75, 38) + Me.cmdYmdHms.Size = New System.Drawing.Size(60, 30) Me.cmdYmdHms.TabIndex = 242 Me.cmdYmdHms.Text = "ymd.hms" Me.cmdYmdHms.UseVisualStyleBackColor = True @@ -983,9 +987,10 @@ Partial Class ucrCalculator 'cmdYmdHm ' Me.cmdYmdHm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmdHm.Location = New System.Drawing.Point(80, 91) + Me.cmdYmdHm.Location = New System.Drawing.Point(64, 73) + Me.cmdYmdHm.Margin = New System.Windows.Forms.Padding(2) Me.cmdYmdHm.Name = "cmdYmdHm" - Me.cmdYmdHm.Size = New System.Drawing.Size(75, 38) + Me.cmdYmdHm.Size = New System.Drawing.Size(60, 30) Me.cmdYmdHm.TabIndex = 241 Me.cmdYmdHm.Text = "ymd.hm" Me.cmdYmdHm.UseVisualStyleBackColor = True @@ -993,9 +998,10 @@ Partial Class ucrCalculator 'cmdAsDate ' Me.cmdAsDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsDate.Location = New System.Drawing.Point(80, 19) + Me.cmdAsDate.Location = New System.Drawing.Point(64, 15) + Me.cmdAsDate.Margin = New System.Windows.Forms.Padding(2) Me.cmdAsDate.Name = "cmdAsDate" - Me.cmdAsDate.Size = New System.Drawing.Size(75, 38) + Me.cmdAsDate.Size = New System.Drawing.Size(60, 30) Me.cmdAsDate.TabIndex = 240 Me.cmdAsDate.Text = "as.date" Me.cmdAsDate.UseVisualStyleBackColor = True @@ -1003,9 +1009,10 @@ Partial Class ucrCalculator 'cmdAsTime ' Me.cmdAsTime.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsTime.Location = New System.Drawing.Point(239, 55) + Me.cmdAsTime.Location = New System.Drawing.Point(191, 44) + Me.cmdAsTime.Margin = New System.Windows.Forms.Padding(2) Me.cmdAsTime.Name = "cmdAsTime" - Me.cmdAsTime.Size = New System.Drawing.Size(75, 38) + Me.cmdAsTime.Size = New System.Drawing.Size(60, 30) Me.cmdAsTime.TabIndex = 239 Me.cmdAsTime.Text = "as.time" Me.cmdAsTime.UseVisualStyleBackColor = True @@ -1013,9 +1020,10 @@ Partial Class ucrCalculator 'cmdYmdH ' Me.cmdYmdH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmdH.Location = New System.Drawing.Point(154, 91) + Me.cmdYmdH.Location = New System.Drawing.Point(123, 73) + Me.cmdYmdH.Margin = New System.Windows.Forms.Padding(2) Me.cmdYmdH.Name = "cmdYmdH" - Me.cmdYmdH.Size = New System.Drawing.Size(86, 38) + Me.cmdYmdH.Size = New System.Drawing.Size(69, 30) Me.cmdYmdH.TabIndex = 238 Me.cmdYmdH.Text = "ymd.h" Me.cmdYmdH.UseVisualStyleBackColor = True @@ -1023,9 +1031,10 @@ Partial Class ucrCalculator 'cmdPm ' Me.cmdPm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPm.Location = New System.Drawing.Point(6, 200) + Me.cmdPm.Location = New System.Drawing.Point(5, 160) + Me.cmdPm.Margin = New System.Windows.Forms.Padding(2) Me.cmdPm.Name = "cmdPm" - Me.cmdPm.Size = New System.Drawing.Size(75, 38) + Me.cmdPm.Size = New System.Drawing.Size(60, 30) Me.cmdPm.TabIndex = 237 Me.cmdPm.Text = "pm" Me.cmdPm.UseVisualStyleBackColor = True @@ -1033,10 +1042,10 @@ Partial Class ucrCalculator 'cmdTime ' Me.cmdTime.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTime.Location = New System.Drawing.Point(239, 19) - Me.cmdTime.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTime.Location = New System.Drawing.Point(191, 15) + Me.cmdTime.Margin = New System.Windows.Forms.Padding(2) Me.cmdTime.Name = "cmdTime" - Me.cmdTime.Size = New System.Drawing.Size(75, 38) + Me.cmdTime.Size = New System.Drawing.Size(60, 30) Me.cmdTime.TabIndex = 236 Me.cmdTime.Text = "time" Me.cmdTime.UseVisualStyleBackColor = True @@ -1044,10 +1053,10 @@ Partial Class ucrCalculator 'cmdDateTime ' Me.cmdDateTime.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDateTime.Location = New System.Drawing.Point(154, 19) - Me.cmdDateTime.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDateTime.Location = New System.Drawing.Point(123, 15) + Me.cmdDateTime.Margin = New System.Windows.Forms.Padding(2) Me.cmdDateTime.Name = "cmdDateTime" - Me.cmdDateTime.Size = New System.Drawing.Size(86, 38) + Me.cmdDateTime.Size = New System.Drawing.Size(69, 30) Me.cmdDateTime.TabIndex = 235 Me.cmdDateTime.Text = "as.datetime" Me.cmdDateTime.UseVisualStyleBackColor = True @@ -1055,9 +1064,10 @@ Partial Class ucrCalculator 'cmdQuarter ' Me.cmdQuarter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuarter.Location = New System.Drawing.Point(80, 127) + Me.cmdQuarter.Location = New System.Drawing.Point(64, 102) + Me.cmdQuarter.Margin = New System.Windows.Forms.Padding(2) Me.cmdQuarter.Name = "cmdQuarter" - Me.cmdQuarter.Size = New System.Drawing.Size(75, 38) + Me.cmdQuarter.Size = New System.Drawing.Size(60, 30) Me.cmdQuarter.TabIndex = 234 Me.cmdQuarter.Text = "quarter" Me.cmdQuarter.UseVisualStyleBackColor = True @@ -1065,9 +1075,10 @@ Partial Class ucrCalculator 'cmdD_In_M ' Me.cmdD_In_M.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdD_In_M.Location = New System.Drawing.Point(154, 164) + Me.cmdD_In_M.Location = New System.Drawing.Point(123, 131) + Me.cmdD_In_M.Margin = New System.Windows.Forms.Padding(2) Me.cmdD_In_M.Name = "cmdD_In_M" - Me.cmdD_In_M.Size = New System.Drawing.Size(86, 38) + Me.cmdD_In_M.Size = New System.Drawing.Size(69, 30) Me.cmdD_In_M.TabIndex = 233 Me.cmdD_In_M.Text = "d_in_m" Me.cmdD_In_M.UseVisualStyleBackColor = True @@ -1075,9 +1086,10 @@ Partial Class ucrCalculator 'cmdAm ' Me.cmdAm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAm.Location = New System.Drawing.Point(239, 164) + Me.cmdAm.Location = New System.Drawing.Point(191, 131) + Me.cmdAm.Margin = New System.Windows.Forms.Padding(2) Me.cmdAm.Name = "cmdAm" - Me.cmdAm.Size = New System.Drawing.Size(75, 38) + Me.cmdAm.Size = New System.Drawing.Size(60, 30) Me.cmdAm.TabIndex = 232 Me.cmdAm.Text = "am" Me.cmdAm.UseVisualStyleBackColor = True @@ -1085,9 +1097,10 @@ Partial Class ucrCalculator 'cmdSec ' Me.cmdSec.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSec.Location = New System.Drawing.Point(239, 200) + Me.cmdSec.Location = New System.Drawing.Point(191, 160) + Me.cmdSec.Margin = New System.Windows.Forms.Padding(2) Me.cmdSec.Name = "cmdSec" - Me.cmdSec.Size = New System.Drawing.Size(75, 38) + Me.cmdSec.Size = New System.Drawing.Size(60, 30) Me.cmdSec.TabIndex = 231 Me.cmdSec.Text = "sec" Me.cmdSec.UseVisualStyleBackColor = True @@ -1095,9 +1108,10 @@ Partial Class ucrCalculator 'cmdHour ' Me.cmdHour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHour.Location = New System.Drawing.Point(80, 200) + Me.cmdHour.Location = New System.Drawing.Point(64, 160) + Me.cmdHour.Margin = New System.Windows.Forms.Padding(2) Me.cmdHour.Name = "cmdHour" - Me.cmdHour.Size = New System.Drawing.Size(75, 38) + Me.cmdHour.Size = New System.Drawing.Size(60, 30) Me.cmdHour.TabIndex = 230 Me.cmdHour.Text = "hour" Me.cmdHour.UseVisualStyleBackColor = True @@ -1105,9 +1119,10 @@ Partial Class ucrCalculator 'cmdMinutes ' Me.cmdMinutes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMinutes.Location = New System.Drawing.Point(154, 200) + Me.cmdMinutes.Location = New System.Drawing.Point(123, 160) + Me.cmdMinutes.Margin = New System.Windows.Forms.Padding(2) Me.cmdMinutes.Name = "cmdMinutes" - Me.cmdMinutes.Size = New System.Drawing.Size(86, 38) + Me.cmdMinutes.Size = New System.Drawing.Size(69, 30) Me.cmdMinutes.TabIndex = 229 Me.cmdMinutes.Text = "min" Me.cmdMinutes.UseVisualStyleBackColor = True @@ -1115,10 +1130,10 @@ Partial Class ucrCalculator 'cmdDmy ' Me.cmdDmy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDmy.Location = New System.Drawing.Point(80, 55) - Me.cmdDmy.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDmy.Location = New System.Drawing.Point(64, 44) + Me.cmdDmy.Margin = New System.Windows.Forms.Padding(2) Me.cmdDmy.Name = "cmdDmy" - Me.cmdDmy.Size = New System.Drawing.Size(75, 38) + Me.cmdDmy.Size = New System.Drawing.Size(60, 30) Me.cmdDmy.TabIndex = 228 Me.cmdDmy.Tag = "dmy" Me.cmdDmy.Text = "dmy" @@ -1127,10 +1142,10 @@ Partial Class ucrCalculator 'cmdDay ' Me.cmdDay.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDay.Location = New System.Drawing.Point(239, 127) - Me.cmdDay.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDay.Location = New System.Drawing.Point(191, 102) + Me.cmdDay.Margin = New System.Windows.Forms.Padding(2) Me.cmdDay.Name = "cmdDay" - Me.cmdDay.Size = New System.Drawing.Size(75, 38) + Me.cmdDay.Size = New System.Drawing.Size(60, 30) Me.cmdDay.TabIndex = 227 Me.cmdDay.Text = "day" Me.cmdDay.UseVisualStyleBackColor = True @@ -1138,11 +1153,11 @@ Partial Class ucrCalculator 'cmdMonth ' Me.cmdMonth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMonth.Location = New System.Drawing.Point(154, 127) - Me.cmdMonth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMonth.Location = New System.Drawing.Point(123, 102) + Me.cmdMonth.Margin = New System.Windows.Forms.Padding(2) Me.cmdMonth.Name = "cmdMonth" Me.cmdMonth.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.cmdMonth.Size = New System.Drawing.Size(86, 38) + Me.cmdMonth.Size = New System.Drawing.Size(69, 30) Me.cmdMonth.TabIndex = 226 Me.cmdMonth.Text = "month" Me.cmdMonth.UseVisualStyleBackColor = True @@ -1150,10 +1165,10 @@ Partial Class ucrCalculator 'cmdYear ' Me.cmdYear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYear.Location = New System.Drawing.Point(6, 127) - Me.cmdYear.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdYear.Location = New System.Drawing.Point(5, 102) + Me.cmdYear.Margin = New System.Windows.Forms.Padding(2) Me.cmdYear.Name = "cmdYear" - Me.cmdYear.Size = New System.Drawing.Size(75, 38) + Me.cmdYear.Size = New System.Drawing.Size(60, 30) Me.cmdYear.TabIndex = 225 Me.cmdYear.Text = "year" Me.cmdYear.UseVisualStyleBackColor = True @@ -1161,10 +1176,10 @@ Partial Class ucrCalculator 'cmdDate ' Me.cmdDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDate.Location = New System.Drawing.Point(6, 19) - Me.cmdDate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDate.Location = New System.Drawing.Point(5, 15) + Me.cmdDate.Margin = New System.Windows.Forms.Padding(2) Me.cmdDate.Name = "cmdDate" - Me.cmdDate.Size = New System.Drawing.Size(75, 38) + Me.cmdDate.Size = New System.Drawing.Size(60, 30) Me.cmdDate.TabIndex = 224 Me.cmdDate.Text = "date" Me.cmdDate.UseVisualStyleBackColor = True @@ -1172,10 +1187,10 @@ Partial Class ucrCalculator 'cmdYday ' Me.cmdYday.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYday.Location = New System.Drawing.Point(6, 164) - Me.cmdYday.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdYday.Location = New System.Drawing.Point(5, 131) + Me.cmdYday.Margin = New System.Windows.Forms.Padding(2) Me.cmdYday.Name = "cmdYday" - Me.cmdYday.Size = New System.Drawing.Size(75, 38) + Me.cmdYday.Size = New System.Drawing.Size(60, 30) Me.cmdYday.TabIndex = 223 Me.cmdYday.Text = "yday" Me.cmdYday.UseVisualStyleBackColor = True @@ -1183,10 +1198,10 @@ Partial Class ucrCalculator 'cmdWday ' Me.cmdWday.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWday.Location = New System.Drawing.Point(80, 164) - Me.cmdWday.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdWday.Location = New System.Drawing.Point(64, 131) + Me.cmdWday.Margin = New System.Windows.Forms.Padding(2) Me.cmdWday.Name = "cmdWday" - Me.cmdWday.Size = New System.Drawing.Size(75, 38) + Me.cmdWday.Size = New System.Drawing.Size(60, 30) Me.cmdWday.TabIndex = 222 Me.cmdWday.Text = "wday" Me.cmdWday.UseVisualStyleBackColor = True @@ -1194,10 +1209,10 @@ Partial Class ucrCalculator 'cmdMdy ' Me.cmdMdy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMdy.Location = New System.Drawing.Point(154, 55) - Me.cmdMdy.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMdy.Location = New System.Drawing.Point(123, 44) + Me.cmdMdy.Margin = New System.Windows.Forms.Padding(2) Me.cmdMdy.Name = "cmdMdy" - Me.cmdMdy.Size = New System.Drawing.Size(86, 38) + Me.cmdMdy.Size = New System.Drawing.Size(69, 30) Me.cmdMdy.TabIndex = 221 Me.cmdMdy.Text = "mdy" Me.cmdMdy.UseVisualStyleBackColor = True @@ -1205,10 +1220,10 @@ Partial Class ucrCalculator 'cmdYmd ' Me.cmdYmd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmd.Location = New System.Drawing.Point(6, 55) - Me.cmdYmd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdYmd.Location = New System.Drawing.Point(5, 44) + Me.cmdYmd.Margin = New System.Windows.Forms.Padding(2) Me.cmdYmd.Name = "cmdYmd" - Me.cmdYmd.Size = New System.Drawing.Size(75, 38) + Me.cmdYmd.Size = New System.Drawing.Size(60, 30) Me.cmdYmd.TabIndex = 220 Me.cmdYmd.Text = "ymd" Me.cmdYmd.UseVisualStyleBackColor = True @@ -1216,31 +1231,44 @@ Partial Class ucrCalculator 'cmdLeap ' Me.cmdLeap.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLeap.Location = New System.Drawing.Point(239, 91) - Me.cmdLeap.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLeap.Location = New System.Drawing.Point(191, 73) + Me.cmdLeap.Margin = New System.Windows.Forms.Padding(2) Me.cmdLeap.Name = "cmdLeap" - Me.cmdLeap.Size = New System.Drawing.Size(75, 38) + Me.cmdLeap.Size = New System.Drawing.Size(60, 30) Me.cmdLeap.TabIndex = 219 Me.cmdLeap.Text = "leap" Me.cmdLeap.UseVisualStyleBackColor = True ' + 'cmdRHelp + ' + Me.cmdRHelp.AutoSize = True + Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.Location = New System.Drawing.Point(155, 198) + Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRHelp.Name = "cmdRHelp" + Me.cmdRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.TabIndex = 212 + Me.cmdRHelp.Text = "R Help" + Me.cmdRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripDate ' Me.ContextMenuStripDate.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripDate.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateLubridateToolStripMenuItem, Me.DateHmsToolStripMenuItem}) Me.ContextMenuStripDate.Name = "ContextMenuStrip1" - Me.ContextMenuStripDate.Size = New System.Drawing.Size(139, 52) + Me.ContextMenuStripDate.Size = New System.Drawing.Size(122, 48) ' 'DateLubridateToolStripMenuItem ' Me.DateLubridateToolStripMenuItem.Name = "DateLubridateToolStripMenuItem" - Me.DateLubridateToolStripMenuItem.Size = New System.Drawing.Size(138, 24) + Me.DateLubridateToolStripMenuItem.Size = New System.Drawing.Size(121, 22) Me.DateLubridateToolStripMenuItem.Text = "lubridate" ' 'DateHmsToolStripMenuItem ' Me.DateHmsToolStripMenuItem.Name = "DateHmsToolStripMenuItem" - Me.DateHmsToolStripMenuItem.Size = New System.Drawing.Size(138, 24) + Me.DateHmsToolStripMenuItem.Size = New System.Drawing.Size(121, 22) Me.DateHmsToolStripMenuItem.Text = "hms" ' 'ContextMenuStripComplex @@ -1248,12 +1276,12 @@ Partial Class ucrCalculator Me.ContextMenuStripComplex.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripComplex.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ComplexBaseToolStripMenuItem}) Me.ContextMenuStripComplex.Name = "ContextMenuStrip1" - Me.ContextMenuStripComplex.Size = New System.Drawing.Size(110, 28) + Me.ContextMenuStripComplex.Size = New System.Drawing.Size(99, 26) ' 'ComplexBaseToolStripMenuItem ' Me.ComplexBaseToolStripMenuItem.Name = "ComplexBaseToolStripMenuItem" - Me.ComplexBaseToolStripMenuItem.Size = New System.Drawing.Size(109, 24) + Me.ComplexBaseToolStripMenuItem.Size = New System.Drawing.Size(98, 22) Me.ComplexBaseToolStripMenuItem.Text = "base" ' 'grpInteger @@ -1303,9 +1331,11 @@ Partial Class ucrCalculator Me.grpInteger.Controls.Add(Me.cmdFactorial) Me.grpInteger.Controls.Add(Me.cmdIsPrime) Me.grpInteger.Controls.Add(Me.cmdBigZ) - Me.grpInteger.Location = New System.Drawing.Point(542, 77) + Me.grpInteger.Location = New System.Drawing.Point(434, 62) + Me.grpInteger.Margin = New System.Windows.Forms.Padding(2) Me.grpInteger.Name = "grpInteger" - Me.grpInteger.Size = New System.Drawing.Size(385, 397) + Me.grpInteger.Padding = New System.Windows.Forms.Padding(2) + Me.grpInteger.Size = New System.Drawing.Size(308, 318) Me.grpInteger.TabIndex = 183 Me.grpInteger.TabStop = False Me.grpInteger.Text = "Integer" @@ -1313,9 +1343,10 @@ Partial Class ucrCalculator 'cmdPrimorial ' Me.cmdPrimorial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPrimorial.Location = New System.Drawing.Point(278, 227) + Me.cmdPrimorial.Location = New System.Drawing.Point(222, 182) + Me.cmdPrimorial.Margin = New System.Windows.Forms.Padding(2) Me.cmdPrimorial.Name = "cmdPrimorial" - Me.cmdPrimorial.Size = New System.Drawing.Size(93, 28) + Me.cmdPrimorial.Size = New System.Drawing.Size(74, 22) Me.cmdPrimorial.TabIndex = 47 Me.cmdPrimorial.Text = "primorial" Me.cmdPrimorial.UseVisualStyleBackColor = True @@ -1323,27 +1354,30 @@ Partial Class ucrCalculator 'cmdFactorize2 ' Me.cmdFactorize2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFactorize2.Location = New System.Drawing.Point(187, 48) + Me.cmdFactorize2.Location = New System.Drawing.Point(150, 38) + Me.cmdFactorize2.Margin = New System.Windows.Forms.Padding(2) Me.cmdFactorize2.Name = "cmdFactorize2" - Me.cmdFactorize2.Size = New System.Drawing.Size(93, 28) + Me.cmdFactorize2.Size = New System.Drawing.Size(74, 22) Me.cmdFactorize2.TabIndex = 46 Me.cmdFactorize2.Text = "factorize2" Me.cmdFactorize2.UseVisualStyleBackColor = True ' 'cmdLucas ' - Me.cmdLucas.Location = New System.Drawing.Point(93, 77) + Me.cmdLucas.Location = New System.Drawing.Point(74, 62) + Me.cmdLucas.Margin = New System.Windows.Forms.Padding(2) Me.cmdLucas.Name = "cmdLucas" - Me.cmdLucas.Size = New System.Drawing.Size(93, 28) + Me.cmdLucas.Size = New System.Drawing.Size(74, 22) Me.cmdLucas.TabIndex = 45 Me.cmdLucas.Text = "lucas" Me.cmdLucas.UseVisualStyleBackColor = True ' 'cmdFactorize ' - Me.cmdFactorize.Location = New System.Drawing.Point(93, 48) + Me.cmdFactorize.Location = New System.Drawing.Point(74, 38) + Me.cmdFactorize.Margin = New System.Windows.Forms.Padding(2) Me.cmdFactorize.Name = "cmdFactorize" - Me.cmdFactorize.Size = New System.Drawing.Size(93, 28) + Me.cmdFactorize.Size = New System.Drawing.Size(74, 22) Me.cmdFactorize.TabIndex = 44 Me.cmdFactorize.Text = "factorize" Me.cmdFactorize.UseVisualStyleBackColor = True @@ -1351,9 +1385,10 @@ Partial Class ucrCalculator 'cmdSquare ' Me.cmdSquare.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSquare.Location = New System.Drawing.Point(278, 322) + Me.cmdSquare.Location = New System.Drawing.Point(222, 258) + Me.cmdSquare.Margin = New System.Windows.Forms.Padding(2) Me.cmdSquare.Name = "cmdSquare" - Me.cmdSquare.Size = New System.Drawing.Size(93, 28) + Me.cmdSquare.Size = New System.Drawing.Size(74, 22) Me.cmdSquare.TabIndex = 43 Me.cmdSquare.Text = "square" Me.cmdSquare.UseVisualStyleBackColor = True @@ -1361,9 +1396,10 @@ Partial Class ucrCalculator 'cmdTriangle ' Me.cmdTriangle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTriangle.Location = New System.Drawing.Point(187, 322) + Me.cmdTriangle.Location = New System.Drawing.Point(150, 258) + Me.cmdTriangle.Margin = New System.Windows.Forms.Padding(2) Me.cmdTriangle.Name = "cmdTriangle" - Me.cmdTriangle.Size = New System.Drawing.Size(93, 28) + Me.cmdTriangle.Size = New System.Drawing.Size(74, 22) Me.cmdTriangle.TabIndex = 42 Me.cmdTriangle.Text = "triangle" Me.cmdTriangle.UseVisualStyleBackColor = True @@ -1371,9 +1407,10 @@ Partial Class ucrCalculator 'cmdPadovan ' Me.cmdPadovan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPadovan.Location = New System.Drawing.Point(93, 322) + Me.cmdPadovan.Location = New System.Drawing.Point(74, 258) + Me.cmdPadovan.Margin = New System.Windows.Forms.Padding(2) Me.cmdPadovan.Name = "cmdPadovan" - Me.cmdPadovan.Size = New System.Drawing.Size(93, 28) + Me.cmdPadovan.Size = New System.Drawing.Size(74, 22) Me.cmdPadovan.TabIndex = 41 Me.cmdPadovan.Text = "padovan" Me.cmdPadovan.UseVisualStyleBackColor = True @@ -1381,9 +1418,10 @@ Partial Class ucrCalculator 'cmdAchilles ' Me.cmdAchilles.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAchilles.Location = New System.Drawing.Point(2, 322) + Me.cmdAchilles.Location = New System.Drawing.Point(2, 258) + Me.cmdAchilles.Margin = New System.Windows.Forms.Padding(2) Me.cmdAchilles.Name = "cmdAchilles" - Me.cmdAchilles.Size = New System.Drawing.Size(93, 28) + Me.cmdAchilles.Size = New System.Drawing.Size(74, 22) Me.cmdAchilles.TabIndex = 40 Me.cmdAchilles.Text = "achilles" Me.cmdAchilles.UseVisualStyleBackColor = True @@ -1391,9 +1429,10 @@ Partial Class ucrCalculator 'cmdHappy ' Me.cmdHappy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHappy.Location = New System.Drawing.Point(278, 293) + Me.cmdHappy.Location = New System.Drawing.Point(222, 234) + Me.cmdHappy.Margin = New System.Windows.Forms.Padding(2) Me.cmdHappy.Name = "cmdHappy" - Me.cmdHappy.Size = New System.Drawing.Size(93, 28) + Me.cmdHappy.Size = New System.Drawing.Size(74, 22) Me.cmdHappy.TabIndex = 39 Me.cmdHappy.Text = "happy" Me.cmdHappy.UseVisualStyleBackColor = True @@ -1401,9 +1440,10 @@ Partial Class ucrCalculator 'cmdUgly ' Me.cmdUgly.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdUgly.Location = New System.Drawing.Point(187, 293) + Me.cmdUgly.Location = New System.Drawing.Point(150, 234) + Me.cmdUgly.Margin = New System.Windows.Forms.Padding(2) Me.cmdUgly.Name = "cmdUgly" - Me.cmdUgly.Size = New System.Drawing.Size(93, 28) + Me.cmdUgly.Size = New System.Drawing.Size(74, 22) Me.cmdUgly.TabIndex = 38 Me.cmdUgly.Text = "ugly" Me.cmdUgly.UseVisualStyleBackColor = True @@ -1411,9 +1451,10 @@ Partial Class ucrCalculator 'cmdPowerful ' Me.cmdPowerful.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPowerful.Location = New System.Drawing.Point(93, 293) + Me.cmdPowerful.Location = New System.Drawing.Point(74, 234) + Me.cmdPowerful.Margin = New System.Windows.Forms.Padding(2) Me.cmdPowerful.Name = "cmdPowerful" - Me.cmdPowerful.Size = New System.Drawing.Size(93, 28) + Me.cmdPowerful.Size = New System.Drawing.Size(74, 22) Me.cmdPowerful.TabIndex = 37 Me.cmdPowerful.Text = "powerful" Me.cmdPowerful.UseVisualStyleBackColor = True @@ -1421,9 +1462,10 @@ Partial Class ucrCalculator 'cmdFrugal ' Me.cmdFrugal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFrugal.Location = New System.Drawing.Point(2, 293) + Me.cmdFrugal.Location = New System.Drawing.Point(2, 234) + Me.cmdFrugal.Margin = New System.Windows.Forms.Padding(2) Me.cmdFrugal.Name = "cmdFrugal" - Me.cmdFrugal.Size = New System.Drawing.Size(93, 28) + Me.cmdFrugal.Size = New System.Drawing.Size(74, 22) Me.cmdFrugal.TabIndex = 36 Me.cmdFrugal.Text = "frugal" Me.cmdFrugal.UseVisualStyleBackColor = True @@ -1431,9 +1473,10 @@ Partial Class ucrCalculator 'cmdPerfect ' Me.cmdPerfect.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPerfect.Location = New System.Drawing.Point(278, 267) + Me.cmdPerfect.Location = New System.Drawing.Point(222, 214) + Me.cmdPerfect.Margin = New System.Windows.Forms.Padding(2) Me.cmdPerfect.Name = "cmdPerfect" - Me.cmdPerfect.Size = New System.Drawing.Size(93, 28) + Me.cmdPerfect.Size = New System.Drawing.Size(74, 22) Me.cmdPerfect.TabIndex = 35 Me.cmdPerfect.Text = "perfect" Me.cmdPerfect.UseVisualStyleBackColor = True @@ -1441,9 +1484,10 @@ Partial Class ucrCalculator 'cmdAbundant ' Me.cmdAbundant.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAbundant.Location = New System.Drawing.Point(187, 267) + Me.cmdAbundant.Location = New System.Drawing.Point(150, 214) + Me.cmdAbundant.Margin = New System.Windows.Forms.Padding(2) Me.cmdAbundant.Name = "cmdAbundant" - Me.cmdAbundant.Size = New System.Drawing.Size(93, 28) + Me.cmdAbundant.Size = New System.Drawing.Size(74, 22) Me.cmdAbundant.TabIndex = 34 Me.cmdAbundant.Text = "abundant" Me.cmdAbundant.UseVisualStyleBackColor = True @@ -1451,9 +1495,10 @@ Partial Class ucrCalculator 'cmdFibonacci2 ' Me.cmdFibonacci2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFibonacci2.Location = New System.Drawing.Point(93, 267) + Me.cmdFibonacci2.Location = New System.Drawing.Point(74, 214) + Me.cmdFibonacci2.Margin = New System.Windows.Forms.Padding(2) Me.cmdFibonacci2.Name = "cmdFibonacci2" - Me.cmdFibonacci2.Size = New System.Drawing.Size(93, 28) + Me.cmdFibonacci2.Size = New System.Drawing.Size(74, 22) Me.cmdFibonacci2.TabIndex = 33 Me.cmdFibonacci2.Text = "fibonacci2" Me.cmdFibonacci2.UseVisualStyleBackColor = True @@ -1461,9 +1506,10 @@ Partial Class ucrCalculator 'cmdPalindrome ' Me.cmdPalindrome.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPalindrome.Location = New System.Drawing.Point(2, 267) + Me.cmdPalindrome.Location = New System.Drawing.Point(2, 214) + Me.cmdPalindrome.Margin = New System.Windows.Forms.Padding(2) Me.cmdPalindrome.Name = "cmdPalindrome" - Me.cmdPalindrome.Size = New System.Drawing.Size(93, 28) + Me.cmdPalindrome.Size = New System.Drawing.Size(74, 22) Me.cmdPalindrome.TabIndex = 32 Me.cmdPalindrome.Text = "palindrome" Me.cmdPalindrome.UseVisualStyleBackColor = True @@ -1471,9 +1517,10 @@ Partial Class ucrCalculator 'cmdRoman ' Me.cmdRoman.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdRoman.Location = New System.Drawing.Point(187, 132) + Me.cmdRoman.Location = New System.Drawing.Point(150, 106) + Me.cmdRoman.Margin = New System.Windows.Forms.Padding(2) Me.cmdRoman.Name = "cmdRoman" - Me.cmdRoman.Size = New System.Drawing.Size(93, 28) + Me.cmdRoman.Size = New System.Drawing.Size(74, 22) Me.cmdRoman.TabIndex = 31 Me.cmdRoman.Text = "roman" Me.cmdRoman.UseVisualStyleBackColor = True @@ -1481,9 +1528,10 @@ Partial Class ucrCalculator 'cmdHexmode ' Me.cmdHexmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHexmode.Location = New System.Drawing.Point(278, 103) + Me.cmdHexmode.Location = New System.Drawing.Point(222, 82) + Me.cmdHexmode.Margin = New System.Windows.Forms.Padding(2) Me.cmdHexmode.Name = "cmdHexmode" - Me.cmdHexmode.Size = New System.Drawing.Size(93, 28) + Me.cmdHexmode.Size = New System.Drawing.Size(74, 22) Me.cmdHexmode.TabIndex = 30 Me.cmdHexmode.Text = "hexmode" Me.cmdHexmode.UseVisualStyleBackColor = True @@ -1491,9 +1539,10 @@ Partial Class ucrCalculator 'cmdOctmode ' Me.cmdOctmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdOctmode.Location = New System.Drawing.Point(187, 103) + Me.cmdOctmode.Location = New System.Drawing.Point(150, 82) + Me.cmdOctmode.Margin = New System.Windows.Forms.Padding(2) Me.cmdOctmode.Name = "cmdOctmode" - Me.cmdOctmode.Size = New System.Drawing.Size(93, 28) + Me.cmdOctmode.Size = New System.Drawing.Size(74, 22) Me.cmdOctmode.TabIndex = 29 Me.cmdOctmode.Text = "octmode" Me.cmdOctmode.UseVisualStyleBackColor = True @@ -1501,9 +1550,10 @@ Partial Class ucrCalculator 'cmdKTuple ' Me.cmdKTuple.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdKTuple.Location = New System.Drawing.Point(187, 227) + Me.cmdKTuple.Location = New System.Drawing.Point(150, 182) + Me.cmdKTuple.Margin = New System.Windows.Forms.Padding(2) Me.cmdKTuple.Name = "cmdKTuple" - Me.cmdKTuple.Size = New System.Drawing.Size(93, 28) + Me.cmdKTuple.Size = New System.Drawing.Size(74, 22) Me.cmdKTuple.TabIndex = 28 Me.cmdKTuple.Text = "k-tuple" Me.cmdKTuple.UseVisualStyleBackColor = True @@ -1511,9 +1561,10 @@ Partial Class ucrCalculator 'cmdTriplets ' Me.cmdTriplets.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTriplets.Location = New System.Drawing.Point(93, 227) + Me.cmdTriplets.Location = New System.Drawing.Point(74, 182) + Me.cmdTriplets.Margin = New System.Windows.Forms.Padding(2) Me.cmdTriplets.Name = "cmdTriplets" - Me.cmdTriplets.Size = New System.Drawing.Size(93, 28) + Me.cmdTriplets.Size = New System.Drawing.Size(74, 22) Me.cmdTriplets.TabIndex = 27 Me.cmdTriplets.Text = "triplets" Me.cmdTriplets.UseVisualStyleBackColor = True @@ -1521,9 +1572,10 @@ Partial Class ucrCalculator 'cmdThird ' Me.cmdThird.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdThird.Location = New System.Drawing.Point(2, 227) + Me.cmdThird.Location = New System.Drawing.Point(2, 182) + Me.cmdThird.Margin = New System.Windows.Forms.Padding(2) Me.cmdThird.Name = "cmdThird" - Me.cmdThird.Size = New System.Drawing.Size(93, 28) + Me.cmdThird.Size = New System.Drawing.Size(74, 22) Me.cmdThird.TabIndex = 26 Me.cmdThird.Text = "third" Me.cmdThird.UseVisualStyleBackColor = True @@ -1531,9 +1583,10 @@ Partial Class ucrCalculator 'cmdSexy ' Me.cmdSexy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSexy.Location = New System.Drawing.Point(278, 198) + Me.cmdSexy.Location = New System.Drawing.Point(222, 158) + Me.cmdSexy.Margin = New System.Windows.Forms.Padding(2) Me.cmdSexy.Name = "cmdSexy" - Me.cmdSexy.Size = New System.Drawing.Size(93, 28) + Me.cmdSexy.Size = New System.Drawing.Size(74, 22) Me.cmdSexy.TabIndex = 25 Me.cmdSexy.Text = "sexy" Me.cmdSexy.UseVisualStyleBackColor = True @@ -1541,9 +1594,10 @@ Partial Class ucrCalculator 'cmdCousin ' Me.cmdCousin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdCousin.Location = New System.Drawing.Point(187, 198) + Me.cmdCousin.Location = New System.Drawing.Point(150, 158) + Me.cmdCousin.Margin = New System.Windows.Forms.Padding(2) Me.cmdCousin.Name = "cmdCousin" - Me.cmdCousin.Size = New System.Drawing.Size(93, 28) + Me.cmdCousin.Size = New System.Drawing.Size(74, 22) Me.cmdCousin.TabIndex = 24 Me.cmdCousin.Text = "cousin" Me.cmdCousin.UseVisualStyleBackColor = True @@ -1551,9 +1605,10 @@ Partial Class ucrCalculator 'cmdTwin ' Me.cmdTwin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTwin.Location = New System.Drawing.Point(93, 198) + Me.cmdTwin.Location = New System.Drawing.Point(74, 158) + Me.cmdTwin.Margin = New System.Windows.Forms.Padding(2) Me.cmdTwin.Name = "cmdTwin" - Me.cmdTwin.Size = New System.Drawing.Size(93, 28) + Me.cmdTwin.Size = New System.Drawing.Size(74, 22) Me.cmdTwin.TabIndex = 23 Me.cmdTwin.Text = "twin" Me.cmdTwin.UseVisualStyleBackColor = True @@ -1561,9 +1616,10 @@ Partial Class ucrCalculator 'cmdPhi ' Me.cmdPhi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPhi.Location = New System.Drawing.Point(93, 132) + Me.cmdPhi.Location = New System.Drawing.Point(74, 106) + Me.cmdPhi.Margin = New System.Windows.Forms.Padding(2) Me.cmdPhi.Name = "cmdPhi" - Me.cmdPhi.Size = New System.Drawing.Size(93, 28) + Me.cmdPhi.Size = New System.Drawing.Size(74, 22) Me.cmdPhi.TabIndex = 22 Me.cmdPhi.Text = "phi" Me.cmdPhi.UseVisualStyleBackColor = True @@ -1571,9 +1627,10 @@ Partial Class ucrCalculator 'cmdCoprime ' Me.cmdCoprime.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdCoprime.Location = New System.Drawing.Point(2, 198) + Me.cmdCoprime.Location = New System.Drawing.Point(2, 158) + Me.cmdCoprime.Margin = New System.Windows.Forms.Padding(2) Me.cmdCoprime.Name = "cmdCoprime" - Me.cmdCoprime.Size = New System.Drawing.Size(93, 28) + Me.cmdCoprime.Size = New System.Drawing.Size(74, 22) Me.cmdCoprime.TabIndex = 21 Me.cmdCoprime.Text = "coprime" Me.cmdCoprime.UseVisualStyleBackColor = True @@ -1581,9 +1638,10 @@ Partial Class ucrCalculator 'cmdSCM ' Me.cmdSCM.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSCM.Location = New System.Drawing.Point(2, 132) + Me.cmdSCM.Location = New System.Drawing.Point(2, 106) + Me.cmdSCM.Margin = New System.Windows.Forms.Padding(2) Me.cmdSCM.Name = "cmdSCM" - Me.cmdSCM.Size = New System.Drawing.Size(93, 28) + Me.cmdSCM.Size = New System.Drawing.Size(74, 22) Me.cmdSCM.TabIndex = 20 Me.cmdSCM.Text = "scm" Me.cmdSCM.UseVisualStyleBackColor = True @@ -1591,9 +1649,10 @@ Partial Class ucrCalculator 'cmdGCD ' Me.cmdGCD.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdGCD.Location = New System.Drawing.Point(278, 132) + Me.cmdGCD.Location = New System.Drawing.Point(222, 106) + Me.cmdGCD.Margin = New System.Windows.Forms.Padding(2) Me.cmdGCD.Name = "cmdGCD" - Me.cmdGCD.Size = New System.Drawing.Size(93, 28) + Me.cmdGCD.Size = New System.Drawing.Size(74, 22) Me.cmdGCD.TabIndex = 19 Me.cmdGCD.Text = "gcd" Me.cmdGCD.UseVisualStyleBackColor = True @@ -1601,77 +1660,93 @@ Partial Class ucrCalculator 'cmdGeneratePrimes ' Me.cmdGeneratePrimes.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdGeneratePrimes.Location = New System.Drawing.Point(2, 172) + Me.cmdGeneratePrimes.Location = New System.Drawing.Point(2, 138) + Me.cmdGeneratePrimes.Margin = New System.Windows.Forms.Padding(2) Me.cmdGeneratePrimes.Name = "cmdGeneratePrimes" - Me.cmdGeneratePrimes.Size = New System.Drawing.Size(93, 28) + Me.cmdGeneratePrimes.Size = New System.Drawing.Size(74, 22) Me.cmdGeneratePrimes.TabIndex = 18 Me.cmdGeneratePrimes.Text = "primes" Me.cmdGeneratePrimes.UseVisualStyleBackColor = True ' 'cmdNthPrime ' - Me.cmdNthPrime.Location = New System.Drawing.Point(93, 172) + Me.cmdNthPrime.Location = New System.Drawing.Point(74, 138) + Me.cmdNthPrime.Margin = New System.Windows.Forms.Padding(2) Me.cmdNthPrime.Name = "cmdNthPrime" - Me.cmdNthPrime.Size = New System.Drawing.Size(93, 28) + Me.cmdNthPrime.Size = New System.Drawing.Size(74, 22) Me.cmdNthPrime.TabIndex = 17 Me.cmdNthPrime.Text = "nth_prime" Me.cmdNthPrime.UseVisualStyleBackColor = True ' + 'cmdIntegerRHelp + ' + Me.cmdIntegerRHelp.AutoSize = True + Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(210, 283) + Me.cmdIntegerRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" + Me.cmdIntegerRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.TabIndex = 16 + Me.cmdIntegerRHelp.Text = "R Help" + Me.cmdIntegerRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripInteger ' Me.ContextMenuStripInteger.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripInteger.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GmpToolStripMenuItem, Me.DescToolsToolStripMenuItem, Me.RutilsToolStripMenuItem, Me.PrimesToolStripMenuItem, Me.ZseqToolStripMenuItem, Me.UtilsToolStripMenuItem, Me.ConfdesignToolStripMenuItem}) Me.ContextMenuStripInteger.Name = "ContextMenuStripInteger" - Me.ContextMenuStripInteger.Size = New System.Drawing.Size(157, 172) + Me.ContextMenuStripInteger.Size = New System.Drawing.Size(139, 158) ' 'GmpToolStripMenuItem ' Me.GmpToolStripMenuItem.Name = "GmpToolStripMenuItem" - Me.GmpToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.GmpToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.GmpToolStripMenuItem.Text = "Gmp" ' 'DescToolsToolStripMenuItem ' Me.DescToolsToolStripMenuItem.Name = "DescToolsToolStripMenuItem" - Me.DescToolsToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.DescToolsToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.DescToolsToolStripMenuItem.Text = "DescTools" ' 'RutilsToolStripMenuItem ' Me.RutilsToolStripMenuItem.Name = "RutilsToolStripMenuItem" - Me.RutilsToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.RutilsToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.RutilsToolStripMenuItem.Text = "R.utils" ' 'PrimesToolStripMenuItem ' Me.PrimesToolStripMenuItem.Name = "PrimesToolStripMenuItem" - Me.PrimesToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.PrimesToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.PrimesToolStripMenuItem.Text = "Primes" ' 'ZseqToolStripMenuItem ' Me.ZseqToolStripMenuItem.Name = "ZseqToolStripMenuItem" - Me.ZseqToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.ZseqToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.ZseqToolStripMenuItem.Text = "Zseq" ' 'UtilsToolStripMenuItem ' Me.UtilsToolStripMenuItem.Name = "UtilsToolStripMenuItem" - Me.UtilsToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.UtilsToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.UtilsToolStripMenuItem.Text = "R Utils" ' 'ConfdesignToolStripMenuItem ' Me.ConfdesignToolStripMenuItem.Name = "ConfdesignToolStripMenuItem" - Me.ConfdesignToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.ConfdesignToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.ConfdesignToolStripMenuItem.Text = "Conf.design" ' 'cmdHex ' Me.cmdHex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHex.Location = New System.Drawing.Point(93, 103) + Me.cmdHex.Location = New System.Drawing.Point(74, 82) + Me.cmdHex.Margin = New System.Windows.Forms.Padding(2) Me.cmdHex.Name = "cmdHex" - Me.cmdHex.Size = New System.Drawing.Size(93, 28) + Me.cmdHex.Size = New System.Drawing.Size(74, 22) Me.cmdHex.TabIndex = 15 Me.cmdHex.Text = "hex" Me.cmdHex.UseVisualStyleBackColor = True @@ -1679,9 +1754,10 @@ Partial Class ucrCalculator 'cmdOctal ' Me.cmdOctal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdOctal.Location = New System.Drawing.Point(2, 103) + Me.cmdOctal.Location = New System.Drawing.Point(2, 82) + Me.cmdOctal.Margin = New System.Windows.Forms.Padding(2) Me.cmdOctal.Name = "cmdOctal" - Me.cmdOctal.Size = New System.Drawing.Size(93, 28) + Me.cmdOctal.Size = New System.Drawing.Size(74, 22) Me.cmdOctal.TabIndex = 14 Me.cmdOctal.Text = "octal" Me.cmdOctal.UseVisualStyleBackColor = True @@ -1689,9 +1765,10 @@ Partial Class ucrCalculator 'cmdBinary ' Me.cmdBinary.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBinary.Location = New System.Drawing.Point(278, 77) + Me.cmdBinary.Location = New System.Drawing.Point(222, 62) + Me.cmdBinary.Margin = New System.Windows.Forms.Padding(2) Me.cmdBinary.Name = "cmdBinary" - Me.cmdBinary.Size = New System.Drawing.Size(93, 28) + Me.cmdBinary.Size = New System.Drawing.Size(74, 22) Me.cmdBinary.TabIndex = 13 Me.cmdBinary.Text = "binary" Me.cmdBinary.UseVisualStyleBackColor = True @@ -1699,18 +1776,20 @@ Partial Class ucrCalculator 'cmdBigQ ' Me.cmdBigQ.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBigQ.Location = New System.Drawing.Point(93, 22) + Me.cmdBigQ.Location = New System.Drawing.Point(74, 18) + Me.cmdBigQ.Margin = New System.Windows.Forms.Padding(2) Me.cmdBigQ.Name = "cmdBigQ" - Me.cmdBigQ.Size = New System.Drawing.Size(93, 28) + Me.cmdBigQ.Size = New System.Drawing.Size(74, 22) Me.cmdBigQ.TabIndex = 12 Me.cmdBigQ.Text = "bigq" Me.cmdBigQ.UseVisualStyleBackColor = True ' 'cmdDigitSum ' - Me.cmdDigitSum.Location = New System.Drawing.Point(278, 48) + Me.cmdDigitSum.Location = New System.Drawing.Point(222, 38) + Me.cmdDigitSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdDigitSum.Name = "cmdDigitSum" - Me.cmdDigitSum.Size = New System.Drawing.Size(93, 28) + Me.cmdDigitSum.Size = New System.Drawing.Size(74, 22) Me.cmdDigitSum.TabIndex = 10 Me.cmdDigitSum.Text = "digitsum" Me.cmdDigitSum.UseVisualStyleBackColor = True @@ -1718,54 +1797,60 @@ Partial Class ucrCalculator 'cmdRankPercent ' Me.cmdRankPercent.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdRankPercent.Location = New System.Drawing.Point(187, 77) + Me.cmdRankPercent.Location = New System.Drawing.Point(150, 62) + Me.cmdRankPercent.Margin = New System.Windows.Forms.Padding(2) Me.cmdRankPercent.Name = "cmdRankPercent" - Me.cmdRankPercent.Size = New System.Drawing.Size(93, 28) + Me.cmdRankPercent.Size = New System.Drawing.Size(74, 22) Me.cmdRankPercent.TabIndex = 9 Me.cmdRankPercent.Text = "percentrank" Me.cmdRankPercent.UseVisualStyleBackColor = True ' 'cmdDivisors ' - Me.cmdDivisors.Location = New System.Drawing.Point(2, 48) + Me.cmdDivisors.Location = New System.Drawing.Point(2, 38) + Me.cmdDivisors.Margin = New System.Windows.Forms.Padding(2) Me.cmdDivisors.Name = "cmdDivisors" - Me.cmdDivisors.Size = New System.Drawing.Size(93, 28) + Me.cmdDivisors.Size = New System.Drawing.Size(74, 22) Me.cmdDivisors.TabIndex = 8 Me.cmdDivisors.Text = "divisors" Me.cmdDivisors.UseVisualStyleBackColor = True ' 'cmdFibonacci ' - Me.cmdFibonacci.Location = New System.Drawing.Point(2, 77) + Me.cmdFibonacci.Location = New System.Drawing.Point(2, 62) + Me.cmdFibonacci.Margin = New System.Windows.Forms.Padding(2) Me.cmdFibonacci.Name = "cmdFibonacci" - Me.cmdFibonacci.Size = New System.Drawing.Size(93, 28) + Me.cmdFibonacci.Size = New System.Drawing.Size(74, 22) Me.cmdFibonacci.TabIndex = 7 Me.cmdFibonacci.Text = "fibonacci" Me.cmdFibonacci.UseVisualStyleBackColor = True ' 'cmdNextPrime ' - Me.cmdNextPrime.Location = New System.Drawing.Point(187, 172) + Me.cmdNextPrime.Location = New System.Drawing.Point(150, 138) + Me.cmdNextPrime.Margin = New System.Windows.Forms.Padding(2) Me.cmdNextPrime.Name = "cmdNextPrime" - Me.cmdNextPrime.Size = New System.Drawing.Size(93, 28) + Me.cmdNextPrime.Size = New System.Drawing.Size(74, 22) Me.cmdNextPrime.TabIndex = 5 Me.cmdNextPrime.Text = "next prime" Me.cmdNextPrime.UseVisualStyleBackColor = True ' 'cmdChoosez ' - Me.cmdChoosez.Location = New System.Drawing.Point(278, 22) + Me.cmdChoosez.Location = New System.Drawing.Point(222, 18) + Me.cmdChoosez.Margin = New System.Windows.Forms.Padding(2) Me.cmdChoosez.Name = "cmdChoosez" - Me.cmdChoosez.Size = New System.Drawing.Size(93, 28) + Me.cmdChoosez.Size = New System.Drawing.Size(74, 22) Me.cmdChoosez.TabIndex = 4 Me.cmdChoosez.Text = "choose" Me.cmdChoosez.UseVisualStyleBackColor = True ' 'cmdFactorial ' - Me.cmdFactorial.Location = New System.Drawing.Point(187, 22) + Me.cmdFactorial.Location = New System.Drawing.Point(150, 18) + Me.cmdFactorial.Margin = New System.Windows.Forms.Padding(2) Me.cmdFactorial.Name = "cmdFactorial" - Me.cmdFactorial.Size = New System.Drawing.Size(93, 28) + Me.cmdFactorial.Size = New System.Drawing.Size(74, 22) Me.cmdFactorial.TabIndex = 2 Me.cmdFactorial.Text = "factorial" Me.cmdFactorial.UseVisualStyleBackColor = True @@ -1773,9 +1858,10 @@ Partial Class ucrCalculator 'cmdIsPrime ' Me.cmdIsPrime.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdIsPrime.Location = New System.Drawing.Point(278, 172) + Me.cmdIsPrime.Location = New System.Drawing.Point(222, 138) + Me.cmdIsPrime.Margin = New System.Windows.Forms.Padding(2) Me.cmdIsPrime.Name = "cmdIsPrime" - Me.cmdIsPrime.Size = New System.Drawing.Size(93, 28) + Me.cmdIsPrime.Size = New System.Drawing.Size(74, 22) Me.cmdIsPrime.TabIndex = 1 Me.cmdIsPrime.Text = "is_prime" Me.cmdIsPrime.UseVisualStyleBackColor = True @@ -1783,9 +1869,10 @@ Partial Class ucrCalculator 'cmdBigZ ' Me.cmdBigZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBigZ.Location = New System.Drawing.Point(2, 22) + Me.cmdBigZ.Location = New System.Drawing.Point(2, 18) + Me.cmdBigZ.Margin = New System.Windows.Forms.Padding(2) Me.cmdBigZ.Name = "cmdBigZ" - Me.cmdBigZ.Size = New System.Drawing.Size(93, 28) + Me.cmdBigZ.Size = New System.Drawing.Size(74, 22) Me.cmdBigZ.TabIndex = 0 Me.cmdBigZ.Text = "bigz" Me.cmdBigZ.UseVisualStyleBackColor = True @@ -1813,35 +1900,48 @@ Partial Class ucrCalculator Me.grpFactor.Controls.Add(Me.cmdLabelled) Me.grpFactor.Controls.Add(Me.cmdFactor) Me.grpFactor.Controls.Add(Me.cmdAnon) - Me.grpFactor.Location = New System.Drawing.Point(542, 77) + Me.grpFactor.Location = New System.Drawing.Point(434, 62) Me.grpFactor.Margin = New System.Windows.Forms.Padding(2) Me.grpFactor.Name = "grpFactor" Me.grpFactor.Padding = New System.Windows.Forms.Padding(2) - Me.grpFactor.Size = New System.Drawing.Size(310, 260) + Me.grpFactor.Size = New System.Drawing.Size(248, 208) Me.grpFactor.TabIndex = 191 Me.grpFactor.TabStop = False Me.grpFactor.Text = "Factor" ' + 'cmdTransformHelp + ' + Me.cmdTransformHelp.AutoSize = True + Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.Location = New System.Drawing.Point(150, 174) + Me.cmdTransformHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTransformHelp.Name = "cmdTransformHelp" + Me.cmdTransformHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.TabIndex = 212 + Me.cmdTransformHelp.Text = "R Help" + Me.cmdTransformHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripFactor ' Me.ContextMenuStripFactor.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripFactor.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FactorForcatsToolStripMenuItem}) Me.ContextMenuStripFactor.Name = "ContextMenuStrip1" - Me.ContextMenuStripFactor.Size = New System.Drawing.Size(124, 28) + Me.ContextMenuStripFactor.Size = New System.Drawing.Size(111, 26) ' 'FactorForcatsToolStripMenuItem ' Me.FactorForcatsToolStripMenuItem.Name = "FactorForcatsToolStripMenuItem" - Me.FactorForcatsToolStripMenuItem.Size = New System.Drawing.Size(123, 24) + Me.FactorForcatsToolStripMenuItem.Size = New System.Drawing.Size(110, 22) Me.FactorForcatsToolStripMenuItem.Text = "forcats" ' 'cmdShuffle ' Me.cmdShuffle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdShuffle.Location = New System.Drawing.Point(228, 178) + Me.cmdShuffle.Location = New System.Drawing.Point(182, 142) Me.cmdShuffle.Margin = New System.Windows.Forms.Padding(2) Me.cmdShuffle.Name = "cmdShuffle" - Me.cmdShuffle.Size = New System.Drawing.Size(75, 40) + Me.cmdShuffle.Size = New System.Drawing.Size(60, 32) Me.cmdShuffle.TabIndex = 210 Me.cmdShuffle.Text = "shuffle" Me.cmdShuffle.UseVisualStyleBackColor = True @@ -1849,10 +1949,10 @@ Partial Class ucrCalculator 'cmdShift ' Me.cmdShift.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdShift.Location = New System.Drawing.Point(153, 178) + Me.cmdShift.Location = New System.Drawing.Point(122, 142) Me.cmdShift.Margin = New System.Windows.Forms.Padding(2) Me.cmdShift.Name = "cmdShift" - Me.cmdShift.Size = New System.Drawing.Size(75, 40) + Me.cmdShift.Size = New System.Drawing.Size(60, 32) Me.cmdShift.TabIndex = 209 Me.cmdShift.Text = "shift" Me.cmdShift.UseVisualStyleBackColor = True @@ -1860,10 +1960,10 @@ Partial Class ucrCalculator 'cmdReverse ' Me.cmdReverse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReverse.Location = New System.Drawing.Point(80, 178) + Me.cmdReverse.Location = New System.Drawing.Point(64, 142) Me.cmdReverse.Margin = New System.Windows.Forms.Padding(2) Me.cmdReverse.Name = "cmdReverse" - Me.cmdReverse.Size = New System.Drawing.Size(75, 40) + Me.cmdReverse.Size = New System.Drawing.Size(60, 32) Me.cmdReverse.TabIndex = 208 Me.cmdReverse.Text = "reverse" Me.cmdReverse.UseVisualStyleBackColor = True @@ -1871,10 +1971,10 @@ Partial Class ucrCalculator 'cmdReorder ' Me.cmdReorder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReorder.Location = New System.Drawing.Point(5, 178) + Me.cmdReorder.Location = New System.Drawing.Point(4, 142) Me.cmdReorder.Margin = New System.Windows.Forms.Padding(2) Me.cmdReorder.Name = "cmdReorder" - Me.cmdReorder.Size = New System.Drawing.Size(75, 40) + Me.cmdReorder.Size = New System.Drawing.Size(60, 32) Me.cmdReorder.TabIndex = 207 Me.cmdReorder.Text = "reorder" Me.cmdReorder.UseVisualStyleBackColor = True @@ -1882,10 +1982,10 @@ Partial Class ucrCalculator 'cmdRelevel ' Me.cmdRelevel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRelevel.Location = New System.Drawing.Point(228, 138) + Me.cmdRelevel.Location = New System.Drawing.Point(182, 110) Me.cmdRelevel.Margin = New System.Windows.Forms.Padding(2) Me.cmdRelevel.Name = "cmdRelevel" - Me.cmdRelevel.Size = New System.Drawing.Size(75, 40) + Me.cmdRelevel.Size = New System.Drawing.Size(60, 32) Me.cmdRelevel.TabIndex = 206 Me.cmdRelevel.Text = "relevel" Me.cmdRelevel.UseVisualStyleBackColor = True @@ -1893,10 +1993,10 @@ Partial Class ucrCalculator 'cmdRecode ' Me.cmdRecode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRecode.Location = New System.Drawing.Point(153, 138) + Me.cmdRecode.Location = New System.Drawing.Point(122, 110) Me.cmdRecode.Margin = New System.Windows.Forms.Padding(2) Me.cmdRecode.Name = "cmdRecode" - Me.cmdRecode.Size = New System.Drawing.Size(75, 40) + Me.cmdRecode.Size = New System.Drawing.Size(60, 32) Me.cmdRecode.TabIndex = 205 Me.cmdRecode.Text = "recode" Me.cmdRecode.UseVisualStyleBackColor = True @@ -1904,10 +2004,10 @@ Partial Class ucrCalculator 'cmdOther ' Me.cmdOther.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOther.Location = New System.Drawing.Point(80, 138) + Me.cmdOther.Location = New System.Drawing.Point(64, 110) Me.cmdOther.Margin = New System.Windows.Forms.Padding(2) Me.cmdOther.Name = "cmdOther" - Me.cmdOther.Size = New System.Drawing.Size(75, 40) + Me.cmdOther.Size = New System.Drawing.Size(60, 32) Me.cmdOther.TabIndex = 204 Me.cmdOther.Text = "other" Me.cmdOther.UseVisualStyleBackColor = True @@ -1915,10 +2015,10 @@ Partial Class ucrCalculator 'cmdFmatch ' Me.cmdFmatch.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFmatch.Location = New System.Drawing.Point(5, 138) + Me.cmdFmatch.Location = New System.Drawing.Point(4, 110) Me.cmdFmatch.Margin = New System.Windows.Forms.Padding(2) Me.cmdFmatch.Name = "cmdFmatch" - Me.cmdFmatch.Size = New System.Drawing.Size(75, 40) + Me.cmdFmatch.Size = New System.Drawing.Size(60, 32) Me.cmdFmatch.TabIndex = 203 Me.cmdFmatch.Text = "match" Me.cmdFmatch.UseVisualStyleBackColor = True @@ -1926,10 +2026,10 @@ Partial Class ucrCalculator 'cmdLump ' Me.cmdLump.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLump.Location = New System.Drawing.Point(228, 100) + Me.cmdLump.Location = New System.Drawing.Point(182, 80) Me.cmdLump.Margin = New System.Windows.Forms.Padding(2) Me.cmdLump.Name = "cmdLump" - Me.cmdLump.Size = New System.Drawing.Size(75, 40) + Me.cmdLump.Size = New System.Drawing.Size(60, 32) Me.cmdLump.TabIndex = 202 Me.cmdLump.Text = "lump" Me.cmdLump.UseVisualStyleBackColor = True @@ -1937,10 +2037,10 @@ Partial Class ucrCalculator 'cmdInseq ' Me.cmdInseq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInseq.Location = New System.Drawing.Point(153, 100) + Me.cmdInseq.Location = New System.Drawing.Point(122, 80) Me.cmdInseq.Margin = New System.Windows.Forms.Padding(2) Me.cmdInseq.Name = "cmdInseq" - Me.cmdInseq.Size = New System.Drawing.Size(75, 40) + Me.cmdInseq.Size = New System.Drawing.Size(60, 32) Me.cmdInseq.TabIndex = 201 Me.cmdInseq.Text = "inseq" Me.cmdInseq.UseVisualStyleBackColor = True @@ -1948,10 +2048,10 @@ Partial Class ucrCalculator 'cmdInfreq ' Me.cmdInfreq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInfreq.Location = New System.Drawing.Point(80, 100) + Me.cmdInfreq.Location = New System.Drawing.Point(64, 80) Me.cmdInfreq.Margin = New System.Windows.Forms.Padding(2) Me.cmdInfreq.Name = "cmdInfreq" - Me.cmdInfreq.Size = New System.Drawing.Size(75, 40) + Me.cmdInfreq.Size = New System.Drawing.Size(60, 32) Me.cmdInfreq.TabIndex = 200 Me.cmdInfreq.Text = "infreq" Me.cmdInfreq.UseVisualStyleBackColor = True @@ -1959,10 +2059,10 @@ Partial Class ucrCalculator 'cmdInorder ' Me.cmdInorder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInorder.Location = New System.Drawing.Point(5, 100) + Me.cmdInorder.Location = New System.Drawing.Point(4, 80) Me.cmdInorder.Margin = New System.Windows.Forms.Padding(2) Me.cmdInorder.Name = "cmdInorder" - Me.cmdInorder.Size = New System.Drawing.Size(75, 40) + Me.cmdInorder.Size = New System.Drawing.Size(60, 32) Me.cmdInorder.TabIndex = 199 Me.cmdInorder.Text = "inorder" Me.cmdInorder.UseVisualStyleBackColor = True @@ -1970,10 +2070,10 @@ Partial Class ucrCalculator 'cmdAdd_na ' Me.cmdAdd_na.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAdd_na.Location = New System.Drawing.Point(228, 60) + Me.cmdAdd_na.Location = New System.Drawing.Point(182, 48) Me.cmdAdd_na.Margin = New System.Windows.Forms.Padding(2) Me.cmdAdd_na.Name = "cmdAdd_na" - Me.cmdAdd_na.Size = New System.Drawing.Size(75, 40) + Me.cmdAdd_na.Size = New System.Drawing.Size(60, 32) Me.cmdAdd_na.TabIndex = 198 Me.cmdAdd_na.Text = "add_na" Me.cmdAdd_na.UseVisualStyleBackColor = True @@ -1981,10 +2081,10 @@ Partial Class ucrCalculator 'cmdExpand ' Me.cmdExpand.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExpand.Location = New System.Drawing.Point(153, 60) + Me.cmdExpand.Location = New System.Drawing.Point(122, 48) Me.cmdExpand.Margin = New System.Windows.Forms.Padding(2) Me.cmdExpand.Name = "cmdExpand" - Me.cmdExpand.Size = New System.Drawing.Size(75, 40) + Me.cmdExpand.Size = New System.Drawing.Size(60, 32) Me.cmdExpand.TabIndex = 197 Me.cmdExpand.Text = "expand" Me.cmdExpand.UseVisualStyleBackColor = True @@ -1992,10 +2092,10 @@ Partial Class ucrCalculator 'cmdDrop ' Me.cmdDrop.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDrop.Location = New System.Drawing.Point(80, 60) + Me.cmdDrop.Location = New System.Drawing.Point(64, 48) Me.cmdDrop.Margin = New System.Windows.Forms.Padding(2) Me.cmdDrop.Name = "cmdDrop" - Me.cmdDrop.Size = New System.Drawing.Size(75, 40) + Me.cmdDrop.Size = New System.Drawing.Size(60, 32) Me.cmdDrop.TabIndex = 196 Me.cmdDrop.Text = "drop" Me.cmdDrop.UseVisualStyleBackColor = True @@ -2003,10 +2103,10 @@ Partial Class ucrCalculator 'cmdCross ' Me.cmdCross.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCross.Location = New System.Drawing.Point(5, 60) + Me.cmdCross.Location = New System.Drawing.Point(4, 48) Me.cmdCross.Margin = New System.Windows.Forms.Padding(2) Me.cmdCross.Name = "cmdCross" - Me.cmdCross.Size = New System.Drawing.Size(75, 40) + Me.cmdCross.Size = New System.Drawing.Size(60, 32) Me.cmdCross.TabIndex = 195 Me.cmdCross.Text = "cross" Me.cmdCross.UseVisualStyleBackColor = True @@ -2014,10 +2114,10 @@ Partial Class ucrCalculator 'cmdCollapse ' Me.cmdCollapse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCollapse.Location = New System.Drawing.Point(228, 20) + Me.cmdCollapse.Location = New System.Drawing.Point(182, 16) Me.cmdCollapse.Margin = New System.Windows.Forms.Padding(2) Me.cmdCollapse.Name = "cmdCollapse" - Me.cmdCollapse.Size = New System.Drawing.Size(75, 40) + Me.cmdCollapse.Size = New System.Drawing.Size(60, 32) Me.cmdCollapse.TabIndex = 194 Me.cmdCollapse.Text = "collapse" Me.cmdCollapse.UseVisualStyleBackColor = True @@ -2025,10 +2125,10 @@ Partial Class ucrCalculator 'cmdLabelled ' Me.cmdLabelled.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLabelled.Location = New System.Drawing.Point(153, 20) + Me.cmdLabelled.Location = New System.Drawing.Point(122, 16) Me.cmdLabelled.Margin = New System.Windows.Forms.Padding(2) Me.cmdLabelled.Name = "cmdLabelled" - Me.cmdLabelled.Size = New System.Drawing.Size(75, 40) + Me.cmdLabelled.Size = New System.Drawing.Size(60, 32) Me.cmdLabelled.TabIndex = 193 Me.cmdLabelled.Text = "labelled " Me.cmdLabelled.UseVisualStyleBackColor = True @@ -2036,10 +2136,10 @@ Partial Class ucrCalculator 'cmdFactor ' Me.cmdFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFactor.Location = New System.Drawing.Point(5, 20) + Me.cmdFactor.Location = New System.Drawing.Point(4, 16) Me.cmdFactor.Margin = New System.Windows.Forms.Padding(2) Me.cmdFactor.Name = "cmdFactor" - Me.cmdFactor.Size = New System.Drawing.Size(75, 40) + Me.cmdFactor.Size = New System.Drawing.Size(60, 32) Me.cmdFactor.TabIndex = 191 Me.cmdFactor.Text = "factor" Me.cmdFactor.UseVisualStyleBackColor = True @@ -2047,10 +2147,10 @@ Partial Class ucrCalculator 'cmdAnon ' Me.cmdAnon.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnon.Location = New System.Drawing.Point(80, 20) + Me.cmdAnon.Location = New System.Drawing.Point(64, 16) Me.cmdAnon.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnon.Name = "cmdAnon" - Me.cmdAnon.Size = New System.Drawing.Size(75, 40) + Me.cmdAnon.Size = New System.Drawing.Size(60, 32) Me.cmdAnon.TabIndex = 192 Me.cmdAnon.Text = "anon" Me.cmdAnon.UseVisualStyleBackColor = True @@ -2079,35 +2179,48 @@ Partial Class ucrCalculator Me.grpHydroGOF.Controls.Add(Me.cmdD) Me.grpHydroGOF.Controls.Add(Me.cmdCp) Me.grpHydroGOF.Controls.Add(Me.cmdBr2) - Me.grpHydroGOF.Location = New System.Drawing.Point(542, 77) + Me.grpHydroGOF.Location = New System.Drawing.Point(434, 62) Me.grpHydroGOF.Margin = New System.Windows.Forms.Padding(2) Me.grpHydroGOF.Name = "grpHydroGOF" Me.grpHydroGOF.Padding = New System.Windows.Forms.Padding(2) - Me.grpHydroGOF.Size = New System.Drawing.Size(228, 337) + Me.grpHydroGOF.Size = New System.Drawing.Size(182, 270) Me.grpHydroGOF.TabIndex = 195 Me.grpHydroGOF.TabStop = False - Me.grpHydroGOF.Text = "hydroGOF " + Me.grpHydroGOF.Text = "Goodness of Fit" + ' + 'cmdHydroHelp + ' + Me.cmdHydroHelp.AutoSize = True + Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.Location = New System.Drawing.Point(90, 238) + Me.cmdHydroHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdHydroHelp.Name = "cmdHydroHelp" + Me.cmdHydroHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.TabIndex = 212 + Me.cmdHydroHelp.Text = "R Help" + Me.cmdHydroHelp.UseVisualStyleBackColor = True ' 'ContextMenuStripHydroGOF ' Me.ContextMenuStripHydroGOF.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripHydroGOF.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.HydroGOFToolStripMenuItem}) Me.ContextMenuStripHydroGOF.Name = "ContextMenuStrip1" - Me.ContextMenuStripHydroGOF.Size = New System.Drawing.Size(145, 28) + Me.ContextMenuStripHydroGOF.Size = New System.Drawing.Size(129, 26) ' 'HydroGOFToolStripMenuItem ' Me.HydroGOFToolStripMenuItem.Name = "HydroGOFToolStripMenuItem" - Me.HydroGOFToolStripMenuItem.Size = New System.Drawing.Size(144, 24) + Me.HydroGOFToolStripMenuItem.Size = New System.Drawing.Size(128, 22) Me.HydroGOFToolStripMenuItem.Text = "hydroGOF" ' 'cmdVE ' Me.cmdVE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdVE.Location = New System.Drawing.Point(150, 258) + Me.cmdVE.Location = New System.Drawing.Point(120, 206) Me.cmdVE.Margin = New System.Windows.Forms.Padding(2) Me.cmdVE.Name = "cmdVE" - Me.cmdVE.Size = New System.Drawing.Size(75, 40) + Me.cmdVE.Size = New System.Drawing.Size(60, 32) Me.cmdVE.TabIndex = 20 Me.cmdVE.Text = "VE" Me.cmdVE.UseVisualStyleBackColor = True @@ -2115,10 +2228,10 @@ Partial Class ucrCalculator 'cmdSsq ' Me.cmdSsq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSsq.Location = New System.Drawing.Point(77, 258) + Me.cmdSsq.Location = New System.Drawing.Point(62, 206) Me.cmdSsq.Margin = New System.Windows.Forms.Padding(2) Me.cmdSsq.Name = "cmdSsq" - Me.cmdSsq.Size = New System.Drawing.Size(75, 40) + Me.cmdSsq.Size = New System.Drawing.Size(60, 32) Me.cmdSsq.TabIndex = 19 Me.cmdSsq.Text = "ssq" Me.cmdSsq.UseVisualStyleBackColor = True @@ -2126,10 +2239,10 @@ Partial Class ucrCalculator 'cmdRsr ' Me.cmdRsr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRsr.Location = New System.Drawing.Point(2, 258) + Me.cmdRsr.Location = New System.Drawing.Point(2, 206) Me.cmdRsr.Margin = New System.Windows.Forms.Padding(2) Me.cmdRsr.Name = "cmdRsr" - Me.cmdRsr.Size = New System.Drawing.Size(75, 40) + Me.cmdRsr.Size = New System.Drawing.Size(60, 32) Me.cmdRsr.TabIndex = 18 Me.cmdRsr.Text = "rsr" Me.cmdRsr.UseVisualStyleBackColor = True @@ -2137,10 +2250,10 @@ Partial Class ucrCalculator 'cmdRSD ' Me.cmdRSD.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRSD.Location = New System.Drawing.Point(150, 218) + Me.cmdRSD.Location = New System.Drawing.Point(120, 174) Me.cmdRSD.Margin = New System.Windows.Forms.Padding(2) Me.cmdRSD.Name = "cmdRSD" - Me.cmdRSD.Size = New System.Drawing.Size(75, 40) + Me.cmdRSD.Size = New System.Drawing.Size(60, 32) Me.cmdRSD.TabIndex = 17 Me.cmdRSD.Text = "rSD" Me.cmdRSD.UseVisualStyleBackColor = True @@ -2148,10 +2261,10 @@ Partial Class ucrCalculator 'cmdRPearson ' Me.cmdRPearson.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRPearson.Location = New System.Drawing.Point(77, 218) + Me.cmdRPearson.Location = New System.Drawing.Point(62, 174) Me.cmdRPearson.Margin = New System.Windows.Forms.Padding(2) Me.cmdRPearson.Name = "cmdRPearson" - Me.cmdRPearson.Size = New System.Drawing.Size(75, 40) + Me.cmdRPearson.Size = New System.Drawing.Size(60, 32) Me.cmdRPearson.TabIndex = 16 Me.cmdRPearson.Text = "rPearson" Me.cmdRPearson.UseVisualStyleBackColor = True @@ -2159,10 +2272,10 @@ Partial Class ucrCalculator 'cmdRNSE ' Me.cmdRNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRNSE.Location = New System.Drawing.Point(2, 218) + Me.cmdRNSE.Location = New System.Drawing.Point(2, 174) Me.cmdRNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdRNSE.Name = "cmdRNSE" - Me.cmdRNSE.Size = New System.Drawing.Size(75, 40) + Me.cmdRNSE.Size = New System.Drawing.Size(60, 32) Me.cmdRNSE.TabIndex = 15 Me.cmdRNSE.Text = "rNSE" Me.cmdRNSE.UseVisualStyleBackColor = True @@ -2170,10 +2283,10 @@ Partial Class ucrCalculator 'cmdRmse ' Me.cmdRmse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRmse.Location = New System.Drawing.Point(150, 178) + Me.cmdRmse.Location = New System.Drawing.Point(120, 142) Me.cmdRmse.Margin = New System.Windows.Forms.Padding(2) Me.cmdRmse.Name = "cmdRmse" - Me.cmdRmse.Size = New System.Drawing.Size(75, 40) + Me.cmdRmse.Size = New System.Drawing.Size(60, 32) Me.cmdRmse.TabIndex = 14 Me.cmdRmse.Text = "rmse" Me.cmdRmse.UseVisualStyleBackColor = True @@ -2181,10 +2294,10 @@ Partial Class ucrCalculator 'cmdRd ' Me.cmdRd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRd.Location = New System.Drawing.Point(77, 178) + Me.cmdRd.Location = New System.Drawing.Point(62, 142) Me.cmdRd.Margin = New System.Windows.Forms.Padding(2) Me.cmdRd.Name = "cmdRd" - Me.cmdRd.Size = New System.Drawing.Size(75, 40) + Me.cmdRd.Size = New System.Drawing.Size(60, 32) Me.cmdRd.TabIndex = 13 Me.cmdRd.Text = "rd" Me.cmdRd.UseVisualStyleBackColor = True @@ -2192,10 +2305,10 @@ Partial Class ucrCalculator 'cmdPbiasfdc ' Me.cmdPbiasfdc.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbiasfdc.Location = New System.Drawing.Point(2, 178) + Me.cmdPbiasfdc.Location = New System.Drawing.Point(2, 142) Me.cmdPbiasfdc.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbiasfdc.Name = "cmdPbiasfdc" - Me.cmdPbiasfdc.Size = New System.Drawing.Size(75, 40) + Me.cmdPbiasfdc.Size = New System.Drawing.Size(60, 32) Me.cmdPbiasfdc.TabIndex = 12 Me.cmdPbiasfdc.Text = "pbiasfdc" Me.cmdPbiasfdc.UseVisualStyleBackColor = True @@ -2203,10 +2316,10 @@ Partial Class ucrCalculator 'cmdPbias ' Me.cmdPbias.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbias.Location = New System.Drawing.Point(150, 138) + Me.cmdPbias.Location = New System.Drawing.Point(120, 110) Me.cmdPbias.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbias.Name = "cmdPbias" - Me.cmdPbias.Size = New System.Drawing.Size(75, 40) + Me.cmdPbias.Size = New System.Drawing.Size(60, 32) Me.cmdPbias.TabIndex = 11 Me.cmdPbias.Text = "pbias" Me.cmdPbias.UseVisualStyleBackColor = True @@ -2214,10 +2327,10 @@ Partial Class ucrCalculator 'cmdNSE ' Me.cmdNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNSE.Location = New System.Drawing.Point(77, 138) + Me.cmdNSE.Location = New System.Drawing.Point(62, 110) Me.cmdNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdNSE.Name = "cmdNSE" - Me.cmdNSE.Size = New System.Drawing.Size(75, 40) + Me.cmdNSE.Size = New System.Drawing.Size(60, 32) Me.cmdNSE.TabIndex = 10 Me.cmdNSE.Text = "NSE" Me.cmdNSE.UseVisualStyleBackColor = True @@ -2225,10 +2338,10 @@ Partial Class ucrCalculator 'cmdNrmse ' Me.cmdNrmse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNrmse.Location = New System.Drawing.Point(2, 138) + Me.cmdNrmse.Location = New System.Drawing.Point(2, 110) Me.cmdNrmse.Margin = New System.Windows.Forms.Padding(2) Me.cmdNrmse.Name = "cmdNrmse" - Me.cmdNrmse.Size = New System.Drawing.Size(75, 40) + Me.cmdNrmse.Size = New System.Drawing.Size(60, 32) Me.cmdNrmse.TabIndex = 9 Me.cmdNrmse.Text = "nrmse" Me.cmdNrmse.UseVisualStyleBackColor = True @@ -2236,10 +2349,10 @@ Partial Class ucrCalculator 'cmdMse ' Me.cmdMse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMse.Location = New System.Drawing.Point(150, 100) + Me.cmdMse.Location = New System.Drawing.Point(120, 80) Me.cmdMse.Margin = New System.Windows.Forms.Padding(2) Me.cmdMse.Name = "cmdMse" - Me.cmdMse.Size = New System.Drawing.Size(75, 40) + Me.cmdMse.Size = New System.Drawing.Size(60, 32) Me.cmdMse.TabIndex = 8 Me.cmdMse.Text = "mse" Me.cmdMse.UseVisualStyleBackColor = True @@ -2247,10 +2360,10 @@ Partial Class ucrCalculator 'cmdmNSE ' Me.cmdmNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdmNSE.Location = New System.Drawing.Point(77, 100) + Me.cmdmNSE.Location = New System.Drawing.Point(62, 80) Me.cmdmNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdmNSE.Name = "cmdmNSE" - Me.cmdmNSE.Size = New System.Drawing.Size(75, 40) + Me.cmdmNSE.Size = New System.Drawing.Size(60, 32) Me.cmdmNSE.TabIndex = 7 Me.cmdmNSE.Text = "mNSE" Me.cmdmNSE.UseVisualStyleBackColor = True @@ -2258,10 +2371,10 @@ Partial Class ucrCalculator 'cmdMe ' Me.cmdMe.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMe.Location = New System.Drawing.Point(2, 100) + Me.cmdMe.Location = New System.Drawing.Point(2, 80) Me.cmdMe.Margin = New System.Windows.Forms.Padding(2) Me.cmdMe.Name = "cmdMe" - Me.cmdMe.Size = New System.Drawing.Size(75, 40) + Me.cmdMe.Size = New System.Drawing.Size(60, 32) Me.cmdMe.TabIndex = 6 Me.cmdMe.Text = "me" Me.cmdMe.UseVisualStyleBackColor = True @@ -2269,10 +2382,10 @@ Partial Class ucrCalculator 'cmdMd ' Me.cmdMd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMd.Location = New System.Drawing.Point(150, 60) + Me.cmdMd.Location = New System.Drawing.Point(120, 48) Me.cmdMd.Margin = New System.Windows.Forms.Padding(2) Me.cmdMd.Name = "cmdMd" - Me.cmdMd.Size = New System.Drawing.Size(75, 40) + Me.cmdMd.Size = New System.Drawing.Size(60, 32) Me.cmdMd.TabIndex = 5 Me.cmdMd.Text = "md" Me.cmdMd.UseVisualStyleBackColor = True @@ -2280,10 +2393,10 @@ Partial Class ucrCalculator 'cmdMae ' Me.cmdMae.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMae.Location = New System.Drawing.Point(77, 60) + Me.cmdMae.Location = New System.Drawing.Point(62, 48) Me.cmdMae.Margin = New System.Windows.Forms.Padding(2) Me.cmdMae.Name = "cmdMae" - Me.cmdMae.Size = New System.Drawing.Size(75, 40) + Me.cmdMae.Size = New System.Drawing.Size(60, 32) Me.cmdMae.TabIndex = 4 Me.cmdMae.Text = "mae" Me.cmdMae.UseVisualStyleBackColor = True @@ -2291,10 +2404,10 @@ Partial Class ucrCalculator 'cmdKGE ' Me.cmdKGE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdKGE.Location = New System.Drawing.Point(2, 60) + Me.cmdKGE.Location = New System.Drawing.Point(2, 48) Me.cmdKGE.Margin = New System.Windows.Forms.Padding(2) Me.cmdKGE.Name = "cmdKGE" - Me.cmdKGE.Size = New System.Drawing.Size(75, 40) + Me.cmdKGE.Size = New System.Drawing.Size(60, 32) Me.cmdKGE.TabIndex = 3 Me.cmdKGE.Text = "KGE" Me.cmdKGE.UseVisualStyleBackColor = True @@ -2302,10 +2415,10 @@ Partial Class ucrCalculator 'cmdD ' Me.cmdD.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdD.Location = New System.Drawing.Point(150, 20) + Me.cmdD.Location = New System.Drawing.Point(120, 16) Me.cmdD.Margin = New System.Windows.Forms.Padding(2) Me.cmdD.Name = "cmdD" - Me.cmdD.Size = New System.Drawing.Size(75, 40) + Me.cmdD.Size = New System.Drawing.Size(60, 32) Me.cmdD.TabIndex = 2 Me.cmdD.Text = "d" Me.cmdD.UseVisualStyleBackColor = True @@ -2313,10 +2426,10 @@ Partial Class ucrCalculator 'cmdCp ' Me.cmdCp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCp.Location = New System.Drawing.Point(77, 20) + Me.cmdCp.Location = New System.Drawing.Point(62, 16) Me.cmdCp.Margin = New System.Windows.Forms.Padding(2) Me.cmdCp.Name = "cmdCp" - Me.cmdCp.Size = New System.Drawing.Size(75, 40) + Me.cmdCp.Size = New System.Drawing.Size(60, 32) Me.cmdCp.TabIndex = 1 Me.cmdCp.Text = "cp" Me.cmdCp.UseVisualStyleBackColor = True @@ -2324,10 +2437,10 @@ Partial Class ucrCalculator 'cmdBr2 ' Me.cmdBr2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBr2.Location = New System.Drawing.Point(2, 20) + Me.cmdBr2.Location = New System.Drawing.Point(2, 16) Me.cmdBr2.Margin = New System.Windows.Forms.Padding(2) Me.cmdBr2.Name = "cmdBr2" - Me.cmdBr2.Size = New System.Drawing.Size(75, 40) + Me.cmdBr2.Size = New System.Drawing.Size(60, 32) Me.cmdBr2.TabIndex = 0 Me.cmdBr2.Text = "br2" Me.cmdBr2.UseVisualStyleBackColor = True @@ -2363,7 +2476,7 @@ Partial Class ucrCalculator Me.grpWakefield.Controls.Add(Me.cmdWakefieldLower) Me.grpWakefield.Controls.Add(Me.cmdLanguage) Me.grpWakefield.Controls.Add(Me.cmdIq) - Me.grpWakefield.Controls.Add(Me.cmdInternet_Browser) + Me.grpWakefield.Controls.Add(Me.cmdid) Me.grpWakefield.Controls.Add(Me.cmdGrade_Level) Me.grpWakefield.Controls.Add(Me.cmdEye) Me.grpWakefield.Controls.Add(Me.cmdEmployment) @@ -2389,9 +2502,11 @@ Partial Class ucrCalculator Me.grpWakefield.Controls.Add(Me.cmdHair) Me.grpWakefield.Controls.Add(Me.cmdGroup) Me.grpWakefield.Controls.Add(Me.cmdGrade) - Me.grpWakefield.Location = New System.Drawing.Point(542, 78) + Me.grpWakefield.Location = New System.Drawing.Point(434, 62) + Me.grpWakefield.Margin = New System.Windows.Forms.Padding(2) Me.grpWakefield.Name = "grpWakefield" - Me.grpWakefield.Size = New System.Drawing.Size(543, 432) + Me.grpWakefield.Padding = New System.Windows.Forms.Padding(2) + Me.grpWakefield.Size = New System.Drawing.Size(434, 346) Me.grpWakefield.TabIndex = 191 Me.grpWakefield.TabStop = False Me.grpWakefield.Text = "Wakefield" @@ -2400,9 +2515,10 @@ Partial Class ucrCalculator ' Me.cmdLikert7.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLikert7.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLikert7.Location = New System.Drawing.Point(427, 382) + Me.cmdLikert7.Location = New System.Drawing.Point(342, 306) + Me.cmdLikert7.Margin = New System.Windows.Forms.Padding(2) Me.cmdLikert7.Name = "cmdLikert7" - Me.cmdLikert7.Size = New System.Drawing.Size(107, 38) + Me.cmdLikert7.Size = New System.Drawing.Size(86, 30) Me.cmdLikert7.TabIndex = 54 Me.cmdLikert7.Text = "likert7 (O.F)" Me.cmdLikert7.UseVisualStyleBackColor = True @@ -2411,9 +2527,10 @@ Partial Class ucrCalculator ' Me.cmdWakefield_Year.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefield_Year.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefield_Year.Location = New System.Drawing.Point(322, 382) + Me.cmdWakefield_Year.Location = New System.Drawing.Point(258, 306) + Me.cmdWakefield_Year.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefield_Year.Name = "cmdWakefield_Year" - Me.cmdWakefield_Year.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefield_Year.Size = New System.Drawing.Size(86, 30) Me.cmdWakefield_Year.TabIndex = 53 Me.cmdWakefield_Year.Text = "year" Me.cmdWakefield_Year.UseVisualStyleBackColor = True @@ -2422,9 +2539,10 @@ Partial Class ucrCalculator ' Me.cmdValid.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdValid.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdValid.Location = New System.Drawing.Point(217, 382) + Me.cmdValid.Location = New System.Drawing.Point(174, 306) + Me.cmdValid.Margin = New System.Windows.Forms.Padding(2) Me.cmdValid.Name = "cmdValid" - Me.cmdValid.Size = New System.Drawing.Size(107, 38) + Me.cmdValid.Size = New System.Drawing.Size(86, 30) Me.cmdValid.TabIndex = 52 Me.cmdValid.Text = "valid (L)" Me.cmdValid.UseVisualStyleBackColor = True @@ -2433,9 +2551,10 @@ Partial Class ucrCalculator ' Me.cmdWakefieldUpper.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldUpper.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldUpper.Location = New System.Drawing.Point(112, 382) + Me.cmdWakefieldUpper.Location = New System.Drawing.Point(90, 306) + Me.cmdWakefieldUpper.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldUpper.Name = "cmdWakefieldUpper" - Me.cmdWakefieldUpper.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldUpper.Size = New System.Drawing.Size(86, 30) Me.cmdWakefieldUpper.TabIndex = 51 Me.cmdWakefieldUpper.Text = "upper (F)" Me.cmdWakefieldUpper.UseVisualStyleBackColor = True @@ -2444,9 +2563,10 @@ Partial Class ucrCalculator ' Me.cmdString.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdString.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdString.Location = New System.Drawing.Point(7, 382) + Me.cmdString.Location = New System.Drawing.Point(6, 306) + Me.cmdString.Margin = New System.Windows.Forms.Padding(2) Me.cmdString.Name = "cmdString" - Me.cmdString.Size = New System.Drawing.Size(107, 38) + Me.cmdString.Size = New System.Drawing.Size(86, 30) Me.cmdString.TabIndex = 50 Me.cmdString.Text = "string (C)" Me.cmdString.UseVisualStyleBackColor = True @@ -2455,9 +2575,10 @@ Partial Class ucrCalculator ' Me.cmdState.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdState.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdState.Location = New System.Drawing.Point(427, 347) + Me.cmdState.Location = New System.Drawing.Point(342, 278) + Me.cmdState.Margin = New System.Windows.Forms.Padding(2) Me.cmdState.Name = "cmdState" - Me.cmdState.Size = New System.Drawing.Size(107, 38) + Me.cmdState.Size = New System.Drawing.Size(86, 30) Me.cmdState.TabIndex = 49 Me.cmdState.Text = "state (F)" Me.cmdState.UseVisualStyleBackColor = True @@ -2466,9 +2587,10 @@ Partial Class ucrCalculator ' Me.cmdSpeed.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSpeed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSpeed.Location = New System.Drawing.Point(322, 347) + Me.cmdSpeed.Location = New System.Drawing.Point(258, 278) + Me.cmdSpeed.Margin = New System.Windows.Forms.Padding(2) Me.cmdSpeed.Name = "cmdSpeed" - Me.cmdSpeed.Size = New System.Drawing.Size(107, 38) + Me.cmdSpeed.Size = New System.Drawing.Size(86, 30) Me.cmdSpeed.TabIndex = 48 Me.cmdSpeed.Text = "speed" Me.cmdSpeed.UseVisualStyleBackColor = True @@ -2477,9 +2599,10 @@ Partial Class ucrCalculator ' Me.cmdSmokes.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSmokes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSmokes.Location = New System.Drawing.Point(217, 347) + Me.cmdSmokes.Location = New System.Drawing.Point(174, 278) + Me.cmdSmokes.Margin = New System.Windows.Forms.Padding(2) Me.cmdSmokes.Name = "cmdSmokes" - Me.cmdSmokes.Size = New System.Drawing.Size(107, 38) + Me.cmdSmokes.Size = New System.Drawing.Size(86, 30) Me.cmdSmokes.TabIndex = 47 Me.cmdSmokes.Text = "smokes (L)" Me.cmdSmokes.UseVisualStyleBackColor = True @@ -2488,9 +2611,10 @@ Partial Class ucrCalculator ' Me.cmdWakefieldTimes.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldTimes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldTimes.Location = New System.Drawing.Point(112, 347) + Me.cmdWakefieldTimes.Location = New System.Drawing.Point(90, 278) + Me.cmdWakefieldTimes.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldTimes.Name = "cmdWakefieldTimes" - Me.cmdWakefieldTimes.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldTimes.Size = New System.Drawing.Size(86, 30) Me.cmdWakefieldTimes.TabIndex = 46 Me.cmdWakefieldTimes.Text = "times (T)" Me.cmdWakefieldTimes.UseVisualStyleBackColor = True @@ -2499,9 +2623,10 @@ Partial Class ucrCalculator ' Me.cmdSex_Inclusive.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSex_Inclusive.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSex_Inclusive.Location = New System.Drawing.Point(7, 347) + Me.cmdSex_Inclusive.Location = New System.Drawing.Point(6, 278) + Me.cmdSex_Inclusive.Margin = New System.Windows.Forms.Padding(2) Me.cmdSex_Inclusive.Name = "cmdSex_Inclusive" - Me.cmdSex_Inclusive.Size = New System.Drawing.Size(107, 38) + Me.cmdSex_Inclusive.Size = New System.Drawing.Size(86, 30) Me.cmdSex_Inclusive.TabIndex = 45 Me.cmdSex_Inclusive.Text = "sex_inclusive (F)" Me.cmdSex_Inclusive.UseVisualStyleBackColor = True @@ -2510,9 +2635,10 @@ Partial Class ucrCalculator ' Me.cmdGender.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGender.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGender.Location = New System.Drawing.Point(427, 310) + Me.cmdGender.Location = New System.Drawing.Point(342, 248) + Me.cmdGender.Margin = New System.Windows.Forms.Padding(2) Me.cmdGender.Name = "cmdGender" - Me.cmdGender.Size = New System.Drawing.Size(107, 38) + Me.cmdGender.Size = New System.Drawing.Size(86, 30) Me.cmdGender.TabIndex = 44 Me.cmdGender.Text = "gender (F)" Me.cmdGender.UseVisualStyleBackColor = True @@ -2521,9 +2647,10 @@ Partial Class ucrCalculator ' Me.cmdSentence.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSentence.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSentence.Location = New System.Drawing.Point(322, 310) + Me.cmdSentence.Location = New System.Drawing.Point(258, 248) + Me.cmdSentence.Margin = New System.Windows.Forms.Padding(2) Me.cmdSentence.Name = "cmdSentence" - Me.cmdSentence.Size = New System.Drawing.Size(107, 38) + Me.cmdSentence.Size = New System.Drawing.Size(86, 30) Me.cmdSentence.TabIndex = 43 Me.cmdSentence.Text = "sentence (C)" Me.cmdSentence.UseVisualStyleBackColor = True @@ -2532,9 +2659,10 @@ Partial Class ucrCalculator ' Me.cmdSat.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSat.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSat.Location = New System.Drawing.Point(217, 310) + Me.cmdSat.Location = New System.Drawing.Point(174, 248) + Me.cmdSat.Margin = New System.Windows.Forms.Padding(2) Me.cmdSat.Name = "cmdSat" - Me.cmdSat.Size = New System.Drawing.Size(107, 38) + Me.cmdSat.Size = New System.Drawing.Size(86, 30) Me.cmdSat.TabIndex = 42 Me.cmdSat.Text = "sat" Me.cmdSat.UseVisualStyleBackColor = True @@ -2543,9 +2671,10 @@ Partial Class ucrCalculator ' Me.cmdReligion.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdReligion.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReligion.Location = New System.Drawing.Point(112, 310) + Me.cmdReligion.Location = New System.Drawing.Point(90, 248) + Me.cmdReligion.Margin = New System.Windows.Forms.Padding(2) Me.cmdReligion.Name = "cmdReligion" - Me.cmdReligion.Size = New System.Drawing.Size(107, 38) + Me.cmdReligion.Size = New System.Drawing.Size(86, 30) Me.cmdReligion.TabIndex = 41 Me.cmdReligion.Text = "religion (F)" Me.cmdReligion.UseVisualStyleBackColor = True @@ -2554,9 +2683,10 @@ Partial Class ucrCalculator ' Me.cmdRace.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdRace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRace.Location = New System.Drawing.Point(7, 310) + Me.cmdRace.Location = New System.Drawing.Point(6, 248) + Me.cmdRace.Margin = New System.Windows.Forms.Padding(2) Me.cmdRace.Name = "cmdRace" - Me.cmdRace.Size = New System.Drawing.Size(107, 38) + Me.cmdRace.Size = New System.Drawing.Size(86, 30) Me.cmdRace.TabIndex = 40 Me.cmdRace.Text = "race (F)" Me.cmdRace.UseVisualStyleBackColor = True @@ -2565,9 +2695,10 @@ Partial Class ucrCalculator ' Me.cmdPolitical.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdPolitical.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPolitical.Location = New System.Drawing.Point(427, 273) + Me.cmdPolitical.Location = New System.Drawing.Point(342, 218) + Me.cmdPolitical.Margin = New System.Windows.Forms.Padding(2) Me.cmdPolitical.Name = "cmdPolitical" - Me.cmdPolitical.Size = New System.Drawing.Size(107, 38) + Me.cmdPolitical.Size = New System.Drawing.Size(86, 30) Me.cmdPolitical.TabIndex = 39 Me.cmdPolitical.Text = "political (F)" Me.cmdPolitical.UseVisualStyleBackColor = True @@ -2576,9 +2707,10 @@ Partial Class ucrCalculator ' Me.cmdNormal.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdNormal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNormal.Location = New System.Drawing.Point(322, 273) + Me.cmdNormal.Location = New System.Drawing.Point(258, 218) + Me.cmdNormal.Margin = New System.Windows.Forms.Padding(2) Me.cmdNormal.Name = "cmdNormal" - Me.cmdNormal.Size = New System.Drawing.Size(107, 38) + Me.cmdNormal.Size = New System.Drawing.Size(86, 30) Me.cmdNormal.TabIndex = 38 Me.cmdNormal.Text = "normal" Me.cmdNormal.UseVisualStyleBackColor = True @@ -2587,9 +2719,10 @@ Partial Class ucrCalculator ' Me.cmdName.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdName.Location = New System.Drawing.Point(217, 273) + Me.cmdName.Location = New System.Drawing.Point(174, 218) + Me.cmdName.Margin = New System.Windows.Forms.Padding(2) Me.cmdName.Name = "cmdName" - Me.cmdName.Size = New System.Drawing.Size(107, 38) + Me.cmdName.Size = New System.Drawing.Size(86, 30) Me.cmdName.TabIndex = 37 Me.cmdName.Text = "name (C)" Me.cmdName.UseVisualStyleBackColor = True @@ -2598,9 +2731,10 @@ Partial Class ucrCalculator ' Me.cmdWakefield_Month.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefield_Month.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefield_Month.Location = New System.Drawing.Point(112, 273) + Me.cmdWakefield_Month.Location = New System.Drawing.Point(90, 218) + Me.cmdWakefield_Month.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefield_Month.Name = "cmdWakefield_Month" - Me.cmdWakefield_Month.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefield_Month.Size = New System.Drawing.Size(86, 30) Me.cmdWakefield_Month.TabIndex = 36 Me.cmdWakefield_Month.Text = "month (F)" Me.cmdWakefield_Month.UseVisualStyleBackColor = True @@ -2609,9 +2743,10 @@ Partial Class ucrCalculator ' Me.cmdMilitary.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdMilitary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMilitary.Location = New System.Drawing.Point(7, 273) + Me.cmdMilitary.Location = New System.Drawing.Point(6, 218) + Me.cmdMilitary.Margin = New System.Windows.Forms.Padding(2) Me.cmdMilitary.Name = "cmdMilitary" - Me.cmdMilitary.Size = New System.Drawing.Size(107, 38) + Me.cmdMilitary.Size = New System.Drawing.Size(86, 30) Me.cmdMilitary.TabIndex = 35 Me.cmdMilitary.Text = "military (F)" Me.cmdMilitary.UseVisualStyleBackColor = True @@ -2620,9 +2755,10 @@ Partial Class ucrCalculator ' Me.cmdMarital.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdMarital.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMarital.Location = New System.Drawing.Point(427, 237) + Me.cmdMarital.Location = New System.Drawing.Point(342, 190) + Me.cmdMarital.Margin = New System.Windows.Forms.Padding(2) Me.cmdMarital.Name = "cmdMarital" - Me.cmdMarital.Size = New System.Drawing.Size(107, 38) + Me.cmdMarital.Size = New System.Drawing.Size(86, 30) Me.cmdMarital.TabIndex = 34 Me.cmdMarital.Text = "marital (F)" Me.cmdMarital.UseVisualStyleBackColor = True @@ -2631,9 +2767,10 @@ Partial Class ucrCalculator ' Me.cmdLorem_ipsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLorem_ipsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLorem_ipsum.Location = New System.Drawing.Point(322, 237) + Me.cmdLorem_ipsum.Location = New System.Drawing.Point(258, 190) + Me.cmdLorem_ipsum.Margin = New System.Windows.Forms.Padding(2) Me.cmdLorem_ipsum.Name = "cmdLorem_ipsum" - Me.cmdLorem_ipsum.Size = New System.Drawing.Size(107, 38) + Me.cmdLorem_ipsum.Size = New System.Drawing.Size(86, 30) Me.cmdLorem_ipsum.TabIndex = 33 Me.cmdLorem_ipsum.Text = "lorem_ipsum (C)" Me.cmdLorem_ipsum.UseVisualStyleBackColor = True @@ -2642,9 +2779,10 @@ Partial Class ucrCalculator ' Me.cmdLikert.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLikert.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLikert.Location = New System.Drawing.Point(217, 237) + Me.cmdLikert.Location = New System.Drawing.Point(174, 190) + Me.cmdLikert.Margin = New System.Windows.Forms.Padding(2) Me.cmdLikert.Name = "cmdLikert" - Me.cmdLikert.Size = New System.Drawing.Size(107, 38) + Me.cmdLikert.Size = New System.Drawing.Size(86, 30) Me.cmdLikert.TabIndex = 32 Me.cmdLikert.Text = "likert (O.F)" Me.cmdLikert.UseVisualStyleBackColor = True @@ -2653,9 +2791,10 @@ Partial Class ucrCalculator ' Me.cmdGpa.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGpa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGpa.Location = New System.Drawing.Point(112, 237) + Me.cmdGpa.Location = New System.Drawing.Point(90, 190) + Me.cmdGpa.Margin = New System.Windows.Forms.Padding(2) Me.cmdGpa.Name = "cmdGpa" - Me.cmdGpa.Size = New System.Drawing.Size(107, 38) + Me.cmdGpa.Size = New System.Drawing.Size(86, 30) Me.cmdGpa.TabIndex = 31 Me.cmdGpa.Text = "gpa" Me.cmdGpa.UseVisualStyleBackColor = True @@ -2664,9 +2803,10 @@ Partial Class ucrCalculator ' Me.cmdWakefieldMinute.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldMinute.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldMinute.Location = New System.Drawing.Point(7, 237) + Me.cmdWakefieldMinute.Location = New System.Drawing.Point(6, 190) + Me.cmdWakefieldMinute.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldMinute.Name = "cmdWakefieldMinute" - Me.cmdWakefieldMinute.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldMinute.Size = New System.Drawing.Size(86, 30) Me.cmdWakefieldMinute.TabIndex = 30 Me.cmdWakefieldMinute.Text = "minute (T)" Me.cmdWakefieldMinute.UseVisualStyleBackColor = True @@ -2675,9 +2815,10 @@ Partial Class ucrCalculator ' Me.cmdMath.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdMath.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMath.Location = New System.Drawing.Point(427, 200) + Me.cmdMath.Location = New System.Drawing.Point(342, 160) + Me.cmdMath.Margin = New System.Windows.Forms.Padding(2) Me.cmdMath.Name = "cmdMath" - Me.cmdMath.Size = New System.Drawing.Size(107, 38) + Me.cmdMath.Size = New System.Drawing.Size(86, 30) Me.cmdMath.TabIndex = 29 Me.cmdMath.Text = "math" Me.cmdMath.UseVisualStyleBackColor = True @@ -2686,9 +2827,10 @@ Partial Class ucrCalculator ' Me.cmdWakefieldLower.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldLower.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldLower.Location = New System.Drawing.Point(322, 200) + Me.cmdWakefieldLower.Location = New System.Drawing.Point(258, 160) + Me.cmdWakefieldLower.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldLower.Name = "cmdWakefieldLower" - Me.cmdWakefieldLower.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldLower.Size = New System.Drawing.Size(86, 30) Me.cmdWakefieldLower.TabIndex = 28 Me.cmdWakefieldLower.Text = "lower(F)" Me.cmdWakefieldLower.UseVisualStyleBackColor = True @@ -2697,9 +2839,10 @@ Partial Class ucrCalculator ' Me.cmdLanguage.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLanguage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLanguage.Location = New System.Drawing.Point(217, 200) + Me.cmdLanguage.Location = New System.Drawing.Point(174, 160) + Me.cmdLanguage.Margin = New System.Windows.Forms.Padding(2) Me.cmdLanguage.Name = "cmdLanguage" - Me.cmdLanguage.Size = New System.Drawing.Size(107, 38) + Me.cmdLanguage.Size = New System.Drawing.Size(86, 30) Me.cmdLanguage.TabIndex = 27 Me.cmdLanguage.Text = "language (F)" Me.cmdLanguage.UseVisualStyleBackColor = True @@ -2708,31 +2851,34 @@ Partial Class ucrCalculator ' Me.cmdIq.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdIq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIq.Location = New System.Drawing.Point(112, 200) + Me.cmdIq.Location = New System.Drawing.Point(90, 160) + Me.cmdIq.Margin = New System.Windows.Forms.Padding(2) Me.cmdIq.Name = "cmdIq" - Me.cmdIq.Size = New System.Drawing.Size(107, 38) + Me.cmdIq.Size = New System.Drawing.Size(86, 30) Me.cmdIq.TabIndex = 26 Me.cmdIq.Text = "iq" Me.cmdIq.UseVisualStyleBackColor = True ' - 'cmdInternet_Browser + 'cmdid ' - Me.cmdInternet_Browser.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) - Me.cmdInternet_Browser.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInternet_Browser.Location = New System.Drawing.Point(7, 200) - Me.cmdInternet_Browser.Name = "cmdInternet_Browser" - Me.cmdInternet_Browser.Size = New System.Drawing.Size(107, 38) - Me.cmdInternet_Browser.TabIndex = 25 - Me.cmdInternet_Browser.Text = "browser (F)" - Me.cmdInternet_Browser.UseVisualStyleBackColor = True + Me.cmdid.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) + Me.cmdid.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdid.Location = New System.Drawing.Point(6, 160) + Me.cmdid.Margin = New System.Windows.Forms.Padding(2) + Me.cmdid.Name = "cmdid" + Me.cmdid.Size = New System.Drawing.Size(86, 30) + Me.cmdid.TabIndex = 25 + Me.cmdid.Text = "id (C)" + Me.cmdid.UseVisualStyleBackColor = True ' 'cmdGrade_Level ' Me.cmdGrade_Level.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGrade_Level.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGrade_Level.Location = New System.Drawing.Point(427, 128) + Me.cmdGrade_Level.Location = New System.Drawing.Point(342, 102) + Me.cmdGrade_Level.Margin = New System.Windows.Forms.Padding(2) Me.cmdGrade_Level.Name = "cmdGrade_Level" - Me.cmdGrade_Level.Size = New System.Drawing.Size(107, 38) + Me.cmdGrade_Level.Size = New System.Drawing.Size(86, 30) Me.cmdGrade_Level.TabIndex = 19 Me.cmdGrade_Level.Text = "grade_level (F)" Me.cmdGrade_Level.UseVisualStyleBackColor = True @@ -2741,9 +2887,10 @@ Partial Class ucrCalculator ' Me.cmdEye.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdEye.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEye.Location = New System.Drawing.Point(322, 128) + Me.cmdEye.Location = New System.Drawing.Point(258, 102) + Me.cmdEye.Margin = New System.Windows.Forms.Padding(2) Me.cmdEye.Name = "cmdEye" - Me.cmdEye.Size = New System.Drawing.Size(107, 38) + Me.cmdEye.Size = New System.Drawing.Size(86, 30) Me.cmdEye.TabIndex = 18 Me.cmdEye.Text = "eye (F)" Me.cmdEye.UseVisualStyleBackColor = True @@ -2752,9 +2899,10 @@ Partial Class ucrCalculator ' Me.cmdEmployment.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdEmployment.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEmployment.Location = New System.Drawing.Point(217, 128) + Me.cmdEmployment.Location = New System.Drawing.Point(174, 102) + Me.cmdEmployment.Margin = New System.Windows.Forms.Padding(2) Me.cmdEmployment.Name = "cmdEmployment" - Me.cmdEmployment.Size = New System.Drawing.Size(107, 38) + Me.cmdEmployment.Size = New System.Drawing.Size(86, 30) Me.cmdEmployment.TabIndex = 17 Me.cmdEmployment.Text = "employment (F)" Me.cmdEmployment.UseVisualStyleBackColor = True @@ -2763,9 +2911,10 @@ Partial Class ucrCalculator ' Me.cmdEducation.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdEducation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEducation.Location = New System.Drawing.Point(112, 128) + Me.cmdEducation.Location = New System.Drawing.Point(90, 102) + Me.cmdEducation.Margin = New System.Windows.Forms.Padding(2) Me.cmdEducation.Name = "cmdEducation" - Me.cmdEducation.Size = New System.Drawing.Size(107, 38) + Me.cmdEducation.Size = New System.Drawing.Size(86, 30) Me.cmdEducation.TabIndex = 16 Me.cmdEducation.Text = "education (F)" Me.cmdEducation.UseVisualStyleBackColor = True @@ -2774,9 +2923,10 @@ Partial Class ucrCalculator ' Me.cmdDummy.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDummy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDummy.Location = New System.Drawing.Point(7, 128) + Me.cmdDummy.Location = New System.Drawing.Point(6, 102) + Me.cmdDummy.Margin = New System.Windows.Forms.Padding(2) Me.cmdDummy.Name = "cmdDummy" - Me.cmdDummy.Size = New System.Drawing.Size(107, 38) + Me.cmdDummy.Size = New System.Drawing.Size(86, 30) Me.cmdDummy.TabIndex = 15 Me.cmdDummy.Text = "dummy" Me.cmdDummy.UseVisualStyleBackColor = True @@ -2785,9 +2935,10 @@ Partial Class ucrCalculator ' Me.cmdDob.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDob.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDob.Location = New System.Drawing.Point(427, 90) + Me.cmdDob.Location = New System.Drawing.Point(342, 72) + Me.cmdDob.Margin = New System.Windows.Forms.Padding(2) Me.cmdDob.Name = "cmdDob" - Me.cmdDob.Size = New System.Drawing.Size(107, 38) + Me.cmdDob.Size = New System.Drawing.Size(86, 30) Me.cmdDob.TabIndex = 14 Me.cmdDob.Text = "dob (D)" Me.cmdDob.UseVisualStyleBackColor = True @@ -2796,9 +2947,10 @@ Partial Class ucrCalculator ' Me.cmdDna.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDna.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDna.Location = New System.Drawing.Point(322, 90) + Me.cmdDna.Location = New System.Drawing.Point(258, 72) + Me.cmdDna.Margin = New System.Windows.Forms.Padding(2) Me.cmdDna.Name = "cmdDna" - Me.cmdDna.Size = New System.Drawing.Size(107, 38) + Me.cmdDna.Size = New System.Drawing.Size(86, 30) Me.cmdDna.TabIndex = 13 Me.cmdDna.Text = "dna (F)" Me.cmdDna.UseVisualStyleBackColor = True @@ -2807,9 +2959,10 @@ Partial Class ucrCalculator ' Me.cmdDice.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDice.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDice.Location = New System.Drawing.Point(217, 90) + Me.cmdDice.Location = New System.Drawing.Point(174, 72) + Me.cmdDice.Margin = New System.Windows.Forms.Padding(2) Me.cmdDice.Name = "cmdDice" - Me.cmdDice.Size = New System.Drawing.Size(107, 38) + Me.cmdDice.Size = New System.Drawing.Size(86, 30) Me.cmdDice.TabIndex = 12 Me.cmdDice.Text = "dice" Me.cmdDice.UseVisualStyleBackColor = True @@ -2818,9 +2971,10 @@ Partial Class ucrCalculator ' Me.cmdGrade_Letter.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGrade_Letter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGrade_Letter.Location = New System.Drawing.Point(112, 90) + Me.cmdGrade_Letter.Location = New System.Drawing.Point(90, 72) + Me.cmdGrade_Letter.Margin = New System.Windows.Forms.Padding(2) Me.cmdGrade_Letter.Name = "cmdGrade_Letter" - Me.cmdGrade_Letter.Size = New System.Drawing.Size(107, 38) + Me.cmdGrade_Letter.Size = New System.Drawing.Size(86, 30) Me.cmdGrade_Letter.TabIndex = 11 Me.cmdGrade_Letter.Text = "grade_letter(F)" Me.cmdGrade_Letter.UseVisualStyleBackColor = True @@ -2829,9 +2983,10 @@ Partial Class ucrCalculator ' Me.cmdDeath.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDeath.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDeath.Location = New System.Drawing.Point(7, 90) + Me.cmdDeath.Location = New System.Drawing.Point(6, 72) + Me.cmdDeath.Margin = New System.Windows.Forms.Padding(2) Me.cmdDeath.Name = "cmdDeath" - Me.cmdDeath.Size = New System.Drawing.Size(107, 38) + Me.cmdDeath.Size = New System.Drawing.Size(86, 30) Me.cmdDeath.TabIndex = 10 Me.cmdDeath.Text = "death (L)" Me.cmdDeath.UseVisualStyleBackColor = True @@ -2840,9 +2995,10 @@ Partial Class ucrCalculator ' Me.cmdWakefieldDates.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldDates.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldDates.Location = New System.Drawing.Point(427, 53) + Me.cmdWakefieldDates.Location = New System.Drawing.Point(342, 42) + Me.cmdWakefieldDates.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldDates.Name = "cmdWakefieldDates" - Me.cmdWakefieldDates.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldDates.Size = New System.Drawing.Size(86, 30) Me.cmdWakefieldDates.TabIndex = 9 Me.cmdWakefieldDates.Text = "dates (D)" Me.cmdWakefieldDates.UseVisualStyleBackColor = True @@ -2851,9 +3007,10 @@ Partial Class ucrCalculator ' Me.cmdPrimary.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdPrimary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPrimary.Location = New System.Drawing.Point(322, 53) + Me.cmdPrimary.Location = New System.Drawing.Point(258, 42) + Me.cmdPrimary.Margin = New System.Windows.Forms.Padding(2) Me.cmdPrimary.Name = "cmdPrimary" - Me.cmdPrimary.Size = New System.Drawing.Size(107, 38) + Me.cmdPrimary.Size = New System.Drawing.Size(86, 30) Me.cmdPrimary.TabIndex = 8 Me.cmdPrimary.Text = "primary (F)" Me.cmdPrimary.UseVisualStyleBackColor = True @@ -2862,9 +3019,10 @@ Partial Class ucrCalculator ' Me.cmdColor.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdColor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdColor.Location = New System.Drawing.Point(217, 53) + Me.cmdColor.Location = New System.Drawing.Point(174, 42) + Me.cmdColor.Margin = New System.Windows.Forms.Padding(2) Me.cmdColor.Name = "cmdColor" - Me.cmdColor.Size = New System.Drawing.Size(107, 38) + Me.cmdColor.Size = New System.Drawing.Size(86, 30) Me.cmdColor.TabIndex = 7 Me.cmdColor.Text = "color (F)" Me.cmdColor.UseVisualStyleBackColor = True @@ -2873,9 +3031,10 @@ Partial Class ucrCalculator ' Me.cmdCoin.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdCoin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCoin.Location = New System.Drawing.Point(112, 53) + Me.cmdCoin.Location = New System.Drawing.Point(90, 42) + Me.cmdCoin.Margin = New System.Windows.Forms.Padding(2) Me.cmdCoin.Name = "cmdCoin" - Me.cmdCoin.Size = New System.Drawing.Size(107, 38) + Me.cmdCoin.Size = New System.Drawing.Size(86, 30) Me.cmdCoin.TabIndex = 6 Me.cmdCoin.Text = "coin (F)" Me.cmdCoin.UseVisualStyleBackColor = True @@ -2884,9 +3043,10 @@ Partial Class ucrCalculator ' Me.cmdChildren.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdChildren.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdChildren.Location = New System.Drawing.Point(7, 53) + Me.cmdChildren.Location = New System.Drawing.Point(6, 42) + Me.cmdChildren.Margin = New System.Windows.Forms.Padding(2) Me.cmdChildren.Name = "cmdChildren" - Me.cmdChildren.Size = New System.Drawing.Size(107, 38) + Me.cmdChildren.Size = New System.Drawing.Size(86, 30) Me.cmdChildren.TabIndex = 5 Me.cmdChildren.Text = "children" Me.cmdChildren.UseVisualStyleBackColor = True @@ -2895,9 +3055,10 @@ Partial Class ucrCalculator ' Me.cmdCar.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdCar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCar.Location = New System.Drawing.Point(427, 18) + Me.cmdCar.Location = New System.Drawing.Point(342, 14) + Me.cmdCar.Margin = New System.Windows.Forms.Padding(2) Me.cmdCar.Name = "cmdCar" - Me.cmdCar.Size = New System.Drawing.Size(107, 38) + Me.cmdCar.Size = New System.Drawing.Size(86, 30) Me.cmdCar.TabIndex = 4 Me.cmdCar.Text = "car (F)" Me.cmdCar.UseVisualStyleBackColor = True @@ -2906,9 +3067,10 @@ Partial Class ucrCalculator ' Me.cmdAnswer.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdAnswer.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnswer.Location = New System.Drawing.Point(322, 18) + Me.cmdAnswer.Location = New System.Drawing.Point(258, 14) + Me.cmdAnswer.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnswer.Name = "cmdAnswer" - Me.cmdAnswer.Size = New System.Drawing.Size(107, 38) + Me.cmdAnswer.Size = New System.Drawing.Size(86, 30) Me.cmdAnswer.TabIndex = 3 Me.cmdAnswer.Text = "answer (F)" Me.cmdAnswer.UseVisualStyleBackColor = True @@ -2917,9 +3079,10 @@ Partial Class ucrCalculator ' Me.cmdPet.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdPet.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPet.Location = New System.Drawing.Point(217, 18) + Me.cmdPet.Location = New System.Drawing.Point(174, 14) + Me.cmdPet.Margin = New System.Windows.Forms.Padding(2) Me.cmdPet.Name = "cmdPet" - Me.cmdPet.Size = New System.Drawing.Size(107, 38) + Me.cmdPet.Size = New System.Drawing.Size(86, 30) Me.cmdPet.TabIndex = 2 Me.cmdPet.Text = "pet (F)" Me.cmdPet.UseVisualStyleBackColor = True @@ -2928,9 +3091,10 @@ Partial Class ucrCalculator ' Me.cmdAnimal.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdAnimal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnimal.Location = New System.Drawing.Point(112, 18) + Me.cmdAnimal.Location = New System.Drawing.Point(90, 14) + Me.cmdAnimal.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnimal.Name = "cmdAnimal" - Me.cmdAnimal.Size = New System.Drawing.Size(107, 38) + Me.cmdAnimal.Size = New System.Drawing.Size(86, 30) Me.cmdAnimal.TabIndex = 1 Me.cmdAnimal.Text = "animal (F)" Me.cmdAnimal.UseVisualStyleBackColor = True @@ -2939,9 +3103,10 @@ Partial Class ucrCalculator ' Me.cmdAge.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdAge.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAge.Location = New System.Drawing.Point(7, 18) + Me.cmdAge.Location = New System.Drawing.Point(6, 14) + Me.cmdAge.Margin = New System.Windows.Forms.Padding(2) Me.cmdAge.Name = "cmdAge" - Me.cmdAge.Size = New System.Drawing.Size(107, 38) + Me.cmdAge.Size = New System.Drawing.Size(86, 30) Me.cmdAge.TabIndex = 0 Me.cmdAge.Text = "age" Me.cmdAge.UseVisualStyleBackColor = True @@ -2950,9 +3115,10 @@ Partial Class ucrCalculator ' Me.cmdIncome.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdIncome.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIncome.Location = New System.Drawing.Point(427, 163) + Me.cmdIncome.Location = New System.Drawing.Point(342, 130) + Me.cmdIncome.Margin = New System.Windows.Forms.Padding(2) Me.cmdIncome.Name = "cmdIncome" - Me.cmdIncome.Size = New System.Drawing.Size(107, 38) + Me.cmdIncome.Size = New System.Drawing.Size(86, 30) Me.cmdIncome.TabIndex = 24 Me.cmdIncome.Text = "income" Me.cmdIncome.UseVisualStyleBackColor = True @@ -2961,9 +3127,10 @@ Partial Class ucrCalculator ' Me.cmdHeight.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdHeight.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHeight.Location = New System.Drawing.Point(322, 163) + Me.cmdHeight.Location = New System.Drawing.Point(258, 130) + Me.cmdHeight.Margin = New System.Windows.Forms.Padding(2) Me.cmdHeight.Name = "cmdHeight" - Me.cmdHeight.Size = New System.Drawing.Size(107, 38) + Me.cmdHeight.Size = New System.Drawing.Size(86, 30) Me.cmdHeight.TabIndex = 23 Me.cmdHeight.Text = "height" Me.cmdHeight.UseVisualStyleBackColor = True @@ -2972,9 +3139,10 @@ Partial Class ucrCalculator ' Me.cmdHair.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdHair.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHair.Location = New System.Drawing.Point(217, 163) + Me.cmdHair.Location = New System.Drawing.Point(174, 130) + Me.cmdHair.Margin = New System.Windows.Forms.Padding(2) Me.cmdHair.Name = "cmdHair" - Me.cmdHair.Size = New System.Drawing.Size(107, 38) + Me.cmdHair.Size = New System.Drawing.Size(86, 30) Me.cmdHair.TabIndex = 22 Me.cmdHair.Text = "hair (F)" Me.cmdHair.UseVisualStyleBackColor = True @@ -2983,9 +3151,10 @@ Partial Class ucrCalculator ' Me.cmdGroup.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGroup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGroup.Location = New System.Drawing.Point(112, 163) + Me.cmdGroup.Location = New System.Drawing.Point(90, 130) + Me.cmdGroup.Margin = New System.Windows.Forms.Padding(2) Me.cmdGroup.Name = "cmdGroup" - Me.cmdGroup.Size = New System.Drawing.Size(107, 38) + Me.cmdGroup.Size = New System.Drawing.Size(86, 30) Me.cmdGroup.TabIndex = 21 Me.cmdGroup.Text = "group (F)" Me.cmdGroup.UseVisualStyleBackColor = True @@ -2994,9 +3163,10 @@ Partial Class ucrCalculator ' Me.cmdGrade.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGrade.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGrade.Location = New System.Drawing.Point(7, 163) + Me.cmdGrade.Location = New System.Drawing.Point(6, 130) + Me.cmdGrade.Margin = New System.Windows.Forms.Padding(2) Me.cmdGrade.Name = "cmdGrade" - Me.cmdGrade.Size = New System.Drawing.Size(107, 38) + Me.cmdGrade.Size = New System.Drawing.Size(86, 30) Me.cmdGrade.TabIndex = 20 Me.cmdGrade.Text = "grade" Me.cmdGrade.UseVisualStyleBackColor = True @@ -3027,52 +3197,66 @@ Partial Class ucrCalculator Me.grpMaths.Controls.Add(Me.cmdAcos) Me.grpMaths.Controls.Add(Me.cmdCos) Me.grpMaths.Controls.Add(Me.cmdSqrt) - Me.grpMaths.Location = New System.Drawing.Point(542, 78) - Me.grpMaths.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpMaths.Location = New System.Drawing.Point(434, 62) + Me.grpMaths.Margin = New System.Windows.Forms.Padding(2) Me.grpMaths.Name = "grpMaths" - Me.grpMaths.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpMaths.Size = New System.Drawing.Size(320, 205) + Me.grpMaths.Padding = New System.Windows.Forms.Padding(2) + Me.grpMaths.Size = New System.Drawing.Size(256, 164) Me.grpMaths.TabIndex = 184 Me.grpMaths.TabStop = False Me.grpMaths.Text = "Maths" ' + 'cmdMathsHelp + ' + Me.cmdMathsHelp.AutoSize = True + Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.Location = New System.Drawing.Point(163, 132) + Me.cmdMathsHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMathsHelp.Name = "cmdMathsHelp" + Me.cmdMathsHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.TabIndex = 211 + Me.cmdMathsHelp.Text = "R Help" + Me.cmdMathsHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripMaths ' Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripMaths.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MathsBaseStripMenuItem, Me.MathsStatsStripMenuItem, Me.MathsCarToolStripMenuItem, Me.MathsCircularToolStripMenuItem}) Me.ContextMenuStripMaths.Name = "ContextMenuStrip1" - Me.ContextMenuStripMaths.Size = New System.Drawing.Size(127, 100) + Me.ContextMenuStripMaths.Size = New System.Drawing.Size(114, 92) ' 'MathsBaseStripMenuItem ' Me.MathsBaseStripMenuItem.Name = "MathsBaseStripMenuItem" - Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(126, 24) + Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(113, 22) Me.MathsBaseStripMenuItem.Text = "base" ' 'MathsStatsStripMenuItem ' Me.MathsStatsStripMenuItem.Name = "MathsStatsStripMenuItem" - Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(126, 24) + Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(113, 22) Me.MathsStatsStripMenuItem.Text = "stats" ' 'MathsCarToolStripMenuItem ' Me.MathsCarToolStripMenuItem.Name = "MathsCarToolStripMenuItem" - Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(126, 24) + Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(113, 22) Me.MathsCarToolStripMenuItem.Text = "car" ' 'MathsCircularToolStripMenuItem ' Me.MathsCircularToolStripMenuItem.Name = "MathsCircularToolStripMenuItem" - Me.MathsCircularToolStripMenuItem.Size = New System.Drawing.Size(126, 24) + Me.MathsCircularToolStripMenuItem.Size = New System.Drawing.Size(113, 22) Me.MathsCircularToolStripMenuItem.Text = "circular" ' 'cmdAtan2 ' Me.cmdAtan2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAtan2.Location = New System.Drawing.Point(128, 162) + Me.cmdAtan2.Location = New System.Drawing.Point(102, 130) + Me.cmdAtan2.Margin = New System.Windows.Forms.Padding(2) Me.cmdAtan2.Name = "cmdAtan2" - Me.cmdAtan2.Size = New System.Drawing.Size(63, 38) + Me.cmdAtan2.Size = New System.Drawing.Size(50, 30) Me.cmdAtan2.TabIndex = 151 Me.cmdAtan2.Text = "atan2" Me.cmdAtan2.UseVisualStyleBackColor = True @@ -3080,9 +3264,10 @@ Partial Class ucrCalculator 'cmdLogistic ' Me.cmdLogistic.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogistic.Location = New System.Drawing.Point(65, 162) + Me.cmdLogistic.Location = New System.Drawing.Point(52, 130) + Me.cmdLogistic.Margin = New System.Windows.Forms.Padding(2) Me.cmdLogistic.Name = "cmdLogistic" - Me.cmdLogistic.Size = New System.Drawing.Size(63, 38) + Me.cmdLogistic.Size = New System.Drawing.Size(50, 30) Me.cmdLogistic.TabIndex = 149 Me.cmdLogistic.Text = "logistic" Me.cmdLogistic.UseVisualStyleBackColor = True @@ -3090,9 +3275,10 @@ Partial Class ucrCalculator 'cmdLogit ' Me.cmdLogit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogit.Location = New System.Drawing.Point(2, 162) + Me.cmdLogit.Location = New System.Drawing.Point(2, 130) + Me.cmdLogit.Margin = New System.Windows.Forms.Padding(2) Me.cmdLogit.Name = "cmdLogit" - Me.cmdLogit.Size = New System.Drawing.Size(63, 38) + Me.cmdLogit.Size = New System.Drawing.Size(50, 30) Me.cmdLogit.TabIndex = 148 Me.cmdLogit.Text = "logit" Me.cmdLogit.UseVisualStyleBackColor = True @@ -3100,10 +3286,10 @@ Partial Class ucrCalculator 'cmdSign ' Me.cmdSign.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSign.Location = New System.Drawing.Point(253, 127) - Me.cmdSign.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSign.Location = New System.Drawing.Point(202, 102) + Me.cmdSign.Margin = New System.Windows.Forms.Padding(2) Me.cmdSign.Name = "cmdSign" - Me.cmdSign.Size = New System.Drawing.Size(63, 38) + Me.cmdSign.Size = New System.Drawing.Size(50, 30) Me.cmdSign.TabIndex = 147 Me.cmdSign.Text = "sign" Me.cmdSign.UseVisualStyleBackColor = True @@ -3112,10 +3298,10 @@ Partial Class ucrCalculator ' Me.cmdRound.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRound.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRound.Location = New System.Drawing.Point(192, 127) - Me.cmdRound.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRound.Location = New System.Drawing.Point(154, 102) + Me.cmdRound.Margin = New System.Windows.Forms.Padding(2) Me.cmdRound.Name = "cmdRound" - Me.cmdRound.Size = New System.Drawing.Size(63, 38) + Me.cmdRound.Size = New System.Drawing.Size(50, 30) Me.cmdRound.TabIndex = 146 Me.cmdRound.Text = "round" Me.cmdRound.UseVisualStyleBackColor = True @@ -3124,10 +3310,10 @@ Partial Class ucrCalculator ' Me.cmdSiginf.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSiginf.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSiginf.Location = New System.Drawing.Point(128, 127) - Me.cmdSiginf.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSiginf.Location = New System.Drawing.Point(102, 102) + Me.cmdSiginf.Margin = New System.Windows.Forms.Padding(2) Me.cmdSiginf.Name = "cmdSiginf" - Me.cmdSiginf.Size = New System.Drawing.Size(63, 38) + Me.cmdSiginf.Size = New System.Drawing.Size(50, 30) Me.cmdSiginf.TabIndex = 145 Me.cmdSiginf.Text = "siginf" Me.cmdSiginf.UseVisualStyleBackColor = True @@ -3135,10 +3321,10 @@ Partial Class ucrCalculator 'cmdAbs ' Me.cmdAbs.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAbs.Location = New System.Drawing.Point(65, 127) - Me.cmdAbs.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAbs.Location = New System.Drawing.Point(52, 102) + Me.cmdAbs.Margin = New System.Windows.Forms.Padding(2) Me.cmdAbs.Name = "cmdAbs" - Me.cmdAbs.Size = New System.Drawing.Size(63, 38) + Me.cmdAbs.Size = New System.Drawing.Size(50, 30) Me.cmdAbs.TabIndex = 144 Me.cmdAbs.Text = "abs" Me.cmdAbs.UseVisualStyleBackColor = True @@ -3146,10 +3332,10 @@ Partial Class ucrCalculator 'cmdExp ' Me.cmdExp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExp.Location = New System.Drawing.Point(2, 127) - Me.cmdExp.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdExp.Location = New System.Drawing.Point(2, 102) + Me.cmdExp.Margin = New System.Windows.Forms.Padding(2) Me.cmdExp.Name = "cmdExp" - Me.cmdExp.Size = New System.Drawing.Size(63, 38) + Me.cmdExp.Size = New System.Drawing.Size(50, 30) Me.cmdExp.TabIndex = 143 Me.cmdExp.Text = "exp" Me.cmdExp.UseVisualStyleBackColor = True @@ -3157,10 +3343,10 @@ Partial Class ucrCalculator 'cmdDeg ' Me.cmdDeg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDeg.Location = New System.Drawing.Point(253, 90) - Me.cmdDeg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDeg.Location = New System.Drawing.Point(202, 72) + Me.cmdDeg.Margin = New System.Windows.Forms.Padding(2) Me.cmdDeg.Name = "cmdDeg" - Me.cmdDeg.Size = New System.Drawing.Size(63, 38) + Me.cmdDeg.Size = New System.Drawing.Size(50, 30) Me.cmdDeg.TabIndex = 142 Me.cmdDeg.Text = "deg" Me.cmdDeg.UseVisualStyleBackColor = True @@ -3169,10 +3355,10 @@ Partial Class ucrCalculator ' Me.cmdTrunc.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrunc.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrunc.Location = New System.Drawing.Point(192, 90) - Me.cmdTrunc.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTrunc.Location = New System.Drawing.Point(154, 72) + Me.cmdTrunc.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrunc.Name = "cmdTrunc" - Me.cmdTrunc.Size = New System.Drawing.Size(63, 38) + Me.cmdTrunc.Size = New System.Drawing.Size(50, 30) Me.cmdTrunc.TabIndex = 141 Me.cmdTrunc.Text = "trunc" Me.cmdTrunc.UseVisualStyleBackColor = True @@ -3180,10 +3366,10 @@ Partial Class ucrCalculator 'cmdAtan ' Me.cmdAtan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAtan.Location = New System.Drawing.Point(128, 90) - Me.cmdAtan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAtan.Location = New System.Drawing.Point(102, 72) + Me.cmdAtan.Margin = New System.Windows.Forms.Padding(2) Me.cmdAtan.Name = "cmdAtan" - Me.cmdAtan.Size = New System.Drawing.Size(63, 38) + Me.cmdAtan.Size = New System.Drawing.Size(50, 30) Me.cmdAtan.TabIndex = 140 Me.cmdAtan.Text = "atan" Me.cmdAtan.UseVisualStyleBackColor = True @@ -3191,10 +3377,10 @@ Partial Class ucrCalculator 'cmdTan ' Me.cmdTan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTan.Location = New System.Drawing.Point(65, 90) - Me.cmdTan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTan.Location = New System.Drawing.Point(52, 72) + Me.cmdTan.Margin = New System.Windows.Forms.Padding(2) Me.cmdTan.Name = "cmdTan" - Me.cmdTan.Size = New System.Drawing.Size(63, 38) + Me.cmdTan.Size = New System.Drawing.Size(50, 30) Me.cmdTan.TabIndex = 139 Me.cmdTan.Text = "tan" Me.cmdTan.UseVisualStyleBackColor = True @@ -3203,10 +3389,10 @@ Partial Class ucrCalculator ' Me.cmdLogTen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLogTen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogTen.Location = New System.Drawing.Point(2, 90) - Me.cmdLogTen.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLogTen.Location = New System.Drawing.Point(2, 72) + Me.cmdLogTen.Margin = New System.Windows.Forms.Padding(2) Me.cmdLogTen.Name = "cmdLogTen" - Me.cmdLogTen.Size = New System.Drawing.Size(63, 38) + Me.cmdLogTen.Size = New System.Drawing.Size(50, 30) Me.cmdLogTen.TabIndex = 138 Me.cmdLogTen.Text = "log10" Me.cmdLogTen.UseVisualStyleBackColor = True @@ -3214,10 +3400,10 @@ Partial Class ucrCalculator 'cmdRad ' Me.cmdRad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRad.Location = New System.Drawing.Point(253, 53) - Me.cmdRad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRad.Location = New System.Drawing.Point(202, 42) + Me.cmdRad.Margin = New System.Windows.Forms.Padding(2) Me.cmdRad.Name = "cmdRad" - Me.cmdRad.Size = New System.Drawing.Size(63, 38) + Me.cmdRad.Size = New System.Drawing.Size(50, 30) Me.cmdRad.TabIndex = 137 Me.cmdRad.Text = "rad" Me.cmdRad.UseVisualStyleBackColor = True @@ -3226,10 +3412,10 @@ Partial Class ucrCalculator ' Me.cmdFloor.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFloor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFloor.Location = New System.Drawing.Point(192, 53) - Me.cmdFloor.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFloor.Location = New System.Drawing.Point(154, 42) + Me.cmdFloor.Margin = New System.Windows.Forms.Padding(2) Me.cmdFloor.Name = "cmdFloor" - Me.cmdFloor.Size = New System.Drawing.Size(63, 38) + Me.cmdFloor.Size = New System.Drawing.Size(50, 30) Me.cmdFloor.TabIndex = 136 Me.cmdFloor.Text = "floor" Me.cmdFloor.UseVisualStyleBackColor = True @@ -3237,10 +3423,10 @@ Partial Class ucrCalculator 'cmdAsin ' Me.cmdAsin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsin.Location = New System.Drawing.Point(128, 53) - Me.cmdAsin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAsin.Location = New System.Drawing.Point(102, 42) + Me.cmdAsin.Margin = New System.Windows.Forms.Padding(2) Me.cmdAsin.Name = "cmdAsin" - Me.cmdAsin.Size = New System.Drawing.Size(63, 38) + Me.cmdAsin.Size = New System.Drawing.Size(50, 30) Me.cmdAsin.TabIndex = 135 Me.cmdAsin.Text = "asin" Me.cmdAsin.UseVisualStyleBackColor = True @@ -3248,10 +3434,10 @@ Partial Class ucrCalculator 'cmdSin ' Me.cmdSin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSin.Location = New System.Drawing.Point(65, 53) - Me.cmdSin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSin.Location = New System.Drawing.Point(52, 42) + Me.cmdSin.Margin = New System.Windows.Forms.Padding(2) Me.cmdSin.Name = "cmdSin" - Me.cmdSin.Size = New System.Drawing.Size(63, 38) + Me.cmdSin.Size = New System.Drawing.Size(50, 30) Me.cmdSin.TabIndex = 134 Me.cmdSin.Text = "sin" Me.cmdSin.UseVisualStyleBackColor = True @@ -3259,10 +3445,10 @@ Partial Class ucrCalculator 'cmdLog ' Me.cmdLog.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLog.Location = New System.Drawing.Point(2, 53) - Me.cmdLog.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLog.Location = New System.Drawing.Point(2, 42) + Me.cmdLog.Margin = New System.Windows.Forms.Padding(2) Me.cmdLog.Name = "cmdLog" - Me.cmdLog.Size = New System.Drawing.Size(63, 38) + Me.cmdLog.Size = New System.Drawing.Size(50, 30) Me.cmdLog.TabIndex = 133 Me.cmdLog.Text = "log" Me.cmdLog.UseVisualStyleBackColor = True @@ -3270,10 +3456,10 @@ Partial Class ucrCalculator 'cmdPi ' Me.cmdPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPi.Location = New System.Drawing.Point(253, 18) - Me.cmdPi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPi.Location = New System.Drawing.Point(202, 14) + Me.cmdPi.Margin = New System.Windows.Forms.Padding(2) Me.cmdPi.Name = "cmdPi" - Me.cmdPi.Size = New System.Drawing.Size(63, 38) + Me.cmdPi.Size = New System.Drawing.Size(50, 30) Me.cmdPi.TabIndex = 132 Me.cmdPi.Text = "pi" Me.cmdPi.UseVisualStyleBackColor = True @@ -3282,10 +3468,10 @@ Partial Class ucrCalculator ' Me.cmdCeiling.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCeiling.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCeiling.Location = New System.Drawing.Point(192, 18) - Me.cmdCeiling.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCeiling.Location = New System.Drawing.Point(154, 14) + Me.cmdCeiling.Margin = New System.Windows.Forms.Padding(2) Me.cmdCeiling.Name = "cmdCeiling" - Me.cmdCeiling.Size = New System.Drawing.Size(63, 38) + Me.cmdCeiling.Size = New System.Drawing.Size(50, 30) Me.cmdCeiling.TabIndex = 131 Me.cmdCeiling.Text = "ceiling" Me.cmdCeiling.UseVisualStyleBackColor = True @@ -3293,10 +3479,10 @@ Partial Class ucrCalculator 'cmdAcos ' Me.cmdAcos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAcos.Location = New System.Drawing.Point(128, 18) - Me.cmdAcos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAcos.Location = New System.Drawing.Point(102, 14) + Me.cmdAcos.Margin = New System.Windows.Forms.Padding(2) Me.cmdAcos.Name = "cmdAcos" - Me.cmdAcos.Size = New System.Drawing.Size(63, 38) + Me.cmdAcos.Size = New System.Drawing.Size(50, 30) Me.cmdAcos.TabIndex = 130 Me.cmdAcos.Text = "acos" Me.cmdAcos.UseVisualStyleBackColor = True @@ -3304,10 +3490,10 @@ Partial Class ucrCalculator 'cmdCos ' Me.cmdCos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCos.Location = New System.Drawing.Point(65, 18) - Me.cmdCos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCos.Location = New System.Drawing.Point(52, 14) + Me.cmdCos.Margin = New System.Windows.Forms.Padding(2) Me.cmdCos.Name = "cmdCos" - Me.cmdCos.Size = New System.Drawing.Size(63, 38) + Me.cmdCos.Size = New System.Drawing.Size(50, 30) Me.cmdCos.TabIndex = 129 Me.cmdCos.Text = "cos" Me.cmdCos.UseVisualStyleBackColor = True @@ -3315,10 +3501,10 @@ Partial Class ucrCalculator 'cmdSqrt ' Me.cmdSqrt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSqrt.Location = New System.Drawing.Point(2, 18) - Me.cmdSqrt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSqrt.Location = New System.Drawing.Point(2, 14) + Me.cmdSqrt.Margin = New System.Windows.Forms.Padding(2) Me.cmdSqrt.Name = "cmdSqrt" - Me.cmdSqrt.Size = New System.Drawing.Size(63, 38) + Me.cmdSqrt.Size = New System.Drawing.Size(50, 30) Me.cmdSqrt.TabIndex = 128 Me.cmdSqrt.Text = "sqrt" Me.cmdSqrt.UseVisualStyleBackColor = True @@ -3359,11 +3545,11 @@ Partial Class ucrCalculator Me.grpSummary.Controls.Add(Me.cmdSum) Me.grpSummary.Controls.Add(Me.cmdVar) Me.grpSummary.Controls.Add(Me.grpFrequencies) - Me.grpSummary.Location = New System.Drawing.Point(542, 78) - Me.grpSummary.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpSummary.Location = New System.Drawing.Point(434, 62) + Me.grpSummary.Margin = New System.Windows.Forms.Padding(2) Me.grpSummary.Name = "grpSummary" - Me.grpSummary.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpSummary.Size = New System.Drawing.Size(360, 421) + Me.grpSummary.Padding = New System.Windows.Forms.Padding(2) + Me.grpSummary.Size = New System.Drawing.Size(288, 337) Me.grpSummary.TabIndex = 185 Me.grpSummary.TabStop = False Me.grpSummary.Text = "Summary" @@ -3372,10 +3558,10 @@ Partial Class ucrCalculator ' Me.cmdwheremin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdwheremin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwheremin.Location = New System.Drawing.Point(269, 199) - Me.cmdwheremin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwheremin.Location = New System.Drawing.Point(215, 159) + Me.cmdwheremin.Margin = New System.Windows.Forms.Padding(2) Me.cmdwheremin.Name = "cmdwheremin" - Me.cmdwheremin.Size = New System.Drawing.Size(88, 38) + Me.cmdwheremin.Size = New System.Drawing.Size(70, 30) Me.cmdwheremin.TabIndex = 193 Me.cmdwheremin.Text = "where.min" Me.cmdwheremin.UseVisualStyleBackColor = True @@ -3383,10 +3569,10 @@ Partial Class ucrCalculator 'cmdwhichmax ' Me.cmdwhichmax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwhichmax.Location = New System.Drawing.Point(2, 199) - Me.cmdwhichmax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwhichmax.Location = New System.Drawing.Point(2, 159) + Me.cmdwhichmax.Margin = New System.Windows.Forms.Padding(2) Me.cmdwhichmax.Name = "cmdwhichmax" - Me.cmdwhichmax.Size = New System.Drawing.Size(90, 38) + Me.cmdwhichmax.Size = New System.Drawing.Size(72, 30) Me.cmdwhichmax.TabIndex = 192 Me.cmdwhichmax.Text = "which.max" Me.cmdwhichmax.UseVisualStyleBackColor = True @@ -3394,10 +3580,10 @@ Partial Class ucrCalculator 'cmdwheremax ' Me.cmdwheremax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwheremax.Location = New System.Drawing.Point(91, 199) - Me.cmdwheremax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwheremax.Location = New System.Drawing.Point(73, 159) + Me.cmdwheremax.Margin = New System.Windows.Forms.Padding(2) Me.cmdwheremax.Name = "cmdwheremax" - Me.cmdwheremax.Size = New System.Drawing.Size(90, 38) + Me.cmdwheremax.Size = New System.Drawing.Size(72, 30) Me.cmdwheremax.TabIndex = 191 Me.cmdwheremax.Text = "where.max" Me.cmdwheremax.UseVisualStyleBackColor = True @@ -3406,65 +3592,78 @@ Partial Class ucrCalculator ' Me.cmdwhichmin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdwhichmin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwhichmin.Location = New System.Drawing.Point(180, 199) - Me.cmdwhichmin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwhichmin.Location = New System.Drawing.Point(144, 159) + Me.cmdwhichmin.Margin = New System.Windows.Forms.Padding(2) Me.cmdwhichmin.Name = "cmdwhichmin" - Me.cmdwhichmin.Size = New System.Drawing.Size(90, 38) + Me.cmdwhichmin.Size = New System.Drawing.Size(72, 30) Me.cmdwhichmin.TabIndex = 190 Me.cmdwhichmin.Text = "which.min" Me.cmdwhichmin.UseVisualStyleBackColor = True ' + 'cmdSummaryRHelp + ' + Me.cmdSummaryRHelp.AutoSize = True + Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.Location = New System.Drawing.Point(182, 190) + Me.cmdSummaryRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" + Me.cmdSummaryRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.TabIndex = 185 + Me.cmdSummaryRHelp.Text = "R Help" + Me.cmdSummaryRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripSummary ' Me.ContextMenuStripSummary.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripSummary.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BaseToolStripMenuItem1, Me.StatsToolStripMenuItem, Me.StatipToolStripMenuItem, Me.E1071ToolStripMenuItem, Me.RobustbaseToolStripMenuItem, Me.RasterToolStripMenuItem}) Me.ContextMenuStripSummary.Name = "ContextMenuStripSummary" - Me.ContextMenuStripSummary.Size = New System.Drawing.Size(156, 148) + Me.ContextMenuStripSummary.Size = New System.Drawing.Size(136, 136) ' 'BaseToolStripMenuItem1 ' Me.BaseToolStripMenuItem1.Name = "BaseToolStripMenuItem1" - Me.BaseToolStripMenuItem1.Size = New System.Drawing.Size(155, 24) + Me.BaseToolStripMenuItem1.Size = New System.Drawing.Size(135, 22) Me.BaseToolStripMenuItem1.Text = "Base" ' 'StatsToolStripMenuItem ' Me.StatsToolStripMenuItem.Name = "StatsToolStripMenuItem" - Me.StatsToolStripMenuItem.Size = New System.Drawing.Size(155, 24) + Me.StatsToolStripMenuItem.Size = New System.Drawing.Size(135, 22) Me.StatsToolStripMenuItem.Text = "Stats" ' 'StatipToolStripMenuItem ' Me.StatipToolStripMenuItem.Name = "StatipToolStripMenuItem" - Me.StatipToolStripMenuItem.Size = New System.Drawing.Size(155, 24) + Me.StatipToolStripMenuItem.Size = New System.Drawing.Size(135, 22) Me.StatipToolStripMenuItem.Text = "Statip" ' 'E1071ToolStripMenuItem ' Me.E1071ToolStripMenuItem.Name = "E1071ToolStripMenuItem" - Me.E1071ToolStripMenuItem.Size = New System.Drawing.Size(155, 24) + Me.E1071ToolStripMenuItem.Size = New System.Drawing.Size(135, 22) Me.E1071ToolStripMenuItem.Text = "e1071" ' 'RobustbaseToolStripMenuItem ' Me.RobustbaseToolStripMenuItem.Name = "RobustbaseToolStripMenuItem" - Me.RobustbaseToolStripMenuItem.Size = New System.Drawing.Size(155, 24) + Me.RobustbaseToolStripMenuItem.Size = New System.Drawing.Size(135, 22) Me.RobustbaseToolStripMenuItem.Text = "Robustbase" ' 'RasterToolStripMenuItem ' Me.RasterToolStripMenuItem.Name = "RasterToolStripMenuItem" - Me.RasterToolStripMenuItem.Size = New System.Drawing.Size(155, 24) + Me.RasterToolStripMenuItem.Size = New System.Drawing.Size(135, 22) Me.RasterToolStripMenuItem.Text = "Raster" ' 'cmdKurtosis ' Me.cmdKurtosis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdKurtosis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdKurtosis.Location = New System.Drawing.Point(287, 125) - Me.cmdKurtosis.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdKurtosis.Location = New System.Drawing.Point(230, 100) + Me.cmdKurtosis.Margin = New System.Windows.Forms.Padding(2) Me.cmdKurtosis.Name = "cmdKurtosis" - Me.cmdKurtosis.Size = New System.Drawing.Size(70, 38) + Me.cmdKurtosis.Size = New System.Drawing.Size(56, 30) Me.cmdKurtosis.TabIndex = 182 Me.cmdKurtosis.Text = "kurtosis" Me.cmdKurtosis.UseVisualStyleBackColor = True @@ -3472,10 +3671,10 @@ Partial Class ucrCalculator 'cmdMode1 ' Me.cmdMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMode1.Location = New System.Drawing.Point(287, 52) - Me.cmdMode1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMode1.Location = New System.Drawing.Point(230, 42) + Me.cmdMode1.Margin = New System.Windows.Forms.Padding(2) Me.cmdMode1.Name = "cmdMode1" - Me.cmdMode1.Size = New System.Drawing.Size(70, 38) + Me.cmdMode1.Size = New System.Drawing.Size(56, 30) Me.cmdMode1.TabIndex = 180 Me.cmdMode1.Text = "mode1" Me.cmdMode1.UseVisualStyleBackColor = True @@ -3483,10 +3682,10 @@ Partial Class ucrCalculator 'cmdMode ' Me.cmdMode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMode.Location = New System.Drawing.Point(218, 52) - Me.cmdMode.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMode.Location = New System.Drawing.Point(174, 42) + Me.cmdMode.Margin = New System.Windows.Forms.Padding(2) Me.cmdMode.Name = "cmdMode" - Me.cmdMode.Size = New System.Drawing.Size(70, 38) + Me.cmdMode.Size = New System.Drawing.Size(56, 30) Me.cmdMode.TabIndex = 179 Me.cmdMode.Text = "mode" Me.cmdMode.UseVisualStyleBackColor = True @@ -3494,10 +3693,10 @@ Partial Class ucrCalculator 'cmdFirst ' Me.cmdFirst.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFirst.Location = New System.Drawing.Point(148, 162) - Me.cmdFirst.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFirst.Location = New System.Drawing.Point(118, 130) + Me.cmdFirst.Margin = New System.Windows.Forms.Padding(2) Me.cmdFirst.Name = "cmdFirst" - Me.cmdFirst.Size = New System.Drawing.Size(70, 38) + Me.cmdFirst.Size = New System.Drawing.Size(56, 30) Me.cmdFirst.TabIndex = 178 Me.cmdFirst.Text = "first" Me.cmdFirst.UseVisualStyleBackColor = True @@ -3505,10 +3704,10 @@ Partial Class ucrCalculator 'cmdLast ' Me.cmdLast.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLast.Location = New System.Drawing.Point(218, 162) - Me.cmdLast.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLast.Location = New System.Drawing.Point(174, 130) + Me.cmdLast.Margin = New System.Windows.Forms.Padding(2) Me.cmdLast.Name = "cmdLast" - Me.cmdLast.Size = New System.Drawing.Size(70, 38) + Me.cmdLast.Size = New System.Drawing.Size(56, 30) Me.cmdLast.TabIndex = 177 Me.cmdLast.Text = "last" Me.cmdLast.UseVisualStyleBackColor = True @@ -3516,10 +3715,10 @@ Partial Class ucrCalculator 'cmdnth ' Me.cmdnth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnth.Location = New System.Drawing.Point(287, 162) - Me.cmdnth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdnth.Location = New System.Drawing.Point(230, 130) + Me.cmdnth.Margin = New System.Windows.Forms.Padding(2) Me.cmdnth.Name = "cmdnth" - Me.cmdnth.Size = New System.Drawing.Size(70, 38) + Me.cmdnth.Size = New System.Drawing.Size(56, 30) Me.cmdnth.TabIndex = 176 Me.cmdnth.Text = "nth" Me.cmdnth.UseVisualStyleBackColor = True @@ -3527,10 +3726,10 @@ Partial Class ucrCalculator 'cmdCor ' Me.cmdCor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCor.Location = New System.Drawing.Point(2, 236) - Me.cmdCor.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCor.Location = New System.Drawing.Point(2, 189) + Me.cmdCor.Margin = New System.Windows.Forms.Padding(2) Me.cmdCor.Name = "cmdCor" - Me.cmdCor.Size = New System.Drawing.Size(78, 38) + Me.cmdCor.Size = New System.Drawing.Size(62, 30) Me.cmdCor.TabIndex = 175 Me.cmdCor.Text = "cor" Me.cmdCor.UseVisualStyleBackColor = True @@ -3538,10 +3737,10 @@ Partial Class ucrCalculator 'cmdCov ' Me.cmdCov.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCov.Location = New System.Drawing.Point(79, 236) - Me.cmdCov.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCov.Location = New System.Drawing.Point(63, 189) + Me.cmdCov.Margin = New System.Windows.Forms.Padding(2) Me.cmdCov.Name = "cmdCov" - Me.cmdCov.Size = New System.Drawing.Size(70, 38) + Me.cmdCov.Size = New System.Drawing.Size(56, 30) Me.cmdCov.TabIndex = 174 Me.cmdCov.Text = "cov" Me.cmdCov.UseVisualStyleBackColor = True @@ -3550,10 +3749,10 @@ Partial Class ucrCalculator ' Me.cmdMad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMad.Location = New System.Drawing.Point(218, 88) - Me.cmdMad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMad.Location = New System.Drawing.Point(174, 70) + Me.cmdMad.Margin = New System.Windows.Forms.Padding(2) Me.cmdMad.Name = "cmdMad" - Me.cmdMad.Size = New System.Drawing.Size(70, 38) + Me.cmdMad.Size = New System.Drawing.Size(56, 30) Me.cmdMad.TabIndex = 173 Me.cmdMad.Text = "mad" Me.cmdMad.UseVisualStyleBackColor = True @@ -3562,10 +3761,10 @@ Partial Class ucrCalculator ' Me.cmdMc.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMc.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMc.Location = New System.Drawing.Point(148, 125) - Me.cmdMc.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMc.Location = New System.Drawing.Point(118, 100) + Me.cmdMc.Margin = New System.Windows.Forms.Padding(2) Me.cmdMc.Name = "cmdMc" - Me.cmdMc.Size = New System.Drawing.Size(70, 38) + Me.cmdMc.Size = New System.Drawing.Size(56, 30) Me.cmdMc.TabIndex = 172 Me.cmdMc.Text = "mc" Me.cmdMc.UseVisualStyleBackColor = True @@ -3574,10 +3773,10 @@ Partial Class ucrCalculator ' Me.cmdPropn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPropn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPropn.Location = New System.Drawing.Point(80, 162) - Me.cmdPropn.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPropn.Location = New System.Drawing.Point(64, 130) + Me.cmdPropn.Margin = New System.Windows.Forms.Padding(2) Me.cmdPropn.Name = "cmdPropn" - Me.cmdPropn.Size = New System.Drawing.Size(70, 38) + Me.cmdPropn.Size = New System.Drawing.Size(56, 30) Me.cmdPropn.TabIndex = 171 Me.cmdPropn.Text = "propn" Me.cmdPropn.UseVisualStyleBackColor = True @@ -3586,10 +3785,10 @@ Partial Class ucrCalculator ' Me.cmdCv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCv.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCv.Location = New System.Drawing.Point(80, 125) - Me.cmdCv.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCv.Location = New System.Drawing.Point(64, 100) + Me.cmdCv.Margin = New System.Windows.Forms.Padding(2) Me.cmdCv.Name = "cmdCv" - Me.cmdCv.Size = New System.Drawing.Size(70, 38) + Me.cmdCv.Size = New System.Drawing.Size(56, 30) Me.cmdCv.TabIndex = 170 Me.cmdCv.Text = "cv" Me.cmdCv.UseVisualStyleBackColor = True @@ -3598,10 +3797,10 @@ Partial Class ucrCalculator ' Me.cmdSkew.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSkew.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSkew.Location = New System.Drawing.Point(218, 125) - Me.cmdSkew.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSkew.Location = New System.Drawing.Point(174, 100) + Me.cmdSkew.Margin = New System.Windows.Forms.Padding(2) Me.cmdSkew.Name = "cmdSkew" - Me.cmdSkew.Size = New System.Drawing.Size(70, 38) + Me.cmdSkew.Size = New System.Drawing.Size(56, 30) Me.cmdSkew.TabIndex = 169 Me.cmdSkew.Text = "skew" Me.cmdSkew.UseVisualStyleBackColor = True @@ -3610,10 +3809,10 @@ Partial Class ucrCalculator ' Me.cmdAnyDup.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdAnyDup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnyDup.Location = New System.Drawing.Point(2, 162) - Me.cmdAnyDup.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAnyDup.Location = New System.Drawing.Point(2, 130) + Me.cmdAnyDup.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnyDup.Name = "cmdAnyDup" - Me.cmdAnyDup.Size = New System.Drawing.Size(78, 38) + Me.cmdAnyDup.Size = New System.Drawing.Size(62, 30) Me.cmdAnyDup.TabIndex = 168 Me.cmdAnyDup.Text = "anyDup" Me.cmdAnyDup.UseVisualStyleBackColor = True @@ -3621,10 +3820,10 @@ Partial Class ucrCalculator 'cmdDistinct ' Me.cmdDistinct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDistinct.Location = New System.Drawing.Point(2, 125) - Me.cmdDistinct.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDistinct.Location = New System.Drawing.Point(2, 100) + Me.cmdDistinct.Margin = New System.Windows.Forms.Padding(2) Me.cmdDistinct.Name = "cmdDistinct" - Me.cmdDistinct.Size = New System.Drawing.Size(78, 38) + Me.cmdDistinct.Size = New System.Drawing.Size(62, 30) Me.cmdDistinct.TabIndex = 167 Me.cmdDistinct.Text = "distinct" Me.cmdDistinct.UseVisualStyleBackColor = True @@ -3632,10 +3831,10 @@ Partial Class ucrCalculator 'cmdNonMiss ' Me.cmdNonMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNonMiss.Location = New System.Drawing.Point(2, 88) - Me.cmdNonMiss.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdNonMiss.Location = New System.Drawing.Point(2, 70) + Me.cmdNonMiss.Margin = New System.Windows.Forms.Padding(2) Me.cmdNonMiss.Name = "cmdNonMiss" - Me.cmdNonMiss.Size = New System.Drawing.Size(78, 38) + Me.cmdNonMiss.Size = New System.Drawing.Size(62, 30) Me.cmdNonMiss.TabIndex = 166 Me.cmdNonMiss.Text = "non miss" Me.cmdNonMiss.UseVisualStyleBackColor = True @@ -3644,10 +3843,10 @@ Partial Class ucrCalculator ' Me.cmdIQR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdIQR.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIQR.Location = New System.Drawing.Point(287, 88) - Me.cmdIQR.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdIQR.Location = New System.Drawing.Point(230, 70) + Me.cmdIQR.Margin = New System.Windows.Forms.Padding(2) Me.cmdIQR.Name = "cmdIQR" - Me.cmdIQR.Size = New System.Drawing.Size(70, 38) + Me.cmdIQR.Size = New System.Drawing.Size(56, 30) Me.cmdIQR.TabIndex = 165 Me.cmdIQR.Text = "IQR" Me.cmdIQR.UseVisualStyleBackColor = True @@ -3656,10 +3855,10 @@ Partial Class ucrCalculator ' Me.cmdQuantile.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuantile.Location = New System.Drawing.Point(148, 236) - Me.cmdQuantile.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQuantile.Location = New System.Drawing.Point(118, 189) + Me.cmdQuantile.Margin = New System.Windows.Forms.Padding(2) Me.cmdQuantile.Name = "cmdQuantile" - Me.cmdQuantile.Size = New System.Drawing.Size(70, 38) + Me.cmdQuantile.Size = New System.Drawing.Size(56, 30) Me.cmdQuantile.TabIndex = 164 Me.cmdQuantile.Text = "quantile" Me.cmdQuantile.UseVisualStyleBackColor = True @@ -3668,10 +3867,10 @@ Partial Class ucrCalculator ' Me.cmdRange.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRange.Location = New System.Drawing.Point(287, 17) - Me.cmdRange.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRange.Location = New System.Drawing.Point(230, 14) + Me.cmdRange.Margin = New System.Windows.Forms.Padding(2) Me.cmdRange.Name = "cmdRange" - Me.cmdRange.Size = New System.Drawing.Size(70, 38) + Me.cmdRange.Size = New System.Drawing.Size(56, 30) Me.cmdRange.TabIndex = 163 Me.cmdRange.Text = "range" Me.cmdRange.UseVisualStyleBackColor = True @@ -3679,10 +3878,10 @@ Partial Class ucrCalculator 'cmdSd ' Me.cmdSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSd.Location = New System.Drawing.Point(148, 88) - Me.cmdSd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSd.Location = New System.Drawing.Point(118, 70) + Me.cmdSd.Margin = New System.Windows.Forms.Padding(2) Me.cmdSd.Name = "cmdSd" - Me.cmdSd.Size = New System.Drawing.Size(70, 38) + Me.cmdSd.Size = New System.Drawing.Size(56, 30) Me.cmdSd.TabIndex = 160 Me.cmdSd.Text = "sd" Me.cmdSd.UseVisualStyleBackColor = True @@ -3691,10 +3890,10 @@ Partial Class ucrCalculator ' Me.cmdMedian.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMedian.Location = New System.Drawing.Point(148, 52) - Me.cmdMedian.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMedian.Location = New System.Drawing.Point(118, 42) + Me.cmdMedian.Margin = New System.Windows.Forms.Padding(2) Me.cmdMedian.Name = "cmdMedian" - Me.cmdMedian.Size = New System.Drawing.Size(70, 38) + Me.cmdMedian.Size = New System.Drawing.Size(56, 30) Me.cmdMedian.TabIndex = 158 Me.cmdMedian.Text = "median" Me.cmdMedian.UseVisualStyleBackColor = True @@ -3702,10 +3901,10 @@ Partial Class ucrCalculator 'cmdMin ' Me.cmdMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMin.Location = New System.Drawing.Point(148, 17) - Me.cmdMin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMin.Location = New System.Drawing.Point(118, 14) + Me.cmdMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdMin.Name = "cmdMin" - Me.cmdMin.Size = New System.Drawing.Size(70, 38) + Me.cmdMin.Size = New System.Drawing.Size(56, 30) Me.cmdMin.TabIndex = 155 Me.cmdMin.Text = "min" Me.cmdMin.UseVisualStyleBackColor = True @@ -3713,10 +3912,10 @@ Partial Class ucrCalculator 'cmdMax ' Me.cmdMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMax.Location = New System.Drawing.Point(218, 17) - Me.cmdMax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMax.Location = New System.Drawing.Point(174, 14) + Me.cmdMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdMax.Name = "cmdMax" - Me.cmdMax.Size = New System.Drawing.Size(70, 38) + Me.cmdMax.Size = New System.Drawing.Size(56, 30) Me.cmdMax.TabIndex = 154 Me.cmdMax.Text = "max" Me.cmdMax.UseVisualStyleBackColor = True @@ -3725,10 +3924,10 @@ Partial Class ucrCalculator ' Me.cmdMean.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMean.Location = New System.Drawing.Point(80, 52) - Me.cmdMean.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMean.Location = New System.Drawing.Point(64, 42) + Me.cmdMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdMean.Name = "cmdMean" - Me.cmdMean.Size = New System.Drawing.Size(70, 38) + Me.cmdMean.Size = New System.Drawing.Size(56, 30) Me.cmdMean.TabIndex = 153 Me.cmdMean.Text = "mean" Me.cmdMean.UseVisualStyleBackColor = True @@ -3736,10 +3935,10 @@ Partial Class ucrCalculator 'cmdMiss ' Me.cmdMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMiss.Location = New System.Drawing.Point(2, 52) - Me.cmdMiss.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMiss.Location = New System.Drawing.Point(2, 42) + Me.cmdMiss.Margin = New System.Windows.Forms.Padding(2) Me.cmdMiss.Name = "cmdMiss" - Me.cmdMiss.Size = New System.Drawing.Size(78, 38) + Me.cmdMiss.Size = New System.Drawing.Size(62, 30) Me.cmdMiss.TabIndex = 149 Me.cmdMiss.Text = "miss" Me.cmdMiss.UseVisualStyleBackColor = True @@ -3748,10 +3947,10 @@ Partial Class ucrCalculator ' Me.cmdLength.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLength.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLength.Location = New System.Drawing.Point(2, 17) - Me.cmdLength.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLength.Location = New System.Drawing.Point(2, 14) + Me.cmdLength.Margin = New System.Windows.Forms.Padding(2) Me.cmdLength.Name = "cmdLength" - Me.cmdLength.Size = New System.Drawing.Size(78, 38) + Me.cmdLength.Size = New System.Drawing.Size(62, 30) Me.cmdLength.TabIndex = 148 Me.cmdLength.Text = "length" Me.cmdLength.UseVisualStyleBackColor = True @@ -3759,10 +3958,10 @@ Partial Class ucrCalculator 'cmdSum ' Me.cmdSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSum.Location = New System.Drawing.Point(80, 17) - Me.cmdSum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSum.Location = New System.Drawing.Point(64, 14) + Me.cmdSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdSum.Name = "cmdSum" - Me.cmdSum.Size = New System.Drawing.Size(70, 38) + Me.cmdSum.Size = New System.Drawing.Size(56, 30) Me.cmdSum.TabIndex = 150 Me.cmdSum.Text = "sum" Me.cmdSum.UseVisualStyleBackColor = True @@ -3770,10 +3969,10 @@ Partial Class ucrCalculator 'cmdVar ' Me.cmdVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdVar.Location = New System.Drawing.Point(80, 88) - Me.cmdVar.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdVar.Location = New System.Drawing.Point(64, 70) + Me.cmdVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdVar.Name = "cmdVar" - Me.cmdVar.Size = New System.Drawing.Size(70, 38) + Me.cmdVar.Size = New System.Drawing.Size(56, 30) Me.cmdVar.TabIndex = 159 Me.cmdVar.Text = "var" Me.cmdVar.UseVisualStyleBackColor = True @@ -3795,9 +3994,11 @@ Partial Class ucrCalculator Me.grpFrequencies.Controls.Add(Me.cmdFreqMin) Me.grpFrequencies.Controls.Add(Me.cmdFreqSum) Me.grpFrequencies.Controls.Add(Me.cmdFreqLength) - Me.grpFrequencies.Location = New System.Drawing.Point(2, 283) + Me.grpFrequencies.Location = New System.Drawing.Point(2, 226) + Me.grpFrequencies.Margin = New System.Windows.Forms.Padding(2) Me.grpFrequencies.Name = "grpFrequencies" - Me.grpFrequencies.Size = New System.Drawing.Size(353, 133) + Me.grpFrequencies.Padding = New System.Windows.Forms.Padding(2) + Me.grpFrequencies.Size = New System.Drawing.Size(282, 106) Me.grpFrequencies.TabIndex = 184 Me.grpFrequencies.TabStop = False Me.grpFrequencies.Text = "Frequencies" @@ -3806,10 +4007,10 @@ Partial Class ucrCalculator ' Me.cmdFreqQuantile.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqQuantile.Location = New System.Drawing.Point(282, 90) - Me.cmdFreqQuantile.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqQuantile.Location = New System.Drawing.Point(226, 72) + Me.cmdFreqQuantile.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqQuantile.Name = "cmdFreqQuantile" - Me.cmdFreqQuantile.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqQuantile.Size = New System.Drawing.Size(58, 30) Me.cmdFreqQuantile.TabIndex = 186 Me.cmdFreqQuantile.Text = "quantile" Me.cmdFreqQuantile.UseVisualStyleBackColor = True @@ -3818,10 +4019,10 @@ Partial Class ucrCalculator ' Me.cmdFreqPropn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqPropn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqPropn.Location = New System.Drawing.Point(212, 90) - Me.cmdFreqPropn.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqPropn.Location = New System.Drawing.Point(170, 72) + Me.cmdFreqPropn.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqPropn.Name = "cmdFreqPropn" - Me.cmdFreqPropn.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqPropn.Size = New System.Drawing.Size(58, 30) Me.cmdFreqPropn.TabIndex = 185 Me.cmdFreqPropn.Text = "propn" Me.cmdFreqPropn.UseVisualStyleBackColor = True @@ -3830,10 +4031,10 @@ Partial Class ucrCalculator ' Me.cmdFreqDistinct.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqDistinct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqDistinct.Location = New System.Drawing.Point(142, 90) - Me.cmdFreqDistinct.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqDistinct.Location = New System.Drawing.Point(114, 72) + Me.cmdFreqDistinct.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqDistinct.Name = "cmdFreqDistinct" - Me.cmdFreqDistinct.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqDistinct.Size = New System.Drawing.Size(58, 30) Me.cmdFreqDistinct.TabIndex = 184 Me.cmdFreqDistinct.Text = "distinct" Me.cmdFreqDistinct.UseVisualStyleBackColor = True @@ -3842,10 +4043,10 @@ Partial Class ucrCalculator ' Me.cmdFreqIQR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqIQR.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqIQR.Location = New System.Drawing.Point(70, 90) - Me.cmdFreqIQR.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqIQR.Location = New System.Drawing.Point(56, 72) + Me.cmdFreqIQR.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqIQR.Name = "cmdFreqIQR" - Me.cmdFreqIQR.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqIQR.Size = New System.Drawing.Size(58, 30) Me.cmdFreqIQR.TabIndex = 183 Me.cmdFreqIQR.Text = "IQR" Me.cmdFreqIQR.UseVisualStyleBackColor = True @@ -3854,10 +4055,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMedian.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMedian.Location = New System.Drawing.Point(142, 53) - Me.cmdFreqMedian.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMedian.Location = New System.Drawing.Point(114, 42) + Me.cmdFreqMedian.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMedian.Name = "cmdFreqMedian" - Me.cmdFreqMedian.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMedian.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMedian.TabIndex = 182 Me.cmdFreqMedian.Text = "median" Me.cmdFreqMedian.UseVisualStyleBackColor = True @@ -3866,10 +4067,10 @@ Partial Class ucrCalculator ' Me.cmdFreqSd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqSd.Location = New System.Drawing.Point(282, 53) - Me.cmdFreqSd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqSd.Location = New System.Drawing.Point(226, 42) + Me.cmdFreqSd.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqSd.Name = "cmdFreqSd" - Me.cmdFreqSd.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqSd.Size = New System.Drawing.Size(58, 30) Me.cmdFreqSd.TabIndex = 181 Me.cmdFreqSd.Text = "sd" Me.cmdFreqSd.UseVisualStyleBackColor = True @@ -3878,10 +4079,10 @@ Partial Class ucrCalculator ' Me.cmdFreqVar.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqVar.Location = New System.Drawing.Point(212, 53) - Me.cmdFreqVar.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqVar.Location = New System.Drawing.Point(170, 42) + Me.cmdFreqVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqVar.Name = "cmdFreqVar" - Me.cmdFreqVar.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqVar.Size = New System.Drawing.Size(58, 30) Me.cmdFreqVar.TabIndex = 180 Me.cmdFreqVar.Text = "var" Me.cmdFreqVar.UseVisualStyleBackColor = True @@ -3890,10 +4091,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMean.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMean.Location = New System.Drawing.Point(70, 53) - Me.cmdFreqMean.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMean.Location = New System.Drawing.Point(56, 42) + Me.cmdFreqMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMean.Name = "cmdFreqMean" - Me.cmdFreqMean.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMean.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMean.TabIndex = 179 Me.cmdFreqMean.Text = "mean" Me.cmdFreqMean.UseVisualStyleBackColor = True @@ -3902,10 +4103,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMad.Location = New System.Drawing.Point(0, 90) - Me.cmdFreqMad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMad.Location = New System.Drawing.Point(0, 72) + Me.cmdFreqMad.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMad.Name = "cmdFreqMad" - Me.cmdFreqMad.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMad.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMad.TabIndex = 178 Me.cmdFreqMad.Text = "mad" Me.cmdFreqMad.UseVisualStyleBackColor = True @@ -3914,10 +4115,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMiss.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMiss.Location = New System.Drawing.Point(0, 53) - Me.cmdFreqMiss.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMiss.Location = New System.Drawing.Point(0, 42) + Me.cmdFreqMiss.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMiss.Name = "cmdFreqMiss" - Me.cmdFreqMiss.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMiss.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMiss.TabIndex = 177 Me.cmdFreqMiss.Text = "miss" Me.cmdFreqMiss.UseVisualStyleBackColor = True @@ -3926,10 +4127,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMode1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMode1.Location = New System.Drawing.Point(282, 18) - Me.cmdFreqMode1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMode1.Location = New System.Drawing.Point(226, 14) + Me.cmdFreqMode1.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMode1.Name = "cmdFreqMode1" - Me.cmdFreqMode1.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMode1.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMode1.TabIndex = 176 Me.cmdFreqMode1.Text = "mode1" Me.cmdFreqMode1.UseVisualStyleBackColor = True @@ -3938,10 +4139,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMax.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMax.Location = New System.Drawing.Point(212, 18) - Me.cmdFreqMax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMax.Location = New System.Drawing.Point(170, 14) + Me.cmdFreqMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMax.Name = "cmdFreqMax" - Me.cmdFreqMax.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMax.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMax.TabIndex = 175 Me.cmdFreqMax.Text = "max" Me.cmdFreqMax.UseVisualStyleBackColor = True @@ -3950,10 +4151,10 @@ Partial Class ucrCalculator ' Me.cmdFreqMin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMin.Location = New System.Drawing.Point(142, 18) - Me.cmdFreqMin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMin.Location = New System.Drawing.Point(114, 14) + Me.cmdFreqMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMin.Name = "cmdFreqMin" - Me.cmdFreqMin.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMin.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMin.TabIndex = 174 Me.cmdFreqMin.Text = "min" Me.cmdFreqMin.UseVisualStyleBackColor = True @@ -3962,10 +4163,10 @@ Partial Class ucrCalculator ' Me.cmdFreqSum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqSum.Location = New System.Drawing.Point(70, 18) - Me.cmdFreqSum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqSum.Location = New System.Drawing.Point(56, 14) + Me.cmdFreqSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqSum.Name = "cmdFreqSum" - Me.cmdFreqSum.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqSum.Size = New System.Drawing.Size(58, 30) Me.cmdFreqSum.TabIndex = 173 Me.cmdFreqSum.Text = "sum" Me.cmdFreqSum.UseVisualStyleBackColor = True @@ -3974,10 +4175,10 @@ Partial Class ucrCalculator ' Me.cmdFreqLength.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqLength.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqLength.Location = New System.Drawing.Point(0, 18) - Me.cmdFreqLength.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqLength.Location = New System.Drawing.Point(0, 14) + Me.cmdFreqLength.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqLength.Name = "cmdFreqLength" - Me.cmdFreqLength.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqLength.Size = New System.Drawing.Size(58, 30) Me.cmdFreqLength.TabIndex = 172 Me.cmdFreqLength.Text = "length" Me.cmdFreqLength.UseVisualStyleBackColor = True @@ -4017,9 +4218,11 @@ Partial Class ucrCalculator Me.grpProbabilty.Controls.Add(Me.cmdTrigamma) Me.grpProbabilty.Controls.Add(Me.cmdBeta) Me.grpProbabilty.Controls.Add(Me.cmdDigamma) - Me.grpProbabilty.Location = New System.Drawing.Point(542, 78) + Me.grpProbabilty.Location = New System.Drawing.Point(434, 62) + Me.grpProbabilty.Margin = New System.Windows.Forms.Padding(2) Me.grpProbabilty.Name = "grpProbabilty" - Me.grpProbabilty.Size = New System.Drawing.Size(395, 402) + Me.grpProbabilty.Padding = New System.Windows.Forms.Padding(2) + Me.grpProbabilty.Size = New System.Drawing.Size(316, 322) Me.grpProbabilty.TabIndex = 187 Me.grpProbabilty.TabStop = False Me.grpProbabilty.Text = "Probability" @@ -4028,31 +4231,44 @@ Partial Class ucrCalculator ' Me.cmdPascal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPascal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPascal.Location = New System.Drawing.Point(2, 237) - Me.cmdPascal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPascal.Location = New System.Drawing.Point(2, 190) + Me.cmdPascal.Margin = New System.Windows.Forms.Padding(2) Me.cmdPascal.Name = "cmdPascal" - Me.cmdPascal.Size = New System.Drawing.Size(78, 38) + Me.cmdPascal.Size = New System.Drawing.Size(62, 30) Me.cmdPascal.TabIndex = 213 Me.cmdPascal.Text = "pascal" Me.cmdPascal.UseVisualStyleBackColor = True ' + 'cmdProbRHelp + ' + Me.cmdProbRHelp.AutoSize = True + Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.Location = New System.Drawing.Point(215, 191) + Me.cmdProbRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdProbRHelp.Name = "cmdProbRHelp" + Me.cmdProbRHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.TabIndex = 212 + Me.cmdProbRHelp.Text = "R Help" + Me.cmdProbRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripProbability ' Me.ContextMenuStripProbability.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripProbability.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ProbStatsToolStripMenuItem, Me.ProbBaseToolStripMenuItem}) Me.ContextMenuStripProbability.Name = "ContextMenuStrip1" - Me.ContextMenuStripProbability.Size = New System.Drawing.Size(110, 52) + Me.ContextMenuStripProbability.Size = New System.Drawing.Size(99, 48) ' 'ProbStatsToolStripMenuItem ' Me.ProbStatsToolStripMenuItem.Name = "ProbStatsToolStripMenuItem" - Me.ProbStatsToolStripMenuItem.Size = New System.Drawing.Size(109, 24) + Me.ProbStatsToolStripMenuItem.Size = New System.Drawing.Size(98, 22) Me.ProbStatsToolStripMenuItem.Text = "stats" ' 'ProbBaseToolStripMenuItem ' Me.ProbBaseToolStripMenuItem.Name = "ProbBaseToolStripMenuItem" - Me.ProbBaseToolStripMenuItem.Size = New System.Drawing.Size(109, 24) + Me.ProbBaseToolStripMenuItem.Size = New System.Drawing.Size(98, 22) Me.ProbBaseToolStripMenuItem.Text = "base" ' 'grpRandom @@ -4067,21 +4283,23 @@ Partial Class ucrCalculator Me.grpRandom.Controls.Add(Me.cmduni_integer) Me.grpRandom.Controls.Add(Me.cmdRan_normal) Me.grpRandom.Controls.Add(Me.cmduniform) - Me.grpRandom.Location = New System.Drawing.Point(8, 285) + Me.grpRandom.Location = New System.Drawing.Point(6, 228) + Me.grpRandom.Margin = New System.Windows.Forms.Padding(2) Me.grpRandom.Name = "grpRandom" - Me.grpRandom.Size = New System.Drawing.Size(382, 105) + Me.grpRandom.Padding = New System.Windows.Forms.Padding(2) + Me.grpRandom.Size = New System.Drawing.Size(306, 84) Me.grpRandom.TabIndex = 199 Me.grpRandom.TabStop = False - Me.grpRandom.Text = "Random" + Me.grpRandom.Text = "Random Samples" ' 'cmdnbinomial ' Me.cmdnbinomial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdnbinomial.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnbinomial.Location = New System.Drawing.Point(145, 53) - Me.cmdnbinomial.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdnbinomial.Location = New System.Drawing.Point(116, 42) + Me.cmdnbinomial.Margin = New System.Windows.Forms.Padding(2) Me.cmdnbinomial.Name = "cmdnbinomial" - Me.cmdnbinomial.Size = New System.Drawing.Size(90, 38) + Me.cmdnbinomial.Size = New System.Drawing.Size(72, 30) Me.cmdnbinomial.TabIndex = 182 Me.cmdnbinomial.Text = "nbinomial" Me.cmdnbinomial.UseVisualStyleBackColor = True @@ -4090,10 +4308,10 @@ Partial Class ucrCalculator ' Me.cmdRan_sample.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_sample.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_sample.Location = New System.Drawing.Point(303, 53) - Me.cmdRan_sample.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRan_sample.Location = New System.Drawing.Point(242, 42) + Me.cmdRan_sample.Margin = New System.Windows.Forms.Padding(2) Me.cmdRan_sample.Name = "cmdRan_sample" - Me.cmdRan_sample.Size = New System.Drawing.Size(72, 38) + Me.cmdRan_sample.Size = New System.Drawing.Size(58, 30) Me.cmdRan_sample.TabIndex = 181 Me.cmdRan_sample.Text = "sample" Me.cmdRan_sample.UseVisualStyleBackColor = True @@ -4102,10 +4320,10 @@ Partial Class ucrCalculator ' Me.cmdRan_beta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_beta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_beta.Location = New System.Drawing.Point(233, 53) - Me.cmdRan_beta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRan_beta.Location = New System.Drawing.Point(186, 42) + Me.cmdRan_beta.Margin = New System.Windows.Forms.Padding(2) Me.cmdRan_beta.Name = "cmdRan_beta" - Me.cmdRan_beta.Size = New System.Drawing.Size(72, 38) + Me.cmdRan_beta.Size = New System.Drawing.Size(58, 30) Me.cmdRan_beta.TabIndex = 180 Me.cmdRan_beta.Text = "beta" Me.cmdRan_beta.UseVisualStyleBackColor = True @@ -4114,10 +4332,10 @@ Partial Class ucrCalculator ' Me.cmdRan_gamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_gamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_gamma.Location = New System.Drawing.Point(73, 53) - Me.cmdRan_gamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRan_gamma.Location = New System.Drawing.Point(58, 42) + Me.cmdRan_gamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdRan_gamma.Name = "cmdRan_gamma" - Me.cmdRan_gamma.Size = New System.Drawing.Size(72, 38) + Me.cmdRan_gamma.Size = New System.Drawing.Size(58, 30) Me.cmdRan_gamma.TabIndex = 179 Me.cmdRan_gamma.Text = "gamma" Me.cmdRan_gamma.UseVisualStyleBackColor = True @@ -4126,10 +4344,10 @@ Partial Class ucrCalculator ' Me.cmdpoisson.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdpoisson.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdpoisson.Location = New System.Drawing.Point(3, 53) - Me.cmdpoisson.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdpoisson.Location = New System.Drawing.Point(2, 42) + Me.cmdpoisson.Margin = New System.Windows.Forms.Padding(2) Me.cmdpoisson.Name = "cmdpoisson" - Me.cmdpoisson.Size = New System.Drawing.Size(72, 38) + Me.cmdpoisson.Size = New System.Drawing.Size(58, 30) Me.cmdpoisson.TabIndex = 177 Me.cmdpoisson.Text = "poisson" Me.cmdpoisson.UseVisualStyleBackColor = True @@ -4138,10 +4356,10 @@ Partial Class ucrCalculator ' Me.cmdbinomial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdbinomial.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbinomial.Location = New System.Drawing.Point(303, 18) - Me.cmdbinomial.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdbinomial.Location = New System.Drawing.Point(242, 14) + Me.cmdbinomial.Margin = New System.Windows.Forms.Padding(2) Me.cmdbinomial.Name = "cmdbinomial" - Me.cmdbinomial.Size = New System.Drawing.Size(72, 38) + Me.cmdbinomial.Size = New System.Drawing.Size(58, 30) Me.cmdbinomial.TabIndex = 176 Me.cmdbinomial.Text = "binomial" Me.cmdbinomial.UseVisualStyleBackColor = True @@ -4150,10 +4368,10 @@ Partial Class ucrCalculator ' Me.cmdbernoulli.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdbernoulli.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbernoulli.Location = New System.Drawing.Point(233, 18) - Me.cmdbernoulli.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdbernoulli.Location = New System.Drawing.Point(186, 14) + Me.cmdbernoulli.Margin = New System.Windows.Forms.Padding(2) Me.cmdbernoulli.Name = "cmdbernoulli" - Me.cmdbernoulli.Size = New System.Drawing.Size(72, 38) + Me.cmdbernoulli.Size = New System.Drawing.Size(58, 30) Me.cmdbernoulli.TabIndex = 175 Me.cmdbernoulli.Text = "bernoulli" Me.cmdbernoulli.UseVisualStyleBackColor = True @@ -4162,10 +4380,10 @@ Partial Class ucrCalculator ' Me.cmduni_integer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmduni_integer.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmduni_integer.Location = New System.Drawing.Point(145, 18) - Me.cmduni_integer.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmduni_integer.Location = New System.Drawing.Point(116, 14) + Me.cmduni_integer.Margin = New System.Windows.Forms.Padding(2) Me.cmduni_integer.Name = "cmduni_integer" - Me.cmduni_integer.Size = New System.Drawing.Size(90, 38) + Me.cmduni_integer.Size = New System.Drawing.Size(72, 30) Me.cmduni_integer.TabIndex = 174 Me.cmduni_integer.Text = "uni_integer" Me.cmduni_integer.UseVisualStyleBackColor = True @@ -4174,10 +4392,10 @@ Partial Class ucrCalculator ' Me.cmdRan_normal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_normal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_normal.Location = New System.Drawing.Point(73, 18) - Me.cmdRan_normal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRan_normal.Location = New System.Drawing.Point(58, 14) + Me.cmdRan_normal.Margin = New System.Windows.Forms.Padding(2) Me.cmdRan_normal.Name = "cmdRan_normal" - Me.cmdRan_normal.Size = New System.Drawing.Size(72, 38) + Me.cmdRan_normal.Size = New System.Drawing.Size(58, 30) Me.cmdRan_normal.TabIndex = 173 Me.cmdRan_normal.Text = "normal" Me.cmdRan_normal.UseVisualStyleBackColor = True @@ -4186,10 +4404,10 @@ Partial Class ucrCalculator ' Me.cmduniform.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmduniform.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmduniform.Location = New System.Drawing.Point(3, 18) - Me.cmduniform.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmduniform.Location = New System.Drawing.Point(2, 14) + Me.cmduniform.Margin = New System.Windows.Forms.Padding(2) Me.cmduniform.Name = "cmduniform" - Me.cmduniform.Size = New System.Drawing.Size(72, 38) + Me.cmduniform.Size = New System.Drawing.Size(58, 30) Me.cmduniform.TabIndex = 172 Me.cmduniform.Text = "uniform" Me.cmduniform.UseVisualStyleBackColor = True @@ -4198,10 +4416,10 @@ Partial Class ucrCalculator ' Me.cmdQnbin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQnbin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQnbin.Location = New System.Drawing.Point(308, 128) - Me.cmdQnbin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQnbin.Location = New System.Drawing.Point(246, 102) + Me.cmdQnbin.Margin = New System.Windows.Forms.Padding(2) Me.cmdQnbin.Name = "cmdQnbin" - Me.cmdQnbin.Size = New System.Drawing.Size(78, 38) + Me.cmdQnbin.Size = New System.Drawing.Size(62, 30) Me.cmdQnbin.TabIndex = 176 Me.cmdQnbin.Text = "qnbin" Me.cmdQnbin.UseVisualStyleBackColor = True @@ -4210,10 +4428,10 @@ Partial Class ucrCalculator ' Me.cmdQpois.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQpois.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQpois.Location = New System.Drawing.Point(232, 128) - Me.cmdQpois.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQpois.Location = New System.Drawing.Point(186, 102) + Me.cmdQpois.Margin = New System.Windows.Forms.Padding(2) Me.cmdQpois.Name = "cmdQpois" - Me.cmdQpois.Size = New System.Drawing.Size(78, 38) + Me.cmdQpois.Size = New System.Drawing.Size(62, 30) Me.cmdQpois.TabIndex = 175 Me.cmdQpois.Text = "qpois" Me.cmdQpois.UseVisualStyleBackColor = True @@ -4222,10 +4440,10 @@ Partial Class ucrCalculator ' Me.cmdQbinom.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQbinom.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQbinom.Location = New System.Drawing.Point(155, 128) - Me.cmdQbinom.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQbinom.Location = New System.Drawing.Point(124, 102) + Me.cmdQbinom.Margin = New System.Windows.Forms.Padding(2) Me.cmdQbinom.Name = "cmdQbinom" - Me.cmdQbinom.Size = New System.Drawing.Size(78, 38) + Me.cmdQbinom.Size = New System.Drawing.Size(62, 30) Me.cmdQbinom.TabIndex = 174 Me.cmdQbinom.Text = "qbinom" Me.cmdQbinom.UseVisualStyleBackColor = True @@ -4234,10 +4452,10 @@ Partial Class ucrCalculator ' Me.cmdQbirth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQbirth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQbirth.Location = New System.Drawing.Point(78, 128) - Me.cmdQbirth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQbirth.Location = New System.Drawing.Point(62, 102) + Me.cmdQbirth.Margin = New System.Windows.Forms.Padding(2) Me.cmdQbirth.Name = "cmdQbirth" - Me.cmdQbirth.Size = New System.Drawing.Size(78, 38) + Me.cmdQbirth.Size = New System.Drawing.Size(62, 30) Me.cmdQbirth.TabIndex = 173 Me.cmdQbirth.Text = "qbirth" Me.cmdQbirth.UseVisualStyleBackColor = True @@ -4246,10 +4464,10 @@ Partial Class ucrCalculator ' Me.cmdQbeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQbeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQbeta.Location = New System.Drawing.Point(2, 128) - Me.cmdQbeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQbeta.Location = New System.Drawing.Point(2, 102) + Me.cmdQbeta.Margin = New System.Windows.Forms.Padding(2) Me.cmdQbeta.Name = "cmdQbeta" - Me.cmdQbeta.Size = New System.Drawing.Size(78, 38) + Me.cmdQbeta.Size = New System.Drawing.Size(62, 30) Me.cmdQbeta.TabIndex = 172 Me.cmdQbeta.Text = "qbeta" Me.cmdQbeta.UseVisualStyleBackColor = True @@ -4258,10 +4476,10 @@ Partial Class ucrCalculator ' Me.cmdPnbin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPnbin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPnbin.Location = New System.Drawing.Point(308, 92) - Me.cmdPnbin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPnbin.Location = New System.Drawing.Point(246, 74) + Me.cmdPnbin.Margin = New System.Windows.Forms.Padding(2) Me.cmdPnbin.Name = "cmdPnbin" - Me.cmdPnbin.Size = New System.Drawing.Size(78, 38) + Me.cmdPnbin.Size = New System.Drawing.Size(62, 30) Me.cmdPnbin.TabIndex = 171 Me.cmdPnbin.Text = "pnbin" Me.cmdPnbin.UseVisualStyleBackColor = True @@ -4270,10 +4488,10 @@ Partial Class ucrCalculator ' Me.cmdPpois.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPpois.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPpois.Location = New System.Drawing.Point(232, 92) - Me.cmdPpois.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPpois.Location = New System.Drawing.Point(186, 74) + Me.cmdPpois.Margin = New System.Windows.Forms.Padding(2) Me.cmdPpois.Name = "cmdPpois" - Me.cmdPpois.Size = New System.Drawing.Size(78, 38) + Me.cmdPpois.Size = New System.Drawing.Size(62, 30) Me.cmdPpois.TabIndex = 170 Me.cmdPpois.Text = "ppois" Me.cmdPpois.UseVisualStyleBackColor = True @@ -4282,10 +4500,10 @@ Partial Class ucrCalculator ' Me.cmdPbinom.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPbinom.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbinom.Location = New System.Drawing.Point(155, 92) - Me.cmdPbinom.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPbinom.Location = New System.Drawing.Point(124, 74) + Me.cmdPbinom.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbinom.Name = "cmdPbinom" - Me.cmdPbinom.Size = New System.Drawing.Size(78, 38) + Me.cmdPbinom.Size = New System.Drawing.Size(62, 30) Me.cmdPbinom.TabIndex = 169 Me.cmdPbinom.Text = "pbinom" Me.cmdPbinom.UseVisualStyleBackColor = True @@ -4294,10 +4512,10 @@ Partial Class ucrCalculator ' Me.cmdPbirth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPbirth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbirth.Location = New System.Drawing.Point(78, 92) - Me.cmdPbirth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPbirth.Location = New System.Drawing.Point(62, 74) + Me.cmdPbirth.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbirth.Name = "cmdPbirth" - Me.cmdPbirth.Size = New System.Drawing.Size(78, 38) + Me.cmdPbirth.Size = New System.Drawing.Size(62, 30) Me.cmdPbirth.TabIndex = 168 Me.cmdPbirth.Text = "pbirth" Me.cmdPbirth.UseVisualStyleBackColor = True @@ -4306,10 +4524,10 @@ Partial Class ucrCalculator ' Me.cmdPbeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPbeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbeta.Location = New System.Drawing.Point(2, 92) - Me.cmdPbeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPbeta.Location = New System.Drawing.Point(2, 74) + Me.cmdPbeta.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbeta.Name = "cmdPbeta" - Me.cmdPbeta.Size = New System.Drawing.Size(78, 38) + Me.cmdPbeta.Size = New System.Drawing.Size(62, 30) Me.cmdPbeta.TabIndex = 167 Me.cmdPbeta.Text = "pbeta" Me.cmdPbeta.UseVisualStyleBackColor = True @@ -4318,10 +4536,10 @@ Partial Class ucrCalculator ' Me.cmdQgamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQgamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQgamma.Location = New System.Drawing.Point(308, 55) - Me.cmdQgamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQgamma.Location = New System.Drawing.Point(246, 44) + Me.cmdQgamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdQgamma.Name = "cmdQgamma" - Me.cmdQgamma.Size = New System.Drawing.Size(78, 38) + Me.cmdQgamma.Size = New System.Drawing.Size(62, 30) Me.cmdQgamma.TabIndex = 166 Me.cmdQgamma.Text = "qgamma" Me.cmdQgamma.UseVisualStyleBackColor = True @@ -4330,10 +4548,10 @@ Partial Class ucrCalculator ' Me.cmdPgamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPgamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPgamma.Location = New System.Drawing.Point(308, 18) - Me.cmdPgamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPgamma.Location = New System.Drawing.Point(246, 14) + Me.cmdPgamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdPgamma.Name = "cmdPgamma" - Me.cmdPgamma.Size = New System.Drawing.Size(78, 38) + Me.cmdPgamma.Size = New System.Drawing.Size(62, 30) Me.cmdPgamma.TabIndex = 165 Me.cmdPgamma.Text = "pgamma" Me.cmdPgamma.UseVisualStyleBackColor = True @@ -4342,10 +4560,10 @@ Partial Class ucrCalculator ' Me.cmdGamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdGamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGamma.Location = New System.Drawing.Point(232, 163) - Me.cmdGamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdGamma.Location = New System.Drawing.Point(186, 130) + Me.cmdGamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdGamma.Name = "cmdGamma" - Me.cmdGamma.Size = New System.Drawing.Size(78, 38) + Me.cmdGamma.Size = New System.Drawing.Size(62, 30) Me.cmdGamma.TabIndex = 163 Me.cmdGamma.Tag = "" Me.cmdGamma.Text = "gamma" @@ -4355,10 +4573,10 @@ Partial Class ucrCalculator ' Me.cmdLbeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLbeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLbeta.Location = New System.Drawing.Point(155, 200) - Me.cmdLbeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLbeta.Location = New System.Drawing.Point(124, 160) + Me.cmdLbeta.Margin = New System.Windows.Forms.Padding(2) Me.cmdLbeta.Name = "cmdLbeta" - Me.cmdLbeta.Size = New System.Drawing.Size(78, 38) + Me.cmdLbeta.Size = New System.Drawing.Size(62, 30) Me.cmdLbeta.TabIndex = 159 Me.cmdLbeta.Text = "lbeta" Me.cmdLbeta.UseVisualStyleBackColor = True @@ -4367,10 +4585,10 @@ Partial Class ucrCalculator ' Me.cmdqF.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdqF.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdqF.Location = New System.Drawing.Point(232, 55) - Me.cmdqF.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdqF.Location = New System.Drawing.Point(186, 44) + Me.cmdqF.Margin = New System.Windows.Forms.Padding(2) Me.cmdqF.Name = "cmdqF" - Me.cmdqF.Size = New System.Drawing.Size(78, 38) + Me.cmdqF.Size = New System.Drawing.Size(62, 30) Me.cmdqF.TabIndex = 162 Me.cmdqF.Text = "qf" Me.cmdqF.UseVisualStyleBackColor = True @@ -4379,10 +4597,10 @@ Partial Class ucrCalculator ' Me.cmdFact.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFact.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFact.Location = New System.Drawing.Point(2, 163) - Me.cmdFact.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFact.Location = New System.Drawing.Point(2, 130) + Me.cmdFact.Margin = New System.Windows.Forms.Padding(2) Me.cmdFact.Name = "cmdFact" - Me.cmdFact.Size = New System.Drawing.Size(78, 38) + Me.cmdFact.Size = New System.Drawing.Size(62, 30) Me.cmdFact.TabIndex = 154 Me.cmdFact.Text = "fact" Me.cmdFact.UseVisualStyleBackColor = True @@ -4391,10 +4609,10 @@ Partial Class ucrCalculator ' Me.cmdChoose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdChoose.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdChoose.Location = New System.Drawing.Point(78, 163) - Me.cmdChoose.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdChoose.Location = New System.Drawing.Point(62, 130) + Me.cmdChoose.Margin = New System.Windows.Forms.Padding(2) Me.cmdChoose.Name = "cmdChoose" - Me.cmdChoose.Size = New System.Drawing.Size(78, 38) + Me.cmdChoose.Size = New System.Drawing.Size(62, 30) Me.cmdChoose.TabIndex = 161 Me.cmdChoose.Text = "choose" Me.cmdChoose.UseVisualStyleBackColor = True @@ -4403,10 +4621,10 @@ Partial Class ucrCalculator ' Me.cmdPf.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPf.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPf.Location = New System.Drawing.Point(232, 18) - Me.cmdPf.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPf.Location = New System.Drawing.Point(186, 14) + Me.cmdPf.Margin = New System.Windows.Forms.Padding(2) Me.cmdPf.Name = "cmdPf" - Me.cmdPf.Size = New System.Drawing.Size(78, 38) + Me.cmdPf.Size = New System.Drawing.Size(62, 30) Me.cmdPf.TabIndex = 156 Me.cmdPf.Text = "pf" Me.cmdPf.UseVisualStyleBackColor = True @@ -4415,10 +4633,10 @@ Partial Class ucrCalculator ' Me.cmdPChisq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPChisq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPChisq.Location = New System.Drawing.Point(155, 18) - Me.cmdPChisq.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPChisq.Location = New System.Drawing.Point(124, 14) + Me.cmdPChisq.Margin = New System.Windows.Forms.Padding(2) Me.cmdPChisq.Name = "cmdPChisq" - Me.cmdPChisq.Size = New System.Drawing.Size(78, 38) + Me.cmdPChisq.Size = New System.Drawing.Size(62, 30) Me.cmdPChisq.TabIndex = 155 Me.cmdPChisq.Text = "pchisq" Me.cmdPChisq.UseVisualStyleBackColor = True @@ -4427,10 +4645,10 @@ Partial Class ucrCalculator ' Me.cmdLgamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLgamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLgamma.Location = New System.Drawing.Point(232, 200) - Me.cmdLgamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLgamma.Location = New System.Drawing.Point(186, 160) + Me.cmdLgamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdLgamma.Name = "cmdLgamma" - Me.cmdLgamma.Size = New System.Drawing.Size(78, 38) + Me.cmdLgamma.Size = New System.Drawing.Size(62, 30) Me.cmdLgamma.TabIndex = 152 Me.cmdLgamma.Text = "lgamma" Me.cmdLgamma.UseVisualStyleBackColor = True @@ -4439,10 +4657,10 @@ Partial Class ucrCalculator ' Me.cmdPnorm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPnorm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPnorm.Location = New System.Drawing.Point(2, 18) - Me.cmdPnorm.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPnorm.Location = New System.Drawing.Point(2, 14) + Me.cmdPnorm.Margin = New System.Windows.Forms.Padding(2) Me.cmdPnorm.Name = "cmdPnorm" - Me.cmdPnorm.Size = New System.Drawing.Size(78, 38) + Me.cmdPnorm.Size = New System.Drawing.Size(62, 30) Me.cmdPnorm.TabIndex = 148 Me.cmdPnorm.Text = "pnorm" Me.cmdPnorm.UseVisualStyleBackColor = True @@ -4451,10 +4669,10 @@ Partial Class ucrCalculator ' Me.cmdQchisq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQchisq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQchisq.Location = New System.Drawing.Point(155, 55) - Me.cmdQchisq.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQchisq.Location = New System.Drawing.Point(124, 44) + Me.cmdQchisq.Margin = New System.Windows.Forms.Padding(2) Me.cmdQchisq.Name = "cmdQchisq" - Me.cmdQchisq.Size = New System.Drawing.Size(78, 38) + Me.cmdQchisq.Size = New System.Drawing.Size(62, 30) Me.cmdQchisq.TabIndex = 160 Me.cmdQchisq.Text = "qchisq" Me.cmdQchisq.UseVisualStyleBackColor = True @@ -4463,10 +4681,10 @@ Partial Class ucrCalculator ' Me.cmdQt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQt.Location = New System.Drawing.Point(78, 55) - Me.cmdQt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQt.Location = New System.Drawing.Point(62, 44) + Me.cmdQt.Margin = New System.Windows.Forms.Padding(2) Me.cmdQt.Name = "cmdQt" - Me.cmdQt.Size = New System.Drawing.Size(78, 38) + Me.cmdQt.Size = New System.Drawing.Size(62, 30) Me.cmdQt.TabIndex = 158 Me.cmdQt.Text = "qt" Me.cmdQt.UseVisualStyleBackColor = True @@ -4475,10 +4693,10 @@ Partial Class ucrCalculator ' Me.cmdQnorm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQnorm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQnorm.Location = New System.Drawing.Point(2, 55) - Me.cmdQnorm.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQnorm.Location = New System.Drawing.Point(2, 44) + Me.cmdQnorm.Margin = New System.Windows.Forms.Padding(2) Me.cmdQnorm.Name = "cmdQnorm" - Me.cmdQnorm.Size = New System.Drawing.Size(78, 38) + Me.cmdQnorm.Size = New System.Drawing.Size(62, 30) Me.cmdQnorm.TabIndex = 157 Me.cmdQnorm.Text = "qnorm" Me.cmdQnorm.UseVisualStyleBackColor = True @@ -4487,10 +4705,10 @@ Partial Class ucrCalculator ' Me.cmdPt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPt.Location = New System.Drawing.Point(78, 18) - Me.cmdPt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPt.Location = New System.Drawing.Point(62, 14) + Me.cmdPt.Margin = New System.Windows.Forms.Padding(2) Me.cmdPt.Name = "cmdPt" - Me.cmdPt.Size = New System.Drawing.Size(78, 38) + Me.cmdPt.Size = New System.Drawing.Size(62, 30) Me.cmdPt.TabIndex = 153 Me.cmdPt.Text = "pt" Me.cmdPt.UseVisualStyleBackColor = True @@ -4499,10 +4717,10 @@ Partial Class ucrCalculator ' Me.cmdLchoose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLchoose.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLchoose.Location = New System.Drawing.Point(78, 200) - Me.cmdLchoose.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLchoose.Location = New System.Drawing.Point(62, 160) + Me.cmdLchoose.Margin = New System.Windows.Forms.Padding(2) Me.cmdLchoose.Name = "cmdLchoose" - Me.cmdLchoose.Size = New System.Drawing.Size(78, 38) + Me.cmdLchoose.Size = New System.Drawing.Size(62, 30) Me.cmdLchoose.TabIndex = 151 Me.cmdLchoose.Text = "lchoose" Me.cmdLchoose.UseVisualStyleBackColor = True @@ -4511,10 +4729,10 @@ Partial Class ucrCalculator ' Me.cmdLfact.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLfact.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLfact.Location = New System.Drawing.Point(2, 200) - Me.cmdLfact.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLfact.Location = New System.Drawing.Point(2, 160) + Me.cmdLfact.Margin = New System.Windows.Forms.Padding(2) Me.cmdLfact.Name = "cmdLfact" - Me.cmdLfact.Size = New System.Drawing.Size(78, 38) + Me.cmdLfact.Size = New System.Drawing.Size(62, 30) Me.cmdLfact.TabIndex = 150 Me.cmdLfact.Text = "lfact" Me.cmdLfact.UseVisualStyleBackColor = True @@ -4523,10 +4741,10 @@ Partial Class ucrCalculator ' Me.cmdTrigamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrigamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrigamma.Location = New System.Drawing.Point(308, 200) - Me.cmdTrigamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTrigamma.Location = New System.Drawing.Point(246, 160) + Me.cmdTrigamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrigamma.Name = "cmdTrigamma" - Me.cmdTrigamma.Size = New System.Drawing.Size(78, 38) + Me.cmdTrigamma.Size = New System.Drawing.Size(62, 30) Me.cmdTrigamma.TabIndex = 149 Me.cmdTrigamma.Text = "trigamma" Me.cmdTrigamma.UseVisualStyleBackColor = True @@ -4535,10 +4753,10 @@ Partial Class ucrCalculator ' Me.cmdBeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdBeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBeta.Location = New System.Drawing.Point(155, 163) - Me.cmdBeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdBeta.Location = New System.Drawing.Point(124, 130) + Me.cmdBeta.Margin = New System.Windows.Forms.Padding(2) Me.cmdBeta.Name = "cmdBeta" - Me.cmdBeta.Size = New System.Drawing.Size(78, 38) + Me.cmdBeta.Size = New System.Drawing.Size(62, 30) Me.cmdBeta.TabIndex = 149 Me.cmdBeta.Text = "beta" Me.cmdBeta.UseVisualStyleBackColor = True @@ -4547,10 +4765,10 @@ Partial Class ucrCalculator ' Me.cmdDigamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdDigamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDigamma.Location = New System.Drawing.Point(308, 163) - Me.cmdDigamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDigamma.Location = New System.Drawing.Point(246, 130) + Me.cmdDigamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdDigamma.Name = "cmdDigamma" - Me.cmdDigamma.Size = New System.Drawing.Size(78, 38) + Me.cmdDigamma.Size = New System.Drawing.Size(62, 30) Me.cmdDigamma.TabIndex = 164 Me.cmdDigamma.Text = "digamma" Me.cmdDigamma.UseVisualStyleBackColor = True @@ -4589,9 +4807,11 @@ Partial Class ucrCalculator Me.grpTransform.Controls.Add(Me.cmdPMax) Me.grpTransform.Controls.Add(Me.cmdLead) Me.grpTransform.Controls.Add(Me.cmdLag) - Me.grpTransform.Location = New System.Drawing.Point(542, 78) + Me.grpTransform.Location = New System.Drawing.Point(434, 62) + Me.grpTransform.Margin = New System.Windows.Forms.Padding(2) Me.grpTransform.Name = "grpTransform" - Me.grpTransform.Size = New System.Drawing.Size(388, 313) + Me.grpTransform.Padding = New System.Windows.Forms.Padding(2) + Me.grpTransform.Size = New System.Drawing.Size(310, 250) Me.grpTransform.TabIndex = 189 Me.grpTransform.TabStop = False Me.grpTransform.Text = "Transform" @@ -4599,9 +4819,10 @@ Partial Class ucrCalculator 'cmdDecimals ' Me.cmdDecimals.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDecimals.Location = New System.Drawing.Point(2, 237) + Me.cmdDecimals.Location = New System.Drawing.Point(2, 190) + Me.cmdDecimals.Margin = New System.Windows.Forms.Padding(2) Me.cmdDecimals.Name = "cmdDecimals" - Me.cmdDecimals.Size = New System.Drawing.Size(78, 38) + Me.cmdDecimals.Size = New System.Drawing.Size(62, 30) Me.cmdDecimals.TabIndex = 207 Me.cmdDecimals.Text = "decimals" Me.cmdDecimals.UseVisualStyleBackColor = True @@ -4609,9 +4830,10 @@ Partial Class ucrCalculator 'cmdMASSFractions ' Me.cmdMASSFractions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMASSFractions.Location = New System.Drawing.Point(2, 200) + Me.cmdMASSFractions.Location = New System.Drawing.Point(2, 160) + Me.cmdMASSFractions.Margin = New System.Windows.Forms.Padding(2) Me.cmdMASSFractions.Name = "cmdMASSFractions" - Me.cmdMASSFractions.Size = New System.Drawing.Size(78, 38) + Me.cmdMASSFractions.Size = New System.Drawing.Size(62, 30) Me.cmdMASSFractions.TabIndex = 206 Me.cmdMASSFractions.Text = "fractions" Me.cmdMASSFractions.UseVisualStyleBackColor = True @@ -4619,50 +4841,65 @@ Partial Class ucrCalculator 'cmdScale ' Me.cmdScale.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdScale.Location = New System.Drawing.Point(2, 163) + Me.cmdScale.Location = New System.Drawing.Point(2, 130) + Me.cmdScale.Margin = New System.Windows.Forms.Padding(2) Me.cmdScale.Name = "cmdScale" - Me.cmdScale.Size = New System.Drawing.Size(78, 38) + Me.cmdScale.Size = New System.Drawing.Size(62, 30) Me.cmdScale.TabIndex = 205 Me.cmdScale.Text = "scale" Me.cmdScale.UseVisualStyleBackColor = True ' + 'cmdTransformRHelp + ' + Me.cmdTransformRHelp.AutoSize = True + Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.Location = New System.Drawing.Point(214, 196) + Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTransformRHelp.Name = "cmdTransformRHelp" + Me.cmdTransformRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.TabIndex = 204 + Me.cmdTransformRHelp.Text = "R Help" + Me.cmdTransformRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripTransform ' Me.ContextMenuStripTransform.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripTransform.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BaseToolStripMenuItem, Me.DplyrToolStripMenuItem, Me.MASSToolStripMenuItem, Me.ZooToolStripMenuItem}) Me.ContextMenuStripTransform.Name = "ContextMenuStrip1" - Me.ContextMenuStripTransform.Size = New System.Drawing.Size(118, 100) + Me.ContextMenuStripTransform.Size = New System.Drawing.Size(106, 92) ' 'BaseToolStripMenuItem ' Me.BaseToolStripMenuItem.Name = "BaseToolStripMenuItem" - Me.BaseToolStripMenuItem.Size = New System.Drawing.Size(117, 24) + Me.BaseToolStripMenuItem.Size = New System.Drawing.Size(105, 22) Me.BaseToolStripMenuItem.Text = "base" ' 'DplyrToolStripMenuItem ' Me.DplyrToolStripMenuItem.Name = "DplyrToolStripMenuItem" - Me.DplyrToolStripMenuItem.Size = New System.Drawing.Size(117, 24) + Me.DplyrToolStripMenuItem.Size = New System.Drawing.Size(105, 22) Me.DplyrToolStripMenuItem.Text = "dplyr" ' 'MASSToolStripMenuItem ' Me.MASSToolStripMenuItem.Name = "MASSToolStripMenuItem" - Me.MASSToolStripMenuItem.Size = New System.Drawing.Size(117, 24) + Me.MASSToolStripMenuItem.Size = New System.Drawing.Size(105, 22) Me.MASSToolStripMenuItem.Text = "MASS" ' 'ZooToolStripMenuItem ' Me.ZooToolStripMenuItem.Name = "ZooToolStripMenuItem" - Me.ZooToolStripMenuItem.Size = New System.Drawing.Size(117, 24) + Me.ZooToolStripMenuItem.Size = New System.Drawing.Size(105, 22) Me.ZooToolStripMenuItem.Text = "zoo" ' 'cmdRev ' Me.cmdRev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRev.Location = New System.Drawing.Point(155, 128) + Me.cmdRev.Location = New System.Drawing.Point(124, 102) + Me.cmdRev.Margin = New System.Windows.Forms.Padding(2) Me.cmdRev.Name = "cmdRev" - Me.cmdRev.Size = New System.Drawing.Size(78, 38) + Me.cmdRev.Size = New System.Drawing.Size(62, 30) Me.cmdRev.TabIndex = 203 Me.cmdRev.Text = "rev" Me.cmdRev.UseVisualStyleBackColor = True @@ -4670,9 +4907,10 @@ Partial Class ucrCalculator 'cmdMovProd ' Me.cmdMovProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovProd.Location = New System.Drawing.Point(155, 92) + Me.cmdMovProd.Location = New System.Drawing.Point(124, 74) + Me.cmdMovProd.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovProd.Name = "cmdMovProd" - Me.cmdMovProd.Size = New System.Drawing.Size(78, 38) + Me.cmdMovProd.Size = New System.Drawing.Size(62, 30) Me.cmdMovProd.TabIndex = 202 Me.cmdMovProd.Text = "movprod" Me.cmdMovProd.UseVisualStyleBackColor = True @@ -4680,9 +4918,10 @@ Partial Class ucrCalculator 'cmdCumProd ' Me.cmdCumProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumProd.Location = New System.Drawing.Point(155, 55) + Me.cmdCumProd.Location = New System.Drawing.Point(124, 44) + Me.cmdCumProd.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumProd.Name = "cmdCumProd" - Me.cmdCumProd.Size = New System.Drawing.Size(78, 38) + Me.cmdCumProd.Size = New System.Drawing.Size(62, 30) Me.cmdCumProd.TabIndex = 201 Me.cmdCumProd.Text = "cumprod" Me.cmdCumProd.UseVisualStyleBackColor = True @@ -4690,9 +4929,10 @@ Partial Class ucrCalculator 'cmdSortF ' Me.cmdSortF.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSortF.Location = New System.Drawing.Point(2, 18) + Me.cmdSortF.Location = New System.Drawing.Point(2, 14) + Me.cmdSortF.Margin = New System.Windows.Forms.Padding(2) Me.cmdSortF.Name = "cmdSortF" - Me.cmdSortF.Size = New System.Drawing.Size(78, 38) + Me.cmdSortF.Size = New System.Drawing.Size(62, 30) Me.cmdSortF.TabIndex = 198 Me.cmdSortF.Text = "sort" Me.cmdSortF.UseVisualStyleBackColor = True @@ -4700,9 +4940,10 @@ Partial Class ucrCalculator 'cmdNasplin ' Me.cmdNasplin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNasplin.Location = New System.Drawing.Point(308, 200) + Me.cmdNasplin.Location = New System.Drawing.Point(246, 160) + Me.cmdNasplin.Margin = New System.Windows.Forms.Padding(2) Me.cmdNasplin.Name = "cmdNasplin" - Me.cmdNasplin.Size = New System.Drawing.Size(78, 38) + Me.cmdNasplin.Size = New System.Drawing.Size(62, 30) Me.cmdNasplin.TabIndex = 197 Me.cmdNasplin.Text = "nasplin" Me.cmdNasplin.UseVisualStyleBackColor = True @@ -4710,9 +4951,10 @@ Partial Class ucrCalculator 'cmdNaapprox ' Me.cmdNaapprox.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaapprox.Location = New System.Drawing.Point(232, 200) + Me.cmdNaapprox.Location = New System.Drawing.Point(186, 160) + Me.cmdNaapprox.Margin = New System.Windows.Forms.Padding(2) Me.cmdNaapprox.Name = "cmdNaapprox" - Me.cmdNaapprox.Size = New System.Drawing.Size(78, 38) + Me.cmdNaapprox.Size = New System.Drawing.Size(62, 30) Me.cmdNaapprox.TabIndex = 196 Me.cmdNaapprox.Text = "naapprox" Me.cmdNaapprox.UseVisualStyleBackColor = True @@ -4720,9 +4962,10 @@ Partial Class ucrCalculator 'cmdNaest ' Me.cmdNaest.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaest.Location = New System.Drawing.Point(155, 200) + Me.cmdNaest.Location = New System.Drawing.Point(124, 160) + Me.cmdNaest.Margin = New System.Windows.Forms.Padding(2) Me.cmdNaest.Name = "cmdNaest" - Me.cmdNaest.Size = New System.Drawing.Size(78, 38) + Me.cmdNaest.Size = New System.Drawing.Size(62, 30) Me.cmdNaest.TabIndex = 195 Me.cmdNaest.Text = "naest" Me.cmdNaest.UseVisualStyleBackColor = True @@ -4730,9 +4973,10 @@ Partial Class ucrCalculator 'cmdNafill ' Me.cmdNafill.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNafill.Location = New System.Drawing.Point(78, 200) + Me.cmdNafill.Location = New System.Drawing.Point(62, 160) + Me.cmdNafill.Margin = New System.Windows.Forms.Padding(2) Me.cmdNafill.Name = "cmdNafill" - Me.cmdNafill.Size = New System.Drawing.Size(78, 38) + Me.cmdNafill.Size = New System.Drawing.Size(62, 30) Me.cmdNafill.TabIndex = 194 Me.cmdNafill.Text = "nafill" Me.cmdNafill.UseVisualStyleBackColor = True @@ -4740,9 +4984,10 @@ Partial Class ucrCalculator 'cmdMovmin ' Me.cmdMovmin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovmin.Location = New System.Drawing.Point(308, 92) + Me.cmdMovmin.Location = New System.Drawing.Point(246, 74) + Me.cmdMovmin.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovmin.Name = "cmdMovmin" - Me.cmdMovmin.Size = New System.Drawing.Size(78, 38) + Me.cmdMovmin.Size = New System.Drawing.Size(62, 30) Me.cmdMovmin.TabIndex = 193 Me.cmdMovmin.Text = "movmin" Me.cmdMovmin.UseVisualStyleBackColor = True @@ -4750,9 +4995,10 @@ Partial Class ucrCalculator 'cmdRowRank ' Me.cmdRowRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRowRank.Location = New System.Drawing.Point(78, 163) + Me.cmdRowRank.Location = New System.Drawing.Point(62, 130) + Me.cmdRowRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdRowRank.Name = "cmdRowRank" - Me.cmdRowRank.Size = New System.Drawing.Size(78, 38) + Me.cmdRowRank.Size = New System.Drawing.Size(62, 30) Me.cmdRowRank.TabIndex = 192 Me.cmdRowRank.Text = "r_rank" Me.cmdRowRank.UseVisualStyleBackColor = True @@ -4760,9 +5006,10 @@ Partial Class ucrCalculator 'cmdDiff ' Me.cmdDiff.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDiff.Location = New System.Drawing.Point(78, 128) + Me.cmdDiff.Location = New System.Drawing.Point(62, 102) + Me.cmdDiff.Margin = New System.Windows.Forms.Padding(2) Me.cmdDiff.Name = "cmdDiff" - Me.cmdDiff.Size = New System.Drawing.Size(78, 38) + Me.cmdDiff.Size = New System.Drawing.Size(62, 30) Me.cmdDiff.TabIndex = 191 Me.cmdDiff.Text = "diff" Me.cmdDiff.UseVisualStyleBackColor = True @@ -4770,9 +5017,10 @@ Partial Class ucrCalculator 'cmdCumdist ' Me.cmdCumdist.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumdist.Location = New System.Drawing.Point(308, 128) + Me.cmdCumdist.Location = New System.Drawing.Point(246, 102) + Me.cmdCumdist.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumdist.Name = "cmdCumdist" - Me.cmdCumdist.Size = New System.Drawing.Size(78, 38) + Me.cmdCumdist.Size = New System.Drawing.Size(62, 30) Me.cmdCumdist.TabIndex = 190 Me.cmdCumdist.Text = "cumdist" Me.cmdCumdist.UseVisualStyleBackColor = True @@ -4780,9 +5028,10 @@ Partial Class ucrCalculator 'cmdMovMean ' Me.cmdMovMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovMean.Location = New System.Drawing.Point(232, 92) + Me.cmdMovMean.Location = New System.Drawing.Point(186, 74) + Me.cmdMovMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovMean.Name = "cmdMovMean" - Me.cmdMovMean.Size = New System.Drawing.Size(78, 38) + Me.cmdMovMean.Size = New System.Drawing.Size(62, 30) Me.cmdMovMean.TabIndex = 189 Me.cmdMovMean.Text = "movmean" Me.cmdMovMean.UseVisualStyleBackColor = True @@ -4790,9 +5039,10 @@ Partial Class ucrCalculator 'cmdCumMean ' Me.cmdCumMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMean.Location = New System.Drawing.Point(232, 55) + Me.cmdCumMean.Location = New System.Drawing.Point(186, 44) + Me.cmdCumMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumMean.Name = "cmdCumMean" - Me.cmdCumMean.Size = New System.Drawing.Size(78, 38) + Me.cmdCumMean.Size = New System.Drawing.Size(62, 30) Me.cmdCumMean.TabIndex = 188 Me.cmdCumMean.Text = "cummean" Me.cmdCumMean.UseVisualStyleBackColor = True @@ -4800,9 +5050,10 @@ Partial Class ucrCalculator 'cmdNtile ' Me.cmdNtile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNtile.Location = New System.Drawing.Point(232, 128) + Me.cmdNtile.Location = New System.Drawing.Point(186, 102) + Me.cmdNtile.Margin = New System.Windows.Forms.Padding(2) Me.cmdNtile.Name = "cmdNtile" - Me.cmdNtile.Size = New System.Drawing.Size(78, 38) + Me.cmdNtile.Size = New System.Drawing.Size(62, 30) Me.cmdNtile.TabIndex = 187 Me.cmdNtile.Text = "ntile" Me.cmdNtile.UseVisualStyleBackColor = True @@ -4810,9 +5061,10 @@ Partial Class ucrCalculator 'cmMovMed ' Me.cmMovMed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmMovMed.Location = New System.Drawing.Point(2, 128) + Me.cmMovMed.Location = New System.Drawing.Point(2, 102) + Me.cmMovMed.Margin = New System.Windows.Forms.Padding(2) Me.cmMovMed.Name = "cmMovMed" - Me.cmMovMed.Size = New System.Drawing.Size(78, 38) + Me.cmMovMed.Size = New System.Drawing.Size(62, 30) Me.cmMovMed.TabIndex = 186 Me.cmMovMed.Text = "movmed" Me.cmMovMed.UseVisualStyleBackColor = True @@ -4820,9 +5072,10 @@ Partial Class ucrCalculator 'cmdMRank ' Me.cmdMRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMRank.Location = New System.Drawing.Point(308, 163) + Me.cmdMRank.Location = New System.Drawing.Point(246, 130) + Me.cmdMRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdMRank.Name = "cmdMRank" - Me.cmdMRank.Size = New System.Drawing.Size(78, 38) + Me.cmdMRank.Size = New System.Drawing.Size(62, 30) Me.cmdMRank.TabIndex = 185 Me.cmdMRank.Text = "m_rank" Me.cmdMRank.UseVisualStyleBackColor = True @@ -4830,9 +5083,10 @@ Partial Class ucrCalculator 'cmdDRank ' Me.cmdDRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDRank.Location = New System.Drawing.Point(232, 163) + Me.cmdDRank.Location = New System.Drawing.Point(186, 130) + Me.cmdDRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdDRank.Name = "cmdDRank" - Me.cmdDRank.Size = New System.Drawing.Size(78, 38) + Me.cmdDRank.Size = New System.Drawing.Size(62, 30) Me.cmdDRank.TabIndex = 184 Me.cmdDRank.Text = "d_rank" Me.cmdDRank.UseVisualStyleBackColor = True @@ -4840,9 +5094,10 @@ Partial Class ucrCalculator 'cmdMovMax ' Me.cmdMovMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovMax.Location = New System.Drawing.Point(2, 92) + Me.cmdMovMax.Location = New System.Drawing.Point(2, 74) + Me.cmdMovMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovMax.Name = "cmdMovMax" - Me.cmdMovMax.Size = New System.Drawing.Size(78, 38) + Me.cmdMovMax.Size = New System.Drawing.Size(62, 30) Me.cmdMovMax.TabIndex = 183 Me.cmdMovMax.Text = "movmax" Me.cmdMovMax.UseVisualStyleBackColor = True @@ -4850,9 +5105,10 @@ Partial Class ucrCalculator 'cmdMovSum ' Me.cmdMovSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovSum.Location = New System.Drawing.Point(78, 92) + Me.cmdMovSum.Location = New System.Drawing.Point(62, 74) + Me.cmdMovSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovSum.Name = "cmdMovSum" - Me.cmdMovSum.Size = New System.Drawing.Size(78, 38) + Me.cmdMovSum.Size = New System.Drawing.Size(62, 30) Me.cmdMovSum.TabIndex = 182 Me.cmdMovSum.Text = "movsum" Me.cmdMovSum.UseVisualStyleBackColor = True @@ -4861,10 +5117,10 @@ Partial Class ucrCalculator ' Me.cmdPercentRank.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPercentRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPercentRank.Location = New System.Drawing.Point(155, 163) - Me.cmdPercentRank.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPercentRank.Location = New System.Drawing.Point(124, 130) + Me.cmdPercentRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdPercentRank.Name = "cmdPercentRank" - Me.cmdPercentRank.Size = New System.Drawing.Size(78, 38) + Me.cmdPercentRank.Size = New System.Drawing.Size(62, 30) Me.cmdPercentRank.TabIndex = 181 Me.cmdPercentRank.Text = "% rank" Me.cmdPercentRank.UseVisualStyleBackColor = True @@ -4872,9 +5128,10 @@ Partial Class ucrCalculator 'cmdCumSum ' Me.cmdCumSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumSum.Location = New System.Drawing.Point(78, 55) + Me.cmdCumSum.Location = New System.Drawing.Point(62, 44) + Me.cmdCumSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumSum.Name = "cmdCumSum" - Me.cmdCumSum.Size = New System.Drawing.Size(78, 38) + Me.cmdCumSum.Size = New System.Drawing.Size(62, 30) Me.cmdCumSum.TabIndex = 180 Me.cmdCumSum.Text = "cumsum" Me.cmdCumSum.UseVisualStyleBackColor = True @@ -4882,9 +5139,10 @@ Partial Class ucrCalculator 'cmdCumMin ' Me.cmdCumMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMin.Location = New System.Drawing.Point(308, 55) + Me.cmdCumMin.Location = New System.Drawing.Point(246, 44) + Me.cmdCumMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumMin.Name = "cmdCumMin" - Me.cmdCumMin.Size = New System.Drawing.Size(78, 38) + Me.cmdCumMin.Size = New System.Drawing.Size(62, 30) Me.cmdCumMin.TabIndex = 179 Me.cmdCumMin.Text = "cummin" Me.cmdCumMin.UseVisualStyleBackColor = True @@ -4892,9 +5150,10 @@ Partial Class ucrCalculator 'cmdCumMax ' Me.cmdCumMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMax.Location = New System.Drawing.Point(2, 55) + Me.cmdCumMax.Location = New System.Drawing.Point(2, 44) + Me.cmdCumMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumMax.Name = "cmdCumMax" - Me.cmdCumMax.Size = New System.Drawing.Size(78, 38) + Me.cmdCumMax.Size = New System.Drawing.Size(62, 30) Me.cmdCumMax.TabIndex = 178 Me.cmdCumMax.Text = "cummax" Me.cmdCumMax.UseVisualStyleBackColor = True @@ -4902,9 +5161,10 @@ Partial Class ucrCalculator 'cmdPMin ' Me.cmdPMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPMin.Location = New System.Drawing.Point(308, 18) + Me.cmdPMin.Location = New System.Drawing.Point(246, 14) + Me.cmdPMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdPMin.Name = "cmdPMin" - Me.cmdPMin.Size = New System.Drawing.Size(78, 38) + Me.cmdPMin.Size = New System.Drawing.Size(62, 30) Me.cmdPMin.TabIndex = 177 Me.cmdPMin.Text = "pmin" Me.cmdPMin.UseVisualStyleBackColor = True @@ -4912,9 +5172,10 @@ Partial Class ucrCalculator 'cmdPMax ' Me.cmdPMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPMax.Location = New System.Drawing.Point(232, 18) + Me.cmdPMax.Location = New System.Drawing.Point(186, 14) + Me.cmdPMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdPMax.Name = "cmdPMax" - Me.cmdPMax.Size = New System.Drawing.Size(78, 38) + Me.cmdPMax.Size = New System.Drawing.Size(62, 30) Me.cmdPMax.TabIndex = 176 Me.cmdPMax.Text = "pmax" Me.cmdPMax.UseVisualStyleBackColor = True @@ -4922,9 +5183,10 @@ Partial Class ucrCalculator 'cmdLead ' Me.cmdLead.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLead.Location = New System.Drawing.Point(155, 18) + Me.cmdLead.Location = New System.Drawing.Point(124, 14) + Me.cmdLead.Margin = New System.Windows.Forms.Padding(2) Me.cmdLead.Name = "cmdLead" - Me.cmdLead.Size = New System.Drawing.Size(78, 38) + Me.cmdLead.Size = New System.Drawing.Size(62, 30) Me.cmdLead.TabIndex = 175 Me.cmdLead.Text = "lead" Me.cmdLead.UseVisualStyleBackColor = True @@ -4932,9 +5194,10 @@ Partial Class ucrCalculator 'cmdLag ' Me.cmdLag.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLag.Location = New System.Drawing.Point(78, 18) + Me.cmdLag.Location = New System.Drawing.Point(62, 14) + Me.cmdLag.Margin = New System.Windows.Forms.Padding(2) Me.cmdLag.Name = "cmdLag" - Me.cmdLag.Size = New System.Drawing.Size(78, 38) + Me.cmdLag.Size = New System.Drawing.Size(62, 30) Me.cmdLag.TabIndex = 174 Me.cmdLag.Text = "lag" Me.cmdLag.UseVisualStyleBackColor = True @@ -4976,11 +5239,11 @@ Partial Class ucrCalculator Me.grpLogical.Controls.Add(Me.cmdNot) Me.grpLogical.Controls.Add(Me.cmdNotEqualsTo) Me.grpLogical.Controls.Add(Me.cmdEquivalent) - Me.grpLogical.Location = New System.Drawing.Point(542, 78) - Me.grpLogical.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpLogical.Location = New System.Drawing.Point(434, 62) + Me.grpLogical.Margin = New System.Windows.Forms.Padding(2) Me.grpLogical.Name = "grpLogical" - Me.grpLogical.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpLogical.Size = New System.Drawing.Size(322, 320) + Me.grpLogical.Padding = New System.Windows.Forms.Padding(2) + Me.grpLogical.Size = New System.Drawing.Size(258, 256) Me.grpLogical.TabIndex = 183 Me.grpLogical.TabStop = False Me.grpLogical.Text = "Logical and Symbols" @@ -4988,10 +5251,10 @@ Partial Class ucrCalculator 'cmdnumeric ' Me.cmdnumeric.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnumeric.Location = New System.Drawing.Point(239, 234) - Me.cmdnumeric.Margin = New System.Windows.Forms.Padding(2, 4, 2, 4) + Me.cmdnumeric.Location = New System.Drawing.Point(191, 187) + Me.cmdnumeric.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdnumeric.Name = "cmdnumeric" - Me.cmdnumeric.Size = New System.Drawing.Size(78, 38) + Me.cmdnumeric.Size = New System.Drawing.Size(62, 30) Me.cmdnumeric.TabIndex = 216 Me.cmdnumeric.Text = "numeric" Me.cmdnumeric.UseVisualStyleBackColor = True @@ -5000,10 +5263,10 @@ Partial Class ucrCalculator ' Me.cmdCalcRepelicationFunction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCalcRepelicationFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCalcRepelicationFunction.Location = New System.Drawing.Point(5, 234) - Me.cmdCalcRepelicationFunction.Margin = New System.Windows.Forms.Padding(2, 4, 2, 4) + Me.cmdCalcRepelicationFunction.Location = New System.Drawing.Point(4, 187) + Me.cmdCalcRepelicationFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCalcRepelicationFunction.Name = "cmdCalcRepelicationFunction" - Me.cmdCalcRepelicationFunction.Size = New System.Drawing.Size(78, 38) + Me.cmdCalcRepelicationFunction.Size = New System.Drawing.Size(62, 30) Me.cmdCalcRepelicationFunction.TabIndex = 215 Me.cmdCalcRepelicationFunction.Text = "rep" Me.cmdCalcRepelicationFunction.UseVisualStyleBackColor = True @@ -5012,10 +5275,10 @@ Partial Class ucrCalculator ' Me.cmdCalcSequenceFunction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCalcSequenceFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCalcSequenceFunction.Location = New System.Drawing.Point(82, 234) - Me.cmdCalcSequenceFunction.Margin = New System.Windows.Forms.Padding(2, 4, 2, 4) + Me.cmdCalcSequenceFunction.Location = New System.Drawing.Point(66, 187) + Me.cmdCalcSequenceFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCalcSequenceFunction.Name = "cmdCalcSequenceFunction" - Me.cmdCalcSequenceFunction.Size = New System.Drawing.Size(78, 38) + Me.cmdCalcSequenceFunction.Size = New System.Drawing.Size(62, 30) Me.cmdCalcSequenceFunction.TabIndex = 214 Me.cmdCalcSequenceFunction.Tag = "Del" Me.cmdCalcSequenceFunction.Text = "seq" @@ -5024,39 +5287,53 @@ Partial Class ucrCalculator 'cmdCalcConcantenateFunction ' Me.cmdCalcConcantenateFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCalcConcantenateFunction.Location = New System.Drawing.Point(159, 234) - Me.cmdCalcConcantenateFunction.Margin = New System.Windows.Forms.Padding(2, 4, 2, 4) + Me.cmdCalcConcantenateFunction.Location = New System.Drawing.Point(127, 187) + Me.cmdCalcConcantenateFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCalcConcantenateFunction.Name = "cmdCalcConcantenateFunction" - Me.cmdCalcConcantenateFunction.Size = New System.Drawing.Size(82, 38) + Me.cmdCalcConcantenateFunction.Size = New System.Drawing.Size(66, 30) Me.cmdCalcConcantenateFunction.TabIndex = 213 Me.cmdCalcConcantenateFunction.Text = "c( )" Me.cmdCalcConcantenateFunction.UseVisualStyleBackColor = True ' + 'cmdLogicalHelp + ' + Me.cmdLogicalHelp.AutoSize = True + Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.Location = New System.Drawing.Point(166, 222) + Me.cmdLogicalHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLogicalHelp.Name = "cmdLogicalHelp" + Me.cmdLogicalHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.TabIndex = 212 + Me.cmdLogicalHelp.Text = "R Help" + Me.cmdLogicalHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripLogical ' Me.ContextMenuStripLogical.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripLogical.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LogBaseToolStripMenuItem, Me.LogDplyrToolStripMenuItem}) Me.ContextMenuStripLogical.Name = "ContextMenuStrip1" - Me.ContextMenuStripLogical.Size = New System.Drawing.Size(113, 52) + Me.ContextMenuStripLogical.Size = New System.Drawing.Size(102, 48) ' 'LogBaseToolStripMenuItem ' Me.LogBaseToolStripMenuItem.Name = "LogBaseToolStripMenuItem" - Me.LogBaseToolStripMenuItem.Size = New System.Drawing.Size(112, 24) + Me.LogBaseToolStripMenuItem.Size = New System.Drawing.Size(101, 22) Me.LogBaseToolStripMenuItem.Text = "base" ' 'LogDplyrToolStripMenuItem ' Me.LogDplyrToolStripMenuItem.Name = "LogDplyrToolStripMenuItem" - Me.LogDplyrToolStripMenuItem.Size = New System.Drawing.Size(112, 24) + Me.LogDplyrToolStripMenuItem.Size = New System.Drawing.Size(101, 22) Me.LogDplyrToolStripMenuItem.Text = "dplyr" ' 'cmdFalse ' Me.cmdFalse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFalse.Location = New System.Drawing.Point(251, 52) + Me.cmdFalse.Location = New System.Drawing.Point(201, 42) + Me.cmdFalse.Margin = New System.Windows.Forms.Padding(2) Me.cmdFalse.Name = "cmdFalse" - Me.cmdFalse.Size = New System.Drawing.Size(65, 38) + Me.cmdFalse.Size = New System.Drawing.Size(52, 30) Me.cmdFalse.TabIndex = 207 Me.cmdFalse.Text = "FALSE" Me.cmdFalse.UseVisualStyleBackColor = True @@ -5064,9 +5341,10 @@ Partial Class ucrCalculator 'cmdTrue ' Me.cmdTrue.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrue.Location = New System.Drawing.Point(251, 17) + Me.cmdTrue.Location = New System.Drawing.Point(201, 14) + Me.cmdTrue.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrue.Name = "cmdTrue" - Me.cmdTrue.Size = New System.Drawing.Size(65, 38) + Me.cmdTrue.Size = New System.Drawing.Size(52, 30) Me.cmdTrue.TabIndex = 206 Me.cmdTrue.Text = "TRUE" Me.cmdTrue.UseVisualStyleBackColor = True @@ -5074,10 +5352,10 @@ Partial Class ucrCalculator 'cmdTilde ' Me.cmdTilde.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTilde.Location = New System.Drawing.Point(159, 88) + Me.cmdTilde.Location = New System.Drawing.Point(127, 70) Me.cmdTilde.Margin = New System.Windows.Forms.Padding(2) Me.cmdTilde.Name = "cmdTilde" - Me.cmdTilde.Size = New System.Drawing.Size(45, 38) + Me.cmdTilde.Size = New System.Drawing.Size(36, 30) Me.cmdTilde.TabIndex = 205 Me.cmdTilde.Text = "~" Me.cmdTilde.UseVisualStyleBackColor = True @@ -5085,10 +5363,10 @@ Partial Class ucrCalculator 'cmdIn ' Me.cmdIn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIn.Location = New System.Drawing.Point(159, 125) - Me.cmdIn.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdIn.Location = New System.Drawing.Point(127, 100) + Me.cmdIn.Margin = New System.Windows.Forms.Padding(2) Me.cmdIn.Name = "cmdIn" - Me.cmdIn.Size = New System.Drawing.Size(82, 38) + Me.cmdIn.Size = New System.Drawing.Size(66, 30) Me.cmdIn.TabIndex = 204 Me.cmdIn.Text = "%in%" Me.cmdIn.UseVisualStyleBackColor = True @@ -5096,9 +5374,10 @@ Partial Class ucrCalculator 'cmdWhich ' Me.cmdWhich.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWhich.Location = New System.Drawing.Point(239, 125) + Me.cmdWhich.Location = New System.Drawing.Point(191, 100) + Me.cmdWhich.Margin = New System.Windows.Forms.Padding(2) Me.cmdWhich.Name = "cmdWhich" - Me.cmdWhich.Size = New System.Drawing.Size(78, 38) + Me.cmdWhich.Size = New System.Drawing.Size(62, 30) Me.cmdWhich.TabIndex = 203 Me.cmdWhich.Text = "which" Me.cmdWhich.UseVisualStyleBackColor = True @@ -5106,10 +5385,10 @@ Partial Class ucrCalculator 'cmdNA ' Me.cmdNA.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNA.Location = New System.Drawing.Point(202, 52) - Me.cmdNA.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdNA.Location = New System.Drawing.Point(162, 42) + Me.cmdNA.Margin = New System.Windows.Forms.Padding(2) Me.cmdNA.Name = "cmdNA" - Me.cmdNA.Size = New System.Drawing.Size(50, 38) + Me.cmdNA.Size = New System.Drawing.Size(40, 30) Me.cmdNA.TabIndex = 202 Me.cmdNA.Text = "NA" Me.cmdNA.UseVisualStyleBackColor = True @@ -5117,9 +5396,10 @@ Partial Class ucrCalculator 'cmdNear ' Me.cmdNear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNear.Location = New System.Drawing.Point(239, 198) + Me.cmdNear.Location = New System.Drawing.Point(191, 158) + Me.cmdNear.Margin = New System.Windows.Forms.Padding(2) Me.cmdNear.Name = "cmdNear" - Me.cmdNear.Size = New System.Drawing.Size(78, 38) + Me.cmdNear.Size = New System.Drawing.Size(62, 30) Me.cmdNear.TabIndex = 201 Me.cmdNear.Text = "near" Me.cmdNear.UseVisualStyleBackColor = True @@ -5127,9 +5407,10 @@ Partial Class ucrCalculator 'cmdBetween ' Me.cmdBetween.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBetween.Location = New System.Drawing.Point(239, 162) + Me.cmdBetween.Location = New System.Drawing.Point(191, 130) + Me.cmdBetween.Margin = New System.Windows.Forms.Padding(2) Me.cmdBetween.Name = "cmdBetween" - Me.cmdBetween.Size = New System.Drawing.Size(78, 38) + Me.cmdBetween.Size = New System.Drawing.Size(62, 30) Me.cmdBetween.TabIndex = 200 Me.cmdBetween.Text = "between" Me.cmdBetween.UseVisualStyleBackColor = True @@ -5137,9 +5418,10 @@ Partial Class ucrCalculator 'cmdIsNa ' Me.cmdIsNa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIsNa.Location = New System.Drawing.Point(5, 198) + Me.cmdIsNa.Location = New System.Drawing.Point(4, 158) + Me.cmdIsNa.Margin = New System.Windows.Forms.Padding(2) Me.cmdIsNa.Name = "cmdIsNa" - Me.cmdIsNa.Size = New System.Drawing.Size(78, 38) + Me.cmdIsNa.Size = New System.Drawing.Size(62, 30) Me.cmdIsNa.TabIndex = 195 Me.cmdIsNa.Text = "is.na" Me.cmdIsNa.UseVisualStyleBackColor = True @@ -5147,9 +5429,10 @@ Partial Class ucrCalculator 'cmdNotIsNa ' Me.cmdNotIsNa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNotIsNa.Location = New System.Drawing.Point(82, 198) + Me.cmdNotIsNa.Location = New System.Drawing.Point(66, 158) + Me.cmdNotIsNa.Margin = New System.Windows.Forms.Padding(2) Me.cmdNotIsNa.Name = "cmdNotIsNa" - Me.cmdNotIsNa.Size = New System.Drawing.Size(78, 38) + Me.cmdNotIsNa.Size = New System.Drawing.Size(62, 30) Me.cmdNotIsNa.TabIndex = 194 Me.cmdNotIsNa.Text = "!is.na" Me.cmdNotIsNa.UseVisualStyleBackColor = True @@ -5157,9 +5440,10 @@ Partial Class ucrCalculator 'cmdDuplicate ' Me.cmdDuplicate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDuplicate.Location = New System.Drawing.Point(159, 198) + Me.cmdDuplicate.Location = New System.Drawing.Point(127, 158) + Me.cmdDuplicate.Margin = New System.Windows.Forms.Padding(2) Me.cmdDuplicate.Name = "cmdDuplicate" - Me.cmdDuplicate.Size = New System.Drawing.Size(82, 38) + Me.cmdDuplicate.Size = New System.Drawing.Size(66, 30) Me.cmdDuplicate.TabIndex = 193 Me.cmdDuplicate.Text = "duplicated" Me.cmdDuplicate.UseVisualStyleBackColor = True @@ -5167,9 +5451,10 @@ Partial Class ucrCalculator 'cmdIfelse ' Me.cmdIfelse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIfelse.Location = New System.Drawing.Point(5, 162) + Me.cmdIfelse.Location = New System.Drawing.Point(4, 130) + Me.cmdIfelse.Margin = New System.Windows.Forms.Padding(2) Me.cmdIfelse.Name = "cmdIfelse" - Me.cmdIfelse.Size = New System.Drawing.Size(78, 38) + Me.cmdIfelse.Size = New System.Drawing.Size(62, 30) Me.cmdIfelse.TabIndex = 192 Me.cmdIfelse.Text = "ifelse" Me.cmdIfelse.UseVisualStyleBackColor = True @@ -5177,9 +5462,10 @@ Partial Class ucrCalculator 'cmdmatch ' Me.cmdmatch.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdmatch.Location = New System.Drawing.Point(82, 162) + Me.cmdmatch.Location = New System.Drawing.Point(66, 130) + Me.cmdmatch.Margin = New System.Windows.Forms.Padding(2) Me.cmdmatch.Name = "cmdmatch" - Me.cmdmatch.Size = New System.Drawing.Size(78, 38) + Me.cmdmatch.Size = New System.Drawing.Size(62, 30) Me.cmdmatch.TabIndex = 191 Me.cmdmatch.Text = "match" Me.cmdmatch.UseVisualStyleBackColor = True @@ -5187,9 +5473,10 @@ Partial Class ucrCalculator 'cmdwhen ' Me.cmdwhen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwhen.Location = New System.Drawing.Point(159, 162) + Me.cmdwhen.Location = New System.Drawing.Point(127, 130) + Me.cmdwhen.Margin = New System.Windows.Forms.Padding(2) Me.cmdwhen.Name = "cmdwhen" - Me.cmdwhen.Size = New System.Drawing.Size(82, 38) + Me.cmdwhen.Size = New System.Drawing.Size(66, 30) Me.cmdwhen.TabIndex = 190 Me.cmdwhen.Text = "when" Me.cmdwhen.UseVisualStyleBackColor = True @@ -5197,10 +5484,10 @@ Partial Class ucrCalculator 'cmdOpeningBracket ' Me.cmdOpeningBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOpeningBracket.Location = New System.Drawing.Point(202, 88) - Me.cmdOpeningBracket.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdOpeningBracket.Location = New System.Drawing.Point(162, 70) + Me.cmdOpeningBracket.Margin = New System.Windows.Forms.Padding(2) Me.cmdOpeningBracket.Name = "cmdOpeningBracket" - Me.cmdOpeningBracket.Size = New System.Drawing.Size(50, 38) + Me.cmdOpeningBracket.Size = New System.Drawing.Size(40, 30) Me.cmdOpeningBracket.TabIndex = 139 Me.cmdOpeningBracket.Text = "(" Me.cmdOpeningBracket.UseVisualStyleBackColor = True @@ -5209,10 +5496,10 @@ Partial Class ucrCalculator ' Me.cmdColon.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!) Me.cmdColon.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdColon.Location = New System.Drawing.Point(53, 88) - Me.cmdColon.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdColon.Location = New System.Drawing.Point(42, 70) + Me.cmdColon.Margin = New System.Windows.Forms.Padding(2) Me.cmdColon.Name = "cmdColon" - Me.cmdColon.Size = New System.Drawing.Size(50, 38) + Me.cmdColon.Size = New System.Drawing.Size(40, 30) Me.cmdColon.TabIndex = 139 Me.cmdColon.Text = ":" Me.cmdColon.UseVisualStyleBackColor = True @@ -5220,10 +5507,10 @@ Partial Class ucrCalculator 'cmdGreaterOrEqualsTo ' Me.cmdGreaterOrEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(159, 17) - Me.cmdGreaterOrEqualsTo.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(127, 14) + Me.cmdGreaterOrEqualsTo.Margin = New System.Windows.Forms.Padding(2) Me.cmdGreaterOrEqualsTo.Name = "cmdGreaterOrEqualsTo" - Me.cmdGreaterOrEqualsTo.Size = New System.Drawing.Size(45, 38) + Me.cmdGreaterOrEqualsTo.Size = New System.Drawing.Size(36, 30) Me.cmdGreaterOrEqualsTo.TabIndex = 138 Me.cmdGreaterOrEqualsTo.Text = ">=" Me.cmdGreaterOrEqualsTo.UseVisualStyleBackColor = True @@ -5231,10 +5518,10 @@ Partial Class ucrCalculator 'cmdClossingBracket ' Me.cmdClossingBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClossingBracket.Location = New System.Drawing.Point(251, 88) - Me.cmdClossingBracket.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdClossingBracket.Location = New System.Drawing.Point(201, 70) + Me.cmdClossingBracket.Margin = New System.Windows.Forms.Padding(2) Me.cmdClossingBracket.Name = "cmdClossingBracket" - Me.cmdClossingBracket.Size = New System.Drawing.Size(65, 38) + Me.cmdClossingBracket.Size = New System.Drawing.Size(52, 30) Me.cmdClossingBracket.TabIndex = 137 Me.cmdClossingBracket.Tag = "" Me.cmdClossingBracket.Text = ")" @@ -5244,10 +5531,10 @@ Partial Class ucrCalculator ' Me.cmdAnd.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!) Me.cmdAnd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnd.Location = New System.Drawing.Point(159, 52) - Me.cmdAnd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAnd.Location = New System.Drawing.Point(127, 42) + Me.cmdAnd.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnd.Name = "cmdAnd" - Me.cmdAnd.Size = New System.Drawing.Size(45, 38) + Me.cmdAnd.Size = New System.Drawing.Size(36, 30) Me.cmdAnd.TabIndex = 137 Me.cmdAnd.Tag = "And" Me.cmdAnd.Text = "&&" @@ -5257,10 +5544,10 @@ Partial Class ucrCalculator ' Me.cmdQuotes.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.cmdQuotes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuotes.Location = New System.Drawing.Point(202, 17) - Me.cmdQuotes.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQuotes.Location = New System.Drawing.Point(162, 14) + Me.cmdQuotes.Margin = New System.Windows.Forms.Padding(2) Me.cmdQuotes.Name = "cmdQuotes" - Me.cmdQuotes.Size = New System.Drawing.Size(50, 38) + Me.cmdQuotes.Size = New System.Drawing.Size(40, 30) Me.cmdQuotes.TabIndex = 135 Me.cmdQuotes.Text = """ """ Me.cmdQuotes.UseVisualStyleBackColor = True @@ -5268,10 +5555,10 @@ Partial Class ucrCalculator 'cmdSquareBrackets ' Me.cmdSquareBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSquareBrackets.Location = New System.Drawing.Point(102, 88) + Me.cmdSquareBrackets.Location = New System.Drawing.Point(82, 70) Me.cmdSquareBrackets.Margin = New System.Windows.Forms.Padding(2) Me.cmdSquareBrackets.Name = "cmdSquareBrackets" - Me.cmdSquareBrackets.Size = New System.Drawing.Size(58, 38) + Me.cmdSquareBrackets.Size = New System.Drawing.Size(46, 30) Me.cmdSquareBrackets.TabIndex = 134 Me.cmdSquareBrackets.Text = "[ ]" Me.cmdSquareBrackets.UseVisualStyleBackColor = True @@ -5279,10 +5566,10 @@ Partial Class ucrCalculator 'cmdIntegerDivision ' Me.cmdIntegerDivision.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIntegerDivision.Location = New System.Drawing.Point(82, 125) - Me.cmdIntegerDivision.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdIntegerDivision.Location = New System.Drawing.Point(66, 100) + Me.cmdIntegerDivision.Margin = New System.Windows.Forms.Padding(2) Me.cmdIntegerDivision.Name = "cmdIntegerDivision" - Me.cmdIntegerDivision.Size = New System.Drawing.Size(78, 38) + Me.cmdIntegerDivision.Size = New System.Drawing.Size(62, 30) Me.cmdIntegerDivision.TabIndex = 135 Me.cmdIntegerDivision.Text = "div (%/%)" Me.cmdIntegerDivision.UseVisualStyleBackColor = True @@ -5290,10 +5577,10 @@ Partial Class ucrCalculator 'cmdModulas ' Me.cmdModulas.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdModulas.Location = New System.Drawing.Point(5, 125) + Me.cmdModulas.Location = New System.Drawing.Point(4, 100) Me.cmdModulas.Margin = New System.Windows.Forms.Padding(2) Me.cmdModulas.Name = "cmdModulas" - Me.cmdModulas.Size = New System.Drawing.Size(78, 38) + Me.cmdModulas.Size = New System.Drawing.Size(62, 30) Me.cmdModulas.TabIndex = 134 Me.cmdModulas.Text = "mod (%%)" Me.cmdModulas.UseVisualStyleBackColor = True @@ -5301,10 +5588,10 @@ Partial Class ucrCalculator 'cmdGreater ' Me.cmdGreater.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGreater.Location = New System.Drawing.Point(102, 17) - Me.cmdGreater.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdGreater.Location = New System.Drawing.Point(82, 14) + Me.cmdGreater.Margin = New System.Windows.Forms.Padding(2) Me.cmdGreater.Name = "cmdGreater" - Me.cmdGreater.Size = New System.Drawing.Size(58, 38) + Me.cmdGreater.Size = New System.Drawing.Size(46, 30) Me.cmdGreater.TabIndex = 133 Me.cmdGreater.Text = ">" Me.cmdGreater.UseVisualStyleBackColor = True @@ -5312,10 +5599,10 @@ Partial Class ucrCalculator 'cmdLesserOrEqualsTo ' Me.cmdLesserOrEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLesserOrEqualsTo.Location = New System.Drawing.Point(53, 17) - Me.cmdLesserOrEqualsTo.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLesserOrEqualsTo.Location = New System.Drawing.Point(42, 14) + Me.cmdLesserOrEqualsTo.Margin = New System.Windows.Forms.Padding(2) Me.cmdLesserOrEqualsTo.Name = "cmdLesserOrEqualsTo" - Me.cmdLesserOrEqualsTo.Size = New System.Drawing.Size(50, 38) + Me.cmdLesserOrEqualsTo.Size = New System.Drawing.Size(40, 30) Me.cmdLesserOrEqualsTo.TabIndex = 132 Me.cmdLesserOrEqualsTo.Text = "<=" Me.cmdLesserOrEqualsTo.UseVisualStyleBackColor = True @@ -5323,10 +5610,10 @@ Partial Class ucrCalculator 'cmdLesser ' Me.cmdLesser.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLesser.Location = New System.Drawing.Point(5, 17) + Me.cmdLesser.Location = New System.Drawing.Point(4, 14) Me.cmdLesser.Margin = New System.Windows.Forms.Padding(2) Me.cmdLesser.Name = "cmdLesser" - Me.cmdLesser.Size = New System.Drawing.Size(48, 38) + Me.cmdLesser.Size = New System.Drawing.Size(38, 30) Me.cmdLesser.TabIndex = 131 Me.cmdLesser.Text = "<" Me.cmdLesser.UseVisualStyleBackColor = True @@ -5334,10 +5621,10 @@ Partial Class ucrCalculator 'cmdOr ' Me.cmdOr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr.Location = New System.Drawing.Point(102, 52) - Me.cmdOr.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdOr.Location = New System.Drawing.Point(82, 42) + Me.cmdOr.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr.Name = "cmdOr" - Me.cmdOr.Size = New System.Drawing.Size(58, 38) + Me.cmdOr.Size = New System.Drawing.Size(46, 30) Me.cmdOr.TabIndex = 130 Me.cmdOr.Text = "|" Me.cmdOr.UseVisualStyleBackColor = True @@ -5346,10 +5633,10 @@ Partial Class ucrCalculator ' Me.cmdNot.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.cmdNot.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNot.Location = New System.Drawing.Point(5, 88) - Me.cmdNot.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdNot.Location = New System.Drawing.Point(4, 70) + Me.cmdNot.Margin = New System.Windows.Forms.Padding(2) Me.cmdNot.Name = "cmdNot" - Me.cmdNot.Size = New System.Drawing.Size(48, 38) + Me.cmdNot.Size = New System.Drawing.Size(38, 30) Me.cmdNot.TabIndex = 129 Me.cmdNot.Text = "!" Me.cmdNot.UseVisualStyleBackColor = True @@ -5357,10 +5644,10 @@ Partial Class ucrCalculator 'cmdNotEqualsTo ' Me.cmdNotEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNotEqualsTo.Location = New System.Drawing.Point(53, 52) - Me.cmdNotEqualsTo.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdNotEqualsTo.Location = New System.Drawing.Point(42, 42) + Me.cmdNotEqualsTo.Margin = New System.Windows.Forms.Padding(2) Me.cmdNotEqualsTo.Name = "cmdNotEqualsTo" - Me.cmdNotEqualsTo.Size = New System.Drawing.Size(50, 38) + Me.cmdNotEqualsTo.Size = New System.Drawing.Size(40, 30) Me.cmdNotEqualsTo.TabIndex = 128 Me.cmdNotEqualsTo.Text = "!=" Me.cmdNotEqualsTo.UseVisualStyleBackColor = True @@ -5368,10 +5655,10 @@ Partial Class ucrCalculator 'cmdEquivalent ' Me.cmdEquivalent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEquivalent.Location = New System.Drawing.Point(5, 52) + Me.cmdEquivalent.Location = New System.Drawing.Point(4, 42) Me.cmdEquivalent.Margin = New System.Windows.Forms.Padding(2) Me.cmdEquivalent.Name = "cmdEquivalent" - Me.cmdEquivalent.Size = New System.Drawing.Size(48, 38) + Me.cmdEquivalent.Size = New System.Drawing.Size(38, 30) Me.cmdEquivalent.TabIndex = 127 Me.cmdEquivalent.Text = "==" Me.cmdEquivalent.UseVisualStyleBackColor = True @@ -5406,9 +5693,11 @@ Partial Class ucrCalculator Me.grpTestString.Controls.Add(Me.cmdLocate) Me.grpTestString.Controls.Add(Me.cmdSquishb) Me.grpTestString.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.grpTestString.Location = New System.Drawing.Point(542, 77) + Me.grpTestString.Location = New System.Drawing.Point(434, 62) + Me.grpTestString.Margin = New System.Windows.Forms.Padding(2) Me.grpTestString.Name = "grpTestString" - Me.grpTestString.Size = New System.Drawing.Size(378, 205) + Me.grpTestString.Padding = New System.Windows.Forms.Padding(2) + Me.grpTestString.Size = New System.Drawing.Size(302, 164) Me.grpTestString.TabIndex = 186 Me.grpTestString.TabStop = False Me.grpTestString.Text = "Text/Strings (Character Columns)" @@ -5417,10 +5706,10 @@ Partial Class ucrCalculator ' Me.cmdReverseStr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReverseStr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReverseStr.Location = New System.Drawing.Point(308, 128) - Me.cmdReverseStr.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdReverseStr.Location = New System.Drawing.Point(246, 102) + Me.cmdReverseStr.Margin = New System.Windows.Forms.Padding(2) Me.cmdReverseStr.Name = "cmdReverseStr" - Me.cmdReverseStr.Size = New System.Drawing.Size(65, 38) + Me.cmdReverseStr.Size = New System.Drawing.Size(52, 30) Me.cmdReverseStr.TabIndex = 165 Me.cmdReverseStr.Tag = "" Me.cmdReverseStr.Text = "reverse" @@ -5429,9 +5718,10 @@ Partial Class ucrCalculator 'cmdEnds ' Me.cmdEnds.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEnds.Location = New System.Drawing.Point(150, 92) + Me.cmdEnds.Location = New System.Drawing.Point(120, 74) + Me.cmdEnds.Margin = New System.Windows.Forms.Padding(2) Me.cmdEnds.Name = "cmdEnds" - Me.cmdEnds.Size = New System.Drawing.Size(75, 38) + Me.cmdEnds.Size = New System.Drawing.Size(60, 30) Me.cmdEnds.TabIndex = 164 Me.cmdEnds.Text = "ends" Me.cmdEnds.UseVisualStyleBackColor = True @@ -5440,10 +5730,10 @@ Partial Class ucrCalculator ' Me.cmdTrunck.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrunck.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrunck.Location = New System.Drawing.Point(308, 163) - Me.cmdTrunck.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTrunck.Location = New System.Drawing.Point(246, 130) + Me.cmdTrunck.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrunck.Name = "cmdTrunck" - Me.cmdTrunck.Size = New System.Drawing.Size(65, 38) + Me.cmdTrunck.Size = New System.Drawing.Size(52, 30) Me.cmdTrunck.TabIndex = 163 Me.cmdTrunck.Text = "trunc " Me.cmdTrunck.UseVisualStyleBackColor = True @@ -5452,10 +5742,10 @@ Partial Class ucrCalculator ' Me.cmdLenth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLenth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLenth.Location = New System.Drawing.Point(202, 128) - Me.cmdLenth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLenth.Location = New System.Drawing.Point(162, 102) + Me.cmdLenth.Margin = New System.Windows.Forms.Padding(2) Me.cmdLenth.Name = "cmdLenth" - Me.cmdLenth.Size = New System.Drawing.Size(55, 38) + Me.cmdLenth.Size = New System.Drawing.Size(44, 30) Me.cmdLenth.TabIndex = 162 Me.cmdLenth.Text = "length" Me.cmdLenth.UseVisualStyleBackColor = True @@ -5464,10 +5754,10 @@ Partial Class ucrCalculator ' Me.cmdGlue.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdGlue.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGlue.Location = New System.Drawing.Point(255, 128) - Me.cmdGlue.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdGlue.Location = New System.Drawing.Point(204, 102) + Me.cmdGlue.Margin = New System.Windows.Forms.Padding(2) Me.cmdGlue.Name = "cmdGlue" - Me.cmdGlue.Size = New System.Drawing.Size(53, 38) + Me.cmdGlue.Size = New System.Drawing.Size(42, 30) Me.cmdGlue.TabIndex = 161 Me.cmdGlue.Text = "glue" Me.cmdGlue.UseVisualStyleBackColor = True @@ -5476,10 +5766,10 @@ Partial Class ucrCalculator ' Me.cmdStarts.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdStarts.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdStarts.Location = New System.Drawing.Point(252, 163) - Me.cmdStarts.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdStarts.Location = New System.Drawing.Point(202, 130) + Me.cmdStarts.Margin = New System.Windows.Forms.Padding(2) Me.cmdStarts.Name = "cmdStarts" - Me.cmdStarts.Size = New System.Drawing.Size(58, 38) + Me.cmdStarts.Size = New System.Drawing.Size(46, 30) Me.cmdStarts.TabIndex = 160 Me.cmdStarts.Tag = "" Me.cmdStarts.Text = "starts" @@ -5489,10 +5779,10 @@ Partial Class ucrCalculator ' Me.cmdReplace2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReplace2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReplace2.Location = New System.Drawing.Point(138, 163) - Me.cmdReplace2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdReplace2.Location = New System.Drawing.Point(110, 130) + Me.cmdReplace2.Margin = New System.Windows.Forms.Padding(2) Me.cmdReplace2.Name = "cmdReplace2" - Me.cmdReplace2.Size = New System.Drawing.Size(75, 38) + Me.cmdReplace2.Size = New System.Drawing.Size(60, 30) Me.cmdReplace2.TabIndex = 159 Me.cmdReplace2.Tag = "" Me.cmdReplace2.Text = "replace2" @@ -5502,10 +5792,10 @@ Partial Class ucrCalculator ' Me.cmdReplace.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReplace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReplace.Location = New System.Drawing.Point(77, 163) - Me.cmdReplace.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdReplace.Location = New System.Drawing.Point(62, 130) + Me.cmdReplace.Margin = New System.Windows.Forms.Padding(2) Me.cmdReplace.Name = "cmdReplace" - Me.cmdReplace.Size = New System.Drawing.Size(62, 38) + Me.cmdReplace.Size = New System.Drawing.Size(50, 30) Me.cmdReplace.TabIndex = 158 Me.cmdReplace.Tag = "" Me.cmdReplace.Text = "replace" @@ -5515,10 +5805,10 @@ Partial Class ucrCalculator ' Me.cmdRemove2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRemove2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRemove2.Location = New System.Drawing.Point(2, 163) - Me.cmdRemove2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRemove2.Location = New System.Drawing.Point(2, 130) + Me.cmdRemove2.Margin = New System.Windows.Forms.Padding(2) Me.cmdRemove2.Name = "cmdRemove2" - Me.cmdRemove2.Size = New System.Drawing.Size(75, 38) + Me.cmdRemove2.Size = New System.Drawing.Size(60, 30) Me.cmdRemove2.TabIndex = 157 Me.cmdRemove2.Tag = "" Me.cmdRemove2.Text = "remove2" @@ -5528,10 +5818,10 @@ Partial Class ucrCalculator ' Me.cmdRemove1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRemove1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRemove1.Location = New System.Drawing.Point(138, 128) - Me.cmdRemove1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRemove1.Location = New System.Drawing.Point(110, 102) + Me.cmdRemove1.Margin = New System.Windows.Forms.Padding(2) Me.cmdRemove1.Name = "cmdRemove1" - Me.cmdRemove1.Size = New System.Drawing.Size(65, 38) + Me.cmdRemove1.Size = New System.Drawing.Size(52, 30) Me.cmdRemove1.TabIndex = 156 Me.cmdRemove1.Tag = "" Me.cmdRemove1.Text = "remove" @@ -5541,10 +5831,10 @@ Partial Class ucrCalculator ' Me.cmdLocate2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLocate2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLocate2.Location = New System.Drawing.Point(77, 128) - Me.cmdLocate2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLocate2.Location = New System.Drawing.Point(62, 102) + Me.cmdLocate2.Margin = New System.Windows.Forms.Padding(2) Me.cmdLocate2.Name = "cmdLocate2" - Me.cmdLocate2.Size = New System.Drawing.Size(62, 38) + Me.cmdLocate2.Size = New System.Drawing.Size(50, 30) Me.cmdLocate2.TabIndex = 155 Me.cmdLocate2.Tag = "" Me.cmdLocate2.Text = "locate2" @@ -5554,10 +5844,10 @@ Partial Class ucrCalculator ' Me.cmdExtract2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdExtract2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExtract2.Location = New System.Drawing.Point(298, 92) - Me.cmdExtract2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdExtract2.Location = New System.Drawing.Point(238, 74) + Me.cmdExtract2.Margin = New System.Windows.Forms.Padding(2) Me.cmdExtract2.Name = "cmdExtract2" - Me.cmdExtract2.Size = New System.Drawing.Size(75, 38) + Me.cmdExtract2.Size = New System.Drawing.Size(60, 30) Me.cmdExtract2.TabIndex = 154 Me.cmdExtract2.Tag = "" Me.cmdExtract2.Text = "extract2" @@ -5567,10 +5857,10 @@ Partial Class ucrCalculator ' Me.cmdEncodeb.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdEncodeb.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEncodeb.Location = New System.Drawing.Point(298, 55) - Me.cmdEncodeb.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdEncodeb.Location = New System.Drawing.Point(238, 44) + Me.cmdEncodeb.Margin = New System.Windows.Forms.Padding(2) Me.cmdEncodeb.Name = "cmdEncodeb" - Me.cmdEncodeb.Size = New System.Drawing.Size(75, 38) + Me.cmdEncodeb.Size = New System.Drawing.Size(60, 30) Me.cmdEncodeb.TabIndex = 151 Me.cmdEncodeb.Text = "encode " Me.cmdEncodeb.UseVisualStyleBackColor = True @@ -5579,10 +5869,10 @@ Partial Class ucrCalculator ' Me.cmdSub.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSub.Location = New System.Drawing.Point(212, 163) - Me.cmdSub.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSub.Location = New System.Drawing.Point(170, 130) + Me.cmdSub.Margin = New System.Windows.Forms.Padding(2) Me.cmdSub.Name = "cmdSub" - Me.cmdSub.Size = New System.Drawing.Size(42, 38) + Me.cmdSub.Size = New System.Drawing.Size(34, 30) Me.cmdSub.TabIndex = 149 Me.cmdSub.Tag = "" Me.cmdSub.Text = "sub" @@ -5592,10 +5882,10 @@ Partial Class ucrCalculator ' Me.cmdCombine.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCombine.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCombine.Location = New System.Drawing.Point(223, 55) - Me.cmdCombine.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCombine.Location = New System.Drawing.Point(178, 44) + Me.cmdCombine.Margin = New System.Windows.Forms.Padding(2) Me.cmdCombine.Name = "cmdCombine" - Me.cmdCombine.Size = New System.Drawing.Size(75, 38) + Me.cmdCombine.Size = New System.Drawing.Size(60, 30) Me.cmdCombine.TabIndex = 148 Me.cmdCombine.Text = "combine" Me.cmdCombine.UseVisualStyleBackColor = True @@ -5604,10 +5894,10 @@ Partial Class ucrCalculator ' Me.cmdDetect.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdDetect.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDetect.Location = New System.Drawing.Point(77, 92) - Me.cmdDetect.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDetect.Location = New System.Drawing.Point(62, 74) + Me.cmdDetect.Margin = New System.Windows.Forms.Padding(2) Me.cmdDetect.Name = "cmdDetect" - Me.cmdDetect.Size = New System.Drawing.Size(75, 38) + Me.cmdDetect.Size = New System.Drawing.Size(60, 30) Me.cmdDetect.TabIndex = 147 Me.cmdDetect.Tag = "" Me.cmdDetect.Text = "detect" @@ -5617,10 +5907,10 @@ Partial Class ucrCalculator ' Me.cmdTrim.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrim.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrim.Location = New System.Drawing.Point(223, 18) - Me.cmdTrim.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTrim.Location = New System.Drawing.Point(178, 14) + Me.cmdTrim.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrim.Name = "cmdTrim" - Me.cmdTrim.Size = New System.Drawing.Size(75, 38) + Me.cmdTrim.Size = New System.Drawing.Size(60, 30) Me.cmdTrim.TabIndex = 146 Me.cmdTrim.Text = "trim" Me.cmdTrim.UseVisualStyleBackColor = True @@ -5629,10 +5919,10 @@ Partial Class ucrCalculator ' Me.cmdTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTitle.Location = New System.Drawing.Point(150, 18) - Me.cmdTitle.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTitle.Location = New System.Drawing.Point(120, 14) + Me.cmdTitle.Margin = New System.Windows.Forms.Padding(2) Me.cmdTitle.Name = "cmdTitle" - Me.cmdTitle.Size = New System.Drawing.Size(75, 38) + Me.cmdTitle.Size = New System.Drawing.Size(60, 30) Me.cmdTitle.TabIndex = 142 Me.cmdTitle.Text = "title" Me.cmdTitle.UseVisualStyleBackColor = True @@ -5641,10 +5931,10 @@ Partial Class ucrCalculator ' Me.cmdLower.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLower.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLower.Location = New System.Drawing.Point(77, 18) - Me.cmdLower.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLower.Location = New System.Drawing.Point(62, 14) + Me.cmdLower.Margin = New System.Windows.Forms.Padding(2) Me.cmdLower.Name = "cmdLower" - Me.cmdLower.Size = New System.Drawing.Size(75, 38) + Me.cmdLower.Size = New System.Drawing.Size(60, 30) Me.cmdLower.TabIndex = 141 Me.cmdLower.Text = "lower" Me.cmdLower.UseVisualStyleBackColor = True @@ -5653,10 +5943,10 @@ Partial Class ucrCalculator ' Me.cmdUpper.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdUpper.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdUpper.Location = New System.Drawing.Point(2, 18) - Me.cmdUpper.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdUpper.Location = New System.Drawing.Point(2, 14) + Me.cmdUpper.Margin = New System.Windows.Forms.Padding(2) Me.cmdUpper.Name = "cmdUpper" - Me.cmdUpper.Size = New System.Drawing.Size(75, 38) + Me.cmdUpper.Size = New System.Drawing.Size(60, 30) Me.cmdUpper.TabIndex = 140 Me.cmdUpper.Text = "upper" Me.cmdUpper.UseVisualStyleBackColor = True @@ -5665,10 +5955,10 @@ Partial Class ucrCalculator ' Me.cmdSort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSort.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSort.Location = New System.Drawing.Point(150, 55) - Me.cmdSort.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSort.Location = New System.Drawing.Point(120, 44) + Me.cmdSort.Margin = New System.Windows.Forms.Padding(2) Me.cmdSort.Name = "cmdSort" - Me.cmdSort.Size = New System.Drawing.Size(75, 38) + Me.cmdSort.Size = New System.Drawing.Size(60, 30) Me.cmdSort.TabIndex = 139 Me.cmdSort.Text = "sort" Me.cmdSort.UseVisualStyleBackColor = True @@ -5677,10 +5967,10 @@ Partial Class ucrCalculator ' Me.cmdOrder.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdOrder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOrder.Location = New System.Drawing.Point(77, 55) - Me.cmdOrder.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdOrder.Location = New System.Drawing.Point(62, 44) + Me.cmdOrder.Margin = New System.Windows.Forms.Padding(2) Me.cmdOrder.Name = "cmdOrder" - Me.cmdOrder.Size = New System.Drawing.Size(75, 38) + Me.cmdOrder.Size = New System.Drawing.Size(60, 30) Me.cmdOrder.TabIndex = 138 Me.cmdOrder.Text = "order" Me.cmdOrder.UseVisualStyleBackColor = True @@ -5689,10 +5979,10 @@ Partial Class ucrCalculator ' Me.cmdPad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPad.Location = New System.Drawing.Point(2, 55) - Me.cmdPad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPad.Location = New System.Drawing.Point(2, 44) + Me.cmdPad.Margin = New System.Windows.Forms.Padding(2) Me.cmdPad.Name = "cmdPad" - Me.cmdPad.Size = New System.Drawing.Size(75, 38) + Me.cmdPad.Size = New System.Drawing.Size(60, 30) Me.cmdPad.TabIndex = 137 Me.cmdPad.Text = "pad" Me.cmdPad.UseVisualStyleBackColor = True @@ -5701,10 +5991,10 @@ Partial Class ucrCalculator ' Me.cmdExtract.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdExtract.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExtract.Location = New System.Drawing.Point(223, 92) - Me.cmdExtract.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdExtract.Location = New System.Drawing.Point(178, 74) + Me.cmdExtract.Margin = New System.Windows.Forms.Padding(2) Me.cmdExtract.Name = "cmdExtract" - Me.cmdExtract.Size = New System.Drawing.Size(75, 38) + Me.cmdExtract.Size = New System.Drawing.Size(60, 30) Me.cmdExtract.TabIndex = 136 Me.cmdExtract.Text = "extract" Me.cmdExtract.UseVisualStyleBackColor = True @@ -5713,10 +6003,10 @@ Partial Class ucrCalculator ' Me.cmdCountstrings.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCountstrings.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCountstrings.Location = New System.Drawing.Point(2, 92) - Me.cmdCountstrings.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCountstrings.Location = New System.Drawing.Point(2, 74) + Me.cmdCountstrings.Margin = New System.Windows.Forms.Padding(2) Me.cmdCountstrings.Name = "cmdCountstrings" - Me.cmdCountstrings.Size = New System.Drawing.Size(75, 38) + Me.cmdCountstrings.Size = New System.Drawing.Size(60, 30) Me.cmdCountstrings.TabIndex = 134 Me.cmdCountstrings.Text = "count" Me.cmdCountstrings.UseVisualStyleBackColor = True @@ -5725,10 +6015,10 @@ Partial Class ucrCalculator ' Me.cmdLocate.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLocate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLocate.Location = New System.Drawing.Point(2, 128) - Me.cmdLocate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLocate.Location = New System.Drawing.Point(2, 102) + Me.cmdLocate.Margin = New System.Windows.Forms.Padding(2) Me.cmdLocate.Name = "cmdLocate" - Me.cmdLocate.Size = New System.Drawing.Size(75, 38) + Me.cmdLocate.Size = New System.Drawing.Size(60, 30) Me.cmdLocate.TabIndex = 133 Me.cmdLocate.Text = "locate" Me.cmdLocate.UseVisualStyleBackColor = True @@ -5737,10 +6027,10 @@ Partial Class ucrCalculator ' Me.cmdSquishb.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSquishb.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSquishb.Location = New System.Drawing.Point(298, 18) - Me.cmdSquishb.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSquishb.Location = New System.Drawing.Point(238, 14) + Me.cmdSquishb.Margin = New System.Windows.Forms.Padding(2) Me.cmdSquishb.Name = "cmdSquishb" - Me.cmdSquishb.Size = New System.Drawing.Size(75, 38) + Me.cmdSquishb.Size = New System.Drawing.Size(60, 30) Me.cmdSquishb.TabIndex = 150 Me.cmdSquishb.Text = "squish " Me.cmdSquishb.UseVisualStyleBackColor = True @@ -5770,35 +6060,48 @@ Partial Class ucrCalculator Me.grpCircular.Controls.Add(Me.cmdMedianHL) Me.grpCircular.Controls.Add(Me.cmdCircMedian) Me.grpCircular.Controls.Add(Me.cmdCircMean) - Me.grpCircular.Location = New System.Drawing.Point(542, 77) + Me.grpCircular.Location = New System.Drawing.Point(434, 62) Me.grpCircular.Margin = New System.Windows.Forms.Padding(2) Me.grpCircular.Name = "grpCircular" Me.grpCircular.Padding = New System.Windows.Forms.Padding(2) - Me.grpCircular.Size = New System.Drawing.Size(310, 217) + Me.grpCircular.Size = New System.Drawing.Size(248, 174) Me.grpCircular.TabIndex = 192 Me.grpCircular.TabStop = False Me.grpCircular.Text = "Circular" ' + 'cmdCircularHelp + ' + Me.cmdCircularHelp.AutoSize = True + Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.Location = New System.Drawing.Point(158, 142) + Me.cmdCircularHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircularHelp.Name = "cmdCircularHelp" + Me.cmdCircularHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.TabIndex = 212 + Me.cmdCircularHelp.Text = "R Help" + Me.cmdCircularHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripCircular ' Me.ContextMenuStripCircular.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripCircular.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CircularToolStripMenuItem}) Me.ContextMenuStripCircular.Name = "ContextMenuStrip1" - Me.ContextMenuStripCircular.Size = New System.Drawing.Size(127, 28) + Me.ContextMenuStripCircular.Size = New System.Drawing.Size(114, 26) ' 'CircularToolStripMenuItem ' Me.CircularToolStripMenuItem.Name = "CircularToolStripMenuItem" - Me.CircularToolStripMenuItem.Size = New System.Drawing.Size(126, 24) + Me.CircularToolStripMenuItem.Size = New System.Drawing.Size(113, 22) Me.CircularToolStripMenuItem.Text = "circular" ' 'cmdCircular ' Me.cmdCircular.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircular.Location = New System.Drawing.Point(2, 22) + Me.cmdCircular.Location = New System.Drawing.Point(2, 18) Me.cmdCircular.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircular.Name = "cmdCircular" - Me.cmdCircular.Size = New System.Drawing.Size(75, 40) + Me.cmdCircular.Size = New System.Drawing.Size(60, 32) Me.cmdCircular.TabIndex = 15 Me.cmdCircular.Text = "circular" Me.cmdCircular.UseVisualStyleBackColor = True @@ -5806,10 +6109,10 @@ Partial Class ucrCalculator 'cmdCircQuantiles ' Me.cmdCircQuantiles.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQuantiles.Location = New System.Drawing.Point(150, 100) + Me.cmdCircQuantiles.Location = New System.Drawing.Point(120, 80) Me.cmdCircQuantiles.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircQuantiles.Name = "cmdCircQuantiles" - Me.cmdCircQuantiles.Size = New System.Drawing.Size(75, 40) + Me.cmdCircQuantiles.Size = New System.Drawing.Size(60, 32) Me.cmdCircQuantiles.TabIndex = 13 Me.cmdCircQuantiles.Text = "quantiles" Me.cmdCircQuantiles.UseVisualStyleBackColor = True @@ -5817,10 +6120,10 @@ Partial Class ucrCalculator 'cmdCircMax ' Me.cmdCircMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMax.Location = New System.Drawing.Point(224, 139) + Me.cmdCircMax.Location = New System.Drawing.Point(179, 111) Me.cmdCircMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMax.Name = "cmdCircMax" - Me.cmdCircMax.Size = New System.Drawing.Size(82, 40) + Me.cmdCircMax.Size = New System.Drawing.Size(66, 32) Me.cmdCircMax.TabIndex = 10 Me.cmdCircMax.Text = "max" Me.cmdCircMax.UseVisualStyleBackColor = True @@ -5828,10 +6131,10 @@ Partial Class ucrCalculator 'cmdA1 ' Me.cmdA1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdA1.Location = New System.Drawing.Point(2, 100) + Me.cmdA1.Location = New System.Drawing.Point(2, 80) Me.cmdA1.Margin = New System.Windows.Forms.Padding(2) Me.cmdA1.Name = "cmdA1" - Me.cmdA1.Size = New System.Drawing.Size(75, 40) + Me.cmdA1.Size = New System.Drawing.Size(60, 32) Me.cmdA1.TabIndex = 8 Me.cmdA1.Text = "A1" Me.cmdA1.UseVisualStyleBackColor = True @@ -5839,10 +6142,10 @@ Partial Class ucrCalculator 'cmdAngVar ' Me.cmdAngVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAngVar.Location = New System.Drawing.Point(76, 100) + Me.cmdAngVar.Location = New System.Drawing.Point(61, 80) Me.cmdAngVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdAngVar.Name = "cmdAngVar" - Me.cmdAngVar.Size = New System.Drawing.Size(75, 40) + Me.cmdAngVar.Size = New System.Drawing.Size(60, 32) Me.cmdAngVar.TabIndex = 6 Me.cmdAngVar.Text = "ang.var" Me.cmdAngVar.UseVisualStyleBackColor = True @@ -5850,10 +6153,10 @@ Partial Class ucrCalculator 'cmdCircRho ' Me.cmdCircRho.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircRho.Location = New System.Drawing.Point(224, 100) + Me.cmdCircRho.Location = New System.Drawing.Point(179, 80) Me.cmdCircRho.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircRho.Name = "cmdCircRho" - Me.cmdCircRho.Size = New System.Drawing.Size(82, 40) + Me.cmdCircRho.Size = New System.Drawing.Size(66, 32) Me.cmdCircRho.TabIndex = 14 Me.cmdCircRho.Text = "rho" Me.cmdCircRho.UseVisualStyleBackColor = True @@ -5861,10 +6164,10 @@ Partial Class ucrCalculator 'cmdCircQ3 ' Me.cmdCircQ3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQ3.Location = New System.Drawing.Point(150, 139) + Me.cmdCircQ3.Location = New System.Drawing.Point(120, 111) Me.cmdCircQ3.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircQ3.Name = "cmdCircQ3" - Me.cmdCircQ3.Size = New System.Drawing.Size(75, 40) + Me.cmdCircQ3.Size = New System.Drawing.Size(60, 32) Me.cmdCircQ3.TabIndex = 12 Me.cmdCircQ3.Text = "q3" Me.cmdCircQ3.UseVisualStyleBackColor = True @@ -5872,10 +6175,10 @@ Partial Class ucrCalculator 'cmdCircQ1 ' Me.cmdCircQ1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQ1.Location = New System.Drawing.Point(76, 139) + Me.cmdCircQ1.Location = New System.Drawing.Point(61, 111) Me.cmdCircQ1.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircQ1.Name = "cmdCircQ1" - Me.cmdCircQ1.Size = New System.Drawing.Size(75, 40) + Me.cmdCircQ1.Size = New System.Drawing.Size(60, 32) Me.cmdCircQ1.TabIndex = 11 Me.cmdCircQ1.Text = "q1" Me.cmdCircQ1.UseVisualStyleBackColor = True @@ -5883,10 +6186,10 @@ Partial Class ucrCalculator 'cmdCircMin ' Me.cmdCircMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMin.Location = New System.Drawing.Point(2, 139) + Me.cmdCircMin.Location = New System.Drawing.Point(2, 111) Me.cmdCircMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMin.Name = "cmdCircMin" - Me.cmdCircMin.Size = New System.Drawing.Size(75, 40) + Me.cmdCircMin.Size = New System.Drawing.Size(60, 32) Me.cmdCircMin.TabIndex = 9 Me.cmdCircMin.Text = "min" Me.cmdCircMin.UseVisualStyleBackColor = True @@ -5894,10 +6197,10 @@ Partial Class ucrCalculator 'cmdAngDev ' Me.cmdAngDev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAngDev.Location = New System.Drawing.Point(150, 61) + Me.cmdAngDev.Location = New System.Drawing.Point(120, 49) Me.cmdAngDev.Margin = New System.Windows.Forms.Padding(2) Me.cmdAngDev.Name = "cmdAngDev" - Me.cmdAngDev.Size = New System.Drawing.Size(75, 40) + Me.cmdAngDev.Size = New System.Drawing.Size(60, 32) Me.cmdAngDev.TabIndex = 7 Me.cmdAngDev.Text = "ang.dev" Me.cmdAngDev.UseVisualStyleBackColor = True @@ -5905,10 +6208,10 @@ Partial Class ucrCalculator 'cmdCircVar ' Me.cmdCircVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircVar.Location = New System.Drawing.Point(224, 61) + Me.cmdCircVar.Location = New System.Drawing.Point(179, 49) Me.cmdCircVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircVar.Name = "cmdCircVar" - Me.cmdCircVar.Size = New System.Drawing.Size(82, 40) + Me.cmdCircVar.Size = New System.Drawing.Size(66, 32) Me.cmdCircVar.TabIndex = 5 Me.cmdCircVar.Text = "var" Me.cmdCircVar.UseVisualStyleBackColor = True @@ -5916,10 +6219,10 @@ Partial Class ucrCalculator 'cmdCircSd ' Me.cmdCircSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircSd.Location = New System.Drawing.Point(76, 61) + Me.cmdCircSd.Location = New System.Drawing.Point(61, 49) Me.cmdCircSd.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircSd.Name = "cmdCircSd" - Me.cmdCircSd.Size = New System.Drawing.Size(75, 40) + Me.cmdCircSd.Size = New System.Drawing.Size(60, 32) Me.cmdCircSd.TabIndex = 4 Me.cmdCircSd.Text = "sd" Me.cmdCircSd.UseVisualStyleBackColor = True @@ -5927,10 +6230,10 @@ Partial Class ucrCalculator 'cmdCircRange ' Me.cmdCircRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircRange.Location = New System.Drawing.Point(2, 61) + Me.cmdCircRange.Location = New System.Drawing.Point(2, 49) Me.cmdCircRange.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircRange.Name = "cmdCircRange" - Me.cmdCircRange.Size = New System.Drawing.Size(75, 40) + Me.cmdCircRange.Size = New System.Drawing.Size(60, 32) Me.cmdCircRange.TabIndex = 3 Me.cmdCircRange.Text = "range" Me.cmdCircRange.UseVisualStyleBackColor = True @@ -5938,10 +6241,10 @@ Partial Class ucrCalculator 'cmdMedianHL ' Me.cmdMedianHL.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMedianHL.Location = New System.Drawing.Point(224, 22) + Me.cmdMedianHL.Location = New System.Drawing.Point(179, 18) Me.cmdMedianHL.Margin = New System.Windows.Forms.Padding(2) Me.cmdMedianHL.Name = "cmdMedianHL" - Me.cmdMedianHL.Size = New System.Drawing.Size(82, 40) + Me.cmdMedianHL.Size = New System.Drawing.Size(66, 32) Me.cmdMedianHL.TabIndex = 2 Me.cmdMedianHL.Text = "medianHL" Me.cmdMedianHL.UseVisualStyleBackColor = True @@ -5949,10 +6252,10 @@ Partial Class ucrCalculator 'cmdCircMedian ' Me.cmdCircMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMedian.Location = New System.Drawing.Point(150, 22) + Me.cmdCircMedian.Location = New System.Drawing.Point(120, 18) Me.cmdCircMedian.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMedian.Name = "cmdCircMedian" - Me.cmdCircMedian.Size = New System.Drawing.Size(75, 40) + Me.cmdCircMedian.Size = New System.Drawing.Size(60, 32) Me.cmdCircMedian.TabIndex = 1 Me.cmdCircMedian.Text = "median" Me.cmdCircMedian.UseVisualStyleBackColor = True @@ -5960,10 +6263,10 @@ Partial Class ucrCalculator 'cmdCircMean ' Me.cmdCircMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMean.Location = New System.Drawing.Point(76, 22) + Me.cmdCircMean.Location = New System.Drawing.Point(61, 18) Me.cmdCircMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMean.Name = "cmdCircMean" - Me.cmdCircMean.Size = New System.Drawing.Size(75, 40) + Me.cmdCircMean.Size = New System.Drawing.Size(60, 32) Me.cmdCircMean.TabIndex = 0 Me.cmdCircMean.Text = "mean" Me.cmdCircMean.UseVisualStyleBackColor = True @@ -5974,11 +6277,11 @@ Partial Class ucrCalculator Me.grpModifier.Controls.Add(Me.cmdFixed) Me.grpModifier.Controls.Add(Me.cmdCollate) Me.grpModifier.Controls.Add(Me.cmdBoundary) - Me.grpModifier.Location = New System.Drawing.Point(542, 287) + Me.grpModifier.Location = New System.Drawing.Point(434, 230) Me.grpModifier.Margin = New System.Windows.Forms.Padding(2) Me.grpModifier.Name = "grpModifier" Me.grpModifier.Padding = New System.Windows.Forms.Padding(2) - Me.grpModifier.Size = New System.Drawing.Size(320, 67) + Me.grpModifier.Size = New System.Drawing.Size(256, 54) Me.grpModifier.TabIndex = 192 Me.grpModifier.TabStop = False Me.grpModifier.Text = "Modifier" @@ -5986,10 +6289,10 @@ Partial Class ucrCalculator 'cmdRegex ' Me.cmdRegex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRegex.Location = New System.Drawing.Point(235, 17) + Me.cmdRegex.Location = New System.Drawing.Point(188, 14) Me.cmdRegex.Margin = New System.Windows.Forms.Padding(2) Me.cmdRegex.Name = "cmdRegex" - Me.cmdRegex.Size = New System.Drawing.Size(78, 38) + Me.cmdRegex.Size = New System.Drawing.Size(62, 30) Me.cmdRegex.TabIndex = 3 Me.cmdRegex.Text = "regex" Me.cmdRegex.UseVisualStyleBackColor = True @@ -5997,10 +6300,10 @@ Partial Class ucrCalculator 'cmdFixed ' Me.cmdFixed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFixed.Location = New System.Drawing.Point(158, 17) + Me.cmdFixed.Location = New System.Drawing.Point(126, 14) Me.cmdFixed.Margin = New System.Windows.Forms.Padding(2) Me.cmdFixed.Name = "cmdFixed" - Me.cmdFixed.Size = New System.Drawing.Size(78, 38) + Me.cmdFixed.Size = New System.Drawing.Size(62, 30) Me.cmdFixed.TabIndex = 2 Me.cmdFixed.Text = "fixed" Me.cmdFixed.UseVisualStyleBackColor = True @@ -6008,10 +6311,10 @@ Partial Class ucrCalculator 'cmdCollate ' Me.cmdCollate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCollate.Location = New System.Drawing.Point(80, 17) + Me.cmdCollate.Location = New System.Drawing.Point(64, 14) Me.cmdCollate.Margin = New System.Windows.Forms.Padding(2) Me.cmdCollate.Name = "cmdCollate" - Me.cmdCollate.Size = New System.Drawing.Size(78, 38) + Me.cmdCollate.Size = New System.Drawing.Size(62, 30) Me.cmdCollate.TabIndex = 1 Me.cmdCollate.Text = "collate" Me.cmdCollate.UseVisualStyleBackColor = True @@ -6019,10 +6322,10 @@ Partial Class ucrCalculator 'cmdBoundary ' Me.cmdBoundary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBoundary.Location = New System.Drawing.Point(2, 17) + Me.cmdBoundary.Location = New System.Drawing.Point(2, 14) Me.cmdBoundary.Margin = New System.Windows.Forms.Padding(2) Me.cmdBoundary.Name = "cmdBoundary" - Me.cmdBoundary.Size = New System.Drawing.Size(78, 38) + Me.cmdBoundary.Size = New System.Drawing.Size(62, 30) Me.cmdBoundary.TabIndex = 0 Me.cmdBoundary.Text = "boundary" Me.cmdBoundary.UseVisualStyleBackColor = True @@ -6044,11 +6347,11 @@ Partial Class ucrCalculator Me.grpSymbols.Controls.Add(Me.cmdEnd1) Me.grpSymbols.Controls.Add(Me.cmdbegin) Me.grpSymbols.Controls.Add(Me.cmdAny1) - Me.grpSymbols.Location = New System.Drawing.Point(542, 359) + Me.grpSymbols.Location = New System.Drawing.Point(434, 287) Me.grpSymbols.Margin = New System.Windows.Forms.Padding(2) Me.grpSymbols.Name = "grpSymbols" Me.grpSymbols.Padding = New System.Windows.Forms.Padding(2) - Me.grpSymbols.Size = New System.Drawing.Size(395, 140) + Me.grpSymbols.Size = New System.Drawing.Size(316, 112) Me.grpSymbols.TabIndex = 193 Me.grpSymbols.TabStop = False Me.grpSymbols.Text = "Symbols" @@ -6056,10 +6359,10 @@ Partial Class ucrCalculator 'cmdOr3 ' Me.cmdOr3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr3.Location = New System.Drawing.Point(158, 58) + Me.cmdOr3.Location = New System.Drawing.Point(126, 46) Me.cmdOr3.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr3.Name = "cmdOr3" - Me.cmdOr3.Size = New System.Drawing.Size(78, 38) + Me.cmdOr3.Size = New System.Drawing.Size(62, 30) Me.cmdOr3.TabIndex = 16 Me.cmdOr3.Text = "| or" Me.cmdOr3.UseVisualStyleBackColor = True @@ -6067,10 +6370,10 @@ Partial Class ucrCalculator 'cmdEscape ' Me.cmdEscape.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEscape.Location = New System.Drawing.Point(237, 93) + Me.cmdEscape.Location = New System.Drawing.Point(190, 74) Me.cmdEscape.Margin = New System.Windows.Forms.Padding(2) Me.cmdEscape.Name = "cmdEscape" - Me.cmdEscape.Size = New System.Drawing.Size(78, 38) + Me.cmdEscape.Size = New System.Drawing.Size(62, 30) Me.cmdEscape.TabIndex = 14 Me.cmdEscape.Text = "\\ escape" Me.cmdEscape.UseVisualStyleBackColor = True @@ -6078,10 +6381,10 @@ Partial Class ucrCalculator 'cmdPlusZero ' Me.cmdPlusZero.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlusZero.Location = New System.Drawing.Point(313, 93) + Me.cmdPlusZero.Location = New System.Drawing.Point(250, 74) Me.cmdPlusZero.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlusZero.Name = "cmdPlusZero" - Me.cmdPlusZero.Size = New System.Drawing.Size(78, 38) + Me.cmdPlusZero.Size = New System.Drawing.Size(62, 30) Me.cmdPlusZero.TabIndex = 15 Me.cmdPlusZero.Text = "- to" Me.cmdPlusZero.UseVisualStyleBackColor = True @@ -6089,10 +6392,10 @@ Partial Class ucrCalculator 'cmdZero ' Me.cmdZero.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdZero.Location = New System.Drawing.Point(158, 93) + Me.cmdZero.Location = New System.Drawing.Point(126, 74) Me.cmdZero.Margin = New System.Windows.Forms.Padding(2) Me.cmdZero.Name = "cmdZero" - Me.cmdZero.Size = New System.Drawing.Size(78, 38) + Me.cmdZero.Size = New System.Drawing.Size(62, 30) Me.cmdZero.TabIndex = 13 Me.cmdZero.Text = "* 0+" Me.cmdZero.UseVisualStyleBackColor = True @@ -6100,10 +6403,10 @@ Partial Class ucrCalculator 'cmdPlusOne ' Me.cmdPlusOne.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlusOne.Location = New System.Drawing.Point(80, 93) + Me.cmdPlusOne.Location = New System.Drawing.Point(64, 74) Me.cmdPlusOne.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlusOne.Name = "cmdPlusOne" - Me.cmdPlusOne.Size = New System.Drawing.Size(78, 38) + Me.cmdPlusOne.Size = New System.Drawing.Size(62, 30) Me.cmdPlusOne.TabIndex = 12 Me.cmdPlusOne.Text = "+ 1+" Me.cmdPlusOne.UseVisualStyleBackColor = True @@ -6111,10 +6414,10 @@ Partial Class ucrCalculator 'cmdZeroOrOne ' Me.cmdZeroOrOne.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdZeroOrOne.Location = New System.Drawing.Point(2, 93) + Me.cmdZeroOrOne.Location = New System.Drawing.Point(2, 74) Me.cmdZeroOrOne.Margin = New System.Windows.Forms.Padding(2) Me.cmdZeroOrOne.Name = "cmdZeroOrOne" - Me.cmdZeroOrOne.Size = New System.Drawing.Size(78, 38) + Me.cmdZeroOrOne.Size = New System.Drawing.Size(62, 30) Me.cmdZeroOrOne.TabIndex = 11 Me.cmdZeroOrOne.Text = "? 0 or 1" Me.cmdZeroOrOne.UseVisualStyleBackColor = True @@ -6122,10 +6425,10 @@ Partial Class ucrCalculator 'cmdNumbers ' Me.cmdNumbers.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNumbers.Location = New System.Drawing.Point(313, 58) + Me.cmdNumbers.Location = New System.Drawing.Point(250, 46) Me.cmdNumbers.Margin = New System.Windows.Forms.Padding(2) Me.cmdNumbers.Name = "cmdNumbers" - Me.cmdNumbers.Size = New System.Drawing.Size(78, 38) + Me.cmdNumbers.Size = New System.Drawing.Size(62, 30) Me.cmdNumbers.TabIndex = 10 Me.cmdNumbers.Text = "{ m,n } " Me.cmdNumbers.UseVisualStyleBackColor = True @@ -6133,10 +6436,10 @@ Partial Class ucrCalculator 'cmdNot1 ' Me.cmdNot1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNot1.Location = New System.Drawing.Point(80, 58) + Me.cmdNot1.Location = New System.Drawing.Point(64, 46) Me.cmdNot1.Margin = New System.Windows.Forms.Padding(2) Me.cmdNot1.Name = "cmdNot1" - Me.cmdNot1.Size = New System.Drawing.Size(78, 38) + Me.cmdNot1.Size = New System.Drawing.Size(62, 30) Me.cmdNot1.TabIndex = 8 Me.cmdNot1.Text = "[^ ] not" Me.cmdNot1.UseVisualStyleBackColor = True @@ -6144,10 +6447,10 @@ Partial Class ucrCalculator 'cmdOr2 ' Me.cmdOr2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr2.Location = New System.Drawing.Point(237, 58) + Me.cmdOr2.Location = New System.Drawing.Point(190, 46) Me.cmdOr2.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr2.Name = "cmdOr2" - Me.cmdOr2.Size = New System.Drawing.Size(78, 38) + Me.cmdOr2.Size = New System.Drawing.Size(62, 30) Me.cmdOr2.TabIndex = 9 Me.cmdOr2.Text = "{ n} " Me.cmdOr2.UseVisualStyleBackColor = True @@ -6155,10 +6458,10 @@ Partial Class ucrCalculator 'cmdOr1 ' Me.cmdOr1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr1.Location = New System.Drawing.Point(2, 58) + Me.cmdOr1.Location = New System.Drawing.Point(2, 46) Me.cmdOr1.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr1.Name = "cmdOr1" - Me.cmdOr1.Size = New System.Drawing.Size(78, 38) + Me.cmdOr1.Size = New System.Drawing.Size(62, 30) Me.cmdOr1.TabIndex = 7 Me.cmdOr1.Text = "[ ] or" Me.cmdOr1.UseVisualStyleBackColor = True @@ -6166,10 +6469,10 @@ Partial Class ucrCalculator 'cmdSpace ' Me.cmdSpace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSpace.Location = New System.Drawing.Point(313, 20) + Me.cmdSpace.Location = New System.Drawing.Point(250, 16) Me.cmdSpace.Margin = New System.Windows.Forms.Padding(2) Me.cmdSpace.Name = "cmdSpace" - Me.cmdSpace.Size = New System.Drawing.Size(78, 38) + Me.cmdSpace.Size = New System.Drawing.Size(62, 30) Me.cmdSpace.TabIndex = 6 Me.cmdSpace.Text = "\\s space" Me.cmdSpace.UseVisualStyleBackColor = True @@ -6177,10 +6480,10 @@ Partial Class ucrCalculator 'cmdDigit ' Me.cmdDigit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDigit.Location = New System.Drawing.Point(237, 20) + Me.cmdDigit.Location = New System.Drawing.Point(190, 16) Me.cmdDigit.Margin = New System.Windows.Forms.Padding(2) Me.cmdDigit.Name = "cmdDigit" - Me.cmdDigit.Size = New System.Drawing.Size(78, 38) + Me.cmdDigit.Size = New System.Drawing.Size(62, 30) Me.cmdDigit.TabIndex = 5 Me.cmdDigit.Text = "\\d digit" Me.cmdDigit.UseVisualStyleBackColor = True @@ -6188,10 +6491,10 @@ Partial Class ucrCalculator 'cmdEnd1 ' Me.cmdEnd1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEnd1.Location = New System.Drawing.Point(158, 20) + Me.cmdEnd1.Location = New System.Drawing.Point(126, 16) Me.cmdEnd1.Margin = New System.Windows.Forms.Padding(2) Me.cmdEnd1.Name = "cmdEnd1" - Me.cmdEnd1.Size = New System.Drawing.Size(78, 38) + Me.cmdEnd1.Size = New System.Drawing.Size(62, 30) Me.cmdEnd1.TabIndex = 4 Me.cmdEnd1.Text = "$ end" Me.cmdEnd1.UseVisualStyleBackColor = True @@ -6199,10 +6502,10 @@ Partial Class ucrCalculator 'cmdbegin ' Me.cmdbegin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbegin.Location = New System.Drawing.Point(80, 20) + Me.cmdbegin.Location = New System.Drawing.Point(64, 16) Me.cmdbegin.Margin = New System.Windows.Forms.Padding(2) Me.cmdbegin.Name = "cmdbegin" - Me.cmdbegin.Size = New System.Drawing.Size(78, 38) + Me.cmdbegin.Size = New System.Drawing.Size(62, 30) Me.cmdbegin.TabIndex = 3 Me.cmdbegin.Text = "^ begin" Me.cmdbegin.UseVisualStyleBackColor = True @@ -6210,10 +6513,10 @@ Partial Class ucrCalculator 'cmdAny1 ' Me.cmdAny1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAny1.Location = New System.Drawing.Point(2, 20) + Me.cmdAny1.Location = New System.Drawing.Point(2, 16) Me.cmdAny1.Margin = New System.Windows.Forms.Padding(2) Me.cmdAny1.Name = "cmdAny1" - Me.cmdAny1.Size = New System.Drawing.Size(78, 38) + Me.cmdAny1.Size = New System.Drawing.Size(62, 30) Me.cmdAny1.TabIndex = 2 Me.cmdAny1.Text = ". any" Me.cmdAny1.UseVisualStyleBackColor = True @@ -6246,9 +6549,11 @@ Partial Class ucrCalculator Me.grpComplex.Controls.Add(Me.cmdImaginary) Me.grpComplex.Controls.Add(Me.cmdReal) Me.grpComplex.Controls.Add(Me.cmdComplex) - Me.grpComplex.Location = New System.Drawing.Point(542, 87) + Me.grpComplex.Location = New System.Drawing.Point(434, 70) + Me.grpComplex.Margin = New System.Windows.Forms.Padding(2) Me.grpComplex.Name = "grpComplex" - Me.grpComplex.Size = New System.Drawing.Size(360, 282) + Me.grpComplex.Padding = New System.Windows.Forms.Padding(2) + Me.grpComplex.Size = New System.Drawing.Size(288, 226) Me.grpComplex.TabIndex = 198 Me.grpComplex.TabStop = False Me.grpComplex.Text = "Complex" @@ -6257,10 +6562,10 @@ Partial Class ucrCalculator ' Me.cmdComplexAsin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexAsin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexAsin.Location = New System.Drawing.Point(30, 128) - Me.cmdComplexAsin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexAsin.Location = New System.Drawing.Point(24, 102) + Me.cmdComplexAsin.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexAsin.Name = "cmdComplexAsin" - Me.cmdComplexAsin.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexAsin.Size = New System.Drawing.Size(66, 30) Me.cmdComplexAsin.TabIndex = 217 Me.cmdComplexAsin.Text = "asin" Me.cmdComplexAsin.UseVisualStyleBackColor = True @@ -6269,10 +6574,10 @@ Partial Class ucrCalculator ' Me.cmdComplexAtan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexAtan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexAtan.Location = New System.Drawing.Point(198, 128) - Me.cmdComplexAtan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexAtan.Location = New System.Drawing.Point(158, 102) + Me.cmdComplexAtan.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexAtan.Name = "cmdComplexAtan" - Me.cmdComplexAtan.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexAtan.Size = New System.Drawing.Size(66, 30) Me.cmdComplexAtan.TabIndex = 216 Me.cmdComplexAtan.Text = "atan" Me.cmdComplexAtan.UseVisualStyleBackColor = True @@ -6281,10 +6586,10 @@ Partial Class ucrCalculator ' Me.cmdComplexAcos.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexAcos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexAcos.Location = New System.Drawing.Point(111, 128) - Me.cmdComplexAcos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexAcos.Location = New System.Drawing.Point(89, 102) + Me.cmdComplexAcos.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexAcos.Name = "cmdComplexAcos" - Me.cmdComplexAcos.Size = New System.Drawing.Size(88, 38) + Me.cmdComplexAcos.Size = New System.Drawing.Size(70, 30) Me.cmdComplexAcos.TabIndex = 215 Me.cmdComplexAcos.Text = "acos" Me.cmdComplexAcos.UseVisualStyleBackColor = True @@ -6293,10 +6598,10 @@ Partial Class ucrCalculator ' Me.cmdAsComplex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdAsComplex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsComplex.Location = New System.Drawing.Point(111, 22) - Me.cmdAsComplex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAsComplex.Location = New System.Drawing.Point(89, 18) + Me.cmdAsComplex.Margin = New System.Windows.Forms.Padding(2) Me.cmdAsComplex.Name = "cmdAsComplex" - Me.cmdAsComplex.Size = New System.Drawing.Size(88, 38) + Me.cmdAsComplex.Size = New System.Drawing.Size(70, 30) Me.cmdAsComplex.TabIndex = 211 Me.cmdAsComplex.Text = "as.complex" Me.cmdAsComplex.UseVisualStyleBackColor = True @@ -6305,22 +6610,35 @@ Partial Class ucrCalculator ' Me.cmdComplexi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexi.Location = New System.Drawing.Point(30, 237) - Me.cmdComplexi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexi.Location = New System.Drawing.Point(24, 190) + Me.cmdComplexi.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexi.Name = "cmdComplexi" - Me.cmdComplexi.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexi.Size = New System.Drawing.Size(66, 30) Me.cmdComplexi.TabIndex = 210 Me.cmdComplexi.Text = "i" Me.cmdComplexi.UseVisualStyleBackColor = True ' + 'cmdComplexRHelp + ' + Me.cmdComplexRHelp.AutoSize = True + Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.Location = New System.Drawing.Point(190, 192) + Me.cmdComplexRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexRHelp.Name = "cmdComplexRHelp" + Me.cmdComplexRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.TabIndex = 209 + Me.cmdComplexRHelp.Text = "R Help" + Me.cmdComplexRHelp.UseVisualStyleBackColor = True + ' 'cmdComplexTanH ' Me.cmdComplexTanH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexTanH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexTanH.Location = New System.Drawing.Point(198, 164) - Me.cmdComplexTanH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexTanH.Location = New System.Drawing.Point(158, 131) + Me.cmdComplexTanH.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexTanH.Name = "cmdComplexTanH" - Me.cmdComplexTanH.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexTanH.Size = New System.Drawing.Size(66, 30) Me.cmdComplexTanH.TabIndex = 208 Me.cmdComplexTanH.Text = "tanh" Me.cmdComplexTanH.UseVisualStyleBackColor = True @@ -6329,10 +6647,10 @@ Partial Class ucrCalculator ' Me.cmdComplexTan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexTan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexTan.Location = New System.Drawing.Point(198, 92) - Me.cmdComplexTan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexTan.Location = New System.Drawing.Point(158, 74) + Me.cmdComplexTan.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexTan.Name = "cmdComplexTan" - Me.cmdComplexTan.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexTan.Size = New System.Drawing.Size(66, 30) Me.cmdComplexTan.TabIndex = 207 Me.cmdComplexTan.Text = "tan" Me.cmdComplexTan.UseVisualStyleBackColor = True @@ -6341,10 +6659,10 @@ Partial Class ucrCalculator ' Me.cmdComplexPi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexPi.Location = New System.Drawing.Point(279, 128) - Me.cmdComplexPi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexPi.Location = New System.Drawing.Point(223, 102) + Me.cmdComplexPi.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexPi.Name = "cmdComplexPi" - Me.cmdComplexPi.Size = New System.Drawing.Size(78, 38) + Me.cmdComplexPi.Size = New System.Drawing.Size(62, 30) Me.cmdComplexPi.TabIndex = 206 Me.cmdComplexPi.Text = "pi" Me.cmdComplexPi.UseVisualStyleBackColor = True @@ -6353,10 +6671,10 @@ Partial Class ucrCalculator ' Me.cmdComplexDeg.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexDeg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexDeg.Location = New System.Drawing.Point(279, 92) - Me.cmdComplexDeg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexDeg.Location = New System.Drawing.Point(223, 74) + Me.cmdComplexDeg.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexDeg.Name = "cmdComplexDeg" - Me.cmdComplexDeg.Size = New System.Drawing.Size(79, 38) + Me.cmdComplexDeg.Size = New System.Drawing.Size(63, 30) Me.cmdComplexDeg.TabIndex = 205 Me.cmdComplexDeg.Text = "deg" Me.cmdComplexDeg.UseVisualStyleBackColor = True @@ -6365,10 +6683,10 @@ Partial Class ucrCalculator ' Me.cmdComplexRad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexRad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexRad.Location = New System.Drawing.Point(279, 58) - Me.cmdComplexRad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexRad.Location = New System.Drawing.Point(223, 46) + Me.cmdComplexRad.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexRad.Name = "cmdComplexRad" - Me.cmdComplexRad.Size = New System.Drawing.Size(79, 38) + Me.cmdComplexRad.Size = New System.Drawing.Size(63, 30) Me.cmdComplexRad.TabIndex = 204 Me.cmdComplexRad.Text = "rad" Me.cmdComplexRad.UseVisualStyleBackColor = True @@ -6377,10 +6695,10 @@ Partial Class ucrCalculator ' Me.cmdComplexSignif.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSignif.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSignif.Location = New System.Drawing.Point(198, 200) - Me.cmdComplexSignif.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexSignif.Location = New System.Drawing.Point(158, 160) + Me.cmdComplexSignif.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexSignif.Name = "cmdComplexSignif" - Me.cmdComplexSignif.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexSignif.Size = New System.Drawing.Size(66, 30) Me.cmdComplexSignif.TabIndex = 203 Me.cmdComplexSignif.Text = "signif" Me.cmdComplexSignif.UseVisualStyleBackColor = True @@ -6389,10 +6707,10 @@ Partial Class ucrCalculator ' Me.cmdComplexCosH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexCosH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexCosH.Location = New System.Drawing.Point(111, 164) - Me.cmdComplexCosH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexCosH.Location = New System.Drawing.Point(89, 131) + Me.cmdComplexCosH.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexCosH.Name = "cmdComplexCosH" - Me.cmdComplexCosH.Size = New System.Drawing.Size(88, 38) + Me.cmdComplexCosH.Size = New System.Drawing.Size(70, 30) Me.cmdComplexCosH.TabIndex = 202 Me.cmdComplexCosH.Text = "cosh" Me.cmdComplexCosH.UseVisualStyleBackColor = True @@ -6401,10 +6719,10 @@ Partial Class ucrCalculator ' Me.cmdComplexSinH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSinH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSinH.Location = New System.Drawing.Point(30, 164) - Me.cmdComplexSinH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexSinH.Location = New System.Drawing.Point(24, 131) + Me.cmdComplexSinH.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexSinH.Name = "cmdComplexSinH" - Me.cmdComplexSinH.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexSinH.Size = New System.Drawing.Size(66, 30) Me.cmdComplexSinH.TabIndex = 201 Me.cmdComplexSinH.Text = "sinh" Me.cmdComplexSinH.UseVisualStyleBackColor = True @@ -6413,10 +6731,10 @@ Partial Class ucrCalculator ' Me.cmdComplexCos.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexCos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexCos.Location = New System.Drawing.Point(111, 92) - Me.cmdComplexCos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexCos.Location = New System.Drawing.Point(89, 74) + Me.cmdComplexCos.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexCos.Name = "cmdComplexCos" - Me.cmdComplexCos.Size = New System.Drawing.Size(88, 38) + Me.cmdComplexCos.Size = New System.Drawing.Size(70, 30) Me.cmdComplexCos.TabIndex = 200 Me.cmdComplexCos.Text = "cos" Me.cmdComplexCos.UseVisualStyleBackColor = True @@ -6425,10 +6743,10 @@ Partial Class ucrCalculator ' Me.cmdComplexSin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSin.Location = New System.Drawing.Point(30, 92) - Me.cmdComplexSin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexSin.Location = New System.Drawing.Point(24, 74) + Me.cmdComplexSin.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexSin.Name = "cmdComplexSin" - Me.cmdComplexSin.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexSin.Size = New System.Drawing.Size(66, 30) Me.cmdComplexSin.TabIndex = 199 Me.cmdComplexSin.Text = "sin" Me.cmdComplexSin.UseVisualStyleBackColor = True @@ -6437,10 +6755,10 @@ Partial Class ucrCalculator ' Me.cmdComplexExp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexExp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexExp.Location = New System.Drawing.Point(279, 164) - Me.cmdComplexExp.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexExp.Location = New System.Drawing.Point(223, 131) + Me.cmdComplexExp.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexExp.Name = "cmdComplexExp" - Me.cmdComplexExp.Size = New System.Drawing.Size(79, 38) + Me.cmdComplexExp.Size = New System.Drawing.Size(63, 30) Me.cmdComplexExp.TabIndex = 192 Me.cmdComplexExp.Text = "exp" Me.cmdComplexExp.UseVisualStyleBackColor = True @@ -6449,10 +6767,10 @@ Partial Class ucrCalculator ' Me.cmdComplexRound.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexRound.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexRound.Location = New System.Drawing.Point(111, 200) - Me.cmdComplexRound.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexRound.Location = New System.Drawing.Point(89, 160) + Me.cmdComplexRound.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexRound.Name = "cmdComplexRound" - Me.cmdComplexRound.Size = New System.Drawing.Size(88, 38) + Me.cmdComplexRound.Size = New System.Drawing.Size(70, 30) Me.cmdComplexRound.TabIndex = 191 Me.cmdComplexRound.Text = "round" Me.cmdComplexRound.UseVisualStyleBackColor = True @@ -6461,10 +6779,10 @@ Partial Class ucrCalculator ' Me.cmdComplexLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexLog.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexLog.Location = New System.Drawing.Point(279, 200) - Me.cmdComplexLog.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexLog.Location = New System.Drawing.Point(223, 160) + Me.cmdComplexLog.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexLog.Name = "cmdComplexLog" - Me.cmdComplexLog.Size = New System.Drawing.Size(79, 38) + Me.cmdComplexLog.Size = New System.Drawing.Size(63, 30) Me.cmdComplexLog.TabIndex = 190 Me.cmdComplexLog.Text = "log" Me.cmdComplexLog.UseVisualStyleBackColor = True @@ -6473,10 +6791,10 @@ Partial Class ucrCalculator ' Me.cmdComplexSqrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSqrt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSqrt.Location = New System.Drawing.Point(30, 200) - Me.cmdComplexSqrt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexSqrt.Location = New System.Drawing.Point(24, 160) + Me.cmdComplexSqrt.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexSqrt.Name = "cmdComplexSqrt" - Me.cmdComplexSqrt.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexSqrt.Size = New System.Drawing.Size(66, 30) Me.cmdComplexSqrt.TabIndex = 189 Me.cmdComplexSqrt.Text = "sqrt" Me.cmdComplexSqrt.UseVisualStyleBackColor = True @@ -6485,10 +6803,10 @@ Partial Class ucrCalculator ' Me.cmdConjugate.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdConjugate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdConjugate.Location = New System.Drawing.Point(198, 58) - Me.cmdConjugate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdConjugate.Location = New System.Drawing.Point(158, 46) + Me.cmdConjugate.Margin = New System.Windows.Forms.Padding(2) Me.cmdConjugate.Name = "cmdConjugate" - Me.cmdConjugate.Size = New System.Drawing.Size(82, 38) + Me.cmdConjugate.Size = New System.Drawing.Size(66, 30) Me.cmdConjugate.TabIndex = 188 Me.cmdConjugate.Text = "conjugate" Me.cmdConjugate.UseVisualStyleBackColor = True @@ -6497,10 +6815,10 @@ Partial Class ucrCalculator ' Me.cmdArg.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdArg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdArg.Location = New System.Drawing.Point(111, 58) - Me.cmdArg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdArg.Location = New System.Drawing.Point(89, 46) + Me.cmdArg.Margin = New System.Windows.Forms.Padding(2) Me.cmdArg.Name = "cmdArg" - Me.cmdArg.Size = New System.Drawing.Size(88, 38) + Me.cmdArg.Size = New System.Drawing.Size(70, 30) Me.cmdArg.TabIndex = 187 Me.cmdArg.Text = "arg" Me.cmdArg.UseVisualStyleBackColor = True @@ -6509,10 +6827,10 @@ Partial Class ucrCalculator ' Me.cmdMod.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMod.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMod.Location = New System.Drawing.Point(30, 58) - Me.cmdMod.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMod.Location = New System.Drawing.Point(24, 46) + Me.cmdMod.Margin = New System.Windows.Forms.Padding(2) Me.cmdMod.Name = "cmdMod" - Me.cmdMod.Size = New System.Drawing.Size(82, 38) + Me.cmdMod.Size = New System.Drawing.Size(66, 30) Me.cmdMod.TabIndex = 186 Me.cmdMod.Text = "mod" Me.cmdMod.UseVisualStyleBackColor = True @@ -6521,10 +6839,10 @@ Partial Class ucrCalculator ' Me.cmdImaginary.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdImaginary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdImaginary.Location = New System.Drawing.Point(279, 22) - Me.cmdImaginary.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdImaginary.Location = New System.Drawing.Point(223, 18) + Me.cmdImaginary.Margin = New System.Windows.Forms.Padding(2) Me.cmdImaginary.Name = "cmdImaginary" - Me.cmdImaginary.Size = New System.Drawing.Size(79, 38) + Me.cmdImaginary.Size = New System.Drawing.Size(63, 30) Me.cmdImaginary.TabIndex = 185 Me.cmdImaginary.Text = "imaginary" Me.cmdImaginary.UseVisualStyleBackColor = True @@ -6533,10 +6851,10 @@ Partial Class ucrCalculator ' Me.cmdReal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReal.Location = New System.Drawing.Point(198, 22) - Me.cmdReal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdReal.Location = New System.Drawing.Point(158, 18) + Me.cmdReal.Margin = New System.Windows.Forms.Padding(2) Me.cmdReal.Name = "cmdReal" - Me.cmdReal.Size = New System.Drawing.Size(82, 38) + Me.cmdReal.Size = New System.Drawing.Size(66, 30) Me.cmdReal.TabIndex = 177 Me.cmdReal.Text = "real" Me.cmdReal.UseVisualStyleBackColor = True @@ -6545,10 +6863,10 @@ Partial Class ucrCalculator ' Me.cmdComplex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplex.Location = New System.Drawing.Point(30, 22) - Me.cmdComplex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplex.Location = New System.Drawing.Point(24, 18) + Me.cmdComplex.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplex.Name = "cmdComplex" - Me.cmdComplex.Size = New System.Drawing.Size(82, 38) + Me.cmdComplex.Size = New System.Drawing.Size(66, 30) Me.cmdComplex.TabIndex = 176 Me.cmdComplex.Text = "complex" Me.cmdComplex.UseVisualStyleBackColor = True @@ -6558,18 +6876,18 @@ Partial Class ucrCalculator Me.ContextMenuStripTxtString.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripTxtString.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TxTStringrToolStripMenuItem, Me.TxTBaseToolStripMenuItem}) Me.ContextMenuStripTxtString.Name = "ContextMenuStrip1" - Me.ContextMenuStripTxtString.Size = New System.Drawing.Size(123, 52) + Me.ContextMenuStripTxtString.Size = New System.Drawing.Size(110, 48) ' 'TxTStringrToolStripMenuItem ' Me.TxTStringrToolStripMenuItem.Name = "TxTStringrToolStripMenuItem" - Me.TxTStringrToolStripMenuItem.Size = New System.Drawing.Size(122, 24) + Me.TxTStringrToolStripMenuItem.Size = New System.Drawing.Size(109, 22) Me.TxTStringrToolStripMenuItem.Text = "Stringr" ' 'TxTBaseToolStripMenuItem ' Me.TxTBaseToolStripMenuItem.Name = "TxTBaseToolStripMenuItem" - Me.TxTBaseToolStripMenuItem.Size = New System.Drawing.Size(122, 24) + Me.TxTBaseToolStripMenuItem.Size = New System.Drawing.Size(109, 22) Me.TxTBaseToolStripMenuItem.Text = "base" ' 'ContextMenuStripWakefield @@ -6577,12 +6895,12 @@ Partial Class ucrCalculator Me.ContextMenuStripWakefield.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripWakefield.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.WakefieldToolStripMenuItem}) Me.ContextMenuStripWakefield.Name = "ContextMenuStrip1" - Me.ContextMenuStripWakefield.Size = New System.Drawing.Size(143, 28) + Me.ContextMenuStripWakefield.Size = New System.Drawing.Size(125, 26) ' 'WakefieldToolStripMenuItem ' Me.WakefieldToolStripMenuItem.Name = "WakefieldToolStripMenuItem" - Me.WakefieldToolStripMenuItem.Size = New System.Drawing.Size(142, 24) + Me.WakefieldToolStripMenuItem.Size = New System.Drawing.Size(124, 22) Me.WakefieldToolStripMenuItem.Text = "wakefield" ' 'ContextMenuStripList @@ -6590,24 +6908,24 @@ Partial Class ucrCalculator Me.ContextMenuStripList.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripList.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListBaseToolStripMenuItem, Me.ListStatsToolStripMenuItem, Me.ListStatipToolStripMenuItem}) Me.ContextMenuStripList.Name = "ContextMenuStrip1" - Me.ContextMenuStripList.Size = New System.Drawing.Size(116, 76) + Me.ContextMenuStripList.Size = New System.Drawing.Size(104, 70) ' 'ListBaseToolStripMenuItem ' Me.ListBaseToolStripMenuItem.Name = "ListBaseToolStripMenuItem" - Me.ListBaseToolStripMenuItem.Size = New System.Drawing.Size(115, 24) + Me.ListBaseToolStripMenuItem.Size = New System.Drawing.Size(103, 22) Me.ListBaseToolStripMenuItem.Text = "base" ' 'ListStatsToolStripMenuItem ' Me.ListStatsToolStripMenuItem.Name = "ListStatsToolStripMenuItem" - Me.ListStatsToolStripMenuItem.Size = New System.Drawing.Size(115, 24) + Me.ListStatsToolStripMenuItem.Size = New System.Drawing.Size(103, 22) Me.ListStatsToolStripMenuItem.Text = "stats" ' 'ListStatipToolStripMenuItem ' Me.ListStatipToolStripMenuItem.Name = "ListStatipToolStripMenuItem" - Me.ListStatipToolStripMenuItem.Size = New System.Drawing.Size(115, 24) + Me.ListStatipToolStripMenuItem.Size = New System.Drawing.Size(103, 22) Me.ListStatipToolStripMenuItem.Text = "statip" ' 'grpList @@ -6639,9 +6957,11 @@ Partial Class ucrCalculator Me.grpList.Controls.Add(Me.cmdListSum) Me.grpList.Controls.Add(Me.cmdListSumd) Me.grpList.Controls.Add(Me.cmdListMissing) - Me.grpList.Location = New System.Drawing.Point(548, 52) + Me.grpList.Location = New System.Drawing.Point(438, 42) + Me.grpList.Margin = New System.Windows.Forms.Padding(2) Me.grpList.Name = "grpList" - Me.grpList.Size = New System.Drawing.Size(395, 458) + Me.grpList.Padding = New System.Windows.Forms.Padding(2) + Me.grpList.Size = New System.Drawing.Size(316, 366) Me.grpList.TabIndex = 214 Me.grpList.TabStop = False Me.grpList.Text = "Summary" @@ -6663,9 +6983,11 @@ Partial Class ucrCalculator Me.GroupBox1.Controls.Add(Me.cmdListLag) Me.GroupBox1.Controls.Add(Me.cmdListRank) Me.GroupBox1.Controls.Add(Me.cmdListSort) - Me.GroupBox1.Location = New System.Drawing.Point(5, 310) + Me.GroupBox1.Location = New System.Drawing.Point(4, 248) + Me.GroupBox1.Margin = New System.Windows.Forms.Padding(2) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(388, 137) + Me.GroupBox1.Padding = New System.Windows.Forms.Padding(2) + Me.GroupBox1.Size = New System.Drawing.Size(310, 110) Me.GroupBox1.TabIndex = 200 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Transform" @@ -6674,10 +6996,10 @@ Partial Class ucrCalculator ' Me.cmdListDuplicated.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDuplicated.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDuplicated.Location = New System.Drawing.Point(302, 90) - Me.cmdListDuplicated.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListDuplicated.Location = New System.Drawing.Point(242, 72) + Me.cmdListDuplicated.Margin = New System.Windows.Forms.Padding(2) Me.cmdListDuplicated.Name = "cmdListDuplicated" - Me.cmdListDuplicated.Size = New System.Drawing.Size(82, 38) + Me.cmdListDuplicated.Size = New System.Drawing.Size(66, 30) Me.cmdListDuplicated.TabIndex = 186 Me.cmdListDuplicated.Text = "duplicated" Me.cmdListDuplicated.UseVisualStyleBackColor = True @@ -6686,10 +7008,10 @@ Partial Class ucrCalculator ' Me.cmdListOperator.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListOperator.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListOperator.Location = New System.Drawing.Point(232, 90) - Me.cmdListOperator.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListOperator.Location = New System.Drawing.Point(186, 72) + Me.cmdListOperator.Margin = New System.Windows.Forms.Padding(2) Me.cmdListOperator.Name = "cmdListOperator" - Me.cmdListOperator.Size = New System.Drawing.Size(70, 38) + Me.cmdListOperator.Size = New System.Drawing.Size(56, 30) Me.cmdListOperator.TabIndex = 185 Me.cmdListOperator.Text = ">" Me.cmdListOperator.UseVisualStyleBackColor = True @@ -6698,10 +7020,10 @@ Partial Class ucrCalculator ' Me.cmdListDiv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDiv.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDiv.Location = New System.Drawing.Point(158, 90) - Me.cmdListDiv.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListDiv.Location = New System.Drawing.Point(126, 72) + Me.cmdListDiv.Margin = New System.Windows.Forms.Padding(2) Me.cmdListDiv.Name = "cmdListDiv" - Me.cmdListDiv.Size = New System.Drawing.Size(75, 38) + Me.cmdListDiv.Size = New System.Drawing.Size(60, 30) Me.cmdListDiv.TabIndex = 184 Me.cmdListDiv.Text = "div (%/%)" Me.cmdListDiv.UseVisualStyleBackColor = True @@ -6710,10 +7032,10 @@ Partial Class ucrCalculator ' Me.cmdListMod.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMod.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMod.Location = New System.Drawing.Point(72, 90) - Me.cmdListMod.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMod.Location = New System.Drawing.Point(58, 72) + Me.cmdListMod.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMod.Name = "cmdListMod" - Me.cmdListMod.Size = New System.Drawing.Size(88, 38) + Me.cmdListMod.Size = New System.Drawing.Size(70, 30) Me.cmdListMod.TabIndex = 183 Me.cmdListMod.Text = "mod (%%)" Me.cmdListMod.UseVisualStyleBackColor = True @@ -6722,10 +7044,10 @@ Partial Class ucrCalculator ' Me.cmdListIfelse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListIfelse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListIfelse.Location = New System.Drawing.Point(2, 90) - Me.cmdListIfelse.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListIfelse.Location = New System.Drawing.Point(2, 72) + Me.cmdListIfelse.Margin = New System.Windows.Forms.Padding(2) Me.cmdListIfelse.Name = "cmdListIfelse" - Me.cmdListIfelse.Size = New System.Drawing.Size(72, 38) + Me.cmdListIfelse.Size = New System.Drawing.Size(58, 30) Me.cmdListIfelse.TabIndex = 182 Me.cmdListIfelse.Text = "ifelse" Me.cmdListIfelse.UseVisualStyleBackColor = True @@ -6734,10 +7056,10 @@ Partial Class ucrCalculator ' Me.cmdListOmit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListOmit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListOmit.Location = New System.Drawing.Point(302, 53) - Me.cmdListOmit.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListOmit.Location = New System.Drawing.Point(242, 42) + Me.cmdListOmit.Margin = New System.Windows.Forms.Padding(2) Me.cmdListOmit.Name = "cmdListOmit" - Me.cmdListOmit.Size = New System.Drawing.Size(82, 38) + Me.cmdListOmit.Size = New System.Drawing.Size(66, 30) Me.cmdListOmit.TabIndex = 181 Me.cmdListOmit.Text = "omit.na" Me.cmdListOmit.UseVisualStyleBackColor = True @@ -6746,10 +7068,10 @@ Partial Class ucrCalculator ' Me.cmdListRev.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRev.Location = New System.Drawing.Point(232, 53) - Me.cmdListRev.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListRev.Location = New System.Drawing.Point(186, 42) + Me.cmdListRev.Margin = New System.Windows.Forms.Padding(2) Me.cmdListRev.Name = "cmdListRev" - Me.cmdListRev.Size = New System.Drawing.Size(70, 38) + Me.cmdListRev.Size = New System.Drawing.Size(56, 30) Me.cmdListRev.TabIndex = 180 Me.cmdListRev.Text = "rev" Me.cmdListRev.UseVisualStyleBackColor = True @@ -6758,10 +7080,10 @@ Partial Class ucrCalculator ' Me.cmdListMovsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMovsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMovsum.Location = New System.Drawing.Point(158, 53) - Me.cmdListMovsum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMovsum.Location = New System.Drawing.Point(126, 42) + Me.cmdListMovsum.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMovsum.Name = "cmdListMovsum" - Me.cmdListMovsum.Size = New System.Drawing.Size(75, 38) + Me.cmdListMovsum.Size = New System.Drawing.Size(60, 30) Me.cmdListMovsum.TabIndex = 179 Me.cmdListMovsum.Text = "movsum" Me.cmdListMovsum.UseVisualStyleBackColor = True @@ -6770,10 +7092,10 @@ Partial Class ucrCalculator ' Me.cmdListCumsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListCumsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListCumsum.Location = New System.Drawing.Point(72, 53) - Me.cmdListCumsum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListCumsum.Location = New System.Drawing.Point(58, 42) + Me.cmdListCumsum.Margin = New System.Windows.Forms.Padding(2) Me.cmdListCumsum.Name = "cmdListCumsum" - Me.cmdListCumsum.Size = New System.Drawing.Size(88, 38) + Me.cmdListCumsum.Size = New System.Drawing.Size(70, 30) Me.cmdListCumsum.TabIndex = 178 Me.cmdListCumsum.Text = "cumsum" Me.cmdListCumsum.UseVisualStyleBackColor = True @@ -6782,10 +7104,10 @@ Partial Class ucrCalculator ' Me.cmdListScale.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListScale.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListScale.Location = New System.Drawing.Point(2, 53) - Me.cmdListScale.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListScale.Location = New System.Drawing.Point(2, 42) + Me.cmdListScale.Margin = New System.Windows.Forms.Padding(2) Me.cmdListScale.Name = "cmdListScale" - Me.cmdListScale.Size = New System.Drawing.Size(72, 38) + Me.cmdListScale.Size = New System.Drawing.Size(58, 30) Me.cmdListScale.TabIndex = 177 Me.cmdListScale.Text = " scale" Me.cmdListScale.UseVisualStyleBackColor = True @@ -6794,10 +7116,10 @@ Partial Class ucrCalculator ' Me.cmdListDiff.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDiff.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDiff.Location = New System.Drawing.Point(302, 18) - Me.cmdListDiff.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListDiff.Location = New System.Drawing.Point(242, 14) + Me.cmdListDiff.Margin = New System.Windows.Forms.Padding(2) Me.cmdListDiff.Name = "cmdListDiff" - Me.cmdListDiff.Size = New System.Drawing.Size(82, 38) + Me.cmdListDiff.Size = New System.Drawing.Size(66, 30) Me.cmdListDiff.TabIndex = 176 Me.cmdListDiff.Text = "diff" Me.cmdListDiff.UseVisualStyleBackColor = True @@ -6806,10 +7128,10 @@ Partial Class ucrCalculator ' Me.cmdListLead.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLead.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLead.Location = New System.Drawing.Point(232, 18) - Me.cmdListLead.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListLead.Location = New System.Drawing.Point(186, 14) + Me.cmdListLead.Margin = New System.Windows.Forms.Padding(2) Me.cmdListLead.Name = "cmdListLead" - Me.cmdListLead.Size = New System.Drawing.Size(70, 38) + Me.cmdListLead.Size = New System.Drawing.Size(56, 30) Me.cmdListLead.TabIndex = 175 Me.cmdListLead.Text = "lead" Me.cmdListLead.UseVisualStyleBackColor = True @@ -6818,10 +7140,10 @@ Partial Class ucrCalculator ' Me.cmdListLag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLag.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLag.Location = New System.Drawing.Point(158, 18) - Me.cmdListLag.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListLag.Location = New System.Drawing.Point(126, 14) + Me.cmdListLag.Margin = New System.Windows.Forms.Padding(2) Me.cmdListLag.Name = "cmdListLag" - Me.cmdListLag.Size = New System.Drawing.Size(75, 38) + Me.cmdListLag.Size = New System.Drawing.Size(60, 30) Me.cmdListLag.TabIndex = 174 Me.cmdListLag.Text = "lag" Me.cmdListLag.UseVisualStyleBackColor = True @@ -6830,10 +7152,10 @@ Partial Class ucrCalculator ' Me.cmdListRank.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRank.Location = New System.Drawing.Point(72, 18) - Me.cmdListRank.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListRank.Location = New System.Drawing.Point(58, 14) + Me.cmdListRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdListRank.Name = "cmdListRank" - Me.cmdListRank.Size = New System.Drawing.Size(88, 38) + Me.cmdListRank.Size = New System.Drawing.Size(70, 30) Me.cmdListRank.TabIndex = 173 Me.cmdListRank.Text = "rank" Me.cmdListRank.UseVisualStyleBackColor = True @@ -6842,10 +7164,10 @@ Partial Class ucrCalculator ' Me.cmdListSort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSort.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSort.Location = New System.Drawing.Point(2, 18) - Me.cmdListSort.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSort.Location = New System.Drawing.Point(2, 14) + Me.cmdListSort.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSort.Name = "cmdListSort" - Me.cmdListSort.Size = New System.Drawing.Size(72, 38) + Me.cmdListSort.Size = New System.Drawing.Size(58, 30) Me.cmdListSort.TabIndex = 172 Me.cmdListSort.Text = "sort" Me.cmdListSort.UseVisualStyleBackColor = True @@ -6862,9 +7184,11 @@ Partial Class ucrCalculator Me.grpMathBloc.Controls.Add(Me.cmdListMultiply) Me.grpMathBloc.Controls.Add(Me.cmdListSubtract) Me.grpMathBloc.Controls.Add(Me.cmdListAdd) - Me.grpMathBloc.Location = New System.Drawing.Point(3, 203) + Me.grpMathBloc.Location = New System.Drawing.Point(2, 162) + Me.grpMathBloc.Margin = New System.Windows.Forms.Padding(2) Me.grpMathBloc.Name = "grpMathBloc" - Me.grpMathBloc.Size = New System.Drawing.Size(388, 105) + Me.grpMathBloc.Padding = New System.Windows.Forms.Padding(2) + Me.grpMathBloc.Size = New System.Drawing.Size(310, 84) Me.grpMathBloc.TabIndex = 199 Me.grpMathBloc.TabStop = False Me.grpMathBloc.Text = "Maths" @@ -6873,10 +7197,10 @@ Partial Class ucrCalculator ' Me.cmdListSQRT.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSQRT.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSQRT.Location = New System.Drawing.Point(307, 52) - Me.cmdListSQRT.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSQRT.Location = New System.Drawing.Point(246, 42) + Me.cmdListSQRT.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSQRT.Name = "cmdListSQRT" - Me.cmdListSQRT.Size = New System.Drawing.Size(73, 38) + Me.cmdListSQRT.Size = New System.Drawing.Size(58, 30) Me.cmdListSQRT.TabIndex = 181 Me.cmdListSQRT.Text = "sqrt" Me.cmdListSQRT.UseVisualStyleBackColor = True @@ -6885,10 +7209,10 @@ Partial Class ucrCalculator ' Me.cmdListPercent2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListPercent2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListPercent2.Location = New System.Drawing.Point(232, 53) - Me.cmdListPercent2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListPercent2.Location = New System.Drawing.Point(186, 42) + Me.cmdListPercent2.Margin = New System.Windows.Forms.Padding(2) Me.cmdListPercent2.Name = "cmdListPercent2" - Me.cmdListPercent2.Size = New System.Drawing.Size(75, 38) + Me.cmdListPercent2.Size = New System.Drawing.Size(60, 30) Me.cmdListPercent2.TabIndex = 180 Me.cmdListPercent2.Text = "percent2" Me.cmdListPercent2.UseVisualStyleBackColor = True @@ -6897,10 +7221,10 @@ Partial Class ucrCalculator ' Me.cmdListPercent.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListPercent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListPercent.Location = New System.Drawing.Point(158, 53) - Me.cmdListPercent.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListPercent.Location = New System.Drawing.Point(126, 42) + Me.cmdListPercent.Margin = New System.Windows.Forms.Padding(2) Me.cmdListPercent.Name = "cmdListPercent" - Me.cmdListPercent.Size = New System.Drawing.Size(75, 38) + Me.cmdListPercent.Size = New System.Drawing.Size(60, 30) Me.cmdListPercent.TabIndex = 179 Me.cmdListPercent.Text = "percent" Me.cmdListPercent.UseVisualStyleBackColor = True @@ -6909,10 +7233,10 @@ Partial Class ucrCalculator ' Me.cmdListProportion.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListProportion.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListProportion.Location = New System.Drawing.Point(72, 53) - Me.cmdListProportion.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListProportion.Location = New System.Drawing.Point(58, 42) + Me.cmdListProportion.Margin = New System.Windows.Forms.Padding(2) Me.cmdListProportion.Name = "cmdListProportion" - Me.cmdListProportion.Size = New System.Drawing.Size(88, 38) + Me.cmdListProportion.Size = New System.Drawing.Size(70, 30) Me.cmdListProportion.TabIndex = 178 Me.cmdListProportion.Text = "proportion" Me.cmdListProportion.UseVisualStyleBackColor = True @@ -6921,10 +7245,10 @@ Partial Class ucrCalculator ' Me.cmdListRound.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRound.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRound.Location = New System.Drawing.Point(2, 53) - Me.cmdListRound.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListRound.Location = New System.Drawing.Point(2, 42) + Me.cmdListRound.Margin = New System.Windows.Forms.Padding(2) Me.cmdListRound.Name = "cmdListRound" - Me.cmdListRound.Size = New System.Drawing.Size(72, 38) + Me.cmdListRound.Size = New System.Drawing.Size(58, 30) Me.cmdListRound.TabIndex = 177 Me.cmdListRound.Text = "round" Me.cmdListRound.UseVisualStyleBackColor = True @@ -6933,10 +7257,10 @@ Partial Class ucrCalculator ' Me.cmdListSquare.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSquare.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSquare.Location = New System.Drawing.Point(307, 18) - Me.cmdListSquare.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSquare.Location = New System.Drawing.Point(246, 14) + Me.cmdListSquare.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSquare.Name = "cmdListSquare" - Me.cmdListSquare.Size = New System.Drawing.Size(73, 38) + Me.cmdListSquare.Size = New System.Drawing.Size(58, 30) Me.cmdListSquare.TabIndex = 176 Me.cmdListSquare.Text = "power (^)" Me.cmdListSquare.UseVisualStyleBackColor = True @@ -6945,10 +7269,10 @@ Partial Class ucrCalculator ' Me.cmdListDivide.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDivide.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDivide.Location = New System.Drawing.Point(232, 18) - Me.cmdListDivide.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListDivide.Location = New System.Drawing.Point(186, 14) + Me.cmdListDivide.Margin = New System.Windows.Forms.Padding(2) Me.cmdListDivide.Name = "cmdListDivide" - Me.cmdListDivide.Size = New System.Drawing.Size(75, 38) + Me.cmdListDivide.Size = New System.Drawing.Size(60, 30) Me.cmdListDivide.TabIndex = 175 Me.cmdListDivide.Text = "divide (/)" Me.cmdListDivide.UseVisualStyleBackColor = True @@ -6957,10 +7281,10 @@ Partial Class ucrCalculator ' Me.cmdListMultiply.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMultiply.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMultiply.Location = New System.Drawing.Point(158, 18) - Me.cmdListMultiply.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMultiply.Location = New System.Drawing.Point(126, 14) + Me.cmdListMultiply.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMultiply.Name = "cmdListMultiply" - Me.cmdListMultiply.Size = New System.Drawing.Size(75, 38) + Me.cmdListMultiply.Size = New System.Drawing.Size(60, 30) Me.cmdListMultiply.TabIndex = 174 Me.cmdListMultiply.Text = "times (*)" Me.cmdListMultiply.UseVisualStyleBackColor = True @@ -6969,10 +7293,10 @@ Partial Class ucrCalculator ' Me.cmdListSubtract.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSubtract.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSubtract.Location = New System.Drawing.Point(72, 18) - Me.cmdListSubtract.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSubtract.Location = New System.Drawing.Point(58, 14) + Me.cmdListSubtract.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSubtract.Name = "cmdListSubtract" - Me.cmdListSubtract.Size = New System.Drawing.Size(88, 38) + Me.cmdListSubtract.Size = New System.Drawing.Size(70, 30) Me.cmdListSubtract.TabIndex = 173 Me.cmdListSubtract.Text = " subtract (-)" Me.cmdListSubtract.UseVisualStyleBackColor = True @@ -6981,10 +7305,10 @@ Partial Class ucrCalculator ' Me.cmdListAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListAdd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListAdd.Location = New System.Drawing.Point(2, 18) - Me.cmdListAdd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListAdd.Location = New System.Drawing.Point(2, 14) + Me.cmdListAdd.Margin = New System.Windows.Forms.Padding(2) Me.cmdListAdd.Name = "cmdListAdd" - Me.cmdListAdd.Size = New System.Drawing.Size(72, 38) + Me.cmdListAdd.Size = New System.Drawing.Size(58, 30) Me.cmdListAdd.TabIndex = 172 Me.cmdListAdd.Text = "sum (+)" Me.cmdListAdd.UseVisualStyleBackColor = True @@ -6993,10 +7317,10 @@ Partial Class ucrCalculator ' Me.cmdListNth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListNth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListNth.Location = New System.Drawing.Point(308, 127) - Me.cmdListNth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListNth.Location = New System.Drawing.Point(246, 102) + Me.cmdListNth.Margin = New System.Windows.Forms.Padding(2) Me.cmdListNth.Name = "cmdListNth" - Me.cmdListNth.Size = New System.Drawing.Size(78, 38) + Me.cmdListNth.Size = New System.Drawing.Size(62, 30) Me.cmdListNth.TabIndex = 176 Me.cmdListNth.Text = "nth" Me.cmdListNth.UseVisualStyleBackColor = True @@ -7005,10 +7329,10 @@ Partial Class ucrCalculator ' Me.cmdListLast.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLast.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLast.Location = New System.Drawing.Point(232, 127) - Me.cmdListLast.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListLast.Location = New System.Drawing.Point(186, 102) + Me.cmdListLast.Margin = New System.Windows.Forms.Padding(2) Me.cmdListLast.Name = "cmdListLast" - Me.cmdListLast.Size = New System.Drawing.Size(78, 38) + Me.cmdListLast.Size = New System.Drawing.Size(62, 30) Me.cmdListLast.TabIndex = 175 Me.cmdListLast.Text = "last" Me.cmdListLast.UseVisualStyleBackColor = True @@ -7017,10 +7341,10 @@ Partial Class ucrCalculator ' Me.cmdListFirst.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListFirst.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListFirst.Location = New System.Drawing.Point(157, 127) - Me.cmdListFirst.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListFirst.Location = New System.Drawing.Point(126, 102) + Me.cmdListFirst.Margin = New System.Windows.Forms.Padding(2) Me.cmdListFirst.Name = "cmdListFirst" - Me.cmdListFirst.Size = New System.Drawing.Size(78, 38) + Me.cmdListFirst.Size = New System.Drawing.Size(62, 30) Me.cmdListFirst.TabIndex = 174 Me.cmdListFirst.Text = "first" Me.cmdListFirst.UseVisualStyleBackColor = True @@ -7029,10 +7353,10 @@ Partial Class ucrCalculator ' Me.cmdListAnyDup.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListAnyDup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListAnyDup.Location = New System.Drawing.Point(80, 127) - Me.cmdListAnyDup.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListAnyDup.Location = New System.Drawing.Point(64, 102) + Me.cmdListAnyDup.Margin = New System.Windows.Forms.Padding(2) Me.cmdListAnyDup.Name = "cmdListAnyDup" - Me.cmdListAnyDup.Size = New System.Drawing.Size(78, 38) + Me.cmdListAnyDup.Size = New System.Drawing.Size(62, 30) Me.cmdListAnyDup.TabIndex = 173 Me.cmdListAnyDup.Text = "anydup" Me.cmdListAnyDup.UseVisualStyleBackColor = True @@ -7041,10 +7365,10 @@ Partial Class ucrCalculator ' Me.cmdListDistinct.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDistinct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDistinct.Location = New System.Drawing.Point(3, 127) - Me.cmdListDistinct.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListDistinct.Location = New System.Drawing.Point(2, 102) + Me.cmdListDistinct.Margin = New System.Windows.Forms.Padding(2) Me.cmdListDistinct.Name = "cmdListDistinct" - Me.cmdListDistinct.Size = New System.Drawing.Size(78, 38) + Me.cmdListDistinct.Size = New System.Drawing.Size(62, 30) Me.cmdListDistinct.TabIndex = 172 Me.cmdListDistinct.Text = "distinct" Me.cmdListDistinct.UseVisualStyleBackColor = True @@ -7053,10 +7377,10 @@ Partial Class ucrCalculator ' Me.cmdListIQR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListIQR.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListIQR.Location = New System.Drawing.Point(308, 90) - Me.cmdListIQR.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListIQR.Location = New System.Drawing.Point(246, 72) + Me.cmdListIQR.Margin = New System.Windows.Forms.Padding(2) Me.cmdListIQR.Name = "cmdListIQR" - Me.cmdListIQR.Size = New System.Drawing.Size(78, 38) + Me.cmdListIQR.Size = New System.Drawing.Size(62, 30) Me.cmdListIQR.TabIndex = 171 Me.cmdListIQR.Text = "IQR" Me.cmdListIQR.UseVisualStyleBackColor = True @@ -7065,10 +7389,10 @@ Partial Class ucrCalculator ' Me.cmdListMad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMad.Location = New System.Drawing.Point(232, 90) - Me.cmdListMad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMad.Location = New System.Drawing.Point(186, 72) + Me.cmdListMad.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMad.Name = "cmdListMad" - Me.cmdListMad.Size = New System.Drawing.Size(78, 38) + Me.cmdListMad.Size = New System.Drawing.Size(62, 30) Me.cmdListMad.TabIndex = 170 Me.cmdListMad.Text = "mad" Me.cmdListMad.UseVisualStyleBackColor = True @@ -7077,10 +7401,10 @@ Partial Class ucrCalculator ' Me.cmdListSd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSd.Location = New System.Drawing.Point(157, 90) - Me.cmdListSd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSd.Location = New System.Drawing.Point(126, 72) + Me.cmdListSd.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSd.Name = "cmdListSd" - Me.cmdListSd.Size = New System.Drawing.Size(78, 38) + Me.cmdListSd.Size = New System.Drawing.Size(62, 30) Me.cmdListSd.TabIndex = 169 Me.cmdListSd.Text = "sd" Me.cmdListSd.UseVisualStyleBackColor = True @@ -7089,10 +7413,10 @@ Partial Class ucrCalculator ' Me.cmdListVar.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListVar.Location = New System.Drawing.Point(80, 90) - Me.cmdListVar.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListVar.Location = New System.Drawing.Point(64, 72) + Me.cmdListVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdListVar.Name = "cmdListVar" - Me.cmdListVar.Size = New System.Drawing.Size(78, 38) + Me.cmdListVar.Size = New System.Drawing.Size(62, 30) Me.cmdListVar.TabIndex = 168 Me.cmdListVar.Text = "var" Me.cmdListVar.UseVisualStyleBackColor = True @@ -7101,10 +7425,10 @@ Partial Class ucrCalculator ' Me.cmdListSsq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSsq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSsq.Location = New System.Drawing.Point(3, 90) - Me.cmdListSsq.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSsq.Location = New System.Drawing.Point(2, 72) + Me.cmdListSsq.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSsq.Name = "cmdListSsq" - Me.cmdListSsq.Size = New System.Drawing.Size(78, 38) + Me.cmdListSsq.Size = New System.Drawing.Size(62, 30) Me.cmdListSsq.TabIndex = 167 Me.cmdListSsq.Text = "ssq" Me.cmdListSsq.UseVisualStyleBackColor = True @@ -7113,10 +7437,10 @@ Partial Class ucrCalculator ' Me.cmdListMode1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMode1.Location = New System.Drawing.Point(308, 53) - Me.cmdListMode1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMode1.Location = New System.Drawing.Point(246, 42) + Me.cmdListMode1.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMode1.Name = "cmdListMode1" - Me.cmdListMode1.Size = New System.Drawing.Size(78, 38) + Me.cmdListMode1.Size = New System.Drawing.Size(62, 30) Me.cmdListMode1.TabIndex = 166 Me.cmdListMode1.Text = "mode1" Me.cmdListMode1.UseVisualStyleBackColor = True @@ -7125,10 +7449,10 @@ Partial Class ucrCalculator ' Me.cmdListMax.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMax.Location = New System.Drawing.Point(308, 18) - Me.cmdListMax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMax.Location = New System.Drawing.Point(246, 14) + Me.cmdListMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMax.Name = "cmdListMax" - Me.cmdListMax.Size = New System.Drawing.Size(78, 38) + Me.cmdListMax.Size = New System.Drawing.Size(62, 30) Me.cmdListMax.TabIndex = 165 Me.cmdListMax.Text = "max" Me.cmdListMax.UseVisualStyleBackColor = True @@ -7137,10 +7461,10 @@ Partial Class ucrCalculator ' Me.cmdListFivenum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListFivenum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListFivenum.Location = New System.Drawing.Point(232, 162) - Me.cmdListFivenum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListFivenum.Location = New System.Drawing.Point(186, 130) + Me.cmdListFivenum.Margin = New System.Windows.Forms.Padding(2) Me.cmdListFivenum.Name = "cmdListFivenum" - Me.cmdListFivenum.Size = New System.Drawing.Size(78, 38) + Me.cmdListFivenum.Size = New System.Drawing.Size(62, 30) Me.cmdListFivenum.TabIndex = 163 Me.cmdListFivenum.Tag = "" Me.cmdListFivenum.Text = "fivenum" @@ -7150,10 +7474,10 @@ Partial Class ucrCalculator ' Me.cmdListMode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMode.Location = New System.Drawing.Point(232, 53) - Me.cmdListMode.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMode.Location = New System.Drawing.Point(186, 42) + Me.cmdListMode.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMode.Name = "cmdListMode" - Me.cmdListMode.Size = New System.Drawing.Size(78, 38) + Me.cmdListMode.Size = New System.Drawing.Size(62, 30) Me.cmdListMode.TabIndex = 162 Me.cmdListMode.Text = "mode" Me.cmdListMode.UseVisualStyleBackColor = True @@ -7162,10 +7486,10 @@ Partial Class ucrCalculator ' Me.cmdListQuantile.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListQuantile.Location = New System.Drawing.Point(3, 162) - Me.cmdListQuantile.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListQuantile.Location = New System.Drawing.Point(2, 130) + Me.cmdListQuantile.Margin = New System.Windows.Forms.Padding(2) Me.cmdListQuantile.Name = "cmdListQuantile" - Me.cmdListQuantile.Size = New System.Drawing.Size(78, 38) + Me.cmdListQuantile.Size = New System.Drawing.Size(62, 30) Me.cmdListQuantile.TabIndex = 154 Me.cmdListQuantile.Text = "quantile" Me.cmdListQuantile.UseVisualStyleBackColor = True @@ -7174,10 +7498,10 @@ Partial Class ucrCalculator ' Me.cmdListDigitsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDigitsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDigitsum.Location = New System.Drawing.Point(80, 162) - Me.cmdListDigitsum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListDigitsum.Location = New System.Drawing.Point(64, 130) + Me.cmdListDigitsum.Margin = New System.Windows.Forms.Padding(2) Me.cmdListDigitsum.Name = "cmdListDigitsum" - Me.cmdListDigitsum.Size = New System.Drawing.Size(78, 38) + Me.cmdListDigitsum.Size = New System.Drawing.Size(62, 30) Me.cmdListDigitsum.TabIndex = 161 Me.cmdListDigitsum.Text = "digitsum" Me.cmdListDigitsum.UseVisualStyleBackColor = True @@ -7186,10 +7510,10 @@ Partial Class ucrCalculator ' Me.cmdListMin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMin.Location = New System.Drawing.Point(232, 18) - Me.cmdListMin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMin.Location = New System.Drawing.Point(186, 14) + Me.cmdListMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMin.Name = "cmdListMin" - Me.cmdListMin.Size = New System.Drawing.Size(78, 38) + Me.cmdListMin.Size = New System.Drawing.Size(62, 30) Me.cmdListMin.TabIndex = 156 Me.cmdListMin.Text = "min" Me.cmdListMin.UseVisualStyleBackColor = True @@ -7198,10 +7522,10 @@ Partial Class ucrCalculator ' Me.cmdListProd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListProd.Location = New System.Drawing.Point(157, 18) - Me.cmdListProd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListProd.Location = New System.Drawing.Point(126, 14) + Me.cmdListProd.Margin = New System.Windows.Forms.Padding(2) Me.cmdListProd.Name = "cmdListProd" - Me.cmdListProd.Size = New System.Drawing.Size(78, 38) + Me.cmdListProd.Size = New System.Drawing.Size(62, 30) Me.cmdListProd.TabIndex = 155 Me.cmdListProd.Text = "prod" Me.cmdListProd.UseVisualStyleBackColor = True @@ -7210,10 +7534,10 @@ Partial Class ucrCalculator ' Me.cmdListLength.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLength.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLength.Location = New System.Drawing.Point(3, 18) - Me.cmdListLength.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListLength.Location = New System.Drawing.Point(2, 14) + Me.cmdListLength.Margin = New System.Windows.Forms.Padding(2) Me.cmdListLength.Name = "cmdListLength" - Me.cmdListLength.Size = New System.Drawing.Size(78, 38) + Me.cmdListLength.Size = New System.Drawing.Size(62, 30) Me.cmdListLength.TabIndex = 148 Me.cmdListLength.Text = "length" Me.cmdListLength.UseVisualStyleBackColor = True @@ -7222,10 +7546,10 @@ Partial Class ucrCalculator ' Me.cmdListMedian.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMedian.Location = New System.Drawing.Point(157, 53) - Me.cmdListMedian.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMedian.Location = New System.Drawing.Point(126, 42) + Me.cmdListMedian.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMedian.Name = "cmdListMedian" - Me.cmdListMedian.Size = New System.Drawing.Size(78, 38) + Me.cmdListMedian.Size = New System.Drawing.Size(62, 30) Me.cmdListMedian.TabIndex = 160 Me.cmdListMedian.Text = "median" Me.cmdListMedian.UseVisualStyleBackColor = True @@ -7234,10 +7558,10 @@ Partial Class ucrCalculator ' Me.cmdListMean.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMean.Location = New System.Drawing.Point(80, 53) - Me.cmdListMean.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMean.Location = New System.Drawing.Point(64, 42) + Me.cmdListMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMean.Name = "cmdListMean" - Me.cmdListMean.Size = New System.Drawing.Size(78, 38) + Me.cmdListMean.Size = New System.Drawing.Size(62, 30) Me.cmdListMean.TabIndex = 158 Me.cmdListMean.Text = "mean" Me.cmdListMean.UseVisualStyleBackColor = True @@ -7246,10 +7570,10 @@ Partial Class ucrCalculator ' Me.cmdListRange.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRange.Location = New System.Drawing.Point(3, 53) - Me.cmdListRange.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListRange.Location = New System.Drawing.Point(2, 42) + Me.cmdListRange.Margin = New System.Windows.Forms.Padding(2) Me.cmdListRange.Name = "cmdListRange" - Me.cmdListRange.Size = New System.Drawing.Size(78, 38) + Me.cmdListRange.Size = New System.Drawing.Size(62, 30) Me.cmdListRange.TabIndex = 157 Me.cmdListRange.Text = "range" Me.cmdListRange.UseVisualStyleBackColor = True @@ -7258,10 +7582,10 @@ Partial Class ucrCalculator ' Me.cmdListSum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSum.Location = New System.Drawing.Point(80, 18) - Me.cmdListSum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSum.Location = New System.Drawing.Point(64, 14) + Me.cmdListSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSum.Name = "cmdListSum" - Me.cmdListSum.Size = New System.Drawing.Size(78, 38) + Me.cmdListSum.Size = New System.Drawing.Size(62, 30) Me.cmdListSum.TabIndex = 153 Me.cmdListSum.Text = "sum" Me.cmdListSum.UseVisualStyleBackColor = True @@ -7270,10 +7594,10 @@ Partial Class ucrCalculator ' Me.cmdListSumd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSumd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSumd.Location = New System.Drawing.Point(157, 162) - Me.cmdListSumd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSumd.Location = New System.Drawing.Point(126, 130) + Me.cmdListSumd.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSumd.Name = "cmdListSumd" - Me.cmdListSumd.Size = New System.Drawing.Size(78, 38) + Me.cmdListSumd.Size = New System.Drawing.Size(62, 30) Me.cmdListSumd.TabIndex = 149 Me.cmdListSumd.Text = "sumd" Me.cmdListSumd.UseVisualStyleBackColor = True @@ -7282,10 +7606,10 @@ Partial Class ucrCalculator ' Me.cmdListMissing.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMissing.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMissing.Location = New System.Drawing.Point(308, 162) - Me.cmdListMissing.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMissing.Location = New System.Drawing.Point(246, 130) + Me.cmdListMissing.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMissing.Name = "cmdListMissing" - Me.cmdListMissing.Size = New System.Drawing.Size(78, 38) + Me.cmdListMissing.Size = New System.Drawing.Size(62, 30) Me.cmdListMissing.TabIndex = 164 Me.cmdListMissing.Text = "missing" Me.cmdListMissing.UseVisualStyleBackColor = True @@ -7294,9 +7618,10 @@ Partial Class ucrCalculator ' Me.cmdRhelpList.AutoSize = True Me.cmdRhelpList.ContextMenuStrip = Me.ContextMenuStripList - Me.cmdRhelpList.Location = New System.Drawing.Point(842, 32) + Me.cmdRhelpList.Location = New System.Drawing.Point(674, 26) + Me.cmdRhelpList.Margin = New System.Windows.Forms.Padding(2) Me.cmdRhelpList.Name = "cmdRhelpList" - Me.cmdRhelpList.Size = New System.Drawing.Size(85, 28) + Me.cmdRhelpList.Size = New System.Drawing.Size(68, 23) Me.cmdRhelpList.SplitMenuStrip = Me.ContextMenuStripList Me.cmdRhelpList.TabIndex = 212 Me.cmdRhelpList.Text = "R Help" @@ -7306,9 +7631,10 @@ Partial Class ucrCalculator ' Me.cmdWakefieldHelp.AutoSize = True Me.cmdWakefieldHelp.ContextMenuStrip = Me.ContextMenuStripWakefield - Me.cmdWakefieldHelp.Location = New System.Drawing.Point(967, 43) + Me.cmdWakefieldHelp.Location = New System.Drawing.Point(774, 34) + Me.cmdWakefieldHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldHelp.Name = "cmdWakefieldHelp" - Me.cmdWakefieldHelp.Size = New System.Drawing.Size(113, 28) + Me.cmdWakefieldHelp.Size = New System.Drawing.Size(90, 23) Me.cmdWakefieldHelp.SplitMenuStrip = Me.ContextMenuStripWakefield Me.cmdWakefieldHelp.TabIndex = 211 Me.cmdWakefieldHelp.Text = "R Help" @@ -7318,9 +7644,10 @@ Partial Class ucrCalculator ' Me.cmdStringRHelp.AutoSize = True Me.cmdStringRHelp.ContextMenuStrip = Me.ContextMenuStripTxtString - Me.cmdStringRHelp.Location = New System.Drawing.Point(808, 52) + Me.cmdStringRHelp.Location = New System.Drawing.Point(646, 42) + Me.cmdStringRHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdStringRHelp.Name = "cmdStringRHelp" - Me.cmdStringRHelp.Size = New System.Drawing.Size(113, 28) + Me.cmdStringRHelp.Size = New System.Drawing.Size(90, 23) Me.cmdStringRHelp.SplitMenuStrip = Me.ContextMenuStripTxtString Me.cmdStringRHelp.TabIndex = 210 Me.cmdStringRHelp.Text = "R Help" @@ -7329,20 +7656,20 @@ Partial Class ucrCalculator 'ucrSaveResultInto ' Me.ucrSaveResultInto.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveResultInto.Location = New System.Drawing.Point(13, 379) - Me.ucrSaveResultInto.Margin = New System.Windows.Forms.Padding(5, 7, 5, 7) + Me.ucrSaveResultInto.Location = New System.Drawing.Point(10, 303) + Me.ucrSaveResultInto.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) Me.ucrSaveResultInto.Name = "ucrSaveResultInto" - Me.ucrSaveResultInto.Size = New System.Drawing.Size(408, 28) + Me.ucrSaveResultInto.Size = New System.Drawing.Size(326, 22) Me.ucrSaveResultInto.TabIndex = 196 ' 'ucrTryCalculator ' Me.ucrTryCalculator.AutoSize = True - Me.ucrTryCalculator.Location = New System.Drawing.Point(2, 320) - Me.ucrTryCalculator.Margin = New System.Windows.Forms.Padding(5) + Me.ucrTryCalculator.Location = New System.Drawing.Point(2, 256) + Me.ucrTryCalculator.Margin = New System.Windows.Forms.Padding(4) Me.ucrTryCalculator.Name = "ucrTryCalculator" Me.ucrTryCalculator.RunCommandAsMultipleLines = False - Me.ucrTryCalculator.Size = New System.Drawing.Size(495, 46) + Me.ucrTryCalculator.Size = New System.Drawing.Size(396, 37) Me.ucrTryCalculator.TabIndex = 194 ' 'ucrInputCalOptions @@ -7351,10 +7678,10 @@ Partial Class ucrCalculator Me.ucrInputCalOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputCalOptions.GetSetSelectedIndex = -1 Me.ucrInputCalOptions.IsReadOnly = False - Me.ucrInputCalOptions.Location = New System.Drawing.Point(282, 52) - Me.ucrInputCalOptions.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.ucrInputCalOptions.Location = New System.Drawing.Point(226, 42) + Me.ucrInputCalOptions.Margin = New System.Windows.Forms.Padding(2) Me.ucrInputCalOptions.Name = "ucrInputCalOptions" - Me.ucrInputCalOptions.Size = New System.Drawing.Size(172, 28) + Me.ucrInputCalOptions.Size = New System.Drawing.Size(138, 22) Me.ucrInputCalOptions.TabIndex = 180 ' 'ucrSelectorForCalculations @@ -7363,160 +7690,28 @@ Partial Class ucrCalculator Me.ucrSelectorForCalculations.bDropUnusedFilterLevels = False Me.ucrSelectorForCalculations.bShowHiddenColumns = False Me.ucrSelectorForCalculations.bUseCurrentFilter = True - Me.ucrSelectorForCalculations.Location = New System.Drawing.Point(0, 80) + Me.ucrSelectorForCalculations.Location = New System.Drawing.Point(0, 64) Me.ucrSelectorForCalculations.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForCalculations.Name = "ucrSelectorForCalculations" - Me.ucrSelectorForCalculations.Size = New System.Drawing.Size(267, 228) + Me.ucrSelectorForCalculations.Size = New System.Drawing.Size(214, 183) Me.ucrSelectorForCalculations.TabIndex = 173 ' 'ucrReceiverForCalculation ' Me.ucrReceiverForCalculation.AutoSize = True Me.ucrReceiverForCalculation.frmParent = Nothing - Me.ucrReceiverForCalculation.Location = New System.Drawing.Point(88, 8) - Me.ucrReceiverForCalculation.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.ucrReceiverForCalculation.Location = New System.Drawing.Point(70, 6) + Me.ucrReceiverForCalculation.Margin = New System.Windows.Forms.Padding(2) Me.ucrReceiverForCalculation.Name = "ucrReceiverForCalculation" Me.ucrReceiverForCalculation.Selector = Nothing - Me.ucrReceiverForCalculation.Size = New System.Drawing.Size(488, 37) + Me.ucrReceiverForCalculation.Size = New System.Drawing.Size(390, 30) Me.ucrReceiverForCalculation.strNcFilePath = "" Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' - 'cmdLogicalHelp - ' - Me.cmdLogicalHelp.AutoSize = True - Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.Location = New System.Drawing.Point(207, 277) - Me.cmdLogicalHelp.Name = "cmdLogicalHelp" - Me.cmdLogicalHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.TabIndex = 212 - Me.cmdLogicalHelp.Text = "R Help" - Me.cmdLogicalHelp.UseVisualStyleBackColor = True - ' - 'cmdRHelp - ' - Me.cmdRHelp.AutoSize = True - Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.Location = New System.Drawing.Point(194, 248) - Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.TabIndex = 212 - Me.cmdRHelp.Text = "R Help" - Me.cmdRHelp.UseVisualStyleBackColor = True - ' - 'cmdHydroHelp - ' - Me.cmdHydroHelp.AutoSize = True - Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.Location = New System.Drawing.Point(113, 298) - Me.cmdHydroHelp.Name = "cmdHydroHelp" - Me.cmdHydroHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.TabIndex = 212 - Me.cmdHydroHelp.Text = "R Help" - Me.cmdHydroHelp.UseVisualStyleBackColor = True - ' - 'cmdTransformHelp - ' - Me.cmdTransformHelp.AutoSize = True - Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.Location = New System.Drawing.Point(188, 218) - Me.cmdTransformHelp.Name = "cmdTransformHelp" - Me.cmdTransformHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.TabIndex = 212 - Me.cmdTransformHelp.Text = "R Help" - Me.cmdTransformHelp.UseVisualStyleBackColor = True - ' - 'cmdCircularHelp - ' - Me.cmdCircularHelp.AutoSize = True - Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.Location = New System.Drawing.Point(197, 178) - Me.cmdCircularHelp.Name = "cmdCircularHelp" - Me.cmdCircularHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.TabIndex = 212 - Me.cmdCircularHelp.Text = "R Help" - Me.cmdCircularHelp.UseVisualStyleBackColor = True - ' - 'cmdMathsHelp - ' - Me.cmdMathsHelp.AutoSize = True - Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.Location = New System.Drawing.Point(204, 165) - Me.cmdMathsHelp.Name = "cmdMathsHelp" - Me.cmdMathsHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.TabIndex = 211 - Me.cmdMathsHelp.Text = "R Help" - Me.cmdMathsHelp.UseVisualStyleBackColor = True - ' - 'cmdProbRHelp - ' - Me.cmdProbRHelp.AutoSize = True - Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.Location = New System.Drawing.Point(269, 239) - Me.cmdProbRHelp.Name = "cmdProbRHelp" - Me.cmdProbRHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.TabIndex = 212 - Me.cmdProbRHelp.Text = "R Help" - Me.cmdProbRHelp.UseVisualStyleBackColor = True - ' - 'cmdIntegerRHelp - ' - Me.cmdIntegerRHelp.AutoSize = True - Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.Location = New System.Drawing.Point(262, 354) - Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" - Me.cmdIntegerRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.TabIndex = 16 - Me.cmdIntegerRHelp.Text = "R Help" - Me.cmdIntegerRHelp.UseVisualStyleBackColor = True - ' - 'cmdComplexRHelp - ' - Me.cmdComplexRHelp.AutoSize = True - Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.Location = New System.Drawing.Point(237, 240) - Me.cmdComplexRHelp.Name = "cmdComplexRHelp" - Me.cmdComplexRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.TabIndex = 209 - Me.cmdComplexRHelp.Text = "R Help" - Me.cmdComplexRHelp.UseVisualStyleBackColor = True - ' - 'cmdSummaryRHelp - ' - Me.cmdSummaryRHelp.AutoSize = True - Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.Location = New System.Drawing.Point(228, 238) - Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" - Me.cmdSummaryRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.TabIndex = 185 - Me.cmdSummaryRHelp.Text = "R Help" - Me.cmdSummaryRHelp.UseVisualStyleBackColor = True - ' - 'cmdTransformRHelp - ' - Me.cmdTransformRHelp.AutoSize = True - Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.Location = New System.Drawing.Point(267, 245) - Me.cmdTransformRHelp.Name = "cmdTransformRHelp" - Me.cmdTransformRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.TabIndex = 204 - Me.cmdTransformRHelp.Text = "R Help" - Me.cmdTransformRHelp.UseVisualStyleBackColor = True - ' 'ucrCalculator ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.Controls.Add(Me.grpList) @@ -7531,13 +7726,6 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) - Me.Controls.Add(Me.grpLogical) - Me.Controls.Add(Me.grpDates) - Me.Controls.Add(Me.grpHydroGOF) - Me.Controls.Add(Me.grpFactor) - Me.Controls.Add(Me.grpWakefield) - Me.Controls.Add(Me.grpCircular) - Me.Controls.Add(Me.grpMaths) Me.Controls.Add(Me.grpProbabilty) Me.Controls.Add(Me.grpInteger) Me.Controls.Add(Me.grpTestString) @@ -7546,48 +7734,56 @@ Partial Class ucrCalculator Me.Controls.Add(Me.grpComplex) Me.Controls.Add(Me.grpSummary) Me.Controls.Add(Me.grpTransform) + Me.Controls.Add(Me.grpWakefield) + Me.Controls.Add(Me.grpLogical) + Me.Controls.Add(Me.grpDates) + Me.Controls.Add(Me.grpHydroGOF) + Me.Controls.Add(Me.grpFactor) + Me.Controls.Add(Me.grpCircular) + Me.Controls.Add(Me.grpMaths) + Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "ucrCalculator" - Me.Size = New System.Drawing.Size(1123, 572) + Me.Size = New System.Drawing.Size(898, 458) Me.grpBasic.ResumeLayout(False) Me.grpDates.ResumeLayout(False) - Me.grpDates.PerformLayout() + Me.grpDates.PerformLayout Me.ContextMenuStripDate.ResumeLayout(False) Me.ContextMenuStripComplex.ResumeLayout(False) Me.grpInteger.ResumeLayout(False) - Me.grpInteger.PerformLayout() + Me.grpInteger.PerformLayout Me.ContextMenuStripInteger.ResumeLayout(False) Me.grpFactor.ResumeLayout(False) - Me.grpFactor.PerformLayout() + Me.grpFactor.PerformLayout Me.ContextMenuStripFactor.ResumeLayout(False) Me.grpHydroGOF.ResumeLayout(False) - Me.grpHydroGOF.PerformLayout() + Me.grpHydroGOF.PerformLayout Me.ContextMenuStripHydroGOF.ResumeLayout(False) Me.grpWakefield.ResumeLayout(False) Me.grpMaths.ResumeLayout(False) - Me.grpMaths.PerformLayout() + Me.grpMaths.PerformLayout Me.ContextMenuStripMaths.ResumeLayout(False) Me.grpSummary.ResumeLayout(False) - Me.grpSummary.PerformLayout() + Me.grpSummary.PerformLayout Me.ContextMenuStripSummary.ResumeLayout(False) Me.grpFrequencies.ResumeLayout(False) Me.grpProbabilty.ResumeLayout(False) - Me.grpProbabilty.PerformLayout() + Me.grpProbabilty.PerformLayout Me.ContextMenuStripProbability.ResumeLayout(False) Me.grpRandom.ResumeLayout(False) Me.grpTransform.ResumeLayout(False) - Me.grpTransform.PerformLayout() + Me.grpTransform.PerformLayout Me.ContextMenuStripTransform.ResumeLayout(False) Me.grpLogical.ResumeLayout(False) - Me.grpLogical.PerformLayout() + Me.grpLogical.PerformLayout Me.ContextMenuStripLogical.ResumeLayout(False) Me.grpTestString.ResumeLayout(False) Me.grpCircular.ResumeLayout(False) - Me.grpCircular.PerformLayout() + Me.grpCircular.PerformLayout Me.ContextMenuStripCircular.ResumeLayout(False) Me.grpModifier.ResumeLayout(False) Me.grpSymbols.ResumeLayout(False) Me.grpComplex.ResumeLayout(False) - Me.grpComplex.PerformLayout() + Me.grpComplex.PerformLayout Me.ContextMenuStripTxtString.ResumeLayout(False) Me.ContextMenuStripWakefield.ResumeLayout(False) Me.ContextMenuStripList.ResumeLayout(False) @@ -7595,7 +7791,7 @@ Partial Class ucrCalculator Me.GroupBox1.ResumeLayout(False) Me.grpMathBloc.ResumeLayout(False) Me.ResumeLayout(False) - Me.PerformLayout() + Me.PerformLayout End Sub @@ -7786,7 +7982,7 @@ Partial Class ucrCalculator Friend WithEvents cmdWakefieldLower As Button Friend WithEvents cmdLanguage As Button Friend WithEvents cmdIq As Button - Friend WithEvents cmdInternet_Browser As Button + Friend WithEvents cmdid As Button Friend WithEvents cmdGrade_Level As Button Friend WithEvents cmdEye As Button Friend WithEvents cmdEmployment As Button diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index be3a2823860..e8833c8a3c6 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -61,7 +61,7 @@ Public Class ucrCalculator End Sub Public Sub InitialiseControls() - ucrInputCalOptions.SetItems({"Basic", "Maths", "Logical and Symbols", "Summary", "Text/Strings (Character Columns)", "Factor", "Probability", "Dates/Times", "Transform", "Wakefield", "Circular", "hydroGOF", "List", "Complex", "Integer"}) ' "Rows" is a temp. name + ucrInputCalOptions.SetItems({"Basic", "Maths", "Logical and Symbols", "Transform", "Summary", "Probability", "Factor", "Text/Strings (Character Columns)", "Dates/Times", "Circular", "Wakefield", "Goodness of Fit", "List", "Complex", "Integer"}) ' "Rows" is a temp. name ucrInputCalOptions.SetDropDownStyleAsNonEditable() ucrReceiverForCalculation.Selector = ucrSelectorForCalculations @@ -359,7 +359,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdHair, "Sample with default of 4 hair colours, brown, black, blonde, red, and defined probabilities") ttCalculator.SetToolTip(cmdHeight, "Sample from normal distribution with default mean 69, and sd 3.75, min 1, and no specified max, rounded to no decimals") ttCalculator.SetToolTip(cmdIncome, "Sample from a gamma distribution with mean 40,000 and shape 2. (Multiply the result to change the mean)") - ttCalculator.SetToolTip(cmdInternet_Browser, "Sample from ""Which browser do you use?"" with Chrome, IE, Firefox, Safari, Opera, Android, being the options") + ttCalculator.SetToolTip(cmdid, "Generate a variable with zero-padded IDs") ttCalculator.SetToolTip(cmdIq, "Sample from normal distribution with default of mean 100 and sd 15 - not 10 as provided by the package") ttCalculator.SetToolTip(cmdLanguage, "Sample of world's languages with default being list of 99 languages, provided, together with their proportions") ttCalculator.SetToolTip(cmdWakefieldLower, "Sample of single letters, with default being one of a,b,c,d,e") @@ -935,7 +935,7 @@ Public Class ucrCalculator grpList.Visible = False cmdRhelpList.Visible = False Me.Size = New Size(iBasicWidth * 1.39, iBaseHeight) - Case "hydroGOF" + Case "Goodness of Fit" strPackageName = "hydroGOF" grpDates.Visible = False grpProbabilty.Visible = False @@ -2804,7 +2804,7 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldIncomeFunction.ToScript, 0) End Sub - Private Sub cmdInternet_Browser_Click(sender As Object, e As EventArgs) Handles cmdInternet_Browser.Click + Private Sub cmdid_Click(sender As Object, e As EventArgs) Handles cmdid.Click Dim clsWakefieldInternetBrowserFunction As New RFunction Dim clsWakefieldNrowFunction As New RFunction Dim clsBrowserListFunction As New RFunction @@ -5035,7 +5035,7 @@ Public Class ucrCalculator Private Sub cmdHydroHelp_Click(sender As Object, e As EventArgs) Handles cmdHydroHelp.Click, HydroGOFToolStripMenuItem.Click CalculationsOptions() - If ucrInputCalOptions.GetText = "hydroGOF" Then + If ucrInputCalOptions.GetText = "Goodness of Fit " Then strPackageName = "hydroGOF" End If OpenHelpPage() From 3d22fdd6a23d7fd84ad2386489bab2eab2a46ef9 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 22 Apr 2024 10:17:30 +0300 Subject: [PATCH 37/99] changes --- instat/ucrCalculator.Designer.vb | 4 ++-- instat/ucrCalculator.resx | 2 +- instat/ucrCalculator.vb | 36 ++++++++------------------------ 3 files changed, 12 insertions(+), 30 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index f0a25ed9e37..71b01204a25 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -6957,7 +6957,7 @@ Partial Class ucrCalculator Me.grpList.Controls.Add(Me.cmdListSum) Me.grpList.Controls.Add(Me.cmdListSumd) Me.grpList.Controls.Add(Me.cmdListMissing) - Me.grpList.Location = New System.Drawing.Point(438, 42) + Me.grpList.Location = New System.Drawing.Point(438, 52) Me.grpList.Margin = New System.Windows.Forms.Padding(2) Me.grpList.Name = "grpList" Me.grpList.Padding = New System.Windows.Forms.Padding(2) @@ -7618,7 +7618,7 @@ Partial Class ucrCalculator ' Me.cmdRhelpList.AutoSize = True Me.cmdRhelpList.ContextMenuStrip = Me.ContextMenuStripList - Me.cmdRhelpList.Location = New System.Drawing.Point(674, 26) + Me.cmdRhelpList.Location = New System.Drawing.Point(678, 26) Me.cmdRhelpList.Margin = New System.Windows.Forms.Padding(2) Me.cmdRhelpList.Name = "cmdRhelpList" Me.cmdRhelpList.Size = New System.Drawing.Size(68, 23) diff --git a/instat/ucrCalculator.resx b/instat/ucrCalculator.resx index b436018d56a..fab1bf083ba 100644 --- a/instat/ucrCalculator.resx +++ b/instat/ucrCalculator.resx @@ -163,6 +163,6 @@ 759, 103 - 99 + 65 \ No newline at end of file diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index e8833c8a3c6..8d86b09a414 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -128,6 +128,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdDuplicate, "duplicate detects non-unique values, for example duplicated(c(1:3,2,7)) gives FALSE, FALSE, FALSE, TRUE, FALSE") ttCalculator.SetToolTip(cmdNear, "near(x,y)compares 2 variables. For example sqrt(5)^2 is almost, but isn't exactly 5, however near(sqrt(5)^2,5) is TRUE") ttCalculator.SetToolTip(cmdnumeric, "Define a variable as numeric. For example as numeric(c(TRUE,TRUE,FALSE,TRUE)) gives (1, 1,0, 1) ") + ttCalculator.SetToolTip(cmdSquareBrackets, "Extract one or more elements from a column (or data frame") ttCalculator.SetToolTip(cmdTilde, "This is called tilde and links the left side and right side of a formula") ttCalculator.SetToolTip(cmdCalcConcantenateFunction, "Combines arguments to form a single vector, e.g. c(1:3 8) is 1, 2, 3, 8") ttCalculator.SetToolTip(cmdCalcRepelicationFunction, "Repeat of a sequence, e.g. rep(c(2, 3, 4), each=2) gives 2, 2, 3, 3, 4, 4") @@ -2805,38 +2806,19 @@ Public Class ucrCalculator End Sub Private Sub cmdid_Click(sender As Object, e As EventArgs) Handles cmdid.Click - Dim clsWakefieldInternetBrowserFunction As New RFunction + Dim clsWakefieldIDFunction As New RFunction Dim clsWakefieldNrowFunction As New RFunction - Dim clsBrowserListFunction As New RFunction - Dim clsBrowserProbFunction As New RFunction clsWakefieldNrowFunction.SetRCommand("nrow") clsWakefieldNrowFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem, iPosition:=0) - clsBrowserListFunction.SetRCommand("c") - clsBrowserListFunction.AddParameter("chrome", Chr(34) & "Chrome" & Chr(34), iPosition:=0, bIncludeArgumentName:=False) - clsBrowserListFunction.AddParameter("IE", Chr(34) & "IE" & Chr(34), iPosition:=1, bIncludeArgumentName:=False) - clsBrowserListFunction.AddParameter("firefox", Chr(34) & "Firefox" & Chr(34), iPosition:=2, bIncludeArgumentName:=False) - clsBrowserListFunction.AddParameter("safari", Chr(34) & "Safari" & Chr(34), iPosition:=3, bIncludeArgumentName:=False) - clsBrowserListFunction.AddParameter("opera", Chr(34) & "Opera" & Chr(34), iPosition:=4, bIncludeArgumentName:=False) - clsBrowserListFunction.AddParameter("android", Chr(34) & "Android" & Chr(34), iPosition:=5, bIncludeArgumentName:=False) - - clsBrowserProbFunction.SetRCommand("c") - clsBrowserProbFunction.AddParameter("0.5027", "0.5027", iPosition:=0, bIncludeArgumentName:=False) - clsBrowserProbFunction.AddParameter("0.175", "0.175", iPosition:=1, bIncludeArgumentName:=False) - clsBrowserProbFunction.AddParameter("0.1689", "0.1689", iPosition:=2, bIncludeArgumentName:=False) - clsBrowserProbFunction.AddParameter("0.0994", "0.0994", iPosition:=3, bIncludeArgumentName:=False) - clsBrowserProbFunction.AddParameter("0.017", "0.017", iPosition:=4, bIncludeArgumentName:=False) - clsBrowserProbFunction.AddParameter("0.0132", "0.0132", iPosition:=5, bIncludeArgumentName:=False) - - clsWakefieldInternetBrowserFunction.SetPackageName("wakefield") - clsWakefieldInternetBrowserFunction.SetRCommand("internet_browser") - clsWakefieldInternetBrowserFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) - clsWakefieldInternetBrowserFunction.AddParameter("x", clsRFunctionParameter:=clsBrowserListFunction, iPosition:=1) - clsWakefieldInternetBrowserFunction.AddParameter("prob", clsRFunctionParameter:=clsBrowserProbFunction, iPosition:=2) - clsWakefieldInternetBrowserFunction.AddParameter("name", Chr(34) & "Browser" & Chr(34), iPosition:=3) - - ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldInternetBrowserFunction.ToScript, 0) + clsWakefieldIDFunction.SetPackageName("wakefield") + clsWakefieldIDFunction.SetRCommand("id") + clsWakefieldIDFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) + clsWakefieldIDFunction.AddParameter("random", "FALSE", iPosition:=1) + clsWakefieldIDFunction.AddParameter("name", Chr(34) & "ID" & Chr(34), iPosition:=2) + + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldIDFunction.ToScript, 0) End Sub Private Sub cmdIq_Click(sender As Object, e As EventArgs) Handles cmdIq.Click From 5de036b84ce28bfb720af15ec786b18b20ecaac7 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 22 Apr 2024 08:58:56 +0100 Subject: [PATCH 38/99] Reset as default value to 0.23 --- instat/dlgEvapotranspiration.vb | 4 ++-- instat/sdgLocation.vb | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index 45452879aa7..b78cee3e008 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -501,7 +501,7 @@ Public Class dlgEvapotranspiration clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5) clsListFunction.AddParameter("z", 2, iPosition:=4) clsListFunction.AddParameter("G", 0, iPosition:=6) - clsListFunction.AddParameter("as", 0.25, iPosition:=7) + clsListFunction.AddParameter("as", 0.23, iPosition:=7) clsListFunction.AddParameter("bs", 0.5, iPosition:=8) clsListFunction.AddParameter("lambda", 2.45, iPosition:=1) clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) @@ -522,7 +522,7 @@ Public Class dlgEvapotranspiration clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5) clsListFunction.AddParameter("G", 0, iPosition:=6) - clsListFunction.AddParameter("as", 0.25, iPosition:=7) + clsListFunction.AddParameter("as", 0.23, iPosition:=7) clsListFunction.AddParameter("bs", 0.5, iPosition:=8) clsListFunction.AddParameter("alphaPT", 1.26, iPosition:=9) clsListFunction.RemoveParameterByName("z") diff --git a/instat/sdgLocation.vb b/instat/sdgLocation.vb index ad902300c93..dd2baa3a3b9 100644 --- a/instat/sdgLocation.vb +++ b/instat/sdgLocation.vb @@ -49,6 +49,7 @@ Public Class sdgLocation ucrInputLatitude.SetParameter(New RParameter("lat_rad", 2)) ucrInputLatitude.AddQuotesIfUnrecognised = False ucrInputLatitude.SetLinkedDisplayControl(lblLatitude) + ucrInputLatitude.SetValidationTypeAsNumeric() ucrInputLatitude.SetRDefault("0") ucrReceiverLongitude.SetParameter(New RParameter("lon", 3)) @@ -60,7 +61,8 @@ Public Class sdgLocation ucrInputLongitude.SetParameter(New RParameter("lon", 3)) ucrInputLongitude.AddQuotesIfUnrecognised = False ucrInputLongitude.SetLinkedDisplayControl(lblLongitude) - ucrInputLongitude.SetRDefault(0) + ucrInputLongitude.SetValidationTypeAsNumeric() + ucrInputLongitude.SetRDefault("0") ucrReceiverAltitude.SetParameter(New RParameter("Elev", 4)) ucrReceiverAltitude.SetParameterIsRFunction() @@ -71,6 +73,7 @@ Public Class sdgLocation ucrInputElevation.SetParameter(New RParameter("Elev", 4)) ucrInputElevation.AddQuotesIfUnrecognised = False ucrInputElevation.SetLinkedDisplayControl(lblLatitude) + ucrInputElevation.SetValidationTypeAsNumeric() ucrInputElevation.SetRDefault("0") bControlsInitialised = True @@ -117,6 +120,11 @@ Public Class sdgLocation Private Sub ucrInputElevation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputElevation.ControlValueChanged EnableDesableSelector() + If Not ucrInputElevation.IsEmpty Then + clsListFunction.AddParameter("Elev", ucrInputElevation.GetText(), iPosition:=4) + Else + clsListFunction.RemoveParameterByName("Elev") + End If End Sub Private Sub ucrSelectorLocation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorLocation.ControlValueChanged @@ -125,9 +133,14 @@ Public Class sdgLocation Private Sub ucrInputLatitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLatitude.ControlValueChanged EnableDesableSelector() + If Not ucrInputLatitude.IsEmpty Then + clsListFunction.AddParameter("lat_rad", ucrInputLatitude.GetText(), iPosition:=1) + Else + clsListFunction.RemoveParameterByName("lat_rad") + End If End Sub - Private Sub ucrInputLongitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLongitude.ControlValueChanged + Private Sub ucrReceiverLatitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverLatitude.ControlValueChanged EnableDesableSelector() End Sub End Class \ No newline at end of file From 32fa696b863b137e67103835621f636b14f4e5e3 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Tue, 23 Apr 2024 18:32:53 +0300 Subject: [PATCH 39/99] changes --- instat/ucrCalculator.vb | 64 ++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 8d86b09a414..27b72321e80 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -1453,7 +1453,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(p= , df= , lower.tail = TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(,)", 1) End If End Sub @@ -1461,7 +1461,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(p= , df= , lower.tail = TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(,)", 1) End If End Sub @@ -1469,13 +1469,13 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(p= , df1= , df2= ,lower.tail = TRUE)", 33) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(,,)", 1) End If End Sub Private Sub cmdPnorm_Click(sender As Object, e As EventArgs) Handles cmdPnorm.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnorm(q= , mean = 0, sd = 1, lower.tail = True, Log.p = False)", 52) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnorm(q= , mean = 0, sd = 1, lower.tail = True, Log.p = False)", 54) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnorm()", 1) End If @@ -1485,7 +1485,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(q= , df= , lower.tail = TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(,)", 1) End If End Sub @@ -1493,15 +1493,15 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(q= , df= , lower.tail = TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(,)", 1) End If End Sub Private Sub cmdPf_Click(sender As Object, e As EventArgs) Handles cmdPf.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(q= , df= , lower.tail = TRUE)", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(q= , df= , lower.tail = TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(,,)", 1) End If End Sub @@ -1509,7 +1509,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(n= , k= )", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(,)", 1) End If End Sub @@ -1525,7 +1525,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(a= , b= )", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(,,)", 1) End If End Sub @@ -1533,7 +1533,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(n= , k= )", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(,)", 1) End If End Sub @@ -1549,7 +1549,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(a= , b= )", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(,,)", 1) End If End Sub @@ -3764,25 +3764,25 @@ Public Class ucrCalculator Private Sub cmdPgamma_Click(sender As Object, e As EventArgs) Handles cmdPgamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(q = , shape = , rate = 1, scale = 1/rate, lower.tail = TRUE,log.p = FALSE))", 73) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(q = , shape = , rate = 1, scale = 1/rate, lower.tail = TRUE,log.p = FALSE)", 71) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(,,)", 1) End If End Sub Private Sub cmdQgamma_Click(sender As Object, e As EventArgs) Handles cmdQgamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(p = , shape = , rate = 1, scale = 1/rate, lower.tail = TRUE, log.p = FALSE))", 73) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(p = , shape = , rate = 1, scale = 1/rate, lower.tail = TRUE, log.p = FALSE)", 73) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(,)", 1) End If End Sub Private Sub cmdPbeta_Click(sender As Object, e As EventArgs) Handles cmdPbeta.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(q = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE))", 68) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(q = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 68) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(,,)", 1) End If End Sub @@ -3796,33 +3796,33 @@ Public Class ucrCalculator Private Sub cmdPbinom_Click(sender As Object, e As EventArgs) Handles cmdPbinom.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(q = , size = , prob = , lower.tail = TRUE, log.p = FALSE))", 55) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(q = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 55) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(,,)", 1) End If End Sub Private Sub cmdPpois_Click(sender As Object, e As EventArgs) Handles cmdPpois.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(q = , lambda = , lower.tail = TRUE, log.p = FALSE))", 48) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(q = , lambda = , lower.tail = TRUE, log.p = FALSE)", 48) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(,)", 1) End If End Sub Private Sub cmdPnbin_Click(sender As Object, e As EventArgs) Handles cmdPnbin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(q = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE))", 62) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(q = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 62) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(,,,)", 1) End If End Sub Private Sub cmdQbeta_Click(sender As Object, e As EventArgs) Handles cmdQbeta.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(p = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE))", 68) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(p = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 68) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(,,)", 1) End If End Sub @@ -3836,25 +3836,25 @@ Public Class ucrCalculator Private Sub cmdQbinom_Click(sender As Object, e As EventArgs) Handles cmdQbinom.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(p = , size = , prob = , lower.tail = TRUE, log.p = FALSE))", 55) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(p = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 55) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(,,)", 1) End If End Sub Private Sub Button5_Click(sender As Object, e As EventArgs) Handles cmdQpois.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(p = , lambda = , lower.tail = TRUE, log.p = FALSE))", 48) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(p = , lambda = , lower.tail = TRUE, log.p = FALSE)", 48) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(,)", 1) End If End Sub Private Sub cmdQnbin_Click(sender As Object, e As EventArgs) Handles cmdQnbin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(p = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE))", 62) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(p = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 62) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(,,,)", 1) End If End Sub From 9f68fb26d1d9dcd23dae9b73fea0f854b6c42e32 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Wed, 24 Apr 2024 10:49:38 +0300 Subject: [PATCH 40/99] change --- instat/ucrCalculator.vb | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 27b72321e80..075ca5f7060 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -1453,7 +1453,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(p= , df= , lower.tail = TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(,)", 2) End If End Sub @@ -1461,7 +1461,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(p= , df= , lower.tail = TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(,)", 2) End If End Sub @@ -1469,7 +1469,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(p= , df1= , df2= ,lower.tail = TRUE)", 33) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(,,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(,,)", 3) End If End Sub @@ -1485,7 +1485,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(q= , df= , lower.tail = TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(,)", 2) End If End Sub @@ -1493,7 +1493,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(q= , df= , lower.tail = TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(,)", 2) End If End Sub @@ -1501,7 +1501,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(q= , df= , lower.tail = TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(,,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(,,)", 3) End If End Sub @@ -1509,7 +1509,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(n= , k= )", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(,)", 2) End If End Sub @@ -1525,7 +1525,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(a= , b= )", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(,,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(,)", 2) End If End Sub @@ -1533,7 +1533,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(n= , k= )", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(,)", 2) End If End Sub @@ -1549,7 +1549,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(a= , b= )", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(,,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(,)", 2) End If End Sub @@ -3538,7 +3538,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = seq(0, 1, 0.25), na.rm = TRUE, names = TRUE, type = 7)", 65) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = seq(0, 1, 0.25))", 28) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = seq(0, 1, 0.25))", 26) End If End Sub @@ -3766,7 +3766,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(q = , shape = , rate = 1, scale = 1/rate, lower.tail = TRUE,log.p = FALSE)", 71) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(,,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(,,)", 3) End If End Sub @@ -3774,7 +3774,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(p = , shape = , rate = 1, scale = 1/rate, lower.tail = TRUE, log.p = FALSE)", 73) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(,)", 2) End If End Sub @@ -3782,7 +3782,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(q = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 68) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(,,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(,,)", 3) End If End Sub @@ -3798,7 +3798,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(q = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 55) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(,,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(,,)", 3) End If End Sub @@ -3806,7 +3806,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(q = , lambda = , lower.tail = TRUE, log.p = FALSE)", 48) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(,)", 2) End If End Sub @@ -3814,7 +3814,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(q = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 62) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(,,,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(,,)", 3) End If End Sub @@ -3822,7 +3822,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(p = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 68) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(,,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(,,)", 3) End If End Sub @@ -3838,7 +3838,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(p = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 55) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(,,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(,,)", 3) End If End Sub @@ -3846,7 +3846,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(p = , lambda = , lower.tail = TRUE, log.p = FALSE)", 48) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(,)", 2) End If End Sub @@ -3854,7 +3854,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(p = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 62) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(,,,)", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(,,)", 3) End If End Sub From 9583a49c00ec325e4eecfd08968e1a8f089ac117 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Wed, 24 Apr 2024 11:02:31 +0300 Subject: [PATCH 41/99] design --- instat/ucrCalculator.Designer.vb | 376 +++++++++++++++---------------- 1 file changed, 188 insertions(+), 188 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 71b01204a25..41e1d3f0a1e 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -86,7 +86,6 @@ Partial Class ucrCalculator Me.cmdMdy = New System.Windows.Forms.Button() Me.cmdYmd = New System.Windows.Forms.Button() Me.cmdLeap = New System.Windows.Forms.Button() - Me.cmdRHelp = New instat.ucrSplitButton() Me.ContextMenuStripDate = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateLubridateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateHmsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -124,7 +123,6 @@ Partial Class ucrCalculator Me.cmdGCD = New System.Windows.Forms.Button() Me.cmdGeneratePrimes = New System.Windows.Forms.Button() Me.cmdNthPrime = New System.Windows.Forms.Button() - Me.cmdIntegerRHelp = New instat.ucrSplitButton() Me.ContextMenuStripInteger = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.GmpToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DescToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -147,7 +145,6 @@ Partial Class ucrCalculator Me.cmdIsPrime = New System.Windows.Forms.Button() Me.cmdBigZ = New System.Windows.Forms.Button() Me.grpFactor = New System.Windows.Forms.GroupBox() - Me.cmdTransformHelp = New instat.ucrSplitButton() Me.ContextMenuStripFactor = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FactorForcatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdShuffle = New System.Windows.Forms.Button() @@ -171,7 +168,6 @@ Partial Class ucrCalculator Me.cmdFactor = New System.Windows.Forms.Button() Me.cmdAnon = New System.Windows.Forms.Button() Me.grpHydroGOF = New System.Windows.Forms.GroupBox() - Me.cmdHydroHelp = New instat.ucrSplitButton() Me.ContextMenuStripHydroGOF = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.HydroGOFToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdVE = New System.Windows.Forms.Button() @@ -252,7 +248,6 @@ Partial Class ucrCalculator Me.cmdGroup = New System.Windows.Forms.Button() Me.cmdGrade = New System.Windows.Forms.Button() Me.grpMaths = New System.Windows.Forms.GroupBox() - Me.cmdMathsHelp = New instat.ucrSplitButton() Me.ContextMenuStripMaths = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MathsBaseStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MathsStatsStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -286,7 +281,6 @@ Partial Class ucrCalculator Me.cmdwhichmax = New System.Windows.Forms.Button() Me.cmdwheremax = New System.Windows.Forms.Button() Me.cmdwhichmin = New System.Windows.Forms.Button() - Me.cmdSummaryRHelp = New instat.ucrSplitButton() Me.ContextMenuStripSummary = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.StatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -340,7 +334,6 @@ Partial Class ucrCalculator Me.cmdFreqLength = New System.Windows.Forms.Button() Me.grpProbabilty = New System.Windows.Forms.GroupBox() Me.cmdPascal = New System.Windows.Forms.Button() - Me.cmdProbRHelp = New instat.ucrSplitButton() Me.ContextMenuStripProbability = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ProbStatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ProbBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -389,7 +382,6 @@ Partial Class ucrCalculator Me.cmdDecimals = New System.Windows.Forms.Button() Me.cmdMASSFractions = New System.Windows.Forms.Button() Me.cmdScale = New System.Windows.Forms.Button() - Me.cmdTransformRHelp = New instat.ucrSplitButton() Me.ContextMenuStripTransform = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -428,7 +420,6 @@ Partial Class ucrCalculator Me.cmdCalcRepelicationFunction = New System.Windows.Forms.Button() Me.cmdCalcSequenceFunction = New System.Windows.Forms.Button() Me.cmdCalcConcantenateFunction = New System.Windows.Forms.Button() - Me.cmdLogicalHelp = New instat.ucrSplitButton() Me.ContextMenuStripLogical = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.LogBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LogDplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -492,7 +483,6 @@ Partial Class ucrCalculator Me.cmdSquishb = New System.Windows.Forms.Button() Me.ttCalculator = New System.Windows.Forms.ToolTip(Me.components) Me.grpCircular = New System.Windows.Forms.GroupBox() - Me.cmdCircularHelp = New instat.ucrSplitButton() Me.ContextMenuStripCircular = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CircularToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdCircular = New System.Windows.Forms.Button() @@ -538,7 +528,6 @@ Partial Class ucrCalculator Me.cmdComplexAcos = New System.Windows.Forms.Button() Me.cmdAsComplex = New System.Windows.Forms.Button() Me.cmdComplexi = New System.Windows.Forms.Button() - Me.cmdComplexRHelp = New instat.ucrSplitButton() Me.cmdComplexTanH = New System.Windows.Forms.Button() Me.cmdComplexTan = New System.Windows.Forms.Button() Me.cmdComplexPi = New System.Windows.Forms.Button() @@ -629,6 +618,17 @@ Partial Class ucrCalculator Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() + Me.cmdProbRHelp = New instat.ucrSplitButton() + Me.cmdIntegerRHelp = New instat.ucrSplitButton() + Me.cmdComplexRHelp = New instat.ucrSplitButton() + Me.cmdSummaryRHelp = New instat.ucrSplitButton() + Me.cmdTransformRHelp = New instat.ucrSplitButton() + Me.cmdLogicalHelp = New instat.ucrSplitButton() + Me.cmdRHelp = New instat.ucrSplitButton() + Me.cmdHydroHelp = New instat.ucrSplitButton() + Me.cmdTransformHelp = New instat.ucrSplitButton() + Me.cmdCircularHelp = New instat.ucrSplitButton() + Me.cmdMathsHelp = New instat.ucrSplitButton() Me.grpBasic.SuspendLayout Me.grpDates.SuspendLayout Me.ContextMenuStripDate.SuspendLayout @@ -1239,19 +1239,6 @@ Partial Class ucrCalculator Me.cmdLeap.Text = "leap" Me.cmdLeap.UseVisualStyleBackColor = True ' - 'cmdRHelp - ' - Me.cmdRHelp.AutoSize = True - Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.Location = New System.Drawing.Point(155, 198) - Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.TabIndex = 212 - Me.cmdRHelp.Text = "R Help" - Me.cmdRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripDate ' Me.ContextMenuStripDate.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1678,19 +1665,6 @@ Partial Class ucrCalculator Me.cmdNthPrime.Text = "nth_prime" Me.cmdNthPrime.UseVisualStyleBackColor = True ' - 'cmdIntegerRHelp - ' - Me.cmdIntegerRHelp.AutoSize = True - Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.Location = New System.Drawing.Point(210, 283) - Me.cmdIntegerRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" - Me.cmdIntegerRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.TabIndex = 16 - Me.cmdIntegerRHelp.Text = "R Help" - Me.cmdIntegerRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripInteger ' Me.ContextMenuStripInteger.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1909,19 +1883,6 @@ Partial Class ucrCalculator Me.grpFactor.TabStop = False Me.grpFactor.Text = "Factor" ' - 'cmdTransformHelp - ' - Me.cmdTransformHelp.AutoSize = True - Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.Location = New System.Drawing.Point(150, 174) - Me.cmdTransformHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdTransformHelp.Name = "cmdTransformHelp" - Me.cmdTransformHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.TabIndex = 212 - Me.cmdTransformHelp.Text = "R Help" - Me.cmdTransformHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripFactor ' Me.ContextMenuStripFactor.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2188,19 +2149,6 @@ Partial Class ucrCalculator Me.grpHydroGOF.TabStop = False Me.grpHydroGOF.Text = "Goodness of Fit" ' - 'cmdHydroHelp - ' - Me.cmdHydroHelp.AutoSize = True - Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.Location = New System.Drawing.Point(90, 238) - Me.cmdHydroHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdHydroHelp.Name = "cmdHydroHelp" - Me.cmdHydroHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.TabIndex = 212 - Me.cmdHydroHelp.Text = "R Help" - Me.cmdHydroHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripHydroGOF ' Me.ContextMenuStripHydroGOF.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3206,19 +3154,6 @@ Partial Class ucrCalculator Me.grpMaths.TabStop = False Me.grpMaths.Text = "Maths" ' - 'cmdMathsHelp - ' - Me.cmdMathsHelp.AutoSize = True - Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.Location = New System.Drawing.Point(163, 132) - Me.cmdMathsHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdMathsHelp.Name = "cmdMathsHelp" - Me.cmdMathsHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.TabIndex = 211 - Me.cmdMathsHelp.Text = "R Help" - Me.cmdMathsHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripMaths ' Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3600,19 +3535,6 @@ Partial Class ucrCalculator Me.cmdwhichmin.Text = "which.min" Me.cmdwhichmin.UseVisualStyleBackColor = True ' - 'cmdSummaryRHelp - ' - Me.cmdSummaryRHelp.AutoSize = True - Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.Location = New System.Drawing.Point(182, 190) - Me.cmdSummaryRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" - Me.cmdSummaryRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.TabIndex = 185 - Me.cmdSummaryRHelp.Text = "R Help" - Me.cmdSummaryRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripSummary ' Me.ContextMenuStripSummary.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -4231,7 +4153,7 @@ Partial Class ucrCalculator ' Me.cmdPascal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPascal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPascal.Location = New System.Drawing.Point(2, 190) + Me.cmdPascal.Location = New System.Drawing.Point(2, 188) Me.cmdPascal.Margin = New System.Windows.Forms.Padding(2) Me.cmdPascal.Name = "cmdPascal" Me.cmdPascal.Size = New System.Drawing.Size(62, 30) @@ -4239,19 +4161,6 @@ Partial Class ucrCalculator Me.cmdPascal.Text = "pascal" Me.cmdPascal.UseVisualStyleBackColor = True ' - 'cmdProbRHelp - ' - Me.cmdProbRHelp.AutoSize = True - Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.Location = New System.Drawing.Point(215, 191) - Me.cmdProbRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdProbRHelp.Name = "cmdProbRHelp" - Me.cmdProbRHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.TabIndex = 212 - Me.cmdProbRHelp.Text = "R Help" - Me.cmdProbRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripProbability ' Me.ContextMenuStripProbability.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -4296,7 +4205,7 @@ Partial Class ucrCalculator ' Me.cmdnbinomial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdnbinomial.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnbinomial.Location = New System.Drawing.Point(116, 42) + Me.cmdnbinomial.Location = New System.Drawing.Point(116, 43) Me.cmdnbinomial.Margin = New System.Windows.Forms.Padding(2) Me.cmdnbinomial.Name = "cmdnbinomial" Me.cmdnbinomial.Size = New System.Drawing.Size(72, 30) @@ -4308,7 +4217,7 @@ Partial Class ucrCalculator ' Me.cmdRan_sample.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_sample.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_sample.Location = New System.Drawing.Point(242, 42) + Me.cmdRan_sample.Location = New System.Drawing.Point(244, 43) Me.cmdRan_sample.Margin = New System.Windows.Forms.Padding(2) Me.cmdRan_sample.Name = "cmdRan_sample" Me.cmdRan_sample.Size = New System.Drawing.Size(58, 30) @@ -4320,7 +4229,7 @@ Partial Class ucrCalculator ' Me.cmdRan_beta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_beta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_beta.Location = New System.Drawing.Point(186, 42) + Me.cmdRan_beta.Location = New System.Drawing.Point(187, 43) Me.cmdRan_beta.Margin = New System.Windows.Forms.Padding(2) Me.cmdRan_beta.Name = "cmdRan_beta" Me.cmdRan_beta.Size = New System.Drawing.Size(58, 30) @@ -4332,7 +4241,7 @@ Partial Class ucrCalculator ' Me.cmdRan_gamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_gamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_gamma.Location = New System.Drawing.Point(58, 42) + Me.cmdRan_gamma.Location = New System.Drawing.Point(59, 43) Me.cmdRan_gamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdRan_gamma.Name = "cmdRan_gamma" Me.cmdRan_gamma.Size = New System.Drawing.Size(58, 30) @@ -4344,7 +4253,7 @@ Partial Class ucrCalculator ' Me.cmdpoisson.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdpoisson.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdpoisson.Location = New System.Drawing.Point(2, 42) + Me.cmdpoisson.Location = New System.Drawing.Point(2, 43) Me.cmdpoisson.Margin = New System.Windows.Forms.Padding(2) Me.cmdpoisson.Name = "cmdpoisson" Me.cmdpoisson.Size = New System.Drawing.Size(58, 30) @@ -4356,7 +4265,7 @@ Partial Class ucrCalculator ' Me.cmdbinomial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdbinomial.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbinomial.Location = New System.Drawing.Point(242, 14) + Me.cmdbinomial.Location = New System.Drawing.Point(244, 14) Me.cmdbinomial.Margin = New System.Windows.Forms.Padding(2) Me.cmdbinomial.Name = "cmdbinomial" Me.cmdbinomial.Size = New System.Drawing.Size(58, 30) @@ -4368,7 +4277,7 @@ Partial Class ucrCalculator ' Me.cmdbernoulli.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdbernoulli.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbernoulli.Location = New System.Drawing.Point(186, 14) + Me.cmdbernoulli.Location = New System.Drawing.Point(187, 14) Me.cmdbernoulli.Margin = New System.Windows.Forms.Padding(2) Me.cmdbernoulli.Name = "cmdbernoulli" Me.cmdbernoulli.Size = New System.Drawing.Size(58, 30) @@ -4392,7 +4301,7 @@ Partial Class ucrCalculator ' Me.cmdRan_normal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_normal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_normal.Location = New System.Drawing.Point(58, 14) + Me.cmdRan_normal.Location = New System.Drawing.Point(59, 14) Me.cmdRan_normal.Margin = New System.Windows.Forms.Padding(2) Me.cmdRan_normal.Name = "cmdRan_normal" Me.cmdRan_normal.Size = New System.Drawing.Size(58, 30) @@ -4416,7 +4325,7 @@ Partial Class ucrCalculator ' Me.cmdQnbin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQnbin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQnbin.Location = New System.Drawing.Point(246, 102) + Me.cmdQnbin.Location = New System.Drawing.Point(246, 101) Me.cmdQnbin.Margin = New System.Windows.Forms.Padding(2) Me.cmdQnbin.Name = "cmdQnbin" Me.cmdQnbin.Size = New System.Drawing.Size(62, 30) @@ -4428,7 +4337,7 @@ Partial Class ucrCalculator ' Me.cmdQpois.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQpois.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQpois.Location = New System.Drawing.Point(186, 102) + Me.cmdQpois.Location = New System.Drawing.Point(185, 101) Me.cmdQpois.Margin = New System.Windows.Forms.Padding(2) Me.cmdQpois.Name = "cmdQpois" Me.cmdQpois.Size = New System.Drawing.Size(62, 30) @@ -4440,7 +4349,7 @@ Partial Class ucrCalculator ' Me.cmdQbinom.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQbinom.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQbinom.Location = New System.Drawing.Point(124, 102) + Me.cmdQbinom.Location = New System.Drawing.Point(124, 101) Me.cmdQbinom.Margin = New System.Windows.Forms.Padding(2) Me.cmdQbinom.Name = "cmdQbinom" Me.cmdQbinom.Size = New System.Drawing.Size(62, 30) @@ -4452,7 +4361,7 @@ Partial Class ucrCalculator ' Me.cmdQbirth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQbirth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQbirth.Location = New System.Drawing.Point(62, 102) + Me.cmdQbirth.Location = New System.Drawing.Point(63, 101) Me.cmdQbirth.Margin = New System.Windows.Forms.Padding(2) Me.cmdQbirth.Name = "cmdQbirth" Me.cmdQbirth.Size = New System.Drawing.Size(62, 30) @@ -4464,7 +4373,7 @@ Partial Class ucrCalculator ' Me.cmdQbeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQbeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQbeta.Location = New System.Drawing.Point(2, 102) + Me.cmdQbeta.Location = New System.Drawing.Point(2, 101) Me.cmdQbeta.Margin = New System.Windows.Forms.Padding(2) Me.cmdQbeta.Name = "cmdQbeta" Me.cmdQbeta.Size = New System.Drawing.Size(62, 30) @@ -4476,7 +4385,7 @@ Partial Class ucrCalculator ' Me.cmdPnbin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPnbin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPnbin.Location = New System.Drawing.Point(246, 74) + Me.cmdPnbin.Location = New System.Drawing.Point(246, 72) Me.cmdPnbin.Margin = New System.Windows.Forms.Padding(2) Me.cmdPnbin.Name = "cmdPnbin" Me.cmdPnbin.Size = New System.Drawing.Size(62, 30) @@ -4488,7 +4397,7 @@ Partial Class ucrCalculator ' Me.cmdPpois.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPpois.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPpois.Location = New System.Drawing.Point(186, 74) + Me.cmdPpois.Location = New System.Drawing.Point(185, 72) Me.cmdPpois.Margin = New System.Windows.Forms.Padding(2) Me.cmdPpois.Name = "cmdPpois" Me.cmdPpois.Size = New System.Drawing.Size(62, 30) @@ -4500,7 +4409,7 @@ Partial Class ucrCalculator ' Me.cmdPbinom.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPbinom.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbinom.Location = New System.Drawing.Point(124, 74) + Me.cmdPbinom.Location = New System.Drawing.Point(124, 72) Me.cmdPbinom.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbinom.Name = "cmdPbinom" Me.cmdPbinom.Size = New System.Drawing.Size(62, 30) @@ -4512,7 +4421,7 @@ Partial Class ucrCalculator ' Me.cmdPbirth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPbirth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbirth.Location = New System.Drawing.Point(62, 74) + Me.cmdPbirth.Location = New System.Drawing.Point(63, 72) Me.cmdPbirth.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbirth.Name = "cmdPbirth" Me.cmdPbirth.Size = New System.Drawing.Size(62, 30) @@ -4524,7 +4433,7 @@ Partial Class ucrCalculator ' Me.cmdPbeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPbeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbeta.Location = New System.Drawing.Point(2, 74) + Me.cmdPbeta.Location = New System.Drawing.Point(2, 72) Me.cmdPbeta.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbeta.Name = "cmdPbeta" Me.cmdPbeta.Size = New System.Drawing.Size(62, 30) @@ -4536,7 +4445,7 @@ Partial Class ucrCalculator ' Me.cmdQgamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQgamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQgamma.Location = New System.Drawing.Point(246, 44) + Me.cmdQgamma.Location = New System.Drawing.Point(246, 43) Me.cmdQgamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdQgamma.Name = "cmdQgamma" Me.cmdQgamma.Size = New System.Drawing.Size(62, 30) @@ -4560,7 +4469,7 @@ Partial Class ucrCalculator ' Me.cmdGamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdGamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGamma.Location = New System.Drawing.Point(186, 130) + Me.cmdGamma.Location = New System.Drawing.Point(185, 130) Me.cmdGamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdGamma.Name = "cmdGamma" Me.cmdGamma.Size = New System.Drawing.Size(62, 30) @@ -4573,7 +4482,7 @@ Partial Class ucrCalculator ' Me.cmdLbeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLbeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLbeta.Location = New System.Drawing.Point(124, 160) + Me.cmdLbeta.Location = New System.Drawing.Point(124, 159) Me.cmdLbeta.Margin = New System.Windows.Forms.Padding(2) Me.cmdLbeta.Name = "cmdLbeta" Me.cmdLbeta.Size = New System.Drawing.Size(62, 30) @@ -4585,7 +4494,7 @@ Partial Class ucrCalculator ' Me.cmdqF.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdqF.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdqF.Location = New System.Drawing.Point(186, 44) + Me.cmdqF.Location = New System.Drawing.Point(185, 43) Me.cmdqF.Margin = New System.Windows.Forms.Padding(2) Me.cmdqF.Name = "cmdqF" Me.cmdqF.Size = New System.Drawing.Size(62, 30) @@ -4609,7 +4518,7 @@ Partial Class ucrCalculator ' Me.cmdChoose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdChoose.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdChoose.Location = New System.Drawing.Point(62, 130) + Me.cmdChoose.Location = New System.Drawing.Point(63, 130) Me.cmdChoose.Margin = New System.Windows.Forms.Padding(2) Me.cmdChoose.Name = "cmdChoose" Me.cmdChoose.Size = New System.Drawing.Size(62, 30) @@ -4621,7 +4530,7 @@ Partial Class ucrCalculator ' Me.cmdPf.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPf.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPf.Location = New System.Drawing.Point(186, 14) + Me.cmdPf.Location = New System.Drawing.Point(185, 14) Me.cmdPf.Margin = New System.Windows.Forms.Padding(2) Me.cmdPf.Name = "cmdPf" Me.cmdPf.Size = New System.Drawing.Size(62, 30) @@ -4645,7 +4554,7 @@ Partial Class ucrCalculator ' Me.cmdLgamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLgamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLgamma.Location = New System.Drawing.Point(186, 160) + Me.cmdLgamma.Location = New System.Drawing.Point(185, 159) Me.cmdLgamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdLgamma.Name = "cmdLgamma" Me.cmdLgamma.Size = New System.Drawing.Size(62, 30) @@ -4669,7 +4578,7 @@ Partial Class ucrCalculator ' Me.cmdQchisq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQchisq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQchisq.Location = New System.Drawing.Point(124, 44) + Me.cmdQchisq.Location = New System.Drawing.Point(124, 43) Me.cmdQchisq.Margin = New System.Windows.Forms.Padding(2) Me.cmdQchisq.Name = "cmdQchisq" Me.cmdQchisq.Size = New System.Drawing.Size(62, 30) @@ -4681,7 +4590,7 @@ Partial Class ucrCalculator ' Me.cmdQt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQt.Location = New System.Drawing.Point(62, 44) + Me.cmdQt.Location = New System.Drawing.Point(63, 43) Me.cmdQt.Margin = New System.Windows.Forms.Padding(2) Me.cmdQt.Name = "cmdQt" Me.cmdQt.Size = New System.Drawing.Size(62, 30) @@ -4693,7 +4602,7 @@ Partial Class ucrCalculator ' Me.cmdQnorm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQnorm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQnorm.Location = New System.Drawing.Point(2, 44) + Me.cmdQnorm.Location = New System.Drawing.Point(2, 43) Me.cmdQnorm.Margin = New System.Windows.Forms.Padding(2) Me.cmdQnorm.Name = "cmdQnorm" Me.cmdQnorm.Size = New System.Drawing.Size(62, 30) @@ -4705,7 +4614,7 @@ Partial Class ucrCalculator ' Me.cmdPt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPt.Location = New System.Drawing.Point(62, 14) + Me.cmdPt.Location = New System.Drawing.Point(63, 14) Me.cmdPt.Margin = New System.Windows.Forms.Padding(2) Me.cmdPt.Name = "cmdPt" Me.cmdPt.Size = New System.Drawing.Size(62, 30) @@ -4717,7 +4626,7 @@ Partial Class ucrCalculator ' Me.cmdLchoose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLchoose.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLchoose.Location = New System.Drawing.Point(62, 160) + Me.cmdLchoose.Location = New System.Drawing.Point(63, 159) Me.cmdLchoose.Margin = New System.Windows.Forms.Padding(2) Me.cmdLchoose.Name = "cmdLchoose" Me.cmdLchoose.Size = New System.Drawing.Size(62, 30) @@ -4729,7 +4638,7 @@ Partial Class ucrCalculator ' Me.cmdLfact.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLfact.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLfact.Location = New System.Drawing.Point(2, 160) + Me.cmdLfact.Location = New System.Drawing.Point(2, 159) Me.cmdLfact.Margin = New System.Windows.Forms.Padding(2) Me.cmdLfact.Name = "cmdLfact" Me.cmdLfact.Size = New System.Drawing.Size(62, 30) @@ -4741,7 +4650,7 @@ Partial Class ucrCalculator ' Me.cmdTrigamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrigamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrigamma.Location = New System.Drawing.Point(246, 160) + Me.cmdTrigamma.Location = New System.Drawing.Point(246, 159) Me.cmdTrigamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrigamma.Name = "cmdTrigamma" Me.cmdTrigamma.Size = New System.Drawing.Size(62, 30) @@ -4849,19 +4758,6 @@ Partial Class ucrCalculator Me.cmdScale.Text = "scale" Me.cmdScale.UseVisualStyleBackColor = True ' - 'cmdTransformRHelp - ' - Me.cmdTransformRHelp.AutoSize = True - Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.Location = New System.Drawing.Point(214, 196) - Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdTransformRHelp.Name = "cmdTransformRHelp" - Me.cmdTransformRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.TabIndex = 204 - Me.cmdTransformRHelp.Text = "R Help" - Me.cmdTransformRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripTransform ' Me.ContextMenuStripTransform.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -5295,19 +5191,6 @@ Partial Class ucrCalculator Me.cmdCalcConcantenateFunction.Text = "c( )" Me.cmdCalcConcantenateFunction.UseVisualStyleBackColor = True ' - 'cmdLogicalHelp - ' - Me.cmdLogicalHelp.AutoSize = True - Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.Location = New System.Drawing.Point(166, 222) - Me.cmdLogicalHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdLogicalHelp.Name = "cmdLogicalHelp" - Me.cmdLogicalHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.TabIndex = 212 - Me.cmdLogicalHelp.Text = "R Help" - Me.cmdLogicalHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripLogical ' Me.ContextMenuStripLogical.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -6069,19 +5952,6 @@ Partial Class ucrCalculator Me.grpCircular.TabStop = False Me.grpCircular.Text = "Circular" ' - 'cmdCircularHelp - ' - Me.cmdCircularHelp.AutoSize = True - Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.Location = New System.Drawing.Point(158, 142) - Me.cmdCircularHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdCircularHelp.Name = "cmdCircularHelp" - Me.cmdCircularHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.TabIndex = 212 - Me.cmdCircularHelp.Text = "R Help" - Me.cmdCircularHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripCircular ' Me.ContextMenuStripCircular.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -6618,19 +6488,6 @@ Partial Class ucrCalculator Me.cmdComplexi.Text = "i" Me.cmdComplexi.UseVisualStyleBackColor = True ' - 'cmdComplexRHelp - ' - Me.cmdComplexRHelp.AutoSize = True - Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.Location = New System.Drawing.Point(190, 192) - Me.cmdComplexRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdComplexRHelp.Name = "cmdComplexRHelp" - Me.cmdComplexRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.TabIndex = 209 - Me.cmdComplexRHelp.Text = "R Help" - Me.cmdComplexRHelp.UseVisualStyleBackColor = True - ' 'cmdComplexTanH ' Me.cmdComplexTanH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) @@ -7709,12 +7566,156 @@ Partial Class ucrCalculator Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' + 'cmdProbRHelp + ' + Me.cmdProbRHelp.AutoSize = True + Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.Location = New System.Drawing.Point(215, 191) + Me.cmdProbRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdProbRHelp.Name = "cmdProbRHelp" + Me.cmdProbRHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.TabIndex = 212 + Me.cmdProbRHelp.Text = "R Help" + Me.cmdProbRHelp.UseVisualStyleBackColor = True + ' + 'cmdIntegerRHelp + ' + Me.cmdIntegerRHelp.AutoSize = True + Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(210, 283) + Me.cmdIntegerRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" + Me.cmdIntegerRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.TabIndex = 16 + Me.cmdIntegerRHelp.Text = "R Help" + Me.cmdIntegerRHelp.UseVisualStyleBackColor = True + ' + 'cmdComplexRHelp + ' + Me.cmdComplexRHelp.AutoSize = True + Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.Location = New System.Drawing.Point(190, 192) + Me.cmdComplexRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexRHelp.Name = "cmdComplexRHelp" + Me.cmdComplexRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.TabIndex = 209 + Me.cmdComplexRHelp.Text = "R Help" + Me.cmdComplexRHelp.UseVisualStyleBackColor = True + ' + 'cmdSummaryRHelp + ' + Me.cmdSummaryRHelp.AutoSize = True + Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.Location = New System.Drawing.Point(182, 190) + Me.cmdSummaryRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" + Me.cmdSummaryRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.TabIndex = 185 + Me.cmdSummaryRHelp.Text = "R Help" + Me.cmdSummaryRHelp.UseVisualStyleBackColor = True + ' + 'cmdTransformRHelp + ' + Me.cmdTransformRHelp.AutoSize = True + Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.Location = New System.Drawing.Point(214, 196) + Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTransformRHelp.Name = "cmdTransformRHelp" + Me.cmdTransformRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.TabIndex = 204 + Me.cmdTransformRHelp.Text = "R Help" + Me.cmdTransformRHelp.UseVisualStyleBackColor = True + ' + 'cmdLogicalHelp + ' + Me.cmdLogicalHelp.AutoSize = True + Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.Location = New System.Drawing.Point(166, 222) + Me.cmdLogicalHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLogicalHelp.Name = "cmdLogicalHelp" + Me.cmdLogicalHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.TabIndex = 212 + Me.cmdLogicalHelp.Text = "R Help" + Me.cmdLogicalHelp.UseVisualStyleBackColor = True + ' + 'cmdRHelp + ' + Me.cmdRHelp.AutoSize = True + Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.Location = New System.Drawing.Point(155, 198) + Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRHelp.Name = "cmdRHelp" + Me.cmdRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.TabIndex = 212 + Me.cmdRHelp.Text = "R Help" + Me.cmdRHelp.UseVisualStyleBackColor = True + ' + 'cmdHydroHelp + ' + Me.cmdHydroHelp.AutoSize = True + Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.Location = New System.Drawing.Point(90, 238) + Me.cmdHydroHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdHydroHelp.Name = "cmdHydroHelp" + Me.cmdHydroHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.TabIndex = 212 + Me.cmdHydroHelp.Text = "R Help" + Me.cmdHydroHelp.UseVisualStyleBackColor = True + ' + 'cmdTransformHelp + ' + Me.cmdTransformHelp.AutoSize = True + Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.Location = New System.Drawing.Point(150, 174) + Me.cmdTransformHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTransformHelp.Name = "cmdTransformHelp" + Me.cmdTransformHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.TabIndex = 212 + Me.cmdTransformHelp.Text = "R Help" + Me.cmdTransformHelp.UseVisualStyleBackColor = True + ' + 'cmdCircularHelp + ' + Me.cmdCircularHelp.AutoSize = True + Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.Location = New System.Drawing.Point(158, 142) + Me.cmdCircularHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircularHelp.Name = "cmdCircularHelp" + Me.cmdCircularHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.TabIndex = 212 + Me.cmdCircularHelp.Text = "R Help" + Me.cmdCircularHelp.UseVisualStyleBackColor = True + ' + 'cmdMathsHelp + ' + Me.cmdMathsHelp.AutoSize = True + Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.Location = New System.Drawing.Point(163, 132) + Me.cmdMathsHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMathsHelp.Name = "cmdMathsHelp" + Me.cmdMathsHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.TabIndex = 211 + Me.cmdMathsHelp.Text = "R Help" + Me.cmdMathsHelp.UseVisualStyleBackColor = True + ' 'ucrCalculator ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.Controls.Add(Me.grpList) + Me.Controls.Add(Me.grpProbabilty) Me.Controls.Add(Me.cmdRhelpList) Me.Controls.Add(Me.cmdWakefieldHelp) Me.Controls.Add(Me.cmdStringRHelp) @@ -7726,7 +7727,6 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) - Me.Controls.Add(Me.grpProbabilty) Me.Controls.Add(Me.grpInteger) Me.Controls.Add(Me.grpTestString) Me.Controls.Add(Me.grpModifier) From 1eb9f0edaa6898bbcda71103e130a302408fb255 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Wed, 24 Apr 2024 14:15:18 +0300 Subject: [PATCH 42/99] design --- instat/ucrCalculator.Designer.vb | 84 ++++++++++++++++---------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 41e1d3f0a1e..a6d9b532f31 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -1330,7 +1330,7 @@ Partial Class ucrCalculator 'cmdPrimorial ' Me.cmdPrimorial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPrimorial.Location = New System.Drawing.Point(222, 182) + Me.cmdPrimorial.Location = New System.Drawing.Point(221, 181) Me.cmdPrimorial.Margin = New System.Windows.Forms.Padding(2) Me.cmdPrimorial.Name = "cmdPrimorial" Me.cmdPrimorial.Size = New System.Drawing.Size(74, 22) @@ -1341,7 +1341,7 @@ Partial Class ucrCalculator 'cmdFactorize2 ' Me.cmdFactorize2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFactorize2.Location = New System.Drawing.Point(150, 38) + Me.cmdFactorize2.Location = New System.Drawing.Point(148, 39) Me.cmdFactorize2.Margin = New System.Windows.Forms.Padding(2) Me.cmdFactorize2.Name = "cmdFactorize2" Me.cmdFactorize2.Size = New System.Drawing.Size(74, 22) @@ -1351,7 +1351,7 @@ Partial Class ucrCalculator ' 'cmdLucas ' - Me.cmdLucas.Location = New System.Drawing.Point(74, 62) + Me.cmdLucas.Location = New System.Drawing.Point(75, 60) Me.cmdLucas.Margin = New System.Windows.Forms.Padding(2) Me.cmdLucas.Name = "cmdLucas" Me.cmdLucas.Size = New System.Drawing.Size(74, 22) @@ -1361,7 +1361,7 @@ Partial Class ucrCalculator ' 'cmdFactorize ' - Me.cmdFactorize.Location = New System.Drawing.Point(74, 38) + Me.cmdFactorize.Location = New System.Drawing.Point(75, 39) Me.cmdFactorize.Margin = New System.Windows.Forms.Padding(2) Me.cmdFactorize.Name = "cmdFactorize" Me.cmdFactorize.Size = New System.Drawing.Size(74, 22) @@ -1372,7 +1372,7 @@ Partial Class ucrCalculator 'cmdSquare ' Me.cmdSquare.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSquare.Location = New System.Drawing.Point(222, 258) + Me.cmdSquare.Location = New System.Drawing.Point(221, 255) Me.cmdSquare.Margin = New System.Windows.Forms.Padding(2) Me.cmdSquare.Name = "cmdSquare" Me.cmdSquare.Size = New System.Drawing.Size(74, 22) @@ -1383,7 +1383,7 @@ Partial Class ucrCalculator 'cmdTriangle ' Me.cmdTriangle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTriangle.Location = New System.Drawing.Point(150, 258) + Me.cmdTriangle.Location = New System.Drawing.Point(148, 255) Me.cmdTriangle.Margin = New System.Windows.Forms.Padding(2) Me.cmdTriangle.Name = "cmdTriangle" Me.cmdTriangle.Size = New System.Drawing.Size(74, 22) @@ -1394,7 +1394,7 @@ Partial Class ucrCalculator 'cmdPadovan ' Me.cmdPadovan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPadovan.Location = New System.Drawing.Point(74, 258) + Me.cmdPadovan.Location = New System.Drawing.Point(75, 255) Me.cmdPadovan.Margin = New System.Windows.Forms.Padding(2) Me.cmdPadovan.Name = "cmdPadovan" Me.cmdPadovan.Size = New System.Drawing.Size(74, 22) @@ -1405,7 +1405,7 @@ Partial Class ucrCalculator 'cmdAchilles ' Me.cmdAchilles.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAchilles.Location = New System.Drawing.Point(2, 258) + Me.cmdAchilles.Location = New System.Drawing.Point(2, 255) Me.cmdAchilles.Margin = New System.Windows.Forms.Padding(2) Me.cmdAchilles.Name = "cmdAchilles" Me.cmdAchilles.Size = New System.Drawing.Size(74, 22) @@ -1416,7 +1416,7 @@ Partial Class ucrCalculator 'cmdHappy ' Me.cmdHappy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHappy.Location = New System.Drawing.Point(222, 234) + Me.cmdHappy.Location = New System.Drawing.Point(221, 234) Me.cmdHappy.Margin = New System.Windows.Forms.Padding(2) Me.cmdHappy.Name = "cmdHappy" Me.cmdHappy.Size = New System.Drawing.Size(74, 22) @@ -1427,7 +1427,7 @@ Partial Class ucrCalculator 'cmdUgly ' Me.cmdUgly.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdUgly.Location = New System.Drawing.Point(150, 234) + Me.cmdUgly.Location = New System.Drawing.Point(148, 234) Me.cmdUgly.Margin = New System.Windows.Forms.Padding(2) Me.cmdUgly.Name = "cmdUgly" Me.cmdUgly.Size = New System.Drawing.Size(74, 22) @@ -1438,7 +1438,7 @@ Partial Class ucrCalculator 'cmdPowerful ' Me.cmdPowerful.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPowerful.Location = New System.Drawing.Point(74, 234) + Me.cmdPowerful.Location = New System.Drawing.Point(75, 234) Me.cmdPowerful.Margin = New System.Windows.Forms.Padding(2) Me.cmdPowerful.Name = "cmdPowerful" Me.cmdPowerful.Size = New System.Drawing.Size(74, 22) @@ -1460,7 +1460,7 @@ Partial Class ucrCalculator 'cmdPerfect ' Me.cmdPerfect.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPerfect.Location = New System.Drawing.Point(222, 214) + Me.cmdPerfect.Location = New System.Drawing.Point(221, 214) Me.cmdPerfect.Margin = New System.Windows.Forms.Padding(2) Me.cmdPerfect.Name = "cmdPerfect" Me.cmdPerfect.Size = New System.Drawing.Size(74, 22) @@ -1471,7 +1471,7 @@ Partial Class ucrCalculator 'cmdAbundant ' Me.cmdAbundant.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAbundant.Location = New System.Drawing.Point(150, 214) + Me.cmdAbundant.Location = New System.Drawing.Point(148, 214) Me.cmdAbundant.Margin = New System.Windows.Forms.Padding(2) Me.cmdAbundant.Name = "cmdAbundant" Me.cmdAbundant.Size = New System.Drawing.Size(74, 22) @@ -1482,7 +1482,7 @@ Partial Class ucrCalculator 'cmdFibonacci2 ' Me.cmdFibonacci2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFibonacci2.Location = New System.Drawing.Point(74, 214) + Me.cmdFibonacci2.Location = New System.Drawing.Point(75, 214) Me.cmdFibonacci2.Margin = New System.Windows.Forms.Padding(2) Me.cmdFibonacci2.Name = "cmdFibonacci2" Me.cmdFibonacci2.Size = New System.Drawing.Size(74, 22) @@ -1504,7 +1504,7 @@ Partial Class ucrCalculator 'cmdRoman ' Me.cmdRoman.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdRoman.Location = New System.Drawing.Point(150, 106) + Me.cmdRoman.Location = New System.Drawing.Point(148, 102) Me.cmdRoman.Margin = New System.Windows.Forms.Padding(2) Me.cmdRoman.Name = "cmdRoman" Me.cmdRoman.Size = New System.Drawing.Size(74, 22) @@ -1515,7 +1515,7 @@ Partial Class ucrCalculator 'cmdHexmode ' Me.cmdHexmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHexmode.Location = New System.Drawing.Point(222, 82) + Me.cmdHexmode.Location = New System.Drawing.Point(221, 81) Me.cmdHexmode.Margin = New System.Windows.Forms.Padding(2) Me.cmdHexmode.Name = "cmdHexmode" Me.cmdHexmode.Size = New System.Drawing.Size(74, 22) @@ -1526,7 +1526,7 @@ Partial Class ucrCalculator 'cmdOctmode ' Me.cmdOctmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdOctmode.Location = New System.Drawing.Point(150, 82) + Me.cmdOctmode.Location = New System.Drawing.Point(148, 81) Me.cmdOctmode.Margin = New System.Windows.Forms.Padding(2) Me.cmdOctmode.Name = "cmdOctmode" Me.cmdOctmode.Size = New System.Drawing.Size(74, 22) @@ -1537,7 +1537,7 @@ Partial Class ucrCalculator 'cmdKTuple ' Me.cmdKTuple.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdKTuple.Location = New System.Drawing.Point(150, 182) + Me.cmdKTuple.Location = New System.Drawing.Point(148, 181) Me.cmdKTuple.Margin = New System.Windows.Forms.Padding(2) Me.cmdKTuple.Name = "cmdKTuple" Me.cmdKTuple.Size = New System.Drawing.Size(74, 22) @@ -1548,7 +1548,7 @@ Partial Class ucrCalculator 'cmdTriplets ' Me.cmdTriplets.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTriplets.Location = New System.Drawing.Point(74, 182) + Me.cmdTriplets.Location = New System.Drawing.Point(75, 181) Me.cmdTriplets.Margin = New System.Windows.Forms.Padding(2) Me.cmdTriplets.Name = "cmdTriplets" Me.cmdTriplets.Size = New System.Drawing.Size(74, 22) @@ -1559,7 +1559,7 @@ Partial Class ucrCalculator 'cmdThird ' Me.cmdThird.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdThird.Location = New System.Drawing.Point(2, 182) + Me.cmdThird.Location = New System.Drawing.Point(2, 181) Me.cmdThird.Margin = New System.Windows.Forms.Padding(2) Me.cmdThird.Name = "cmdThird" Me.cmdThird.Size = New System.Drawing.Size(74, 22) @@ -1570,7 +1570,7 @@ Partial Class ucrCalculator 'cmdSexy ' Me.cmdSexy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSexy.Location = New System.Drawing.Point(222, 158) + Me.cmdSexy.Location = New System.Drawing.Point(221, 160) Me.cmdSexy.Margin = New System.Windows.Forms.Padding(2) Me.cmdSexy.Name = "cmdSexy" Me.cmdSexy.Size = New System.Drawing.Size(74, 22) @@ -1581,7 +1581,7 @@ Partial Class ucrCalculator 'cmdCousin ' Me.cmdCousin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdCousin.Location = New System.Drawing.Point(150, 158) + Me.cmdCousin.Location = New System.Drawing.Point(148, 160) Me.cmdCousin.Margin = New System.Windows.Forms.Padding(2) Me.cmdCousin.Name = "cmdCousin" Me.cmdCousin.Size = New System.Drawing.Size(74, 22) @@ -1592,7 +1592,7 @@ Partial Class ucrCalculator 'cmdTwin ' Me.cmdTwin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTwin.Location = New System.Drawing.Point(74, 158) + Me.cmdTwin.Location = New System.Drawing.Point(75, 160) Me.cmdTwin.Margin = New System.Windows.Forms.Padding(2) Me.cmdTwin.Name = "cmdTwin" Me.cmdTwin.Size = New System.Drawing.Size(74, 22) @@ -1603,7 +1603,7 @@ Partial Class ucrCalculator 'cmdPhi ' Me.cmdPhi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPhi.Location = New System.Drawing.Point(74, 106) + Me.cmdPhi.Location = New System.Drawing.Point(75, 102) Me.cmdPhi.Margin = New System.Windows.Forms.Padding(2) Me.cmdPhi.Name = "cmdPhi" Me.cmdPhi.Size = New System.Drawing.Size(74, 22) @@ -1614,7 +1614,7 @@ Partial Class ucrCalculator 'cmdCoprime ' Me.cmdCoprime.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdCoprime.Location = New System.Drawing.Point(2, 158) + Me.cmdCoprime.Location = New System.Drawing.Point(2, 160) Me.cmdCoprime.Margin = New System.Windows.Forms.Padding(2) Me.cmdCoprime.Name = "cmdCoprime" Me.cmdCoprime.Size = New System.Drawing.Size(74, 22) @@ -1625,7 +1625,7 @@ Partial Class ucrCalculator 'cmdSCM ' Me.cmdSCM.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSCM.Location = New System.Drawing.Point(2, 106) + Me.cmdSCM.Location = New System.Drawing.Point(2, 102) Me.cmdSCM.Margin = New System.Windows.Forms.Padding(2) Me.cmdSCM.Name = "cmdSCM" Me.cmdSCM.Size = New System.Drawing.Size(74, 22) @@ -1636,7 +1636,7 @@ Partial Class ucrCalculator 'cmdGCD ' Me.cmdGCD.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdGCD.Location = New System.Drawing.Point(222, 106) + Me.cmdGCD.Location = New System.Drawing.Point(221, 102) Me.cmdGCD.Margin = New System.Windows.Forms.Padding(2) Me.cmdGCD.Name = "cmdGCD" Me.cmdGCD.Size = New System.Drawing.Size(74, 22) @@ -1647,7 +1647,7 @@ Partial Class ucrCalculator 'cmdGeneratePrimes ' Me.cmdGeneratePrimes.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdGeneratePrimes.Location = New System.Drawing.Point(2, 138) + Me.cmdGeneratePrimes.Location = New System.Drawing.Point(2, 139) Me.cmdGeneratePrimes.Margin = New System.Windows.Forms.Padding(2) Me.cmdGeneratePrimes.Name = "cmdGeneratePrimes" Me.cmdGeneratePrimes.Size = New System.Drawing.Size(74, 22) @@ -1657,7 +1657,7 @@ Partial Class ucrCalculator ' 'cmdNthPrime ' - Me.cmdNthPrime.Location = New System.Drawing.Point(74, 138) + Me.cmdNthPrime.Location = New System.Drawing.Point(75, 139) Me.cmdNthPrime.Margin = New System.Windows.Forms.Padding(2) Me.cmdNthPrime.Name = "cmdNthPrime" Me.cmdNthPrime.Size = New System.Drawing.Size(74, 22) @@ -1717,7 +1717,7 @@ Partial Class ucrCalculator 'cmdHex ' Me.cmdHex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHex.Location = New System.Drawing.Point(74, 82) + Me.cmdHex.Location = New System.Drawing.Point(75, 81) Me.cmdHex.Margin = New System.Windows.Forms.Padding(2) Me.cmdHex.Name = "cmdHex" Me.cmdHex.Size = New System.Drawing.Size(74, 22) @@ -1728,7 +1728,7 @@ Partial Class ucrCalculator 'cmdOctal ' Me.cmdOctal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdOctal.Location = New System.Drawing.Point(2, 82) + Me.cmdOctal.Location = New System.Drawing.Point(2, 81) Me.cmdOctal.Margin = New System.Windows.Forms.Padding(2) Me.cmdOctal.Name = "cmdOctal" Me.cmdOctal.Size = New System.Drawing.Size(74, 22) @@ -1739,7 +1739,7 @@ Partial Class ucrCalculator 'cmdBinary ' Me.cmdBinary.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBinary.Location = New System.Drawing.Point(222, 62) + Me.cmdBinary.Location = New System.Drawing.Point(221, 60) Me.cmdBinary.Margin = New System.Windows.Forms.Padding(2) Me.cmdBinary.Name = "cmdBinary" Me.cmdBinary.Size = New System.Drawing.Size(74, 22) @@ -1750,7 +1750,7 @@ Partial Class ucrCalculator 'cmdBigQ ' Me.cmdBigQ.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBigQ.Location = New System.Drawing.Point(74, 18) + Me.cmdBigQ.Location = New System.Drawing.Point(75, 18) Me.cmdBigQ.Margin = New System.Windows.Forms.Padding(2) Me.cmdBigQ.Name = "cmdBigQ" Me.cmdBigQ.Size = New System.Drawing.Size(74, 22) @@ -1760,7 +1760,7 @@ Partial Class ucrCalculator ' 'cmdDigitSum ' - Me.cmdDigitSum.Location = New System.Drawing.Point(222, 38) + Me.cmdDigitSum.Location = New System.Drawing.Point(221, 39) Me.cmdDigitSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdDigitSum.Name = "cmdDigitSum" Me.cmdDigitSum.Size = New System.Drawing.Size(74, 22) @@ -1771,7 +1771,7 @@ Partial Class ucrCalculator 'cmdRankPercent ' Me.cmdRankPercent.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdRankPercent.Location = New System.Drawing.Point(150, 62) + Me.cmdRankPercent.Location = New System.Drawing.Point(148, 60) Me.cmdRankPercent.Margin = New System.Windows.Forms.Padding(2) Me.cmdRankPercent.Name = "cmdRankPercent" Me.cmdRankPercent.Size = New System.Drawing.Size(74, 22) @@ -1781,7 +1781,7 @@ Partial Class ucrCalculator ' 'cmdDivisors ' - Me.cmdDivisors.Location = New System.Drawing.Point(2, 38) + Me.cmdDivisors.Location = New System.Drawing.Point(2, 39) Me.cmdDivisors.Margin = New System.Windows.Forms.Padding(2) Me.cmdDivisors.Name = "cmdDivisors" Me.cmdDivisors.Size = New System.Drawing.Size(74, 22) @@ -1791,7 +1791,7 @@ Partial Class ucrCalculator ' 'cmdFibonacci ' - Me.cmdFibonacci.Location = New System.Drawing.Point(2, 62) + Me.cmdFibonacci.Location = New System.Drawing.Point(2, 60) Me.cmdFibonacci.Margin = New System.Windows.Forms.Padding(2) Me.cmdFibonacci.Name = "cmdFibonacci" Me.cmdFibonacci.Size = New System.Drawing.Size(74, 22) @@ -1801,7 +1801,7 @@ Partial Class ucrCalculator ' 'cmdNextPrime ' - Me.cmdNextPrime.Location = New System.Drawing.Point(150, 138) + Me.cmdNextPrime.Location = New System.Drawing.Point(148, 139) Me.cmdNextPrime.Margin = New System.Windows.Forms.Padding(2) Me.cmdNextPrime.Name = "cmdNextPrime" Me.cmdNextPrime.Size = New System.Drawing.Size(74, 22) @@ -1811,7 +1811,7 @@ Partial Class ucrCalculator ' 'cmdChoosez ' - Me.cmdChoosez.Location = New System.Drawing.Point(222, 18) + Me.cmdChoosez.Location = New System.Drawing.Point(221, 18) Me.cmdChoosez.Margin = New System.Windows.Forms.Padding(2) Me.cmdChoosez.Name = "cmdChoosez" Me.cmdChoosez.Size = New System.Drawing.Size(74, 22) @@ -1821,7 +1821,7 @@ Partial Class ucrCalculator ' 'cmdFactorial ' - Me.cmdFactorial.Location = New System.Drawing.Point(150, 18) + Me.cmdFactorial.Location = New System.Drawing.Point(148, 18) Me.cmdFactorial.Margin = New System.Windows.Forms.Padding(2) Me.cmdFactorial.Name = "cmdFactorial" Me.cmdFactorial.Size = New System.Drawing.Size(74, 22) @@ -1832,7 +1832,7 @@ Partial Class ucrCalculator 'cmdIsPrime ' Me.cmdIsPrime.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdIsPrime.Location = New System.Drawing.Point(222, 138) + Me.cmdIsPrime.Location = New System.Drawing.Point(221, 139) Me.cmdIsPrime.Margin = New System.Windows.Forms.Padding(2) Me.cmdIsPrime.Name = "cmdIsPrime" Me.cmdIsPrime.Size = New System.Drawing.Size(74, 22) @@ -7715,7 +7715,6 @@ Partial Class ucrCalculator Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.Controls.Add(Me.grpList) - Me.Controls.Add(Me.grpProbabilty) Me.Controls.Add(Me.cmdRhelpList) Me.Controls.Add(Me.cmdWakefieldHelp) Me.Controls.Add(Me.cmdStringRHelp) @@ -7741,6 +7740,7 @@ Partial Class ucrCalculator Me.Controls.Add(Me.grpFactor) Me.Controls.Add(Me.grpCircular) Me.Controls.Add(Me.grpMaths) + Me.Controls.Add(Me.grpProbabilty) Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "ucrCalculator" Me.Size = New System.Drawing.Size(898, 458) From 237f05d3cf65ea81ae41ae9b570777b36a9fe05c Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Wed, 24 Apr 2024 15:43:03 +0300 Subject: [PATCH 43/99] change --- instat/ucrCalculator.Designer.vb | 348 +++++++++++++++---------------- instat/ucrCalculator.vb | 35 ++-- 2 files changed, 194 insertions(+), 189 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index a6d9b532f31..812022d6d51 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -86,6 +86,7 @@ Partial Class ucrCalculator Me.cmdMdy = New System.Windows.Forms.Button() Me.cmdYmd = New System.Windows.Forms.Button() Me.cmdLeap = New System.Windows.Forms.Button() + Me.cmdRHelp = New instat.ucrSplitButton() Me.ContextMenuStripDate = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateLubridateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateHmsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -106,7 +107,7 @@ Partial Class ucrCalculator Me.cmdFrugal = New System.Windows.Forms.Button() Me.cmdPerfect = New System.Windows.Forms.Button() Me.cmdAbundant = New System.Windows.Forms.Button() - Me.cmdFibonacci2 = New System.Windows.Forms.Button() + Me.cmdCatalan = New System.Windows.Forms.Button() Me.cmdPalindrome = New System.Windows.Forms.Button() Me.cmdRoman = New System.Windows.Forms.Button() Me.cmdHexmode = New System.Windows.Forms.Button() @@ -123,6 +124,7 @@ Partial Class ucrCalculator Me.cmdGCD = New System.Windows.Forms.Button() Me.cmdGeneratePrimes = New System.Windows.Forms.Button() Me.cmdNthPrime = New System.Windows.Forms.Button() + Me.cmdIntegerRHelp = New instat.ucrSplitButton() Me.ContextMenuStripInteger = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.GmpToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DescToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -145,6 +147,7 @@ Partial Class ucrCalculator Me.cmdIsPrime = New System.Windows.Forms.Button() Me.cmdBigZ = New System.Windows.Forms.Button() Me.grpFactor = New System.Windows.Forms.GroupBox() + Me.cmdTransformHelp = New instat.ucrSplitButton() Me.ContextMenuStripFactor = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FactorForcatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdShuffle = New System.Windows.Forms.Button() @@ -168,6 +171,7 @@ Partial Class ucrCalculator Me.cmdFactor = New System.Windows.Forms.Button() Me.cmdAnon = New System.Windows.Forms.Button() Me.grpHydroGOF = New System.Windows.Forms.GroupBox() + Me.cmdHydroHelp = New instat.ucrSplitButton() Me.ContextMenuStripHydroGOF = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.HydroGOFToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdVE = New System.Windows.Forms.Button() @@ -248,6 +252,7 @@ Partial Class ucrCalculator Me.cmdGroup = New System.Windows.Forms.Button() Me.cmdGrade = New System.Windows.Forms.Button() Me.grpMaths = New System.Windows.Forms.GroupBox() + Me.cmdMathsHelp = New instat.ucrSplitButton() Me.ContextMenuStripMaths = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MathsBaseStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MathsStatsStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -281,6 +286,7 @@ Partial Class ucrCalculator Me.cmdwhichmax = New System.Windows.Forms.Button() Me.cmdwheremax = New System.Windows.Forms.Button() Me.cmdwhichmin = New System.Windows.Forms.Button() + Me.cmdSummaryRHelp = New instat.ucrSplitButton() Me.ContextMenuStripSummary = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.StatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -334,6 +340,7 @@ Partial Class ucrCalculator Me.cmdFreqLength = New System.Windows.Forms.Button() Me.grpProbabilty = New System.Windows.Forms.GroupBox() Me.cmdPascal = New System.Windows.Forms.Button() + Me.cmdProbRHelp = New instat.ucrSplitButton() Me.ContextMenuStripProbability = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ProbStatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ProbBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -382,6 +389,7 @@ Partial Class ucrCalculator Me.cmdDecimals = New System.Windows.Forms.Button() Me.cmdMASSFractions = New System.Windows.Forms.Button() Me.cmdScale = New System.Windows.Forms.Button() + Me.cmdTransformRHelp = New instat.ucrSplitButton() Me.ContextMenuStripTransform = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -420,6 +428,7 @@ Partial Class ucrCalculator Me.cmdCalcRepelicationFunction = New System.Windows.Forms.Button() Me.cmdCalcSequenceFunction = New System.Windows.Forms.Button() Me.cmdCalcConcantenateFunction = New System.Windows.Forms.Button() + Me.cmdLogicalHelp = New instat.ucrSplitButton() Me.ContextMenuStripLogical = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.LogBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LogDplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -483,6 +492,7 @@ Partial Class ucrCalculator Me.cmdSquishb = New System.Windows.Forms.Button() Me.ttCalculator = New System.Windows.Forms.ToolTip(Me.components) Me.grpCircular = New System.Windows.Forms.GroupBox() + Me.cmdCircularHelp = New instat.ucrSplitButton() Me.ContextMenuStripCircular = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CircularToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdCircular = New System.Windows.Forms.Button() @@ -528,6 +538,7 @@ Partial Class ucrCalculator Me.cmdComplexAcos = New System.Windows.Forms.Button() Me.cmdAsComplex = New System.Windows.Forms.Button() Me.cmdComplexi = New System.Windows.Forms.Button() + Me.cmdComplexRHelp = New instat.ucrSplitButton() Me.cmdComplexTanH = New System.Windows.Forms.Button() Me.cmdComplexTan = New System.Windows.Forms.Button() Me.cmdComplexPi = New System.Windows.Forms.Button() @@ -618,17 +629,6 @@ Partial Class ucrCalculator Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() - Me.cmdProbRHelp = New instat.ucrSplitButton() - Me.cmdIntegerRHelp = New instat.ucrSplitButton() - Me.cmdComplexRHelp = New instat.ucrSplitButton() - Me.cmdSummaryRHelp = New instat.ucrSplitButton() - Me.cmdTransformRHelp = New instat.ucrSplitButton() - Me.cmdLogicalHelp = New instat.ucrSplitButton() - Me.cmdRHelp = New instat.ucrSplitButton() - Me.cmdHydroHelp = New instat.ucrSplitButton() - Me.cmdTransformHelp = New instat.ucrSplitButton() - Me.cmdCircularHelp = New instat.ucrSplitButton() - Me.cmdMathsHelp = New instat.ucrSplitButton() Me.grpBasic.SuspendLayout Me.grpDates.SuspendLayout Me.ContextMenuStripDate.SuspendLayout @@ -1239,6 +1239,19 @@ Partial Class ucrCalculator Me.cmdLeap.Text = "leap" Me.cmdLeap.UseVisualStyleBackColor = True ' + 'cmdRHelp + ' + Me.cmdRHelp.AutoSize = True + Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.Location = New System.Drawing.Point(155, 198) + Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRHelp.Name = "cmdRHelp" + Me.cmdRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.TabIndex = 212 + Me.cmdRHelp.Text = "R Help" + Me.cmdRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripDate ' Me.ContextMenuStripDate.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1287,7 +1300,7 @@ Partial Class ucrCalculator Me.grpInteger.Controls.Add(Me.cmdFrugal) Me.grpInteger.Controls.Add(Me.cmdPerfect) Me.grpInteger.Controls.Add(Me.cmdAbundant) - Me.grpInteger.Controls.Add(Me.cmdFibonacci2) + Me.grpInteger.Controls.Add(Me.cmdCatalan) Me.grpInteger.Controls.Add(Me.cmdPalindrome) Me.grpInteger.Controls.Add(Me.cmdRoman) Me.grpInteger.Controls.Add(Me.cmdHexmode) @@ -1372,7 +1385,7 @@ Partial Class ucrCalculator 'cmdSquare ' Me.cmdSquare.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSquare.Location = New System.Drawing.Point(221, 255) + Me.cmdSquare.Location = New System.Drawing.Point(221, 256) Me.cmdSquare.Margin = New System.Windows.Forms.Padding(2) Me.cmdSquare.Name = "cmdSquare" Me.cmdSquare.Size = New System.Drawing.Size(74, 22) @@ -1383,7 +1396,7 @@ Partial Class ucrCalculator 'cmdTriangle ' Me.cmdTriangle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTriangle.Location = New System.Drawing.Point(148, 255) + Me.cmdTriangle.Location = New System.Drawing.Point(148, 256) Me.cmdTriangle.Margin = New System.Windows.Forms.Padding(2) Me.cmdTriangle.Name = "cmdTriangle" Me.cmdTriangle.Size = New System.Drawing.Size(74, 22) @@ -1394,7 +1407,7 @@ Partial Class ucrCalculator 'cmdPadovan ' Me.cmdPadovan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPadovan.Location = New System.Drawing.Point(75, 255) + Me.cmdPadovan.Location = New System.Drawing.Point(75, 256) Me.cmdPadovan.Margin = New System.Windows.Forms.Padding(2) Me.cmdPadovan.Name = "cmdPadovan" Me.cmdPadovan.Size = New System.Drawing.Size(74, 22) @@ -1405,7 +1418,7 @@ Partial Class ucrCalculator 'cmdAchilles ' Me.cmdAchilles.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAchilles.Location = New System.Drawing.Point(2, 255) + Me.cmdAchilles.Location = New System.Drawing.Point(2, 256) Me.cmdAchilles.Margin = New System.Windows.Forms.Padding(2) Me.cmdAchilles.Name = "cmdAchilles" Me.cmdAchilles.Size = New System.Drawing.Size(74, 22) @@ -1416,7 +1429,7 @@ Partial Class ucrCalculator 'cmdHappy ' Me.cmdHappy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHappy.Location = New System.Drawing.Point(221, 234) + Me.cmdHappy.Location = New System.Drawing.Point(221, 235) Me.cmdHappy.Margin = New System.Windows.Forms.Padding(2) Me.cmdHappy.Name = "cmdHappy" Me.cmdHappy.Size = New System.Drawing.Size(74, 22) @@ -1427,7 +1440,7 @@ Partial Class ucrCalculator 'cmdUgly ' Me.cmdUgly.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdUgly.Location = New System.Drawing.Point(148, 234) + Me.cmdUgly.Location = New System.Drawing.Point(148, 235) Me.cmdUgly.Margin = New System.Windows.Forms.Padding(2) Me.cmdUgly.Name = "cmdUgly" Me.cmdUgly.Size = New System.Drawing.Size(74, 22) @@ -1438,7 +1451,7 @@ Partial Class ucrCalculator 'cmdPowerful ' Me.cmdPowerful.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPowerful.Location = New System.Drawing.Point(75, 234) + Me.cmdPowerful.Location = New System.Drawing.Point(75, 235) Me.cmdPowerful.Margin = New System.Windows.Forms.Padding(2) Me.cmdPowerful.Name = "cmdPowerful" Me.cmdPowerful.Size = New System.Drawing.Size(74, 22) @@ -1449,7 +1462,7 @@ Partial Class ucrCalculator 'cmdFrugal ' Me.cmdFrugal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFrugal.Location = New System.Drawing.Point(2, 234) + Me.cmdFrugal.Location = New System.Drawing.Point(2, 235) Me.cmdFrugal.Margin = New System.Windows.Forms.Padding(2) Me.cmdFrugal.Name = "cmdFrugal" Me.cmdFrugal.Size = New System.Drawing.Size(74, 22) @@ -1479,16 +1492,16 @@ Partial Class ucrCalculator Me.cmdAbundant.Text = "abundant" Me.cmdAbundant.UseVisualStyleBackColor = True ' - 'cmdFibonacci2 + 'cmdCatalan ' - Me.cmdFibonacci2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFibonacci2.Location = New System.Drawing.Point(75, 214) - Me.cmdFibonacci2.Margin = New System.Windows.Forms.Padding(2) - Me.cmdFibonacci2.Name = "cmdFibonacci2" - Me.cmdFibonacci2.Size = New System.Drawing.Size(74, 22) - Me.cmdFibonacci2.TabIndex = 33 - Me.cmdFibonacci2.Text = "fibonacci2" - Me.cmdFibonacci2.UseVisualStyleBackColor = True + Me.cmdCatalan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdCatalan.Location = New System.Drawing.Point(75, 214) + Me.cmdCatalan.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCatalan.Name = "cmdCatalan" + Me.cmdCatalan.Size = New System.Drawing.Size(74, 22) + Me.cmdCatalan.TabIndex = 33 + Me.cmdCatalan.Text = " catalan" + Me.cmdCatalan.UseVisualStyleBackColor = True ' 'cmdPalindrome ' @@ -1665,6 +1678,19 @@ Partial Class ucrCalculator Me.cmdNthPrime.Text = "nth_prime" Me.cmdNthPrime.UseVisualStyleBackColor = True ' + 'cmdIntegerRHelp + ' + Me.cmdIntegerRHelp.AutoSize = True + Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(210, 283) + Me.cmdIntegerRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" + Me.cmdIntegerRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.TabIndex = 16 + Me.cmdIntegerRHelp.Text = "R Help" + Me.cmdIntegerRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripInteger ' Me.ContextMenuStripInteger.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1883,6 +1909,19 @@ Partial Class ucrCalculator Me.grpFactor.TabStop = False Me.grpFactor.Text = "Factor" ' + 'cmdTransformHelp + ' + Me.cmdTransformHelp.AutoSize = True + Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.Location = New System.Drawing.Point(150, 174) + Me.cmdTransformHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTransformHelp.Name = "cmdTransformHelp" + Me.cmdTransformHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.TabIndex = 212 + Me.cmdTransformHelp.Text = "R Help" + Me.cmdTransformHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripFactor ' Me.ContextMenuStripFactor.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2149,6 +2188,19 @@ Partial Class ucrCalculator Me.grpHydroGOF.TabStop = False Me.grpHydroGOF.Text = "Goodness of Fit" ' + 'cmdHydroHelp + ' + Me.cmdHydroHelp.AutoSize = True + Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.Location = New System.Drawing.Point(90, 238) + Me.cmdHydroHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdHydroHelp.Name = "cmdHydroHelp" + Me.cmdHydroHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.TabIndex = 212 + Me.cmdHydroHelp.Text = "R Help" + Me.cmdHydroHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripHydroGOF ' Me.ContextMenuStripHydroGOF.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3154,6 +3206,19 @@ Partial Class ucrCalculator Me.grpMaths.TabStop = False Me.grpMaths.Text = "Maths" ' + 'cmdMathsHelp + ' + Me.cmdMathsHelp.AutoSize = True + Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.Location = New System.Drawing.Point(163, 132) + Me.cmdMathsHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMathsHelp.Name = "cmdMathsHelp" + Me.cmdMathsHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.TabIndex = 211 + Me.cmdMathsHelp.Text = "R Help" + Me.cmdMathsHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripMaths ' Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3535,6 +3600,19 @@ Partial Class ucrCalculator Me.cmdwhichmin.Text = "which.min" Me.cmdwhichmin.UseVisualStyleBackColor = True ' + 'cmdSummaryRHelp + ' + Me.cmdSummaryRHelp.AutoSize = True + Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.Location = New System.Drawing.Point(182, 190) + Me.cmdSummaryRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" + Me.cmdSummaryRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.TabIndex = 185 + Me.cmdSummaryRHelp.Text = "R Help" + Me.cmdSummaryRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripSummary ' Me.ContextMenuStripSummary.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -4161,6 +4239,19 @@ Partial Class ucrCalculator Me.cmdPascal.Text = "pascal" Me.cmdPascal.UseVisualStyleBackColor = True ' + 'cmdProbRHelp + ' + Me.cmdProbRHelp.AutoSize = True + Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.Location = New System.Drawing.Point(215, 191) + Me.cmdProbRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdProbRHelp.Name = "cmdProbRHelp" + Me.cmdProbRHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.TabIndex = 212 + Me.cmdProbRHelp.Text = "R Help" + Me.cmdProbRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripProbability ' Me.ContextMenuStripProbability.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -4758,6 +4849,19 @@ Partial Class ucrCalculator Me.cmdScale.Text = "scale" Me.cmdScale.UseVisualStyleBackColor = True ' + 'cmdTransformRHelp + ' + Me.cmdTransformRHelp.AutoSize = True + Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.Location = New System.Drawing.Point(214, 196) + Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTransformRHelp.Name = "cmdTransformRHelp" + Me.cmdTransformRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.TabIndex = 204 + Me.cmdTransformRHelp.Text = "R Help" + Me.cmdTransformRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripTransform ' Me.ContextMenuStripTransform.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -5191,6 +5295,19 @@ Partial Class ucrCalculator Me.cmdCalcConcantenateFunction.Text = "c( )" Me.cmdCalcConcantenateFunction.UseVisualStyleBackColor = True ' + 'cmdLogicalHelp + ' + Me.cmdLogicalHelp.AutoSize = True + Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.Location = New System.Drawing.Point(166, 222) + Me.cmdLogicalHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLogicalHelp.Name = "cmdLogicalHelp" + Me.cmdLogicalHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.TabIndex = 212 + Me.cmdLogicalHelp.Text = "R Help" + Me.cmdLogicalHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripLogical ' Me.ContextMenuStripLogical.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -5952,6 +6069,19 @@ Partial Class ucrCalculator Me.grpCircular.TabStop = False Me.grpCircular.Text = "Circular" ' + 'cmdCircularHelp + ' + Me.cmdCircularHelp.AutoSize = True + Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.Location = New System.Drawing.Point(158, 142) + Me.cmdCircularHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircularHelp.Name = "cmdCircularHelp" + Me.cmdCircularHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.TabIndex = 212 + Me.cmdCircularHelp.Text = "R Help" + Me.cmdCircularHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripCircular ' Me.ContextMenuStripCircular.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -6488,6 +6618,19 @@ Partial Class ucrCalculator Me.cmdComplexi.Text = "i" Me.cmdComplexi.UseVisualStyleBackColor = True ' + 'cmdComplexRHelp + ' + Me.cmdComplexRHelp.AutoSize = True + Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.Location = New System.Drawing.Point(190, 192) + Me.cmdComplexRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexRHelp.Name = "cmdComplexRHelp" + Me.cmdComplexRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.TabIndex = 209 + Me.cmdComplexRHelp.Text = "R Help" + Me.cmdComplexRHelp.UseVisualStyleBackColor = True + ' 'cmdComplexTanH ' Me.cmdComplexTanH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) @@ -7566,149 +7709,6 @@ Partial Class ucrCalculator Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' - 'cmdProbRHelp - ' - Me.cmdProbRHelp.AutoSize = True - Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.Location = New System.Drawing.Point(215, 191) - Me.cmdProbRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdProbRHelp.Name = "cmdProbRHelp" - Me.cmdProbRHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.TabIndex = 212 - Me.cmdProbRHelp.Text = "R Help" - Me.cmdProbRHelp.UseVisualStyleBackColor = True - ' - 'cmdIntegerRHelp - ' - Me.cmdIntegerRHelp.AutoSize = True - Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.Location = New System.Drawing.Point(210, 283) - Me.cmdIntegerRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" - Me.cmdIntegerRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.TabIndex = 16 - Me.cmdIntegerRHelp.Text = "R Help" - Me.cmdIntegerRHelp.UseVisualStyleBackColor = True - ' - 'cmdComplexRHelp - ' - Me.cmdComplexRHelp.AutoSize = True - Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.Location = New System.Drawing.Point(190, 192) - Me.cmdComplexRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdComplexRHelp.Name = "cmdComplexRHelp" - Me.cmdComplexRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.TabIndex = 209 - Me.cmdComplexRHelp.Text = "R Help" - Me.cmdComplexRHelp.UseVisualStyleBackColor = True - ' - 'cmdSummaryRHelp - ' - Me.cmdSummaryRHelp.AutoSize = True - Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.Location = New System.Drawing.Point(182, 190) - Me.cmdSummaryRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" - Me.cmdSummaryRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.TabIndex = 185 - Me.cmdSummaryRHelp.Text = "R Help" - Me.cmdSummaryRHelp.UseVisualStyleBackColor = True - ' - 'cmdTransformRHelp - ' - Me.cmdTransformRHelp.AutoSize = True - Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.Location = New System.Drawing.Point(214, 196) - Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdTransformRHelp.Name = "cmdTransformRHelp" - Me.cmdTransformRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.TabIndex = 204 - Me.cmdTransformRHelp.Text = "R Help" - Me.cmdTransformRHelp.UseVisualStyleBackColor = True - ' - 'cmdLogicalHelp - ' - Me.cmdLogicalHelp.AutoSize = True - Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.Location = New System.Drawing.Point(166, 222) - Me.cmdLogicalHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdLogicalHelp.Name = "cmdLogicalHelp" - Me.cmdLogicalHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.TabIndex = 212 - Me.cmdLogicalHelp.Text = "R Help" - Me.cmdLogicalHelp.UseVisualStyleBackColor = True - ' - 'cmdRHelp - ' - Me.cmdRHelp.AutoSize = True - Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.Location = New System.Drawing.Point(155, 198) - Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.TabIndex = 212 - Me.cmdRHelp.Text = "R Help" - Me.cmdRHelp.UseVisualStyleBackColor = True - ' - 'cmdHydroHelp - ' - Me.cmdHydroHelp.AutoSize = True - Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.Location = New System.Drawing.Point(90, 238) - Me.cmdHydroHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdHydroHelp.Name = "cmdHydroHelp" - Me.cmdHydroHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.TabIndex = 212 - Me.cmdHydroHelp.Text = "R Help" - Me.cmdHydroHelp.UseVisualStyleBackColor = True - ' - 'cmdTransformHelp - ' - Me.cmdTransformHelp.AutoSize = True - Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.Location = New System.Drawing.Point(150, 174) - Me.cmdTransformHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdTransformHelp.Name = "cmdTransformHelp" - Me.cmdTransformHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.TabIndex = 212 - Me.cmdTransformHelp.Text = "R Help" - Me.cmdTransformHelp.UseVisualStyleBackColor = True - ' - 'cmdCircularHelp - ' - Me.cmdCircularHelp.AutoSize = True - Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.Location = New System.Drawing.Point(158, 142) - Me.cmdCircularHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdCircularHelp.Name = "cmdCircularHelp" - Me.cmdCircularHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.TabIndex = 212 - Me.cmdCircularHelp.Text = "R Help" - Me.cmdCircularHelp.UseVisualStyleBackColor = True - ' - 'cmdMathsHelp - ' - Me.cmdMathsHelp.AutoSize = True - Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.Location = New System.Drawing.Point(163, 132) - Me.cmdMathsHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdMathsHelp.Name = "cmdMathsHelp" - Me.cmdMathsHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.TabIndex = 211 - Me.cmdMathsHelp.Text = "R Help" - Me.cmdMathsHelp.UseVisualStyleBackColor = True - ' 'ucrCalculator ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -8177,7 +8177,7 @@ Partial Class ucrCalculator Friend WithEvents cmdFrugal As Button Friend WithEvents cmdPerfect As Button Friend WithEvents cmdAbundant As Button - Friend WithEvents cmdFibonacci2 As Button + Friend WithEvents cmdCatalan As Button Friend WithEvents cmdPalindrome As Button Friend WithEvents cmdFactorize As Button Friend WithEvents GmpToolStripMenuItem As ToolStripMenuItem diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 075ca5f7060..21145f77bdd 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -269,7 +269,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdKTuple, "k_tuple general formula for all these keys. For example k_tuple(0, 10, c(0,2)) gives twin primes") ttCalculator.SetToolTip(cmdRoman, "converts a small(up to 3899) positive integer to Roman numbers. For example as.roman(14)=XIV") ttCalculator.SetToolTip(cmdPalindrome, "generates palindromes to the length of the dataframe. For example the 100th palindromic number is 909") - ttCalculator.SetToolTip(cmdFibonacci2, "generates fibonacci numbers to the length of the data frame. For example the 10th fibonacci number is just 34, but the 50th is much larger, 7778742049") + ttCalculator.SetToolTip(cmdCatalan, "generates Catalan numbers to the length of the data frame. The 5th is 10!/(5!*6!) =7 * 6 = 42") ttCalculator.SetToolTip(cmdAbundant, "when divisors sum to more than the number. So 12 is less than 1+2+3+4+6 = 16. Opposite is Deficient") ttCalculator.SetToolTip(cmdPerfect, "divisors add to the number. So 6 = 1+2+3. Only 51 perfect numbers are currently known.") ttCalculator.SetToolTip(cmdFrugal, "125 is frugal because 125 = 5(cubed) and 5 and 3 are fewer digits (2) than 125 (3).") @@ -4342,11 +4342,16 @@ Public Class ucrCalculator End Sub Private Sub cmdFibonacci_Click(sender As Object, e As EventArgs) Handles cmdFibonacci.Click - If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Fibonacci(n = )", 2) - Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Fibonacci()", 1) - End If + Dim clsFibonacciFunction As New RFunction + + clsDataFunction.SetRCommand("nrow") + clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) + + clsFibonacciFunction.SetPackageName("Zseq") + clsFibonacciFunction.SetRCommand("Fibonacci") + clsFibonacciFunction.AddParameter("n", clsRFunctionParameter:=clsDataFunction, iPosition:=0) + + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsFibonacciFunction.ToScript, 0) End Sub Private Sub cmdDivisors_Click(sender As Object, e As EventArgs) Handles cmdDivisors.Click @@ -4513,7 +4518,7 @@ Public Class ucrCalculator clsPrimesFunction.SetPackageName("primes") clsPrimesFunction.SetRCommand(strRCommand) clsPrimesFunction.AddParameter("min", "0", iPosition:=0) - clsPrimesFunction.AddParameter("max", "100", iPosition:=1) + clsPrimesFunction.AddParameter("max", "1000000", iPosition:=1) clsDataFunction.SetRCommand("nrow") clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) @@ -4556,11 +4561,12 @@ Public Class ucrCalculator clsTuplePatternFunction.SetRCommand("c") clsTuplePatternFunction.AddParameter("x", "0", iPosition:=0, bIncludeArgumentName:=False) clsTuplePatternFunction.AddParameter("y", "2", iPosition:=1, bIncludeArgumentName:=False) + clsTuplePatternFunction.AddParameter("z", "8", iPosition:=2, bIncludeArgumentName:=False) clsKTuplePrimeFunction.SetPackageName("primes") clsKTuplePrimeFunction.SetRCommand("k_tuple") clsKTuplePrimeFunction.AddParameter("min", "0", iPosition:=0) - clsKTuplePrimeFunction.AddParameter("max", "100", iPosition:=1) + clsKTuplePrimeFunction.AddParameter("max", "1000000", iPosition:=1) clsKTuplePrimeFunction.AddParameter("tuple", clsRFunctionParameter:=clsTuplePatternFunction, iPosition:=2) clsRepFunction.SetRCommand("rep") @@ -4594,17 +4600,17 @@ Public Class ucrCalculator ZseqFunctions("Palindromic") End Sub - Private Sub cmdFibonnaci_Click(sender As Object, e As EventArgs) Handles cmdFibonacci2.Click - Dim clsFibonacciFunction As New RFunction + Private Sub cmdCatalan_Click(sender As Object, e As EventArgs) Handles cmdCatalan.Click + Dim clsCatalanFunction As New RFunction clsDataFunction.SetRCommand("nrow") clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) - clsFibonacciFunction.SetPackageName("Zseq") - clsFibonacciFunction.SetRCommand("Fibonacci") - clsFibonacciFunction.AddParameter("n", clsRFunctionParameter:=clsDataFunction, iPosition:=0) + clsCatalanFunction.SetPackageName("Zseq") + clsCatalanFunction.SetRCommand("Catalan") + clsCatalanFunction.AddParameter("n", clsRFunctionParameter:=clsDataFunction, iPosition:=0) - ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsFibonacciFunction.ToScript, 0) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsCatalanFunction.ToScript, 0) End Sub Private Sub cmdAbundant_Click(sender As Object, e As EventArgs) Handles cmdAbundant.Click @@ -4655,7 +4661,6 @@ Public Class ucrCalculator clsPerfectFunction.SetRCommand("Perfect") clsPerfectFunction.AddParameter("n", "10", iPosition:=0) - clsDataFunction.SetRCommand("nrow") clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) clsRepFunction.SetRCommand("rep") From d1befede8ceaa5406d830fde9d9ad2c56f9ab6db Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 29 Apr 2024 08:50:59 +0300 Subject: [PATCH 44/99] Bug fix on pasting multiple columns --- instat/static/InstatObject/R/data_object_R6.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index a81b21fa1db..fc03c39a2c8 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -670,7 +670,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 3791ec6d319019d743b599834e064414e6edc7c0 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 29 Apr 2024 12:19:09 +0300 Subject: [PATCH 45/99] summary --- instat/ucrCalculator.Designer.vb | 76 ++++++++++++++++---------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 812022d6d51..80d828e1236 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -7008,7 +7008,7 @@ Partial Class ucrCalculator ' Me.cmdListOperator.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListOperator.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListOperator.Location = New System.Drawing.Point(186, 72) + Me.cmdListOperator.Location = New System.Drawing.Point(187, 72) Me.cmdListOperator.Margin = New System.Windows.Forms.Padding(2) Me.cmdListOperator.Name = "cmdListOperator" Me.cmdListOperator.Size = New System.Drawing.Size(56, 30) @@ -7020,7 +7020,7 @@ Partial Class ucrCalculator ' Me.cmdListDiv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDiv.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDiv.Location = New System.Drawing.Point(126, 72) + Me.cmdListDiv.Location = New System.Drawing.Point(128, 72) Me.cmdListDiv.Margin = New System.Windows.Forms.Padding(2) Me.cmdListDiv.Name = "cmdListDiv" Me.cmdListDiv.Size = New System.Drawing.Size(60, 30) @@ -7032,7 +7032,7 @@ Partial Class ucrCalculator ' Me.cmdListMod.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMod.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMod.Location = New System.Drawing.Point(58, 72) + Me.cmdListMod.Location = New System.Drawing.Point(59, 72) Me.cmdListMod.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMod.Name = "cmdListMod" Me.cmdListMod.Size = New System.Drawing.Size(70, 30) @@ -7056,7 +7056,7 @@ Partial Class ucrCalculator ' Me.cmdListOmit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListOmit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListOmit.Location = New System.Drawing.Point(242, 42) + Me.cmdListOmit.Location = New System.Drawing.Point(242, 43) Me.cmdListOmit.Margin = New System.Windows.Forms.Padding(2) Me.cmdListOmit.Name = "cmdListOmit" Me.cmdListOmit.Size = New System.Drawing.Size(66, 30) @@ -7068,7 +7068,7 @@ Partial Class ucrCalculator ' Me.cmdListRev.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRev.Location = New System.Drawing.Point(186, 42) + Me.cmdListRev.Location = New System.Drawing.Point(187, 43) Me.cmdListRev.Margin = New System.Windows.Forms.Padding(2) Me.cmdListRev.Name = "cmdListRev" Me.cmdListRev.Size = New System.Drawing.Size(56, 30) @@ -7080,7 +7080,7 @@ Partial Class ucrCalculator ' Me.cmdListMovsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMovsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMovsum.Location = New System.Drawing.Point(126, 42) + Me.cmdListMovsum.Location = New System.Drawing.Point(128, 43) Me.cmdListMovsum.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMovsum.Name = "cmdListMovsum" Me.cmdListMovsum.Size = New System.Drawing.Size(60, 30) @@ -7092,7 +7092,7 @@ Partial Class ucrCalculator ' Me.cmdListCumsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListCumsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListCumsum.Location = New System.Drawing.Point(58, 42) + Me.cmdListCumsum.Location = New System.Drawing.Point(59, 43) Me.cmdListCumsum.Margin = New System.Windows.Forms.Padding(2) Me.cmdListCumsum.Name = "cmdListCumsum" Me.cmdListCumsum.Size = New System.Drawing.Size(70, 30) @@ -7104,7 +7104,7 @@ Partial Class ucrCalculator ' Me.cmdListScale.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListScale.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListScale.Location = New System.Drawing.Point(2, 42) + Me.cmdListScale.Location = New System.Drawing.Point(2, 43) Me.cmdListScale.Margin = New System.Windows.Forms.Padding(2) Me.cmdListScale.Name = "cmdListScale" Me.cmdListScale.Size = New System.Drawing.Size(58, 30) @@ -7128,7 +7128,7 @@ Partial Class ucrCalculator ' Me.cmdListLead.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLead.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLead.Location = New System.Drawing.Point(186, 14) + Me.cmdListLead.Location = New System.Drawing.Point(187, 14) Me.cmdListLead.Margin = New System.Windows.Forms.Padding(2) Me.cmdListLead.Name = "cmdListLead" Me.cmdListLead.Size = New System.Drawing.Size(56, 30) @@ -7140,7 +7140,7 @@ Partial Class ucrCalculator ' Me.cmdListLag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLag.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLag.Location = New System.Drawing.Point(126, 14) + Me.cmdListLag.Location = New System.Drawing.Point(128, 14) Me.cmdListLag.Margin = New System.Windows.Forms.Padding(2) Me.cmdListLag.Name = "cmdListLag" Me.cmdListLag.Size = New System.Drawing.Size(60, 30) @@ -7152,7 +7152,7 @@ Partial Class ucrCalculator ' Me.cmdListRank.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRank.Location = New System.Drawing.Point(58, 14) + Me.cmdListRank.Location = New System.Drawing.Point(59, 14) Me.cmdListRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdListRank.Name = "cmdListRank" Me.cmdListRank.Size = New System.Drawing.Size(70, 30) @@ -7197,7 +7197,7 @@ Partial Class ucrCalculator ' Me.cmdListSQRT.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSQRT.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSQRT.Location = New System.Drawing.Point(246, 42) + Me.cmdListSQRT.Location = New System.Drawing.Point(246, 43) Me.cmdListSQRT.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSQRT.Name = "cmdListSQRT" Me.cmdListSQRT.Size = New System.Drawing.Size(58, 30) @@ -7209,7 +7209,7 @@ Partial Class ucrCalculator ' Me.cmdListPercent2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListPercent2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListPercent2.Location = New System.Drawing.Point(186, 42) + Me.cmdListPercent2.Location = New System.Drawing.Point(187, 43) Me.cmdListPercent2.Margin = New System.Windows.Forms.Padding(2) Me.cmdListPercent2.Name = "cmdListPercent2" Me.cmdListPercent2.Size = New System.Drawing.Size(60, 30) @@ -7221,7 +7221,7 @@ Partial Class ucrCalculator ' Me.cmdListPercent.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListPercent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListPercent.Location = New System.Drawing.Point(126, 42) + Me.cmdListPercent.Location = New System.Drawing.Point(128, 43) Me.cmdListPercent.Margin = New System.Windows.Forms.Padding(2) Me.cmdListPercent.Name = "cmdListPercent" Me.cmdListPercent.Size = New System.Drawing.Size(60, 30) @@ -7233,7 +7233,7 @@ Partial Class ucrCalculator ' Me.cmdListProportion.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListProportion.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListProportion.Location = New System.Drawing.Point(58, 42) + Me.cmdListProportion.Location = New System.Drawing.Point(59, 43) Me.cmdListProportion.Margin = New System.Windows.Forms.Padding(2) Me.cmdListProportion.Name = "cmdListProportion" Me.cmdListProportion.Size = New System.Drawing.Size(70, 30) @@ -7245,7 +7245,7 @@ Partial Class ucrCalculator ' Me.cmdListRound.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRound.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRound.Location = New System.Drawing.Point(2, 42) + Me.cmdListRound.Location = New System.Drawing.Point(2, 43) Me.cmdListRound.Margin = New System.Windows.Forms.Padding(2) Me.cmdListRound.Name = "cmdListRound" Me.cmdListRound.Size = New System.Drawing.Size(58, 30) @@ -7269,7 +7269,7 @@ Partial Class ucrCalculator ' Me.cmdListDivide.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDivide.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDivide.Location = New System.Drawing.Point(186, 14) + Me.cmdListDivide.Location = New System.Drawing.Point(187, 14) Me.cmdListDivide.Margin = New System.Windows.Forms.Padding(2) Me.cmdListDivide.Name = "cmdListDivide" Me.cmdListDivide.Size = New System.Drawing.Size(60, 30) @@ -7281,7 +7281,7 @@ Partial Class ucrCalculator ' Me.cmdListMultiply.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMultiply.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMultiply.Location = New System.Drawing.Point(126, 14) + Me.cmdListMultiply.Location = New System.Drawing.Point(128, 14) Me.cmdListMultiply.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMultiply.Name = "cmdListMultiply" Me.cmdListMultiply.Size = New System.Drawing.Size(60, 30) @@ -7293,7 +7293,7 @@ Partial Class ucrCalculator ' Me.cmdListSubtract.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSubtract.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSubtract.Location = New System.Drawing.Point(58, 14) + Me.cmdListSubtract.Location = New System.Drawing.Point(59, 14) Me.cmdListSubtract.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSubtract.Name = "cmdListSubtract" Me.cmdListSubtract.Size = New System.Drawing.Size(70, 30) @@ -7317,7 +7317,7 @@ Partial Class ucrCalculator ' Me.cmdListNth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListNth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListNth.Location = New System.Drawing.Point(246, 102) + Me.cmdListNth.Location = New System.Drawing.Point(246, 101) Me.cmdListNth.Margin = New System.Windows.Forms.Padding(2) Me.cmdListNth.Name = "cmdListNth" Me.cmdListNth.Size = New System.Drawing.Size(62, 30) @@ -7329,7 +7329,7 @@ Partial Class ucrCalculator ' Me.cmdListLast.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLast.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLast.Location = New System.Drawing.Point(186, 102) + Me.cmdListLast.Location = New System.Drawing.Point(185, 101) Me.cmdListLast.Margin = New System.Windows.Forms.Padding(2) Me.cmdListLast.Name = "cmdListLast" Me.cmdListLast.Size = New System.Drawing.Size(62, 30) @@ -7341,7 +7341,7 @@ Partial Class ucrCalculator ' Me.cmdListFirst.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListFirst.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListFirst.Location = New System.Drawing.Point(126, 102) + Me.cmdListFirst.Location = New System.Drawing.Point(124, 101) Me.cmdListFirst.Margin = New System.Windows.Forms.Padding(2) Me.cmdListFirst.Name = "cmdListFirst" Me.cmdListFirst.Size = New System.Drawing.Size(62, 30) @@ -7353,7 +7353,7 @@ Partial Class ucrCalculator ' Me.cmdListAnyDup.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListAnyDup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListAnyDup.Location = New System.Drawing.Point(64, 102) + Me.cmdListAnyDup.Location = New System.Drawing.Point(63, 101) Me.cmdListAnyDup.Margin = New System.Windows.Forms.Padding(2) Me.cmdListAnyDup.Name = "cmdListAnyDup" Me.cmdListAnyDup.Size = New System.Drawing.Size(62, 30) @@ -7365,7 +7365,7 @@ Partial Class ucrCalculator ' Me.cmdListDistinct.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDistinct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDistinct.Location = New System.Drawing.Point(2, 102) + Me.cmdListDistinct.Location = New System.Drawing.Point(2, 101) Me.cmdListDistinct.Margin = New System.Windows.Forms.Padding(2) Me.cmdListDistinct.Name = "cmdListDistinct" Me.cmdListDistinct.Size = New System.Drawing.Size(62, 30) @@ -7389,7 +7389,7 @@ Partial Class ucrCalculator ' Me.cmdListMad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMad.Location = New System.Drawing.Point(186, 72) + Me.cmdListMad.Location = New System.Drawing.Point(185, 72) Me.cmdListMad.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMad.Name = "cmdListMad" Me.cmdListMad.Size = New System.Drawing.Size(62, 30) @@ -7401,7 +7401,7 @@ Partial Class ucrCalculator ' Me.cmdListSd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSd.Location = New System.Drawing.Point(126, 72) + Me.cmdListSd.Location = New System.Drawing.Point(124, 72) Me.cmdListSd.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSd.Name = "cmdListSd" Me.cmdListSd.Size = New System.Drawing.Size(62, 30) @@ -7413,7 +7413,7 @@ Partial Class ucrCalculator ' Me.cmdListVar.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListVar.Location = New System.Drawing.Point(64, 72) + Me.cmdListVar.Location = New System.Drawing.Point(63, 72) Me.cmdListVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdListVar.Name = "cmdListVar" Me.cmdListVar.Size = New System.Drawing.Size(62, 30) @@ -7437,7 +7437,7 @@ Partial Class ucrCalculator ' Me.cmdListMode1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMode1.Location = New System.Drawing.Point(246, 42) + Me.cmdListMode1.Location = New System.Drawing.Point(246, 43) Me.cmdListMode1.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMode1.Name = "cmdListMode1" Me.cmdListMode1.Size = New System.Drawing.Size(62, 30) @@ -7461,7 +7461,7 @@ Partial Class ucrCalculator ' Me.cmdListFivenum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListFivenum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListFivenum.Location = New System.Drawing.Point(186, 130) + Me.cmdListFivenum.Location = New System.Drawing.Point(185, 130) Me.cmdListFivenum.Margin = New System.Windows.Forms.Padding(2) Me.cmdListFivenum.Name = "cmdListFivenum" Me.cmdListFivenum.Size = New System.Drawing.Size(62, 30) @@ -7474,7 +7474,7 @@ Partial Class ucrCalculator ' Me.cmdListMode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMode.Location = New System.Drawing.Point(186, 42) + Me.cmdListMode.Location = New System.Drawing.Point(185, 43) Me.cmdListMode.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMode.Name = "cmdListMode" Me.cmdListMode.Size = New System.Drawing.Size(62, 30) @@ -7498,7 +7498,7 @@ Partial Class ucrCalculator ' Me.cmdListDigitsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDigitsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDigitsum.Location = New System.Drawing.Point(64, 130) + Me.cmdListDigitsum.Location = New System.Drawing.Point(63, 130) Me.cmdListDigitsum.Margin = New System.Windows.Forms.Padding(2) Me.cmdListDigitsum.Name = "cmdListDigitsum" Me.cmdListDigitsum.Size = New System.Drawing.Size(62, 30) @@ -7510,7 +7510,7 @@ Partial Class ucrCalculator ' Me.cmdListMin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMin.Location = New System.Drawing.Point(186, 14) + Me.cmdListMin.Location = New System.Drawing.Point(185, 14) Me.cmdListMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMin.Name = "cmdListMin" Me.cmdListMin.Size = New System.Drawing.Size(62, 30) @@ -7522,7 +7522,7 @@ Partial Class ucrCalculator ' Me.cmdListProd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListProd.Location = New System.Drawing.Point(126, 14) + Me.cmdListProd.Location = New System.Drawing.Point(124, 14) Me.cmdListProd.Margin = New System.Windows.Forms.Padding(2) Me.cmdListProd.Name = "cmdListProd" Me.cmdListProd.Size = New System.Drawing.Size(62, 30) @@ -7546,7 +7546,7 @@ Partial Class ucrCalculator ' Me.cmdListMedian.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMedian.Location = New System.Drawing.Point(126, 42) + Me.cmdListMedian.Location = New System.Drawing.Point(124, 43) Me.cmdListMedian.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMedian.Name = "cmdListMedian" Me.cmdListMedian.Size = New System.Drawing.Size(62, 30) @@ -7558,7 +7558,7 @@ Partial Class ucrCalculator ' Me.cmdListMean.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMean.Location = New System.Drawing.Point(64, 42) + Me.cmdListMean.Location = New System.Drawing.Point(63, 43) Me.cmdListMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMean.Name = "cmdListMean" Me.cmdListMean.Size = New System.Drawing.Size(62, 30) @@ -7570,7 +7570,7 @@ Partial Class ucrCalculator ' Me.cmdListRange.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRange.Location = New System.Drawing.Point(2, 42) + Me.cmdListRange.Location = New System.Drawing.Point(2, 43) Me.cmdListRange.Margin = New System.Windows.Forms.Padding(2) Me.cmdListRange.Name = "cmdListRange" Me.cmdListRange.Size = New System.Drawing.Size(62, 30) @@ -7582,7 +7582,7 @@ Partial Class ucrCalculator ' Me.cmdListSum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSum.Location = New System.Drawing.Point(64, 14) + Me.cmdListSum.Location = New System.Drawing.Point(63, 14) Me.cmdListSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSum.Name = "cmdListSum" Me.cmdListSum.Size = New System.Drawing.Size(62, 30) @@ -7594,7 +7594,7 @@ Partial Class ucrCalculator ' Me.cmdListSumd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSumd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSumd.Location = New System.Drawing.Point(126, 130) + Me.cmdListSumd.Location = New System.Drawing.Point(124, 130) Me.cmdListSumd.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSumd.Name = "cmdListSumd" Me.cmdListSumd.Size = New System.Drawing.Size(62, 30) From 1cc28d92e5e261095e05aab1a6dd1c467e2ee1fb Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 29 Apr 2024 12:23:58 +0300 Subject: [PATCH 46/99] text/strings --- instat/ucrCalculator.Designer.vb | 80 ++++++++++++++++---------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 80d828e1236..b01067a9c7a 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -1682,7 +1682,7 @@ Partial Class ucrCalculator ' Me.cmdIntegerRHelp.AutoSize = True Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.Location = New System.Drawing.Point(210, 283) + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(205, 283) Me.cmdIntegerRHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" Me.cmdIntegerRHelp.Size = New System.Drawing.Size(90, 30) @@ -5706,7 +5706,7 @@ Partial Class ucrCalculator ' Me.cmdReverseStr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReverseStr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReverseStr.Location = New System.Drawing.Point(246, 102) + Me.cmdReverseStr.Location = New System.Drawing.Point(245, 101) Me.cmdReverseStr.Margin = New System.Windows.Forms.Padding(2) Me.cmdReverseStr.Name = "cmdReverseStr" Me.cmdReverseStr.Size = New System.Drawing.Size(52, 30) @@ -5718,7 +5718,7 @@ Partial Class ucrCalculator 'cmdEnds ' Me.cmdEnds.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEnds.Location = New System.Drawing.Point(120, 74) + Me.cmdEnds.Location = New System.Drawing.Point(120, 72) Me.cmdEnds.Margin = New System.Windows.Forms.Padding(2) Me.cmdEnds.Name = "cmdEnds" Me.cmdEnds.Size = New System.Drawing.Size(60, 30) @@ -5730,7 +5730,7 @@ Partial Class ucrCalculator ' Me.cmdTrunck.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrunck.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrunck.Location = New System.Drawing.Point(246, 130) + Me.cmdTrunck.Location = New System.Drawing.Point(247, 130) Me.cmdTrunck.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrunck.Name = "cmdTrunck" Me.cmdTrunck.Size = New System.Drawing.Size(52, 30) @@ -5742,7 +5742,7 @@ Partial Class ucrCalculator ' Me.cmdLenth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLenth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLenth.Location = New System.Drawing.Point(162, 102) + Me.cmdLenth.Location = New System.Drawing.Point(161, 101) Me.cmdLenth.Margin = New System.Windows.Forms.Padding(2) Me.cmdLenth.Name = "cmdLenth" Me.cmdLenth.Size = New System.Drawing.Size(44, 30) @@ -5754,7 +5754,7 @@ Partial Class ucrCalculator ' Me.cmdGlue.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdGlue.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGlue.Location = New System.Drawing.Point(204, 102) + Me.cmdGlue.Location = New System.Drawing.Point(204, 101) Me.cmdGlue.Margin = New System.Windows.Forms.Padding(2) Me.cmdGlue.Name = "cmdGlue" Me.cmdGlue.Size = New System.Drawing.Size(42, 30) @@ -5792,7 +5792,7 @@ Partial Class ucrCalculator ' Me.cmdReplace.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReplace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReplace.Location = New System.Drawing.Point(62, 130) + Me.cmdReplace.Location = New System.Drawing.Point(61, 130) Me.cmdReplace.Margin = New System.Windows.Forms.Padding(2) Me.cmdReplace.Name = "cmdReplace" Me.cmdReplace.Size = New System.Drawing.Size(50, 30) @@ -5818,7 +5818,7 @@ Partial Class ucrCalculator ' Me.cmdRemove1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRemove1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRemove1.Location = New System.Drawing.Point(110, 102) + Me.cmdRemove1.Location = New System.Drawing.Point(110, 101) Me.cmdRemove1.Margin = New System.Windows.Forms.Padding(2) Me.cmdRemove1.Name = "cmdRemove1" Me.cmdRemove1.Size = New System.Drawing.Size(52, 30) @@ -5831,7 +5831,7 @@ Partial Class ucrCalculator ' Me.cmdLocate2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLocate2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLocate2.Location = New System.Drawing.Point(62, 102) + Me.cmdLocate2.Location = New System.Drawing.Point(61, 101) Me.cmdLocate2.Margin = New System.Windows.Forms.Padding(2) Me.cmdLocate2.Name = "cmdLocate2" Me.cmdLocate2.Size = New System.Drawing.Size(50, 30) @@ -5844,7 +5844,7 @@ Partial Class ucrCalculator ' Me.cmdExtract2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdExtract2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExtract2.Location = New System.Drawing.Point(238, 74) + Me.cmdExtract2.Location = New System.Drawing.Point(238, 72) Me.cmdExtract2.Margin = New System.Windows.Forms.Padding(2) Me.cmdExtract2.Name = "cmdExtract2" Me.cmdExtract2.Size = New System.Drawing.Size(60, 30) @@ -5857,7 +5857,7 @@ Partial Class ucrCalculator ' Me.cmdEncodeb.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdEncodeb.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEncodeb.Location = New System.Drawing.Point(238, 44) + Me.cmdEncodeb.Location = New System.Drawing.Point(238, 43) Me.cmdEncodeb.Margin = New System.Windows.Forms.Padding(2) Me.cmdEncodeb.Name = "cmdEncodeb" Me.cmdEncodeb.Size = New System.Drawing.Size(60, 30) @@ -5869,7 +5869,7 @@ Partial Class ucrCalculator ' Me.cmdSub.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSub.Location = New System.Drawing.Point(170, 130) + Me.cmdSub.Location = New System.Drawing.Point(169, 130) Me.cmdSub.Margin = New System.Windows.Forms.Padding(2) Me.cmdSub.Name = "cmdSub" Me.cmdSub.Size = New System.Drawing.Size(34, 30) @@ -5882,7 +5882,7 @@ Partial Class ucrCalculator ' Me.cmdCombine.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCombine.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCombine.Location = New System.Drawing.Point(178, 44) + Me.cmdCombine.Location = New System.Drawing.Point(179, 43) Me.cmdCombine.Margin = New System.Windows.Forms.Padding(2) Me.cmdCombine.Name = "cmdCombine" Me.cmdCombine.Size = New System.Drawing.Size(60, 30) @@ -5894,7 +5894,7 @@ Partial Class ucrCalculator ' Me.cmdDetect.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdDetect.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDetect.Location = New System.Drawing.Point(62, 74) + Me.cmdDetect.Location = New System.Drawing.Point(61, 72) Me.cmdDetect.Margin = New System.Windows.Forms.Padding(2) Me.cmdDetect.Name = "cmdDetect" Me.cmdDetect.Size = New System.Drawing.Size(60, 30) @@ -5907,7 +5907,7 @@ Partial Class ucrCalculator ' Me.cmdTrim.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrim.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrim.Location = New System.Drawing.Point(178, 14) + Me.cmdTrim.Location = New System.Drawing.Point(179, 14) Me.cmdTrim.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrim.Name = "cmdTrim" Me.cmdTrim.Size = New System.Drawing.Size(60, 30) @@ -5931,7 +5931,7 @@ Partial Class ucrCalculator ' Me.cmdLower.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLower.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLower.Location = New System.Drawing.Point(62, 14) + Me.cmdLower.Location = New System.Drawing.Point(61, 14) Me.cmdLower.Margin = New System.Windows.Forms.Padding(2) Me.cmdLower.Name = "cmdLower" Me.cmdLower.Size = New System.Drawing.Size(60, 30) @@ -5955,7 +5955,7 @@ Partial Class ucrCalculator ' Me.cmdSort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSort.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSort.Location = New System.Drawing.Point(120, 44) + Me.cmdSort.Location = New System.Drawing.Point(120, 43) Me.cmdSort.Margin = New System.Windows.Forms.Padding(2) Me.cmdSort.Name = "cmdSort" Me.cmdSort.Size = New System.Drawing.Size(60, 30) @@ -5967,7 +5967,7 @@ Partial Class ucrCalculator ' Me.cmdOrder.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdOrder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOrder.Location = New System.Drawing.Point(62, 44) + Me.cmdOrder.Location = New System.Drawing.Point(61, 43) Me.cmdOrder.Margin = New System.Windows.Forms.Padding(2) Me.cmdOrder.Name = "cmdOrder" Me.cmdOrder.Size = New System.Drawing.Size(60, 30) @@ -5979,7 +5979,7 @@ Partial Class ucrCalculator ' Me.cmdPad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPad.Location = New System.Drawing.Point(2, 44) + Me.cmdPad.Location = New System.Drawing.Point(2, 43) Me.cmdPad.Margin = New System.Windows.Forms.Padding(2) Me.cmdPad.Name = "cmdPad" Me.cmdPad.Size = New System.Drawing.Size(60, 30) @@ -5991,7 +5991,7 @@ Partial Class ucrCalculator ' Me.cmdExtract.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdExtract.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExtract.Location = New System.Drawing.Point(178, 74) + Me.cmdExtract.Location = New System.Drawing.Point(179, 72) Me.cmdExtract.Margin = New System.Windows.Forms.Padding(2) Me.cmdExtract.Name = "cmdExtract" Me.cmdExtract.Size = New System.Drawing.Size(60, 30) @@ -6003,7 +6003,7 @@ Partial Class ucrCalculator ' Me.cmdCountstrings.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCountstrings.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCountstrings.Location = New System.Drawing.Point(2, 74) + Me.cmdCountstrings.Location = New System.Drawing.Point(2, 72) Me.cmdCountstrings.Margin = New System.Windows.Forms.Padding(2) Me.cmdCountstrings.Name = "cmdCountstrings" Me.cmdCountstrings.Size = New System.Drawing.Size(60, 30) @@ -6015,7 +6015,7 @@ Partial Class ucrCalculator ' Me.cmdLocate.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLocate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLocate.Location = New System.Drawing.Point(2, 102) + Me.cmdLocate.Location = New System.Drawing.Point(2, 101) Me.cmdLocate.Margin = New System.Windows.Forms.Padding(2) Me.cmdLocate.Name = "cmdLocate" Me.cmdLocate.Size = New System.Drawing.Size(60, 30) @@ -6289,7 +6289,7 @@ Partial Class ucrCalculator 'cmdRegex ' Me.cmdRegex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRegex.Location = New System.Drawing.Point(188, 14) + Me.cmdRegex.Location = New System.Drawing.Point(185, 14) Me.cmdRegex.Margin = New System.Windows.Forms.Padding(2) Me.cmdRegex.Name = "cmdRegex" Me.cmdRegex.Size = New System.Drawing.Size(62, 30) @@ -6300,7 +6300,7 @@ Partial Class ucrCalculator 'cmdFixed ' Me.cmdFixed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFixed.Location = New System.Drawing.Point(126, 14) + Me.cmdFixed.Location = New System.Drawing.Point(124, 14) Me.cmdFixed.Margin = New System.Windows.Forms.Padding(2) Me.cmdFixed.Name = "cmdFixed" Me.cmdFixed.Size = New System.Drawing.Size(62, 30) @@ -6311,7 +6311,7 @@ Partial Class ucrCalculator 'cmdCollate ' Me.cmdCollate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCollate.Location = New System.Drawing.Point(64, 14) + Me.cmdCollate.Location = New System.Drawing.Point(63, 14) Me.cmdCollate.Margin = New System.Windows.Forms.Padding(2) Me.cmdCollate.Name = "cmdCollate" Me.cmdCollate.Size = New System.Drawing.Size(62, 30) @@ -6359,7 +6359,7 @@ Partial Class ucrCalculator 'cmdOr3 ' Me.cmdOr3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr3.Location = New System.Drawing.Point(126, 46) + Me.cmdOr3.Location = New System.Drawing.Point(124, 45) Me.cmdOr3.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr3.Name = "cmdOr3" Me.cmdOr3.Size = New System.Drawing.Size(62, 30) @@ -6370,7 +6370,7 @@ Partial Class ucrCalculator 'cmdEscape ' Me.cmdEscape.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEscape.Location = New System.Drawing.Point(190, 74) + Me.cmdEscape.Location = New System.Drawing.Point(185, 74) Me.cmdEscape.Margin = New System.Windows.Forms.Padding(2) Me.cmdEscape.Name = "cmdEscape" Me.cmdEscape.Size = New System.Drawing.Size(62, 30) @@ -6381,7 +6381,7 @@ Partial Class ucrCalculator 'cmdPlusZero ' Me.cmdPlusZero.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlusZero.Location = New System.Drawing.Point(250, 74) + Me.cmdPlusZero.Location = New System.Drawing.Point(246, 74) Me.cmdPlusZero.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlusZero.Name = "cmdPlusZero" Me.cmdPlusZero.Size = New System.Drawing.Size(62, 30) @@ -6392,7 +6392,7 @@ Partial Class ucrCalculator 'cmdZero ' Me.cmdZero.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdZero.Location = New System.Drawing.Point(126, 74) + Me.cmdZero.Location = New System.Drawing.Point(124, 74) Me.cmdZero.Margin = New System.Windows.Forms.Padding(2) Me.cmdZero.Name = "cmdZero" Me.cmdZero.Size = New System.Drawing.Size(62, 30) @@ -6403,7 +6403,7 @@ Partial Class ucrCalculator 'cmdPlusOne ' Me.cmdPlusOne.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlusOne.Location = New System.Drawing.Point(64, 74) + Me.cmdPlusOne.Location = New System.Drawing.Point(63, 74) Me.cmdPlusOne.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlusOne.Name = "cmdPlusOne" Me.cmdPlusOne.Size = New System.Drawing.Size(62, 30) @@ -6425,7 +6425,7 @@ Partial Class ucrCalculator 'cmdNumbers ' Me.cmdNumbers.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNumbers.Location = New System.Drawing.Point(250, 46) + Me.cmdNumbers.Location = New System.Drawing.Point(246, 45) Me.cmdNumbers.Margin = New System.Windows.Forms.Padding(2) Me.cmdNumbers.Name = "cmdNumbers" Me.cmdNumbers.Size = New System.Drawing.Size(62, 30) @@ -6436,7 +6436,7 @@ Partial Class ucrCalculator 'cmdNot1 ' Me.cmdNot1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNot1.Location = New System.Drawing.Point(64, 46) + Me.cmdNot1.Location = New System.Drawing.Point(63, 45) Me.cmdNot1.Margin = New System.Windows.Forms.Padding(2) Me.cmdNot1.Name = "cmdNot1" Me.cmdNot1.Size = New System.Drawing.Size(62, 30) @@ -6447,7 +6447,7 @@ Partial Class ucrCalculator 'cmdOr2 ' Me.cmdOr2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr2.Location = New System.Drawing.Point(190, 46) + Me.cmdOr2.Location = New System.Drawing.Point(185, 45) Me.cmdOr2.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr2.Name = "cmdOr2" Me.cmdOr2.Size = New System.Drawing.Size(62, 30) @@ -6458,7 +6458,7 @@ Partial Class ucrCalculator 'cmdOr1 ' Me.cmdOr1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr1.Location = New System.Drawing.Point(2, 46) + Me.cmdOr1.Location = New System.Drawing.Point(2, 45) Me.cmdOr1.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr1.Name = "cmdOr1" Me.cmdOr1.Size = New System.Drawing.Size(62, 30) @@ -6469,7 +6469,7 @@ Partial Class ucrCalculator 'cmdSpace ' Me.cmdSpace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSpace.Location = New System.Drawing.Point(250, 16) + Me.cmdSpace.Location = New System.Drawing.Point(246, 16) Me.cmdSpace.Margin = New System.Windows.Forms.Padding(2) Me.cmdSpace.Name = "cmdSpace" Me.cmdSpace.Size = New System.Drawing.Size(62, 30) @@ -6480,7 +6480,7 @@ Partial Class ucrCalculator 'cmdDigit ' Me.cmdDigit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDigit.Location = New System.Drawing.Point(190, 16) + Me.cmdDigit.Location = New System.Drawing.Point(185, 16) Me.cmdDigit.Margin = New System.Windows.Forms.Padding(2) Me.cmdDigit.Name = "cmdDigit" Me.cmdDigit.Size = New System.Drawing.Size(62, 30) @@ -6491,7 +6491,7 @@ Partial Class ucrCalculator 'cmdEnd1 ' Me.cmdEnd1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEnd1.Location = New System.Drawing.Point(126, 16) + Me.cmdEnd1.Location = New System.Drawing.Point(124, 16) Me.cmdEnd1.Margin = New System.Windows.Forms.Padding(2) Me.cmdEnd1.Name = "cmdEnd1" Me.cmdEnd1.Size = New System.Drawing.Size(62, 30) @@ -6502,7 +6502,7 @@ Partial Class ucrCalculator 'cmdbegin ' Me.cmdbegin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbegin.Location = New System.Drawing.Point(64, 16) + Me.cmdbegin.Location = New System.Drawing.Point(63, 16) Me.cmdbegin.Margin = New System.Windows.Forms.Padding(2) Me.cmdbegin.Name = "cmdbegin" Me.cmdbegin.Size = New System.Drawing.Size(62, 30) @@ -7714,7 +7714,6 @@ Partial Class ucrCalculator Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.Controls.Add(Me.grpList) Me.Controls.Add(Me.cmdRhelpList) Me.Controls.Add(Me.cmdWakefieldHelp) Me.Controls.Add(Me.cmdStringRHelp) @@ -7726,7 +7725,6 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) - Me.Controls.Add(Me.grpInteger) Me.Controls.Add(Me.grpTestString) Me.Controls.Add(Me.grpModifier) Me.Controls.Add(Me.grpSymbols) @@ -7741,6 +7739,8 @@ Partial Class ucrCalculator Me.Controls.Add(Me.grpCircular) Me.Controls.Add(Me.grpMaths) Me.Controls.Add(Me.grpProbabilty) + Me.Controls.Add(Me.grpList) + Me.Controls.Add(Me.grpInteger) Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "ucrCalculator" Me.Size = New System.Drawing.Size(898, 458) From 2197c89b99b2bc62f50faf001fee0770e2f28fae Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 29 Apr 2024 12:26:24 +0300 Subject: [PATCH 47/99] complex --- instat/ucrCalculator.Designer.vb | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index b01067a9c7a..d10fa5f9083 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -6562,7 +6562,7 @@ Partial Class ucrCalculator ' Me.cmdComplexAsin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexAsin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexAsin.Location = New System.Drawing.Point(24, 102) + Me.cmdComplexAsin.Location = New System.Drawing.Point(24, 105) Me.cmdComplexAsin.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexAsin.Name = "cmdComplexAsin" Me.cmdComplexAsin.Size = New System.Drawing.Size(66, 30) @@ -6574,7 +6574,7 @@ Partial Class ucrCalculator ' Me.cmdComplexAtan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexAtan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexAtan.Location = New System.Drawing.Point(158, 102) + Me.cmdComplexAtan.Location = New System.Drawing.Point(158, 105) Me.cmdComplexAtan.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexAtan.Name = "cmdComplexAtan" Me.cmdComplexAtan.Size = New System.Drawing.Size(66, 30) @@ -6586,7 +6586,7 @@ Partial Class ucrCalculator ' Me.cmdComplexAcos.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexAcos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexAcos.Location = New System.Drawing.Point(89, 102) + Me.cmdComplexAcos.Location = New System.Drawing.Point(89, 105) Me.cmdComplexAcos.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexAcos.Name = "cmdComplexAcos" Me.cmdComplexAcos.Size = New System.Drawing.Size(70, 30) @@ -6610,7 +6610,7 @@ Partial Class ucrCalculator ' Me.cmdComplexi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexi.Location = New System.Drawing.Point(24, 190) + Me.cmdComplexi.Location = New System.Drawing.Point(24, 192) Me.cmdComplexi.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexi.Name = "cmdComplexi" Me.cmdComplexi.Size = New System.Drawing.Size(66, 30) @@ -6635,7 +6635,7 @@ Partial Class ucrCalculator ' Me.cmdComplexTanH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexTanH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexTanH.Location = New System.Drawing.Point(158, 131) + Me.cmdComplexTanH.Location = New System.Drawing.Point(158, 134) Me.cmdComplexTanH.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexTanH.Name = "cmdComplexTanH" Me.cmdComplexTanH.Size = New System.Drawing.Size(66, 30) @@ -6647,7 +6647,7 @@ Partial Class ucrCalculator ' Me.cmdComplexTan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexTan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexTan.Location = New System.Drawing.Point(158, 74) + Me.cmdComplexTan.Location = New System.Drawing.Point(158, 76) Me.cmdComplexTan.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexTan.Name = "cmdComplexTan" Me.cmdComplexTan.Size = New System.Drawing.Size(66, 30) @@ -6659,7 +6659,7 @@ Partial Class ucrCalculator ' Me.cmdComplexPi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexPi.Location = New System.Drawing.Point(223, 102) + Me.cmdComplexPi.Location = New System.Drawing.Point(223, 105) Me.cmdComplexPi.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexPi.Name = "cmdComplexPi" Me.cmdComplexPi.Size = New System.Drawing.Size(62, 30) @@ -6671,7 +6671,7 @@ Partial Class ucrCalculator ' Me.cmdComplexDeg.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexDeg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexDeg.Location = New System.Drawing.Point(223, 74) + Me.cmdComplexDeg.Location = New System.Drawing.Point(223, 76) Me.cmdComplexDeg.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexDeg.Name = "cmdComplexDeg" Me.cmdComplexDeg.Size = New System.Drawing.Size(63, 30) @@ -6683,7 +6683,7 @@ Partial Class ucrCalculator ' Me.cmdComplexRad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexRad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexRad.Location = New System.Drawing.Point(223, 46) + Me.cmdComplexRad.Location = New System.Drawing.Point(223, 47) Me.cmdComplexRad.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexRad.Name = "cmdComplexRad" Me.cmdComplexRad.Size = New System.Drawing.Size(63, 30) @@ -6695,7 +6695,7 @@ Partial Class ucrCalculator ' Me.cmdComplexSignif.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSignif.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSignif.Location = New System.Drawing.Point(158, 160) + Me.cmdComplexSignif.Location = New System.Drawing.Point(158, 163) Me.cmdComplexSignif.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexSignif.Name = "cmdComplexSignif" Me.cmdComplexSignif.Size = New System.Drawing.Size(66, 30) @@ -6707,7 +6707,7 @@ Partial Class ucrCalculator ' Me.cmdComplexCosH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexCosH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexCosH.Location = New System.Drawing.Point(89, 131) + Me.cmdComplexCosH.Location = New System.Drawing.Point(89, 134) Me.cmdComplexCosH.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexCosH.Name = "cmdComplexCosH" Me.cmdComplexCosH.Size = New System.Drawing.Size(70, 30) @@ -6719,7 +6719,7 @@ Partial Class ucrCalculator ' Me.cmdComplexSinH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSinH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSinH.Location = New System.Drawing.Point(24, 131) + Me.cmdComplexSinH.Location = New System.Drawing.Point(24, 134) Me.cmdComplexSinH.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexSinH.Name = "cmdComplexSinH" Me.cmdComplexSinH.Size = New System.Drawing.Size(66, 30) @@ -6731,7 +6731,7 @@ Partial Class ucrCalculator ' Me.cmdComplexCos.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexCos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexCos.Location = New System.Drawing.Point(89, 74) + Me.cmdComplexCos.Location = New System.Drawing.Point(89, 76) Me.cmdComplexCos.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexCos.Name = "cmdComplexCos" Me.cmdComplexCos.Size = New System.Drawing.Size(70, 30) @@ -6743,7 +6743,7 @@ Partial Class ucrCalculator ' Me.cmdComplexSin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSin.Location = New System.Drawing.Point(24, 74) + Me.cmdComplexSin.Location = New System.Drawing.Point(24, 76) Me.cmdComplexSin.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexSin.Name = "cmdComplexSin" Me.cmdComplexSin.Size = New System.Drawing.Size(66, 30) @@ -6755,7 +6755,7 @@ Partial Class ucrCalculator ' Me.cmdComplexExp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexExp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexExp.Location = New System.Drawing.Point(223, 131) + Me.cmdComplexExp.Location = New System.Drawing.Point(223, 134) Me.cmdComplexExp.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexExp.Name = "cmdComplexExp" Me.cmdComplexExp.Size = New System.Drawing.Size(63, 30) @@ -6767,7 +6767,7 @@ Partial Class ucrCalculator ' Me.cmdComplexRound.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexRound.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexRound.Location = New System.Drawing.Point(89, 160) + Me.cmdComplexRound.Location = New System.Drawing.Point(89, 163) Me.cmdComplexRound.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexRound.Name = "cmdComplexRound" Me.cmdComplexRound.Size = New System.Drawing.Size(70, 30) @@ -6779,7 +6779,7 @@ Partial Class ucrCalculator ' Me.cmdComplexLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexLog.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexLog.Location = New System.Drawing.Point(223, 160) + Me.cmdComplexLog.Location = New System.Drawing.Point(223, 163) Me.cmdComplexLog.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexLog.Name = "cmdComplexLog" Me.cmdComplexLog.Size = New System.Drawing.Size(63, 30) @@ -6791,7 +6791,7 @@ Partial Class ucrCalculator ' Me.cmdComplexSqrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSqrt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSqrt.Location = New System.Drawing.Point(24, 160) + Me.cmdComplexSqrt.Location = New System.Drawing.Point(24, 163) Me.cmdComplexSqrt.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexSqrt.Name = "cmdComplexSqrt" Me.cmdComplexSqrt.Size = New System.Drawing.Size(66, 30) @@ -6803,7 +6803,7 @@ Partial Class ucrCalculator ' Me.cmdConjugate.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdConjugate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdConjugate.Location = New System.Drawing.Point(158, 46) + Me.cmdConjugate.Location = New System.Drawing.Point(158, 47) Me.cmdConjugate.Margin = New System.Windows.Forms.Padding(2) Me.cmdConjugate.Name = "cmdConjugate" Me.cmdConjugate.Size = New System.Drawing.Size(66, 30) @@ -6815,7 +6815,7 @@ Partial Class ucrCalculator ' Me.cmdArg.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdArg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdArg.Location = New System.Drawing.Point(89, 46) + Me.cmdArg.Location = New System.Drawing.Point(89, 47) Me.cmdArg.Margin = New System.Windows.Forms.Padding(2) Me.cmdArg.Name = "cmdArg" Me.cmdArg.Size = New System.Drawing.Size(70, 30) @@ -6827,7 +6827,7 @@ Partial Class ucrCalculator ' Me.cmdMod.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMod.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMod.Location = New System.Drawing.Point(24, 46) + Me.cmdMod.Location = New System.Drawing.Point(24, 47) Me.cmdMod.Margin = New System.Windows.Forms.Padding(2) Me.cmdMod.Name = "cmdMod" Me.cmdMod.Size = New System.Drawing.Size(66, 30) @@ -7725,9 +7725,6 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) - Me.Controls.Add(Me.grpTestString) - Me.Controls.Add(Me.grpModifier) - Me.Controls.Add(Me.grpSymbols) Me.Controls.Add(Me.grpComplex) Me.Controls.Add(Me.grpSummary) Me.Controls.Add(Me.grpTransform) @@ -7741,6 +7738,9 @@ Partial Class ucrCalculator Me.Controls.Add(Me.grpProbabilty) Me.Controls.Add(Me.grpList) Me.Controls.Add(Me.grpInteger) + Me.Controls.Add(Me.grpTestString) + Me.Controls.Add(Me.grpModifier) + Me.Controls.Add(Me.grpSymbols) Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "ucrCalculator" Me.Size = New System.Drawing.Size(898, 458) From 05d44e44775d8a2ca28e163362cf7f63319a7ba2 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 29 Apr 2024 12:45:04 +0300 Subject: [PATCH 48/99] design --- instat/ucrCalculator.Designer.vb | 422 +++++++++++++++---------------- 1 file changed, 211 insertions(+), 211 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index d10fa5f9083..1963b1a51e3 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -1243,7 +1243,7 @@ Partial Class ucrCalculator ' Me.cmdRHelp.AutoSize = True Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.Location = New System.Drawing.Point(155, 198) + Me.cmdRHelp.Location = New System.Drawing.Point(157, 193) Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdRHelp.Name = "cmdRHelp" Me.cmdRHelp.Size = New System.Drawing.Size(90, 30) @@ -1913,7 +1913,7 @@ Partial Class ucrCalculator ' Me.cmdTransformHelp.AutoSize = True Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.Location = New System.Drawing.Point(150, 174) + Me.cmdTransformHelp.Location = New System.Drawing.Point(150, 172) Me.cmdTransformHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdTransformHelp.Name = "cmdTransformHelp" Me.cmdTransformHelp.Size = New System.Drawing.Size(90, 30) @@ -1938,7 +1938,7 @@ Partial Class ucrCalculator 'cmdShuffle ' Me.cmdShuffle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdShuffle.Location = New System.Drawing.Point(182, 142) + Me.cmdShuffle.Location = New System.Drawing.Point(181, 140) Me.cmdShuffle.Margin = New System.Windows.Forms.Padding(2) Me.cmdShuffle.Name = "cmdShuffle" Me.cmdShuffle.Size = New System.Drawing.Size(60, 32) @@ -1949,7 +1949,7 @@ Partial Class ucrCalculator 'cmdShift ' Me.cmdShift.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdShift.Location = New System.Drawing.Point(122, 142) + Me.cmdShift.Location = New System.Drawing.Point(122, 140) Me.cmdShift.Margin = New System.Windows.Forms.Padding(2) Me.cmdShift.Name = "cmdShift" Me.cmdShift.Size = New System.Drawing.Size(60, 32) @@ -1960,7 +1960,7 @@ Partial Class ucrCalculator 'cmdReverse ' Me.cmdReverse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReverse.Location = New System.Drawing.Point(64, 142) + Me.cmdReverse.Location = New System.Drawing.Point(63, 140) Me.cmdReverse.Margin = New System.Windows.Forms.Padding(2) Me.cmdReverse.Name = "cmdReverse" Me.cmdReverse.Size = New System.Drawing.Size(60, 32) @@ -1971,7 +1971,7 @@ Partial Class ucrCalculator 'cmdReorder ' Me.cmdReorder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReorder.Location = New System.Drawing.Point(4, 142) + Me.cmdReorder.Location = New System.Drawing.Point(4, 140) Me.cmdReorder.Margin = New System.Windows.Forms.Padding(2) Me.cmdReorder.Name = "cmdReorder" Me.cmdReorder.Size = New System.Drawing.Size(60, 32) @@ -1982,7 +1982,7 @@ Partial Class ucrCalculator 'cmdRelevel ' Me.cmdRelevel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRelevel.Location = New System.Drawing.Point(182, 110) + Me.cmdRelevel.Location = New System.Drawing.Point(181, 109) Me.cmdRelevel.Margin = New System.Windows.Forms.Padding(2) Me.cmdRelevel.Name = "cmdRelevel" Me.cmdRelevel.Size = New System.Drawing.Size(60, 32) @@ -1993,7 +1993,7 @@ Partial Class ucrCalculator 'cmdRecode ' Me.cmdRecode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRecode.Location = New System.Drawing.Point(122, 110) + Me.cmdRecode.Location = New System.Drawing.Point(122, 109) Me.cmdRecode.Margin = New System.Windows.Forms.Padding(2) Me.cmdRecode.Name = "cmdRecode" Me.cmdRecode.Size = New System.Drawing.Size(60, 32) @@ -2004,7 +2004,7 @@ Partial Class ucrCalculator 'cmdOther ' Me.cmdOther.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOther.Location = New System.Drawing.Point(64, 110) + Me.cmdOther.Location = New System.Drawing.Point(63, 109) Me.cmdOther.Margin = New System.Windows.Forms.Padding(2) Me.cmdOther.Name = "cmdOther" Me.cmdOther.Size = New System.Drawing.Size(60, 32) @@ -2015,7 +2015,7 @@ Partial Class ucrCalculator 'cmdFmatch ' Me.cmdFmatch.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFmatch.Location = New System.Drawing.Point(4, 110) + Me.cmdFmatch.Location = New System.Drawing.Point(4, 109) Me.cmdFmatch.Margin = New System.Windows.Forms.Padding(2) Me.cmdFmatch.Name = "cmdFmatch" Me.cmdFmatch.Size = New System.Drawing.Size(60, 32) @@ -2026,7 +2026,7 @@ Partial Class ucrCalculator 'cmdLump ' Me.cmdLump.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLump.Location = New System.Drawing.Point(182, 80) + Me.cmdLump.Location = New System.Drawing.Point(181, 78) Me.cmdLump.Margin = New System.Windows.Forms.Padding(2) Me.cmdLump.Name = "cmdLump" Me.cmdLump.Size = New System.Drawing.Size(60, 32) @@ -2037,7 +2037,7 @@ Partial Class ucrCalculator 'cmdInseq ' Me.cmdInseq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInseq.Location = New System.Drawing.Point(122, 80) + Me.cmdInseq.Location = New System.Drawing.Point(122, 78) Me.cmdInseq.Margin = New System.Windows.Forms.Padding(2) Me.cmdInseq.Name = "cmdInseq" Me.cmdInseq.Size = New System.Drawing.Size(60, 32) @@ -2048,7 +2048,7 @@ Partial Class ucrCalculator 'cmdInfreq ' Me.cmdInfreq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInfreq.Location = New System.Drawing.Point(64, 80) + Me.cmdInfreq.Location = New System.Drawing.Point(63, 78) Me.cmdInfreq.Margin = New System.Windows.Forms.Padding(2) Me.cmdInfreq.Name = "cmdInfreq" Me.cmdInfreq.Size = New System.Drawing.Size(60, 32) @@ -2059,7 +2059,7 @@ Partial Class ucrCalculator 'cmdInorder ' Me.cmdInorder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInorder.Location = New System.Drawing.Point(4, 80) + Me.cmdInorder.Location = New System.Drawing.Point(4, 78) Me.cmdInorder.Margin = New System.Windows.Forms.Padding(2) Me.cmdInorder.Name = "cmdInorder" Me.cmdInorder.Size = New System.Drawing.Size(60, 32) @@ -2070,7 +2070,7 @@ Partial Class ucrCalculator 'cmdAdd_na ' Me.cmdAdd_na.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAdd_na.Location = New System.Drawing.Point(182, 48) + Me.cmdAdd_na.Location = New System.Drawing.Point(181, 47) Me.cmdAdd_na.Margin = New System.Windows.Forms.Padding(2) Me.cmdAdd_na.Name = "cmdAdd_na" Me.cmdAdd_na.Size = New System.Drawing.Size(60, 32) @@ -2081,7 +2081,7 @@ Partial Class ucrCalculator 'cmdExpand ' Me.cmdExpand.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExpand.Location = New System.Drawing.Point(122, 48) + Me.cmdExpand.Location = New System.Drawing.Point(122, 47) Me.cmdExpand.Margin = New System.Windows.Forms.Padding(2) Me.cmdExpand.Name = "cmdExpand" Me.cmdExpand.Size = New System.Drawing.Size(60, 32) @@ -2092,7 +2092,7 @@ Partial Class ucrCalculator 'cmdDrop ' Me.cmdDrop.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDrop.Location = New System.Drawing.Point(64, 48) + Me.cmdDrop.Location = New System.Drawing.Point(63, 47) Me.cmdDrop.Margin = New System.Windows.Forms.Padding(2) Me.cmdDrop.Name = "cmdDrop" Me.cmdDrop.Size = New System.Drawing.Size(60, 32) @@ -2103,7 +2103,7 @@ Partial Class ucrCalculator 'cmdCross ' Me.cmdCross.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCross.Location = New System.Drawing.Point(4, 48) + Me.cmdCross.Location = New System.Drawing.Point(4, 47) Me.cmdCross.Margin = New System.Windows.Forms.Padding(2) Me.cmdCross.Name = "cmdCross" Me.cmdCross.Size = New System.Drawing.Size(60, 32) @@ -2114,7 +2114,7 @@ Partial Class ucrCalculator 'cmdCollapse ' Me.cmdCollapse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCollapse.Location = New System.Drawing.Point(182, 16) + Me.cmdCollapse.Location = New System.Drawing.Point(181, 16) Me.cmdCollapse.Margin = New System.Windows.Forms.Padding(2) Me.cmdCollapse.Name = "cmdCollapse" Me.cmdCollapse.Size = New System.Drawing.Size(60, 32) @@ -2147,7 +2147,7 @@ Partial Class ucrCalculator 'cmdAnon ' Me.cmdAnon.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnon.Location = New System.Drawing.Point(64, 16) + Me.cmdAnon.Location = New System.Drawing.Point(63, 16) Me.cmdAnon.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnon.Name = "cmdAnon" Me.cmdAnon.Size = New System.Drawing.Size(60, 32) @@ -2192,7 +2192,7 @@ Partial Class ucrCalculator ' Me.cmdHydroHelp.AutoSize = True Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.Location = New System.Drawing.Point(90, 238) + Me.cmdHydroHelp.Location = New System.Drawing.Point(91, 236) Me.cmdHydroHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdHydroHelp.Name = "cmdHydroHelp" Me.cmdHydroHelp.Size = New System.Drawing.Size(86, 30) @@ -2217,7 +2217,7 @@ Partial Class ucrCalculator 'cmdVE ' Me.cmdVE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdVE.Location = New System.Drawing.Point(120, 206) + Me.cmdVE.Location = New System.Drawing.Point(120, 202) Me.cmdVE.Margin = New System.Windows.Forms.Padding(2) Me.cmdVE.Name = "cmdVE" Me.cmdVE.Size = New System.Drawing.Size(60, 32) @@ -2228,7 +2228,7 @@ Partial Class ucrCalculator 'cmdSsq ' Me.cmdSsq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSsq.Location = New System.Drawing.Point(62, 206) + Me.cmdSsq.Location = New System.Drawing.Point(61, 202) Me.cmdSsq.Margin = New System.Windows.Forms.Padding(2) Me.cmdSsq.Name = "cmdSsq" Me.cmdSsq.Size = New System.Drawing.Size(60, 32) @@ -2239,7 +2239,7 @@ Partial Class ucrCalculator 'cmdRsr ' Me.cmdRsr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRsr.Location = New System.Drawing.Point(2, 206) + Me.cmdRsr.Location = New System.Drawing.Point(2, 202) Me.cmdRsr.Margin = New System.Windows.Forms.Padding(2) Me.cmdRsr.Name = "cmdRsr" Me.cmdRsr.Size = New System.Drawing.Size(60, 32) @@ -2250,7 +2250,7 @@ Partial Class ucrCalculator 'cmdRSD ' Me.cmdRSD.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRSD.Location = New System.Drawing.Point(120, 174) + Me.cmdRSD.Location = New System.Drawing.Point(120, 171) Me.cmdRSD.Margin = New System.Windows.Forms.Padding(2) Me.cmdRSD.Name = "cmdRSD" Me.cmdRSD.Size = New System.Drawing.Size(60, 32) @@ -2261,7 +2261,7 @@ Partial Class ucrCalculator 'cmdRPearson ' Me.cmdRPearson.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRPearson.Location = New System.Drawing.Point(62, 174) + Me.cmdRPearson.Location = New System.Drawing.Point(61, 171) Me.cmdRPearson.Margin = New System.Windows.Forms.Padding(2) Me.cmdRPearson.Name = "cmdRPearson" Me.cmdRPearson.Size = New System.Drawing.Size(60, 32) @@ -2272,7 +2272,7 @@ Partial Class ucrCalculator 'cmdRNSE ' Me.cmdRNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRNSE.Location = New System.Drawing.Point(2, 174) + Me.cmdRNSE.Location = New System.Drawing.Point(2, 171) Me.cmdRNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdRNSE.Name = "cmdRNSE" Me.cmdRNSE.Size = New System.Drawing.Size(60, 32) @@ -2283,7 +2283,7 @@ Partial Class ucrCalculator 'cmdRmse ' Me.cmdRmse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRmse.Location = New System.Drawing.Point(120, 142) + Me.cmdRmse.Location = New System.Drawing.Point(120, 140) Me.cmdRmse.Margin = New System.Windows.Forms.Padding(2) Me.cmdRmse.Name = "cmdRmse" Me.cmdRmse.Size = New System.Drawing.Size(60, 32) @@ -2294,7 +2294,7 @@ Partial Class ucrCalculator 'cmdRd ' Me.cmdRd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRd.Location = New System.Drawing.Point(62, 142) + Me.cmdRd.Location = New System.Drawing.Point(61, 140) Me.cmdRd.Margin = New System.Windows.Forms.Padding(2) Me.cmdRd.Name = "cmdRd" Me.cmdRd.Size = New System.Drawing.Size(60, 32) @@ -2305,7 +2305,7 @@ Partial Class ucrCalculator 'cmdPbiasfdc ' Me.cmdPbiasfdc.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbiasfdc.Location = New System.Drawing.Point(2, 142) + Me.cmdPbiasfdc.Location = New System.Drawing.Point(2, 140) Me.cmdPbiasfdc.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbiasfdc.Name = "cmdPbiasfdc" Me.cmdPbiasfdc.Size = New System.Drawing.Size(60, 32) @@ -2316,7 +2316,7 @@ Partial Class ucrCalculator 'cmdPbias ' Me.cmdPbias.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbias.Location = New System.Drawing.Point(120, 110) + Me.cmdPbias.Location = New System.Drawing.Point(120, 109) Me.cmdPbias.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbias.Name = "cmdPbias" Me.cmdPbias.Size = New System.Drawing.Size(60, 32) @@ -2327,7 +2327,7 @@ Partial Class ucrCalculator 'cmdNSE ' Me.cmdNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNSE.Location = New System.Drawing.Point(62, 110) + Me.cmdNSE.Location = New System.Drawing.Point(61, 109) Me.cmdNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdNSE.Name = "cmdNSE" Me.cmdNSE.Size = New System.Drawing.Size(60, 32) @@ -2338,7 +2338,7 @@ Partial Class ucrCalculator 'cmdNrmse ' Me.cmdNrmse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNrmse.Location = New System.Drawing.Point(2, 110) + Me.cmdNrmse.Location = New System.Drawing.Point(2, 109) Me.cmdNrmse.Margin = New System.Windows.Forms.Padding(2) Me.cmdNrmse.Name = "cmdNrmse" Me.cmdNrmse.Size = New System.Drawing.Size(60, 32) @@ -2349,7 +2349,7 @@ Partial Class ucrCalculator 'cmdMse ' Me.cmdMse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMse.Location = New System.Drawing.Point(120, 80) + Me.cmdMse.Location = New System.Drawing.Point(120, 78) Me.cmdMse.Margin = New System.Windows.Forms.Padding(2) Me.cmdMse.Name = "cmdMse" Me.cmdMse.Size = New System.Drawing.Size(60, 32) @@ -2360,7 +2360,7 @@ Partial Class ucrCalculator 'cmdmNSE ' Me.cmdmNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdmNSE.Location = New System.Drawing.Point(62, 80) + Me.cmdmNSE.Location = New System.Drawing.Point(61, 78) Me.cmdmNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdmNSE.Name = "cmdmNSE" Me.cmdmNSE.Size = New System.Drawing.Size(60, 32) @@ -2371,7 +2371,7 @@ Partial Class ucrCalculator 'cmdMe ' Me.cmdMe.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMe.Location = New System.Drawing.Point(2, 80) + Me.cmdMe.Location = New System.Drawing.Point(2, 78) Me.cmdMe.Margin = New System.Windows.Forms.Padding(2) Me.cmdMe.Name = "cmdMe" Me.cmdMe.Size = New System.Drawing.Size(60, 32) @@ -2382,7 +2382,7 @@ Partial Class ucrCalculator 'cmdMd ' Me.cmdMd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMd.Location = New System.Drawing.Point(120, 48) + Me.cmdMd.Location = New System.Drawing.Point(120, 47) Me.cmdMd.Margin = New System.Windows.Forms.Padding(2) Me.cmdMd.Name = "cmdMd" Me.cmdMd.Size = New System.Drawing.Size(60, 32) @@ -2393,7 +2393,7 @@ Partial Class ucrCalculator 'cmdMae ' Me.cmdMae.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMae.Location = New System.Drawing.Point(62, 48) + Me.cmdMae.Location = New System.Drawing.Point(61, 47) Me.cmdMae.Margin = New System.Windows.Forms.Padding(2) Me.cmdMae.Name = "cmdMae" Me.cmdMae.Size = New System.Drawing.Size(60, 32) @@ -2404,7 +2404,7 @@ Partial Class ucrCalculator 'cmdKGE ' Me.cmdKGE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdKGE.Location = New System.Drawing.Point(2, 48) + Me.cmdKGE.Location = New System.Drawing.Point(2, 47) Me.cmdKGE.Margin = New System.Windows.Forms.Padding(2) Me.cmdKGE.Name = "cmdKGE" Me.cmdKGE.Size = New System.Drawing.Size(60, 32) @@ -2426,7 +2426,7 @@ Partial Class ucrCalculator 'cmdCp ' Me.cmdCp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCp.Location = New System.Drawing.Point(62, 16) + Me.cmdCp.Location = New System.Drawing.Point(61, 16) Me.cmdCp.Margin = New System.Windows.Forms.Padding(2) Me.cmdCp.Name = "cmdCp" Me.cmdCp.Size = New System.Drawing.Size(60, 32) @@ -2515,7 +2515,7 @@ Partial Class ucrCalculator ' Me.cmdLikert7.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLikert7.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLikert7.Location = New System.Drawing.Point(342, 306) + Me.cmdLikert7.Location = New System.Drawing.Point(346, 304) Me.cmdLikert7.Margin = New System.Windows.Forms.Padding(2) Me.cmdLikert7.Name = "cmdLikert7" Me.cmdLikert7.Size = New System.Drawing.Size(86, 30) @@ -2527,7 +2527,7 @@ Partial Class ucrCalculator ' Me.cmdWakefield_Year.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefield_Year.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefield_Year.Location = New System.Drawing.Point(258, 306) + Me.cmdWakefield_Year.Location = New System.Drawing.Point(261, 304) Me.cmdWakefield_Year.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefield_Year.Name = "cmdWakefield_Year" Me.cmdWakefield_Year.Size = New System.Drawing.Size(86, 30) @@ -2539,7 +2539,7 @@ Partial Class ucrCalculator ' Me.cmdValid.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdValid.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdValid.Location = New System.Drawing.Point(174, 306) + Me.cmdValid.Location = New System.Drawing.Point(176, 304) Me.cmdValid.Margin = New System.Windows.Forms.Padding(2) Me.cmdValid.Name = "cmdValid" Me.cmdValid.Size = New System.Drawing.Size(86, 30) @@ -2551,7 +2551,7 @@ Partial Class ucrCalculator ' Me.cmdWakefieldUpper.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldUpper.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldUpper.Location = New System.Drawing.Point(90, 306) + Me.cmdWakefieldUpper.Location = New System.Drawing.Point(91, 304) Me.cmdWakefieldUpper.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldUpper.Name = "cmdWakefieldUpper" Me.cmdWakefieldUpper.Size = New System.Drawing.Size(86, 30) @@ -2563,7 +2563,7 @@ Partial Class ucrCalculator ' Me.cmdString.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdString.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdString.Location = New System.Drawing.Point(6, 306) + Me.cmdString.Location = New System.Drawing.Point(6, 304) Me.cmdString.Margin = New System.Windows.Forms.Padding(2) Me.cmdString.Name = "cmdString" Me.cmdString.Size = New System.Drawing.Size(86, 30) @@ -2575,7 +2575,7 @@ Partial Class ucrCalculator ' Me.cmdState.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdState.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdState.Location = New System.Drawing.Point(342, 278) + Me.cmdState.Location = New System.Drawing.Point(346, 275) Me.cmdState.Margin = New System.Windows.Forms.Padding(2) Me.cmdState.Name = "cmdState" Me.cmdState.Size = New System.Drawing.Size(86, 30) @@ -2587,7 +2587,7 @@ Partial Class ucrCalculator ' Me.cmdSpeed.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSpeed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSpeed.Location = New System.Drawing.Point(258, 278) + Me.cmdSpeed.Location = New System.Drawing.Point(261, 275) Me.cmdSpeed.Margin = New System.Windows.Forms.Padding(2) Me.cmdSpeed.Name = "cmdSpeed" Me.cmdSpeed.Size = New System.Drawing.Size(86, 30) @@ -2599,7 +2599,7 @@ Partial Class ucrCalculator ' Me.cmdSmokes.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSmokes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSmokes.Location = New System.Drawing.Point(174, 278) + Me.cmdSmokes.Location = New System.Drawing.Point(176, 275) Me.cmdSmokes.Margin = New System.Windows.Forms.Padding(2) Me.cmdSmokes.Name = "cmdSmokes" Me.cmdSmokes.Size = New System.Drawing.Size(86, 30) @@ -2611,7 +2611,7 @@ Partial Class ucrCalculator ' Me.cmdWakefieldTimes.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldTimes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldTimes.Location = New System.Drawing.Point(90, 278) + Me.cmdWakefieldTimes.Location = New System.Drawing.Point(91, 275) Me.cmdWakefieldTimes.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldTimes.Name = "cmdWakefieldTimes" Me.cmdWakefieldTimes.Size = New System.Drawing.Size(86, 30) @@ -2623,7 +2623,7 @@ Partial Class ucrCalculator ' Me.cmdSex_Inclusive.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSex_Inclusive.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSex_Inclusive.Location = New System.Drawing.Point(6, 278) + Me.cmdSex_Inclusive.Location = New System.Drawing.Point(6, 275) Me.cmdSex_Inclusive.Margin = New System.Windows.Forms.Padding(2) Me.cmdSex_Inclusive.Name = "cmdSex_Inclusive" Me.cmdSex_Inclusive.Size = New System.Drawing.Size(86, 30) @@ -2635,7 +2635,7 @@ Partial Class ucrCalculator ' Me.cmdGender.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGender.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGender.Location = New System.Drawing.Point(342, 248) + Me.cmdGender.Location = New System.Drawing.Point(346, 246) Me.cmdGender.Margin = New System.Windows.Forms.Padding(2) Me.cmdGender.Name = "cmdGender" Me.cmdGender.Size = New System.Drawing.Size(86, 30) @@ -2647,7 +2647,7 @@ Partial Class ucrCalculator ' Me.cmdSentence.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSentence.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSentence.Location = New System.Drawing.Point(258, 248) + Me.cmdSentence.Location = New System.Drawing.Point(261, 246) Me.cmdSentence.Margin = New System.Windows.Forms.Padding(2) Me.cmdSentence.Name = "cmdSentence" Me.cmdSentence.Size = New System.Drawing.Size(86, 30) @@ -2659,7 +2659,7 @@ Partial Class ucrCalculator ' Me.cmdSat.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSat.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSat.Location = New System.Drawing.Point(174, 248) + Me.cmdSat.Location = New System.Drawing.Point(176, 246) Me.cmdSat.Margin = New System.Windows.Forms.Padding(2) Me.cmdSat.Name = "cmdSat" Me.cmdSat.Size = New System.Drawing.Size(86, 30) @@ -2671,7 +2671,7 @@ Partial Class ucrCalculator ' Me.cmdReligion.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdReligion.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReligion.Location = New System.Drawing.Point(90, 248) + Me.cmdReligion.Location = New System.Drawing.Point(91, 246) Me.cmdReligion.Margin = New System.Windows.Forms.Padding(2) Me.cmdReligion.Name = "cmdReligion" Me.cmdReligion.Size = New System.Drawing.Size(86, 30) @@ -2683,7 +2683,7 @@ Partial Class ucrCalculator ' Me.cmdRace.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdRace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRace.Location = New System.Drawing.Point(6, 248) + Me.cmdRace.Location = New System.Drawing.Point(6, 246) Me.cmdRace.Margin = New System.Windows.Forms.Padding(2) Me.cmdRace.Name = "cmdRace" Me.cmdRace.Size = New System.Drawing.Size(86, 30) @@ -2695,7 +2695,7 @@ Partial Class ucrCalculator ' Me.cmdPolitical.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdPolitical.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPolitical.Location = New System.Drawing.Point(342, 218) + Me.cmdPolitical.Location = New System.Drawing.Point(346, 217) Me.cmdPolitical.Margin = New System.Windows.Forms.Padding(2) Me.cmdPolitical.Name = "cmdPolitical" Me.cmdPolitical.Size = New System.Drawing.Size(86, 30) @@ -2707,7 +2707,7 @@ Partial Class ucrCalculator ' Me.cmdNormal.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdNormal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNormal.Location = New System.Drawing.Point(258, 218) + Me.cmdNormal.Location = New System.Drawing.Point(261, 217) Me.cmdNormal.Margin = New System.Windows.Forms.Padding(2) Me.cmdNormal.Name = "cmdNormal" Me.cmdNormal.Size = New System.Drawing.Size(86, 30) @@ -2719,7 +2719,7 @@ Partial Class ucrCalculator ' Me.cmdName.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdName.Location = New System.Drawing.Point(174, 218) + Me.cmdName.Location = New System.Drawing.Point(176, 217) Me.cmdName.Margin = New System.Windows.Forms.Padding(2) Me.cmdName.Name = "cmdName" Me.cmdName.Size = New System.Drawing.Size(86, 30) @@ -2731,7 +2731,7 @@ Partial Class ucrCalculator ' Me.cmdWakefield_Month.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefield_Month.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefield_Month.Location = New System.Drawing.Point(90, 218) + Me.cmdWakefield_Month.Location = New System.Drawing.Point(91, 217) Me.cmdWakefield_Month.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefield_Month.Name = "cmdWakefield_Month" Me.cmdWakefield_Month.Size = New System.Drawing.Size(86, 30) @@ -2743,7 +2743,7 @@ Partial Class ucrCalculator ' Me.cmdMilitary.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdMilitary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMilitary.Location = New System.Drawing.Point(6, 218) + Me.cmdMilitary.Location = New System.Drawing.Point(6, 217) Me.cmdMilitary.Margin = New System.Windows.Forms.Padding(2) Me.cmdMilitary.Name = "cmdMilitary" Me.cmdMilitary.Size = New System.Drawing.Size(86, 30) @@ -2755,7 +2755,7 @@ Partial Class ucrCalculator ' Me.cmdMarital.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdMarital.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMarital.Location = New System.Drawing.Point(342, 190) + Me.cmdMarital.Location = New System.Drawing.Point(346, 188) Me.cmdMarital.Margin = New System.Windows.Forms.Padding(2) Me.cmdMarital.Name = "cmdMarital" Me.cmdMarital.Size = New System.Drawing.Size(86, 30) @@ -2767,7 +2767,7 @@ Partial Class ucrCalculator ' Me.cmdLorem_ipsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLorem_ipsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLorem_ipsum.Location = New System.Drawing.Point(258, 190) + Me.cmdLorem_ipsum.Location = New System.Drawing.Point(261, 188) Me.cmdLorem_ipsum.Margin = New System.Windows.Forms.Padding(2) Me.cmdLorem_ipsum.Name = "cmdLorem_ipsum" Me.cmdLorem_ipsum.Size = New System.Drawing.Size(86, 30) @@ -2779,7 +2779,7 @@ Partial Class ucrCalculator ' Me.cmdLikert.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLikert.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLikert.Location = New System.Drawing.Point(174, 190) + Me.cmdLikert.Location = New System.Drawing.Point(176, 188) Me.cmdLikert.Margin = New System.Windows.Forms.Padding(2) Me.cmdLikert.Name = "cmdLikert" Me.cmdLikert.Size = New System.Drawing.Size(86, 30) @@ -2791,7 +2791,7 @@ Partial Class ucrCalculator ' Me.cmdGpa.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGpa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGpa.Location = New System.Drawing.Point(90, 190) + Me.cmdGpa.Location = New System.Drawing.Point(91, 188) Me.cmdGpa.Margin = New System.Windows.Forms.Padding(2) Me.cmdGpa.Name = "cmdGpa" Me.cmdGpa.Size = New System.Drawing.Size(86, 30) @@ -2803,7 +2803,7 @@ Partial Class ucrCalculator ' Me.cmdWakefieldMinute.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldMinute.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldMinute.Location = New System.Drawing.Point(6, 190) + Me.cmdWakefieldMinute.Location = New System.Drawing.Point(6, 188) Me.cmdWakefieldMinute.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldMinute.Name = "cmdWakefieldMinute" Me.cmdWakefieldMinute.Size = New System.Drawing.Size(86, 30) @@ -2815,7 +2815,7 @@ Partial Class ucrCalculator ' Me.cmdMath.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdMath.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMath.Location = New System.Drawing.Point(342, 160) + Me.cmdMath.Location = New System.Drawing.Point(346, 159) Me.cmdMath.Margin = New System.Windows.Forms.Padding(2) Me.cmdMath.Name = "cmdMath" Me.cmdMath.Size = New System.Drawing.Size(86, 30) @@ -2827,7 +2827,7 @@ Partial Class ucrCalculator ' Me.cmdWakefieldLower.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldLower.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldLower.Location = New System.Drawing.Point(258, 160) + Me.cmdWakefieldLower.Location = New System.Drawing.Point(261, 159) Me.cmdWakefieldLower.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldLower.Name = "cmdWakefieldLower" Me.cmdWakefieldLower.Size = New System.Drawing.Size(86, 30) @@ -2839,7 +2839,7 @@ Partial Class ucrCalculator ' Me.cmdLanguage.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLanguage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLanguage.Location = New System.Drawing.Point(174, 160) + Me.cmdLanguage.Location = New System.Drawing.Point(176, 159) Me.cmdLanguage.Margin = New System.Windows.Forms.Padding(2) Me.cmdLanguage.Name = "cmdLanguage" Me.cmdLanguage.Size = New System.Drawing.Size(86, 30) @@ -2851,7 +2851,7 @@ Partial Class ucrCalculator ' Me.cmdIq.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdIq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIq.Location = New System.Drawing.Point(90, 160) + Me.cmdIq.Location = New System.Drawing.Point(91, 159) Me.cmdIq.Margin = New System.Windows.Forms.Padding(2) Me.cmdIq.Name = "cmdIq" Me.cmdIq.Size = New System.Drawing.Size(86, 30) @@ -2863,7 +2863,7 @@ Partial Class ucrCalculator ' Me.cmdid.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdid.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdid.Location = New System.Drawing.Point(6, 160) + Me.cmdid.Location = New System.Drawing.Point(6, 159) Me.cmdid.Margin = New System.Windows.Forms.Padding(2) Me.cmdid.Name = "cmdid" Me.cmdid.Size = New System.Drawing.Size(86, 30) @@ -2875,7 +2875,7 @@ Partial Class ucrCalculator ' Me.cmdGrade_Level.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGrade_Level.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGrade_Level.Location = New System.Drawing.Point(342, 102) + Me.cmdGrade_Level.Location = New System.Drawing.Point(346, 101) Me.cmdGrade_Level.Margin = New System.Windows.Forms.Padding(2) Me.cmdGrade_Level.Name = "cmdGrade_Level" Me.cmdGrade_Level.Size = New System.Drawing.Size(86, 30) @@ -2887,7 +2887,7 @@ Partial Class ucrCalculator ' Me.cmdEye.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdEye.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEye.Location = New System.Drawing.Point(258, 102) + Me.cmdEye.Location = New System.Drawing.Point(261, 101) Me.cmdEye.Margin = New System.Windows.Forms.Padding(2) Me.cmdEye.Name = "cmdEye" Me.cmdEye.Size = New System.Drawing.Size(86, 30) @@ -2899,7 +2899,7 @@ Partial Class ucrCalculator ' Me.cmdEmployment.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdEmployment.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEmployment.Location = New System.Drawing.Point(174, 102) + Me.cmdEmployment.Location = New System.Drawing.Point(176, 101) Me.cmdEmployment.Margin = New System.Windows.Forms.Padding(2) Me.cmdEmployment.Name = "cmdEmployment" Me.cmdEmployment.Size = New System.Drawing.Size(86, 30) @@ -2911,7 +2911,7 @@ Partial Class ucrCalculator ' Me.cmdEducation.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdEducation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEducation.Location = New System.Drawing.Point(90, 102) + Me.cmdEducation.Location = New System.Drawing.Point(91, 101) Me.cmdEducation.Margin = New System.Windows.Forms.Padding(2) Me.cmdEducation.Name = "cmdEducation" Me.cmdEducation.Size = New System.Drawing.Size(86, 30) @@ -2923,7 +2923,7 @@ Partial Class ucrCalculator ' Me.cmdDummy.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDummy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDummy.Location = New System.Drawing.Point(6, 102) + Me.cmdDummy.Location = New System.Drawing.Point(6, 101) Me.cmdDummy.Margin = New System.Windows.Forms.Padding(2) Me.cmdDummy.Name = "cmdDummy" Me.cmdDummy.Size = New System.Drawing.Size(86, 30) @@ -2935,7 +2935,7 @@ Partial Class ucrCalculator ' Me.cmdDob.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDob.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDob.Location = New System.Drawing.Point(342, 72) + Me.cmdDob.Location = New System.Drawing.Point(346, 72) Me.cmdDob.Margin = New System.Windows.Forms.Padding(2) Me.cmdDob.Name = "cmdDob" Me.cmdDob.Size = New System.Drawing.Size(86, 30) @@ -2947,7 +2947,7 @@ Partial Class ucrCalculator ' Me.cmdDna.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDna.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDna.Location = New System.Drawing.Point(258, 72) + Me.cmdDna.Location = New System.Drawing.Point(261, 72) Me.cmdDna.Margin = New System.Windows.Forms.Padding(2) Me.cmdDna.Name = "cmdDna" Me.cmdDna.Size = New System.Drawing.Size(86, 30) @@ -2959,7 +2959,7 @@ Partial Class ucrCalculator ' Me.cmdDice.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDice.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDice.Location = New System.Drawing.Point(174, 72) + Me.cmdDice.Location = New System.Drawing.Point(176, 72) Me.cmdDice.Margin = New System.Windows.Forms.Padding(2) Me.cmdDice.Name = "cmdDice" Me.cmdDice.Size = New System.Drawing.Size(86, 30) @@ -2971,7 +2971,7 @@ Partial Class ucrCalculator ' Me.cmdGrade_Letter.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGrade_Letter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGrade_Letter.Location = New System.Drawing.Point(90, 72) + Me.cmdGrade_Letter.Location = New System.Drawing.Point(91, 72) Me.cmdGrade_Letter.Margin = New System.Windows.Forms.Padding(2) Me.cmdGrade_Letter.Name = "cmdGrade_Letter" Me.cmdGrade_Letter.Size = New System.Drawing.Size(86, 30) @@ -2995,7 +2995,7 @@ Partial Class ucrCalculator ' Me.cmdWakefieldDates.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldDates.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldDates.Location = New System.Drawing.Point(342, 42) + Me.cmdWakefieldDates.Location = New System.Drawing.Point(346, 43) Me.cmdWakefieldDates.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldDates.Name = "cmdWakefieldDates" Me.cmdWakefieldDates.Size = New System.Drawing.Size(86, 30) @@ -3007,7 +3007,7 @@ Partial Class ucrCalculator ' Me.cmdPrimary.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdPrimary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPrimary.Location = New System.Drawing.Point(258, 42) + Me.cmdPrimary.Location = New System.Drawing.Point(261, 43) Me.cmdPrimary.Margin = New System.Windows.Forms.Padding(2) Me.cmdPrimary.Name = "cmdPrimary" Me.cmdPrimary.Size = New System.Drawing.Size(86, 30) @@ -3019,7 +3019,7 @@ Partial Class ucrCalculator ' Me.cmdColor.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdColor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdColor.Location = New System.Drawing.Point(174, 42) + Me.cmdColor.Location = New System.Drawing.Point(176, 43) Me.cmdColor.Margin = New System.Windows.Forms.Padding(2) Me.cmdColor.Name = "cmdColor" Me.cmdColor.Size = New System.Drawing.Size(86, 30) @@ -3031,7 +3031,7 @@ Partial Class ucrCalculator ' Me.cmdCoin.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdCoin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCoin.Location = New System.Drawing.Point(90, 42) + Me.cmdCoin.Location = New System.Drawing.Point(91, 43) Me.cmdCoin.Margin = New System.Windows.Forms.Padding(2) Me.cmdCoin.Name = "cmdCoin" Me.cmdCoin.Size = New System.Drawing.Size(86, 30) @@ -3043,7 +3043,7 @@ Partial Class ucrCalculator ' Me.cmdChildren.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdChildren.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdChildren.Location = New System.Drawing.Point(6, 42) + Me.cmdChildren.Location = New System.Drawing.Point(6, 43) Me.cmdChildren.Margin = New System.Windows.Forms.Padding(2) Me.cmdChildren.Name = "cmdChildren" Me.cmdChildren.Size = New System.Drawing.Size(86, 30) @@ -3055,7 +3055,7 @@ Partial Class ucrCalculator ' Me.cmdCar.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdCar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCar.Location = New System.Drawing.Point(342, 14) + Me.cmdCar.Location = New System.Drawing.Point(346, 14) Me.cmdCar.Margin = New System.Windows.Forms.Padding(2) Me.cmdCar.Name = "cmdCar" Me.cmdCar.Size = New System.Drawing.Size(86, 30) @@ -3067,7 +3067,7 @@ Partial Class ucrCalculator ' Me.cmdAnswer.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdAnswer.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnswer.Location = New System.Drawing.Point(258, 14) + Me.cmdAnswer.Location = New System.Drawing.Point(261, 14) Me.cmdAnswer.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnswer.Name = "cmdAnswer" Me.cmdAnswer.Size = New System.Drawing.Size(86, 30) @@ -3079,7 +3079,7 @@ Partial Class ucrCalculator ' Me.cmdPet.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdPet.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPet.Location = New System.Drawing.Point(174, 14) + Me.cmdPet.Location = New System.Drawing.Point(176, 14) Me.cmdPet.Margin = New System.Windows.Forms.Padding(2) Me.cmdPet.Name = "cmdPet" Me.cmdPet.Size = New System.Drawing.Size(86, 30) @@ -3091,7 +3091,7 @@ Partial Class ucrCalculator ' Me.cmdAnimal.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdAnimal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnimal.Location = New System.Drawing.Point(90, 14) + Me.cmdAnimal.Location = New System.Drawing.Point(91, 14) Me.cmdAnimal.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnimal.Name = "cmdAnimal" Me.cmdAnimal.Size = New System.Drawing.Size(86, 30) @@ -3115,7 +3115,7 @@ Partial Class ucrCalculator ' Me.cmdIncome.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdIncome.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIncome.Location = New System.Drawing.Point(342, 130) + Me.cmdIncome.Location = New System.Drawing.Point(346, 130) Me.cmdIncome.Margin = New System.Windows.Forms.Padding(2) Me.cmdIncome.Name = "cmdIncome" Me.cmdIncome.Size = New System.Drawing.Size(86, 30) @@ -3127,7 +3127,7 @@ Partial Class ucrCalculator ' Me.cmdHeight.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdHeight.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHeight.Location = New System.Drawing.Point(258, 130) + Me.cmdHeight.Location = New System.Drawing.Point(261, 130) Me.cmdHeight.Margin = New System.Windows.Forms.Padding(2) Me.cmdHeight.Name = "cmdHeight" Me.cmdHeight.Size = New System.Drawing.Size(86, 30) @@ -3139,7 +3139,7 @@ Partial Class ucrCalculator ' Me.cmdHair.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdHair.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHair.Location = New System.Drawing.Point(174, 130) + Me.cmdHair.Location = New System.Drawing.Point(176, 130) Me.cmdHair.Margin = New System.Windows.Forms.Padding(2) Me.cmdHair.Name = "cmdHair" Me.cmdHair.Size = New System.Drawing.Size(86, 30) @@ -3151,7 +3151,7 @@ Partial Class ucrCalculator ' Me.cmdGroup.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGroup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGroup.Location = New System.Drawing.Point(90, 130) + Me.cmdGroup.Location = New System.Drawing.Point(91, 130) Me.cmdGroup.Margin = New System.Windows.Forms.Padding(2) Me.cmdGroup.Name = "cmdGroup" Me.cmdGroup.Size = New System.Drawing.Size(86, 30) @@ -3253,7 +3253,7 @@ Partial Class ucrCalculator 'cmdAtan2 ' Me.cmdAtan2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAtan2.Location = New System.Drawing.Point(102, 130) + Me.cmdAtan2.Location = New System.Drawing.Point(100, 130) Me.cmdAtan2.Margin = New System.Windows.Forms.Padding(2) Me.cmdAtan2.Name = "cmdAtan2" Me.cmdAtan2.Size = New System.Drawing.Size(50, 30) @@ -3264,7 +3264,7 @@ Partial Class ucrCalculator 'cmdLogistic ' Me.cmdLogistic.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogistic.Location = New System.Drawing.Point(52, 130) + Me.cmdLogistic.Location = New System.Drawing.Point(51, 130) Me.cmdLogistic.Margin = New System.Windows.Forms.Padding(2) Me.cmdLogistic.Name = "cmdLogistic" Me.cmdLogistic.Size = New System.Drawing.Size(50, 30) @@ -3286,7 +3286,7 @@ Partial Class ucrCalculator 'cmdSign ' Me.cmdSign.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSign.Location = New System.Drawing.Point(202, 102) + Me.cmdSign.Location = New System.Drawing.Point(199, 101) Me.cmdSign.Margin = New System.Windows.Forms.Padding(2) Me.cmdSign.Name = "cmdSign" Me.cmdSign.Size = New System.Drawing.Size(50, 30) @@ -3298,7 +3298,7 @@ Partial Class ucrCalculator ' Me.cmdRound.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRound.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRound.Location = New System.Drawing.Point(154, 102) + Me.cmdRound.Location = New System.Drawing.Point(150, 101) Me.cmdRound.Margin = New System.Windows.Forms.Padding(2) Me.cmdRound.Name = "cmdRound" Me.cmdRound.Size = New System.Drawing.Size(50, 30) @@ -3310,7 +3310,7 @@ Partial Class ucrCalculator ' Me.cmdSiginf.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSiginf.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSiginf.Location = New System.Drawing.Point(102, 102) + Me.cmdSiginf.Location = New System.Drawing.Point(100, 101) Me.cmdSiginf.Margin = New System.Windows.Forms.Padding(2) Me.cmdSiginf.Name = "cmdSiginf" Me.cmdSiginf.Size = New System.Drawing.Size(50, 30) @@ -3321,7 +3321,7 @@ Partial Class ucrCalculator 'cmdAbs ' Me.cmdAbs.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAbs.Location = New System.Drawing.Point(52, 102) + Me.cmdAbs.Location = New System.Drawing.Point(51, 101) Me.cmdAbs.Margin = New System.Windows.Forms.Padding(2) Me.cmdAbs.Name = "cmdAbs" Me.cmdAbs.Size = New System.Drawing.Size(50, 30) @@ -3332,7 +3332,7 @@ Partial Class ucrCalculator 'cmdExp ' Me.cmdExp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExp.Location = New System.Drawing.Point(2, 102) + Me.cmdExp.Location = New System.Drawing.Point(2, 101) Me.cmdExp.Margin = New System.Windows.Forms.Padding(2) Me.cmdExp.Name = "cmdExp" Me.cmdExp.Size = New System.Drawing.Size(50, 30) @@ -3343,7 +3343,7 @@ Partial Class ucrCalculator 'cmdDeg ' Me.cmdDeg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDeg.Location = New System.Drawing.Point(202, 72) + Me.cmdDeg.Location = New System.Drawing.Point(199, 72) Me.cmdDeg.Margin = New System.Windows.Forms.Padding(2) Me.cmdDeg.Name = "cmdDeg" Me.cmdDeg.Size = New System.Drawing.Size(50, 30) @@ -3355,7 +3355,7 @@ Partial Class ucrCalculator ' Me.cmdTrunc.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrunc.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrunc.Location = New System.Drawing.Point(154, 72) + Me.cmdTrunc.Location = New System.Drawing.Point(150, 72) Me.cmdTrunc.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrunc.Name = "cmdTrunc" Me.cmdTrunc.Size = New System.Drawing.Size(50, 30) @@ -3366,7 +3366,7 @@ Partial Class ucrCalculator 'cmdAtan ' Me.cmdAtan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAtan.Location = New System.Drawing.Point(102, 72) + Me.cmdAtan.Location = New System.Drawing.Point(100, 72) Me.cmdAtan.Margin = New System.Windows.Forms.Padding(2) Me.cmdAtan.Name = "cmdAtan" Me.cmdAtan.Size = New System.Drawing.Size(50, 30) @@ -3377,7 +3377,7 @@ Partial Class ucrCalculator 'cmdTan ' Me.cmdTan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTan.Location = New System.Drawing.Point(52, 72) + Me.cmdTan.Location = New System.Drawing.Point(51, 72) Me.cmdTan.Margin = New System.Windows.Forms.Padding(2) Me.cmdTan.Name = "cmdTan" Me.cmdTan.Size = New System.Drawing.Size(50, 30) @@ -3400,7 +3400,7 @@ Partial Class ucrCalculator 'cmdRad ' Me.cmdRad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRad.Location = New System.Drawing.Point(202, 42) + Me.cmdRad.Location = New System.Drawing.Point(199, 43) Me.cmdRad.Margin = New System.Windows.Forms.Padding(2) Me.cmdRad.Name = "cmdRad" Me.cmdRad.Size = New System.Drawing.Size(50, 30) @@ -3412,7 +3412,7 @@ Partial Class ucrCalculator ' Me.cmdFloor.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFloor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFloor.Location = New System.Drawing.Point(154, 42) + Me.cmdFloor.Location = New System.Drawing.Point(150, 43) Me.cmdFloor.Margin = New System.Windows.Forms.Padding(2) Me.cmdFloor.Name = "cmdFloor" Me.cmdFloor.Size = New System.Drawing.Size(50, 30) @@ -3423,7 +3423,7 @@ Partial Class ucrCalculator 'cmdAsin ' Me.cmdAsin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsin.Location = New System.Drawing.Point(102, 42) + Me.cmdAsin.Location = New System.Drawing.Point(100, 43) Me.cmdAsin.Margin = New System.Windows.Forms.Padding(2) Me.cmdAsin.Name = "cmdAsin" Me.cmdAsin.Size = New System.Drawing.Size(50, 30) @@ -3434,7 +3434,7 @@ Partial Class ucrCalculator 'cmdSin ' Me.cmdSin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSin.Location = New System.Drawing.Point(52, 42) + Me.cmdSin.Location = New System.Drawing.Point(51, 43) Me.cmdSin.Margin = New System.Windows.Forms.Padding(2) Me.cmdSin.Name = "cmdSin" Me.cmdSin.Size = New System.Drawing.Size(50, 30) @@ -3445,7 +3445,7 @@ Partial Class ucrCalculator 'cmdLog ' Me.cmdLog.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLog.Location = New System.Drawing.Point(2, 42) + Me.cmdLog.Location = New System.Drawing.Point(2, 43) Me.cmdLog.Margin = New System.Windows.Forms.Padding(2) Me.cmdLog.Name = "cmdLog" Me.cmdLog.Size = New System.Drawing.Size(50, 30) @@ -3456,7 +3456,7 @@ Partial Class ucrCalculator 'cmdPi ' Me.cmdPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPi.Location = New System.Drawing.Point(202, 14) + Me.cmdPi.Location = New System.Drawing.Point(199, 14) Me.cmdPi.Margin = New System.Windows.Forms.Padding(2) Me.cmdPi.Name = "cmdPi" Me.cmdPi.Size = New System.Drawing.Size(50, 30) @@ -3468,7 +3468,7 @@ Partial Class ucrCalculator ' Me.cmdCeiling.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCeiling.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCeiling.Location = New System.Drawing.Point(154, 14) + Me.cmdCeiling.Location = New System.Drawing.Point(150, 14) Me.cmdCeiling.Margin = New System.Windows.Forms.Padding(2) Me.cmdCeiling.Name = "cmdCeiling" Me.cmdCeiling.Size = New System.Drawing.Size(50, 30) @@ -3479,7 +3479,7 @@ Partial Class ucrCalculator 'cmdAcos ' Me.cmdAcos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAcos.Location = New System.Drawing.Point(102, 14) + Me.cmdAcos.Location = New System.Drawing.Point(100, 14) Me.cmdAcos.Margin = New System.Windows.Forms.Padding(2) Me.cmdAcos.Name = "cmdAcos" Me.cmdAcos.Size = New System.Drawing.Size(50, 30) @@ -3490,7 +3490,7 @@ Partial Class ucrCalculator 'cmdCos ' Me.cmdCos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCos.Location = New System.Drawing.Point(52, 14) + Me.cmdCos.Location = New System.Drawing.Point(51, 14) Me.cmdCos.Margin = New System.Windows.Forms.Padding(2) Me.cmdCos.Name = "cmdCos" Me.cmdCos.Size = New System.Drawing.Size(50, 30) @@ -3604,7 +3604,7 @@ Partial Class ucrCalculator ' Me.cmdSummaryRHelp.AutoSize = True Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.Location = New System.Drawing.Point(182, 190) + Me.cmdSummaryRHelp.Location = New System.Drawing.Point(194, 189) Me.cmdSummaryRHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" Me.cmdSummaryRHelp.Size = New System.Drawing.Size(90, 30) @@ -3660,7 +3660,7 @@ Partial Class ucrCalculator ' Me.cmdKurtosis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdKurtosis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdKurtosis.Location = New System.Drawing.Point(230, 100) + Me.cmdKurtosis.Location = New System.Drawing.Point(228, 101) Me.cmdKurtosis.Margin = New System.Windows.Forms.Padding(2) Me.cmdKurtosis.Name = "cmdKurtosis" Me.cmdKurtosis.Size = New System.Drawing.Size(56, 30) @@ -3671,7 +3671,7 @@ Partial Class ucrCalculator 'cmdMode1 ' Me.cmdMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMode1.Location = New System.Drawing.Point(230, 42) + Me.cmdMode1.Location = New System.Drawing.Point(228, 43) Me.cmdMode1.Margin = New System.Windows.Forms.Padding(2) Me.cmdMode1.Name = "cmdMode1" Me.cmdMode1.Size = New System.Drawing.Size(56, 30) @@ -3682,7 +3682,7 @@ Partial Class ucrCalculator 'cmdMode ' Me.cmdMode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMode.Location = New System.Drawing.Point(174, 42) + Me.cmdMode.Location = New System.Drawing.Point(173, 43) Me.cmdMode.Margin = New System.Windows.Forms.Padding(2) Me.cmdMode.Name = "cmdMode" Me.cmdMode.Size = New System.Drawing.Size(56, 30) @@ -3704,7 +3704,7 @@ Partial Class ucrCalculator 'cmdLast ' Me.cmdLast.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLast.Location = New System.Drawing.Point(174, 130) + Me.cmdLast.Location = New System.Drawing.Point(173, 130) Me.cmdLast.Margin = New System.Windows.Forms.Padding(2) Me.cmdLast.Name = "cmdLast" Me.cmdLast.Size = New System.Drawing.Size(56, 30) @@ -3715,7 +3715,7 @@ Partial Class ucrCalculator 'cmdnth ' Me.cmdnth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnth.Location = New System.Drawing.Point(230, 130) + Me.cmdnth.Location = New System.Drawing.Point(228, 130) Me.cmdnth.Margin = New System.Windows.Forms.Padding(2) Me.cmdnth.Name = "cmdnth" Me.cmdnth.Size = New System.Drawing.Size(56, 30) @@ -3726,7 +3726,7 @@ Partial Class ucrCalculator 'cmdCor ' Me.cmdCor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCor.Location = New System.Drawing.Point(2, 189) + Me.cmdCor.Location = New System.Drawing.Point(2, 188) Me.cmdCor.Margin = New System.Windows.Forms.Padding(2) Me.cmdCor.Name = "cmdCor" Me.cmdCor.Size = New System.Drawing.Size(62, 30) @@ -3737,7 +3737,7 @@ Partial Class ucrCalculator 'cmdCov ' Me.cmdCov.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCov.Location = New System.Drawing.Point(63, 189) + Me.cmdCov.Location = New System.Drawing.Point(63, 188) Me.cmdCov.Margin = New System.Windows.Forms.Padding(2) Me.cmdCov.Name = "cmdCov" Me.cmdCov.Size = New System.Drawing.Size(56, 30) @@ -3749,7 +3749,7 @@ Partial Class ucrCalculator ' Me.cmdMad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMad.Location = New System.Drawing.Point(174, 70) + Me.cmdMad.Location = New System.Drawing.Point(173, 72) Me.cmdMad.Margin = New System.Windows.Forms.Padding(2) Me.cmdMad.Name = "cmdMad" Me.cmdMad.Size = New System.Drawing.Size(56, 30) @@ -3761,7 +3761,7 @@ Partial Class ucrCalculator ' Me.cmdMc.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMc.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMc.Location = New System.Drawing.Point(118, 100) + Me.cmdMc.Location = New System.Drawing.Point(118, 101) Me.cmdMc.Margin = New System.Windows.Forms.Padding(2) Me.cmdMc.Name = "cmdMc" Me.cmdMc.Size = New System.Drawing.Size(56, 30) @@ -3773,7 +3773,7 @@ Partial Class ucrCalculator ' Me.cmdPropn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPropn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPropn.Location = New System.Drawing.Point(64, 130) + Me.cmdPropn.Location = New System.Drawing.Point(63, 130) Me.cmdPropn.Margin = New System.Windows.Forms.Padding(2) Me.cmdPropn.Name = "cmdPropn" Me.cmdPropn.Size = New System.Drawing.Size(56, 30) @@ -3785,7 +3785,7 @@ Partial Class ucrCalculator ' Me.cmdCv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCv.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCv.Location = New System.Drawing.Point(64, 100) + Me.cmdCv.Location = New System.Drawing.Point(63, 101) Me.cmdCv.Margin = New System.Windows.Forms.Padding(2) Me.cmdCv.Name = "cmdCv" Me.cmdCv.Size = New System.Drawing.Size(56, 30) @@ -3797,7 +3797,7 @@ Partial Class ucrCalculator ' Me.cmdSkew.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSkew.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSkew.Location = New System.Drawing.Point(174, 100) + Me.cmdSkew.Location = New System.Drawing.Point(173, 101) Me.cmdSkew.Margin = New System.Windows.Forms.Padding(2) Me.cmdSkew.Name = "cmdSkew" Me.cmdSkew.Size = New System.Drawing.Size(56, 30) @@ -3820,7 +3820,7 @@ Partial Class ucrCalculator 'cmdDistinct ' Me.cmdDistinct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDistinct.Location = New System.Drawing.Point(2, 100) + Me.cmdDistinct.Location = New System.Drawing.Point(2, 101) Me.cmdDistinct.Margin = New System.Windows.Forms.Padding(2) Me.cmdDistinct.Name = "cmdDistinct" Me.cmdDistinct.Size = New System.Drawing.Size(62, 30) @@ -3831,7 +3831,7 @@ Partial Class ucrCalculator 'cmdNonMiss ' Me.cmdNonMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNonMiss.Location = New System.Drawing.Point(2, 70) + Me.cmdNonMiss.Location = New System.Drawing.Point(2, 72) Me.cmdNonMiss.Margin = New System.Windows.Forms.Padding(2) Me.cmdNonMiss.Name = "cmdNonMiss" Me.cmdNonMiss.Size = New System.Drawing.Size(62, 30) @@ -3843,7 +3843,7 @@ Partial Class ucrCalculator ' Me.cmdIQR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdIQR.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIQR.Location = New System.Drawing.Point(230, 70) + Me.cmdIQR.Location = New System.Drawing.Point(228, 72) Me.cmdIQR.Margin = New System.Windows.Forms.Padding(2) Me.cmdIQR.Name = "cmdIQR" Me.cmdIQR.Size = New System.Drawing.Size(56, 30) @@ -3855,7 +3855,7 @@ Partial Class ucrCalculator ' Me.cmdQuantile.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuantile.Location = New System.Drawing.Point(118, 189) + Me.cmdQuantile.Location = New System.Drawing.Point(118, 188) Me.cmdQuantile.Margin = New System.Windows.Forms.Padding(2) Me.cmdQuantile.Name = "cmdQuantile" Me.cmdQuantile.Size = New System.Drawing.Size(56, 30) @@ -3867,7 +3867,7 @@ Partial Class ucrCalculator ' Me.cmdRange.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRange.Location = New System.Drawing.Point(230, 14) + Me.cmdRange.Location = New System.Drawing.Point(228, 14) Me.cmdRange.Margin = New System.Windows.Forms.Padding(2) Me.cmdRange.Name = "cmdRange" Me.cmdRange.Size = New System.Drawing.Size(56, 30) @@ -3878,7 +3878,7 @@ Partial Class ucrCalculator 'cmdSd ' Me.cmdSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSd.Location = New System.Drawing.Point(118, 70) + Me.cmdSd.Location = New System.Drawing.Point(118, 72) Me.cmdSd.Margin = New System.Windows.Forms.Padding(2) Me.cmdSd.Name = "cmdSd" Me.cmdSd.Size = New System.Drawing.Size(56, 30) @@ -3890,7 +3890,7 @@ Partial Class ucrCalculator ' Me.cmdMedian.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMedian.Location = New System.Drawing.Point(118, 42) + Me.cmdMedian.Location = New System.Drawing.Point(118, 43) Me.cmdMedian.Margin = New System.Windows.Forms.Padding(2) Me.cmdMedian.Name = "cmdMedian" Me.cmdMedian.Size = New System.Drawing.Size(56, 30) @@ -3912,7 +3912,7 @@ Partial Class ucrCalculator 'cmdMax ' Me.cmdMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMax.Location = New System.Drawing.Point(174, 14) + Me.cmdMax.Location = New System.Drawing.Point(173, 14) Me.cmdMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdMax.Name = "cmdMax" Me.cmdMax.Size = New System.Drawing.Size(56, 30) @@ -3924,7 +3924,7 @@ Partial Class ucrCalculator ' Me.cmdMean.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMean.Location = New System.Drawing.Point(64, 42) + Me.cmdMean.Location = New System.Drawing.Point(63, 43) Me.cmdMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdMean.Name = "cmdMean" Me.cmdMean.Size = New System.Drawing.Size(56, 30) @@ -3935,7 +3935,7 @@ Partial Class ucrCalculator 'cmdMiss ' Me.cmdMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMiss.Location = New System.Drawing.Point(2, 42) + Me.cmdMiss.Location = New System.Drawing.Point(2, 43) Me.cmdMiss.Margin = New System.Windows.Forms.Padding(2) Me.cmdMiss.Name = "cmdMiss" Me.cmdMiss.Size = New System.Drawing.Size(62, 30) @@ -3958,7 +3958,7 @@ Partial Class ucrCalculator 'cmdSum ' Me.cmdSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSum.Location = New System.Drawing.Point(64, 14) + Me.cmdSum.Location = New System.Drawing.Point(63, 14) Me.cmdSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdSum.Name = "cmdSum" Me.cmdSum.Size = New System.Drawing.Size(56, 30) @@ -3969,7 +3969,7 @@ Partial Class ucrCalculator 'cmdVar ' Me.cmdVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdVar.Location = New System.Drawing.Point(64, 70) + Me.cmdVar.Location = New System.Drawing.Point(63, 72) Me.cmdVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdVar.Name = "cmdVar" Me.cmdVar.Size = New System.Drawing.Size(56, 30) @@ -4007,7 +4007,7 @@ Partial Class ucrCalculator ' Me.cmdFreqQuantile.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqQuantile.Location = New System.Drawing.Point(226, 72) + Me.cmdFreqQuantile.Location = New System.Drawing.Point(228, 72) Me.cmdFreqQuantile.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqQuantile.Name = "cmdFreqQuantile" Me.cmdFreqQuantile.Size = New System.Drawing.Size(58, 30) @@ -4019,7 +4019,7 @@ Partial Class ucrCalculator ' Me.cmdFreqPropn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqPropn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqPropn.Location = New System.Drawing.Point(170, 72) + Me.cmdFreqPropn.Location = New System.Drawing.Point(171, 72) Me.cmdFreqPropn.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqPropn.Name = "cmdFreqPropn" Me.cmdFreqPropn.Size = New System.Drawing.Size(58, 30) @@ -4043,7 +4043,7 @@ Partial Class ucrCalculator ' Me.cmdFreqIQR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqIQR.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqIQR.Location = New System.Drawing.Point(56, 72) + Me.cmdFreqIQR.Location = New System.Drawing.Point(57, 72) Me.cmdFreqIQR.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqIQR.Name = "cmdFreqIQR" Me.cmdFreqIQR.Size = New System.Drawing.Size(58, 30) @@ -4055,7 +4055,7 @@ Partial Class ucrCalculator ' Me.cmdFreqMedian.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMedian.Location = New System.Drawing.Point(114, 42) + Me.cmdFreqMedian.Location = New System.Drawing.Point(114, 43) Me.cmdFreqMedian.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMedian.Name = "cmdFreqMedian" Me.cmdFreqMedian.Size = New System.Drawing.Size(58, 30) @@ -4067,7 +4067,7 @@ Partial Class ucrCalculator ' Me.cmdFreqSd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqSd.Location = New System.Drawing.Point(226, 42) + Me.cmdFreqSd.Location = New System.Drawing.Point(228, 43) Me.cmdFreqSd.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqSd.Name = "cmdFreqSd" Me.cmdFreqSd.Size = New System.Drawing.Size(58, 30) @@ -4079,7 +4079,7 @@ Partial Class ucrCalculator ' Me.cmdFreqVar.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqVar.Location = New System.Drawing.Point(170, 42) + Me.cmdFreqVar.Location = New System.Drawing.Point(171, 43) Me.cmdFreqVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqVar.Name = "cmdFreqVar" Me.cmdFreqVar.Size = New System.Drawing.Size(58, 30) @@ -4091,7 +4091,7 @@ Partial Class ucrCalculator ' Me.cmdFreqMean.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMean.Location = New System.Drawing.Point(56, 42) + Me.cmdFreqMean.Location = New System.Drawing.Point(57, 43) Me.cmdFreqMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMean.Name = "cmdFreqMean" Me.cmdFreqMean.Size = New System.Drawing.Size(58, 30) @@ -4115,7 +4115,7 @@ Partial Class ucrCalculator ' Me.cmdFreqMiss.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMiss.Location = New System.Drawing.Point(0, 42) + Me.cmdFreqMiss.Location = New System.Drawing.Point(0, 43) Me.cmdFreqMiss.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMiss.Name = "cmdFreqMiss" Me.cmdFreqMiss.Size = New System.Drawing.Size(58, 30) @@ -4127,7 +4127,7 @@ Partial Class ucrCalculator ' Me.cmdFreqMode1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMode1.Location = New System.Drawing.Point(226, 14) + Me.cmdFreqMode1.Location = New System.Drawing.Point(228, 14) Me.cmdFreqMode1.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMode1.Name = "cmdFreqMode1" Me.cmdFreqMode1.Size = New System.Drawing.Size(58, 30) @@ -4139,7 +4139,7 @@ Partial Class ucrCalculator ' Me.cmdFreqMax.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMax.Location = New System.Drawing.Point(170, 14) + Me.cmdFreqMax.Location = New System.Drawing.Point(171, 14) Me.cmdFreqMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMax.Name = "cmdFreqMax" Me.cmdFreqMax.Size = New System.Drawing.Size(58, 30) @@ -4163,7 +4163,7 @@ Partial Class ucrCalculator ' Me.cmdFreqSum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqSum.Location = New System.Drawing.Point(56, 14) + Me.cmdFreqSum.Location = New System.Drawing.Point(57, 14) Me.cmdFreqSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqSum.Name = "cmdFreqSum" Me.cmdFreqSum.Size = New System.Drawing.Size(58, 30) @@ -4819,7 +4819,7 @@ Partial Class ucrCalculator 'cmdDecimals ' Me.cmdDecimals.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDecimals.Location = New System.Drawing.Point(2, 190) + Me.cmdDecimals.Location = New System.Drawing.Point(2, 188) Me.cmdDecimals.Margin = New System.Windows.Forms.Padding(2) Me.cmdDecimals.Name = "cmdDecimals" Me.cmdDecimals.Size = New System.Drawing.Size(62, 30) @@ -4830,7 +4830,7 @@ Partial Class ucrCalculator 'cmdMASSFractions ' Me.cmdMASSFractions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMASSFractions.Location = New System.Drawing.Point(2, 160) + Me.cmdMASSFractions.Location = New System.Drawing.Point(2, 159) Me.cmdMASSFractions.Margin = New System.Windows.Forms.Padding(2) Me.cmdMASSFractions.Name = "cmdMASSFractions" Me.cmdMASSFractions.Size = New System.Drawing.Size(62, 30) @@ -4853,7 +4853,7 @@ Partial Class ucrCalculator ' Me.cmdTransformRHelp.AutoSize = True Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.Location = New System.Drawing.Point(214, 196) + Me.cmdTransformRHelp.Location = New System.Drawing.Point(218, 189) Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdTransformRHelp.Name = "cmdTransformRHelp" Me.cmdTransformRHelp.Size = New System.Drawing.Size(90, 30) @@ -4896,7 +4896,7 @@ Partial Class ucrCalculator 'cmdRev ' Me.cmdRev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRev.Location = New System.Drawing.Point(124, 102) + Me.cmdRev.Location = New System.Drawing.Point(124, 101) Me.cmdRev.Margin = New System.Windows.Forms.Padding(2) Me.cmdRev.Name = "cmdRev" Me.cmdRev.Size = New System.Drawing.Size(62, 30) @@ -4907,7 +4907,7 @@ Partial Class ucrCalculator 'cmdMovProd ' Me.cmdMovProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovProd.Location = New System.Drawing.Point(124, 74) + Me.cmdMovProd.Location = New System.Drawing.Point(124, 72) Me.cmdMovProd.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovProd.Name = "cmdMovProd" Me.cmdMovProd.Size = New System.Drawing.Size(62, 30) @@ -4918,7 +4918,7 @@ Partial Class ucrCalculator 'cmdCumProd ' Me.cmdCumProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumProd.Location = New System.Drawing.Point(124, 44) + Me.cmdCumProd.Location = New System.Drawing.Point(124, 43) Me.cmdCumProd.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumProd.Name = "cmdCumProd" Me.cmdCumProd.Size = New System.Drawing.Size(62, 30) @@ -4940,7 +4940,7 @@ Partial Class ucrCalculator 'cmdNasplin ' Me.cmdNasplin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNasplin.Location = New System.Drawing.Point(246, 160) + Me.cmdNasplin.Location = New System.Drawing.Point(246, 159) Me.cmdNasplin.Margin = New System.Windows.Forms.Padding(2) Me.cmdNasplin.Name = "cmdNasplin" Me.cmdNasplin.Size = New System.Drawing.Size(62, 30) @@ -4951,7 +4951,7 @@ Partial Class ucrCalculator 'cmdNaapprox ' Me.cmdNaapprox.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaapprox.Location = New System.Drawing.Point(186, 160) + Me.cmdNaapprox.Location = New System.Drawing.Point(185, 159) Me.cmdNaapprox.Margin = New System.Windows.Forms.Padding(2) Me.cmdNaapprox.Name = "cmdNaapprox" Me.cmdNaapprox.Size = New System.Drawing.Size(62, 30) @@ -4962,7 +4962,7 @@ Partial Class ucrCalculator 'cmdNaest ' Me.cmdNaest.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaest.Location = New System.Drawing.Point(124, 160) + Me.cmdNaest.Location = New System.Drawing.Point(124, 159) Me.cmdNaest.Margin = New System.Windows.Forms.Padding(2) Me.cmdNaest.Name = "cmdNaest" Me.cmdNaest.Size = New System.Drawing.Size(62, 30) @@ -4973,7 +4973,7 @@ Partial Class ucrCalculator 'cmdNafill ' Me.cmdNafill.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNafill.Location = New System.Drawing.Point(62, 160) + Me.cmdNafill.Location = New System.Drawing.Point(63, 159) Me.cmdNafill.Margin = New System.Windows.Forms.Padding(2) Me.cmdNafill.Name = "cmdNafill" Me.cmdNafill.Size = New System.Drawing.Size(62, 30) @@ -4984,7 +4984,7 @@ Partial Class ucrCalculator 'cmdMovmin ' Me.cmdMovmin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovmin.Location = New System.Drawing.Point(246, 74) + Me.cmdMovmin.Location = New System.Drawing.Point(246, 72) Me.cmdMovmin.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovmin.Name = "cmdMovmin" Me.cmdMovmin.Size = New System.Drawing.Size(62, 30) @@ -4995,7 +4995,7 @@ Partial Class ucrCalculator 'cmdRowRank ' Me.cmdRowRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRowRank.Location = New System.Drawing.Point(62, 130) + Me.cmdRowRank.Location = New System.Drawing.Point(63, 130) Me.cmdRowRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdRowRank.Name = "cmdRowRank" Me.cmdRowRank.Size = New System.Drawing.Size(62, 30) @@ -5006,7 +5006,7 @@ Partial Class ucrCalculator 'cmdDiff ' Me.cmdDiff.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDiff.Location = New System.Drawing.Point(62, 102) + Me.cmdDiff.Location = New System.Drawing.Point(63, 101) Me.cmdDiff.Margin = New System.Windows.Forms.Padding(2) Me.cmdDiff.Name = "cmdDiff" Me.cmdDiff.Size = New System.Drawing.Size(62, 30) @@ -5017,7 +5017,7 @@ Partial Class ucrCalculator 'cmdCumdist ' Me.cmdCumdist.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumdist.Location = New System.Drawing.Point(246, 102) + Me.cmdCumdist.Location = New System.Drawing.Point(246, 101) Me.cmdCumdist.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumdist.Name = "cmdCumdist" Me.cmdCumdist.Size = New System.Drawing.Size(62, 30) @@ -5028,7 +5028,7 @@ Partial Class ucrCalculator 'cmdMovMean ' Me.cmdMovMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovMean.Location = New System.Drawing.Point(186, 74) + Me.cmdMovMean.Location = New System.Drawing.Point(185, 72) Me.cmdMovMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovMean.Name = "cmdMovMean" Me.cmdMovMean.Size = New System.Drawing.Size(62, 30) @@ -5039,7 +5039,7 @@ Partial Class ucrCalculator 'cmdCumMean ' Me.cmdCumMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMean.Location = New System.Drawing.Point(186, 44) + Me.cmdCumMean.Location = New System.Drawing.Point(185, 43) Me.cmdCumMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumMean.Name = "cmdCumMean" Me.cmdCumMean.Size = New System.Drawing.Size(62, 30) @@ -5050,7 +5050,7 @@ Partial Class ucrCalculator 'cmdNtile ' Me.cmdNtile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNtile.Location = New System.Drawing.Point(186, 102) + Me.cmdNtile.Location = New System.Drawing.Point(185, 101) Me.cmdNtile.Margin = New System.Windows.Forms.Padding(2) Me.cmdNtile.Name = "cmdNtile" Me.cmdNtile.Size = New System.Drawing.Size(62, 30) @@ -5061,7 +5061,7 @@ Partial Class ucrCalculator 'cmMovMed ' Me.cmMovMed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmMovMed.Location = New System.Drawing.Point(2, 102) + Me.cmMovMed.Location = New System.Drawing.Point(2, 101) Me.cmMovMed.Margin = New System.Windows.Forms.Padding(2) Me.cmMovMed.Name = "cmMovMed" Me.cmMovMed.Size = New System.Drawing.Size(62, 30) @@ -5083,7 +5083,7 @@ Partial Class ucrCalculator 'cmdDRank ' Me.cmdDRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDRank.Location = New System.Drawing.Point(186, 130) + Me.cmdDRank.Location = New System.Drawing.Point(185, 130) Me.cmdDRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdDRank.Name = "cmdDRank" Me.cmdDRank.Size = New System.Drawing.Size(62, 30) @@ -5094,7 +5094,7 @@ Partial Class ucrCalculator 'cmdMovMax ' Me.cmdMovMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovMax.Location = New System.Drawing.Point(2, 74) + Me.cmdMovMax.Location = New System.Drawing.Point(2, 72) Me.cmdMovMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovMax.Name = "cmdMovMax" Me.cmdMovMax.Size = New System.Drawing.Size(62, 30) @@ -5105,7 +5105,7 @@ Partial Class ucrCalculator 'cmdMovSum ' Me.cmdMovSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovSum.Location = New System.Drawing.Point(62, 74) + Me.cmdMovSum.Location = New System.Drawing.Point(63, 72) Me.cmdMovSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovSum.Name = "cmdMovSum" Me.cmdMovSum.Size = New System.Drawing.Size(62, 30) @@ -5128,7 +5128,7 @@ Partial Class ucrCalculator 'cmdCumSum ' Me.cmdCumSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumSum.Location = New System.Drawing.Point(62, 44) + Me.cmdCumSum.Location = New System.Drawing.Point(63, 43) Me.cmdCumSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumSum.Name = "cmdCumSum" Me.cmdCumSum.Size = New System.Drawing.Size(62, 30) @@ -5139,7 +5139,7 @@ Partial Class ucrCalculator 'cmdCumMin ' Me.cmdCumMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMin.Location = New System.Drawing.Point(246, 44) + Me.cmdCumMin.Location = New System.Drawing.Point(246, 43) Me.cmdCumMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumMin.Name = "cmdCumMin" Me.cmdCumMin.Size = New System.Drawing.Size(62, 30) @@ -5150,7 +5150,7 @@ Partial Class ucrCalculator 'cmdCumMax ' Me.cmdCumMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMax.Location = New System.Drawing.Point(2, 44) + Me.cmdCumMax.Location = New System.Drawing.Point(2, 43) Me.cmdCumMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumMax.Name = "cmdCumMax" Me.cmdCumMax.Size = New System.Drawing.Size(62, 30) @@ -5172,7 +5172,7 @@ Partial Class ucrCalculator 'cmdPMax ' Me.cmdPMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPMax.Location = New System.Drawing.Point(186, 14) + Me.cmdPMax.Location = New System.Drawing.Point(185, 14) Me.cmdPMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdPMax.Name = "cmdPMax" Me.cmdPMax.Size = New System.Drawing.Size(62, 30) @@ -5194,7 +5194,7 @@ Partial Class ucrCalculator 'cmdLag ' Me.cmdLag.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLag.Location = New System.Drawing.Point(62, 14) + Me.cmdLag.Location = New System.Drawing.Point(63, 14) Me.cmdLag.Margin = New System.Windows.Forms.Padding(2) Me.cmdLag.Name = "cmdLag" Me.cmdLag.Size = New System.Drawing.Size(62, 30) @@ -5251,7 +5251,7 @@ Partial Class ucrCalculator 'cmdnumeric ' Me.cmdnumeric.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnumeric.Location = New System.Drawing.Point(191, 187) + Me.cmdnumeric.Location = New System.Drawing.Point(191, 188) Me.cmdnumeric.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdnumeric.Name = "cmdnumeric" Me.cmdnumeric.Size = New System.Drawing.Size(62, 30) @@ -5263,7 +5263,7 @@ Partial Class ucrCalculator ' Me.cmdCalcRepelicationFunction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCalcRepelicationFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCalcRepelicationFunction.Location = New System.Drawing.Point(4, 187) + Me.cmdCalcRepelicationFunction.Location = New System.Drawing.Point(4, 188) Me.cmdCalcRepelicationFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCalcRepelicationFunction.Name = "cmdCalcRepelicationFunction" Me.cmdCalcRepelicationFunction.Size = New System.Drawing.Size(62, 30) @@ -5275,7 +5275,7 @@ Partial Class ucrCalculator ' Me.cmdCalcSequenceFunction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCalcSequenceFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCalcSequenceFunction.Location = New System.Drawing.Point(66, 187) + Me.cmdCalcSequenceFunction.Location = New System.Drawing.Point(65, 188) Me.cmdCalcSequenceFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCalcSequenceFunction.Name = "cmdCalcSequenceFunction" Me.cmdCalcSequenceFunction.Size = New System.Drawing.Size(62, 30) @@ -5287,7 +5287,7 @@ Partial Class ucrCalculator 'cmdCalcConcantenateFunction ' Me.cmdCalcConcantenateFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCalcConcantenateFunction.Location = New System.Drawing.Point(127, 187) + Me.cmdCalcConcantenateFunction.Location = New System.Drawing.Point(126, 188) Me.cmdCalcConcantenateFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCalcConcantenateFunction.Name = "cmdCalcConcantenateFunction" Me.cmdCalcConcantenateFunction.Size = New System.Drawing.Size(66, 30) @@ -5299,7 +5299,7 @@ Partial Class ucrCalculator ' Me.cmdLogicalHelp.AutoSize = True Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.Location = New System.Drawing.Point(166, 222) + Me.cmdLogicalHelp.Location = New System.Drawing.Point(165, 218) Me.cmdLogicalHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdLogicalHelp.Name = "cmdLogicalHelp" Me.cmdLogicalHelp.Size = New System.Drawing.Size(86, 30) @@ -5330,7 +5330,7 @@ Partial Class ucrCalculator 'cmdFalse ' Me.cmdFalse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFalse.Location = New System.Drawing.Point(201, 42) + Me.cmdFalse.Location = New System.Drawing.Point(199, 43) Me.cmdFalse.Margin = New System.Windows.Forms.Padding(2) Me.cmdFalse.Name = "cmdFalse" Me.cmdFalse.Size = New System.Drawing.Size(52, 30) @@ -5341,7 +5341,7 @@ Partial Class ucrCalculator 'cmdTrue ' Me.cmdTrue.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrue.Location = New System.Drawing.Point(201, 14) + Me.cmdTrue.Location = New System.Drawing.Point(199, 14) Me.cmdTrue.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrue.Name = "cmdTrue" Me.cmdTrue.Size = New System.Drawing.Size(52, 30) @@ -5352,7 +5352,7 @@ Partial Class ucrCalculator 'cmdTilde ' Me.cmdTilde.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTilde.Location = New System.Drawing.Point(127, 70) + Me.cmdTilde.Location = New System.Drawing.Point(125, 72) Me.cmdTilde.Margin = New System.Windows.Forms.Padding(2) Me.cmdTilde.Name = "cmdTilde" Me.cmdTilde.Size = New System.Drawing.Size(36, 30) @@ -5363,7 +5363,7 @@ Partial Class ucrCalculator 'cmdIn ' Me.cmdIn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIn.Location = New System.Drawing.Point(127, 100) + Me.cmdIn.Location = New System.Drawing.Point(126, 101) Me.cmdIn.Margin = New System.Windows.Forms.Padding(2) Me.cmdIn.Name = "cmdIn" Me.cmdIn.Size = New System.Drawing.Size(66, 30) @@ -5374,7 +5374,7 @@ Partial Class ucrCalculator 'cmdWhich ' Me.cmdWhich.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWhich.Location = New System.Drawing.Point(191, 100) + Me.cmdWhich.Location = New System.Drawing.Point(191, 101) Me.cmdWhich.Margin = New System.Windows.Forms.Padding(2) Me.cmdWhich.Name = "cmdWhich" Me.cmdWhich.Size = New System.Drawing.Size(62, 30) @@ -5385,7 +5385,7 @@ Partial Class ucrCalculator 'cmdNA ' Me.cmdNA.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNA.Location = New System.Drawing.Point(162, 42) + Me.cmdNA.Location = New System.Drawing.Point(160, 43) Me.cmdNA.Margin = New System.Windows.Forms.Padding(2) Me.cmdNA.Name = "cmdNA" Me.cmdNA.Size = New System.Drawing.Size(40, 30) @@ -5396,7 +5396,7 @@ Partial Class ucrCalculator 'cmdNear ' Me.cmdNear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNear.Location = New System.Drawing.Point(191, 158) + Me.cmdNear.Location = New System.Drawing.Point(191, 159) Me.cmdNear.Margin = New System.Windows.Forms.Padding(2) Me.cmdNear.Name = "cmdNear" Me.cmdNear.Size = New System.Drawing.Size(62, 30) @@ -5418,7 +5418,7 @@ Partial Class ucrCalculator 'cmdIsNa ' Me.cmdIsNa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIsNa.Location = New System.Drawing.Point(4, 158) + Me.cmdIsNa.Location = New System.Drawing.Point(4, 159) Me.cmdIsNa.Margin = New System.Windows.Forms.Padding(2) Me.cmdIsNa.Name = "cmdIsNa" Me.cmdIsNa.Size = New System.Drawing.Size(62, 30) @@ -5429,7 +5429,7 @@ Partial Class ucrCalculator 'cmdNotIsNa ' Me.cmdNotIsNa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNotIsNa.Location = New System.Drawing.Point(66, 158) + Me.cmdNotIsNa.Location = New System.Drawing.Point(65, 159) Me.cmdNotIsNa.Margin = New System.Windows.Forms.Padding(2) Me.cmdNotIsNa.Name = "cmdNotIsNa" Me.cmdNotIsNa.Size = New System.Drawing.Size(62, 30) @@ -5440,7 +5440,7 @@ Partial Class ucrCalculator 'cmdDuplicate ' Me.cmdDuplicate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDuplicate.Location = New System.Drawing.Point(127, 158) + Me.cmdDuplicate.Location = New System.Drawing.Point(126, 159) Me.cmdDuplicate.Margin = New System.Windows.Forms.Padding(2) Me.cmdDuplicate.Name = "cmdDuplicate" Me.cmdDuplicate.Size = New System.Drawing.Size(66, 30) @@ -5462,7 +5462,7 @@ Partial Class ucrCalculator 'cmdmatch ' Me.cmdmatch.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdmatch.Location = New System.Drawing.Point(66, 130) + Me.cmdmatch.Location = New System.Drawing.Point(65, 130) Me.cmdmatch.Margin = New System.Windows.Forms.Padding(2) Me.cmdmatch.Name = "cmdmatch" Me.cmdmatch.Size = New System.Drawing.Size(62, 30) @@ -5473,7 +5473,7 @@ Partial Class ucrCalculator 'cmdwhen ' Me.cmdwhen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwhen.Location = New System.Drawing.Point(127, 130) + Me.cmdwhen.Location = New System.Drawing.Point(126, 130) Me.cmdwhen.Margin = New System.Windows.Forms.Padding(2) Me.cmdwhen.Name = "cmdwhen" Me.cmdwhen.Size = New System.Drawing.Size(66, 30) @@ -5484,7 +5484,7 @@ Partial Class ucrCalculator 'cmdOpeningBracket ' Me.cmdOpeningBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOpeningBracket.Location = New System.Drawing.Point(162, 70) + Me.cmdOpeningBracket.Location = New System.Drawing.Point(160, 72) Me.cmdOpeningBracket.Margin = New System.Windows.Forms.Padding(2) Me.cmdOpeningBracket.Name = "cmdOpeningBracket" Me.cmdOpeningBracket.Size = New System.Drawing.Size(40, 30) @@ -5496,7 +5496,7 @@ Partial Class ucrCalculator ' Me.cmdColon.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!) Me.cmdColon.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdColon.Location = New System.Drawing.Point(42, 70) + Me.cmdColon.Location = New System.Drawing.Point(41, 72) Me.cmdColon.Margin = New System.Windows.Forms.Padding(2) Me.cmdColon.Name = "cmdColon" Me.cmdColon.Size = New System.Drawing.Size(40, 30) @@ -5507,7 +5507,7 @@ Partial Class ucrCalculator 'cmdGreaterOrEqualsTo ' Me.cmdGreaterOrEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(127, 14) + Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(125, 14) Me.cmdGreaterOrEqualsTo.Margin = New System.Windows.Forms.Padding(2) Me.cmdGreaterOrEqualsTo.Name = "cmdGreaterOrEqualsTo" Me.cmdGreaterOrEqualsTo.Size = New System.Drawing.Size(36, 30) @@ -5518,7 +5518,7 @@ Partial Class ucrCalculator 'cmdClossingBracket ' Me.cmdClossingBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClossingBracket.Location = New System.Drawing.Point(201, 70) + Me.cmdClossingBracket.Location = New System.Drawing.Point(199, 72) Me.cmdClossingBracket.Margin = New System.Windows.Forms.Padding(2) Me.cmdClossingBracket.Name = "cmdClossingBracket" Me.cmdClossingBracket.Size = New System.Drawing.Size(52, 30) @@ -5531,7 +5531,7 @@ Partial Class ucrCalculator ' Me.cmdAnd.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!) Me.cmdAnd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnd.Location = New System.Drawing.Point(127, 42) + Me.cmdAnd.Location = New System.Drawing.Point(125, 43) Me.cmdAnd.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnd.Name = "cmdAnd" Me.cmdAnd.Size = New System.Drawing.Size(36, 30) @@ -5544,7 +5544,7 @@ Partial Class ucrCalculator ' Me.cmdQuotes.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.cmdQuotes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuotes.Location = New System.Drawing.Point(162, 14) + Me.cmdQuotes.Location = New System.Drawing.Point(160, 14) Me.cmdQuotes.Margin = New System.Windows.Forms.Padding(2) Me.cmdQuotes.Name = "cmdQuotes" Me.cmdQuotes.Size = New System.Drawing.Size(40, 30) @@ -5555,7 +5555,7 @@ Partial Class ucrCalculator 'cmdSquareBrackets ' Me.cmdSquareBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSquareBrackets.Location = New System.Drawing.Point(82, 70) + Me.cmdSquareBrackets.Location = New System.Drawing.Point(80, 72) Me.cmdSquareBrackets.Margin = New System.Windows.Forms.Padding(2) Me.cmdSquareBrackets.Name = "cmdSquareBrackets" Me.cmdSquareBrackets.Size = New System.Drawing.Size(46, 30) @@ -5566,7 +5566,7 @@ Partial Class ucrCalculator 'cmdIntegerDivision ' Me.cmdIntegerDivision.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIntegerDivision.Location = New System.Drawing.Point(66, 100) + Me.cmdIntegerDivision.Location = New System.Drawing.Point(65, 101) Me.cmdIntegerDivision.Margin = New System.Windows.Forms.Padding(2) Me.cmdIntegerDivision.Name = "cmdIntegerDivision" Me.cmdIntegerDivision.Size = New System.Drawing.Size(62, 30) @@ -5577,7 +5577,7 @@ Partial Class ucrCalculator 'cmdModulas ' Me.cmdModulas.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdModulas.Location = New System.Drawing.Point(4, 100) + Me.cmdModulas.Location = New System.Drawing.Point(4, 101) Me.cmdModulas.Margin = New System.Windows.Forms.Padding(2) Me.cmdModulas.Name = "cmdModulas" Me.cmdModulas.Size = New System.Drawing.Size(62, 30) @@ -5588,7 +5588,7 @@ Partial Class ucrCalculator 'cmdGreater ' Me.cmdGreater.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGreater.Location = New System.Drawing.Point(82, 14) + Me.cmdGreater.Location = New System.Drawing.Point(80, 14) Me.cmdGreater.Margin = New System.Windows.Forms.Padding(2) Me.cmdGreater.Name = "cmdGreater" Me.cmdGreater.Size = New System.Drawing.Size(46, 30) @@ -5599,7 +5599,7 @@ Partial Class ucrCalculator 'cmdLesserOrEqualsTo ' Me.cmdLesserOrEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLesserOrEqualsTo.Location = New System.Drawing.Point(42, 14) + Me.cmdLesserOrEqualsTo.Location = New System.Drawing.Point(41, 14) Me.cmdLesserOrEqualsTo.Margin = New System.Windows.Forms.Padding(2) Me.cmdLesserOrEqualsTo.Name = "cmdLesserOrEqualsTo" Me.cmdLesserOrEqualsTo.Size = New System.Drawing.Size(40, 30) @@ -5621,7 +5621,7 @@ Partial Class ucrCalculator 'cmdOr ' Me.cmdOr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr.Location = New System.Drawing.Point(82, 42) + Me.cmdOr.Location = New System.Drawing.Point(80, 43) Me.cmdOr.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr.Name = "cmdOr" Me.cmdOr.Size = New System.Drawing.Size(46, 30) @@ -5633,7 +5633,7 @@ Partial Class ucrCalculator ' Me.cmdNot.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.cmdNot.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNot.Location = New System.Drawing.Point(4, 70) + Me.cmdNot.Location = New System.Drawing.Point(4, 72) Me.cmdNot.Margin = New System.Windows.Forms.Padding(2) Me.cmdNot.Name = "cmdNot" Me.cmdNot.Size = New System.Drawing.Size(38, 30) @@ -5644,7 +5644,7 @@ Partial Class ucrCalculator 'cmdNotEqualsTo ' Me.cmdNotEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNotEqualsTo.Location = New System.Drawing.Point(42, 42) + Me.cmdNotEqualsTo.Location = New System.Drawing.Point(41, 43) Me.cmdNotEqualsTo.Margin = New System.Windows.Forms.Padding(2) Me.cmdNotEqualsTo.Name = "cmdNotEqualsTo" Me.cmdNotEqualsTo.Size = New System.Drawing.Size(40, 30) @@ -5655,7 +5655,7 @@ Partial Class ucrCalculator 'cmdEquivalent ' Me.cmdEquivalent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEquivalent.Location = New System.Drawing.Point(4, 42) + Me.cmdEquivalent.Location = New System.Drawing.Point(4, 43) Me.cmdEquivalent.Margin = New System.Windows.Forms.Padding(2) Me.cmdEquivalent.Name = "cmdEquivalent" Me.cmdEquivalent.Size = New System.Drawing.Size(38, 30) @@ -7714,6 +7714,7 @@ Partial Class ucrCalculator Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True + Me.Controls.Add(Me.grpList) Me.Controls.Add(Me.cmdRhelpList) Me.Controls.Add(Me.cmdWakefieldHelp) Me.Controls.Add(Me.cmdStringRHelp) @@ -7725,6 +7726,10 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) + Me.Controls.Add(Me.grpInteger) + Me.Controls.Add(Me.grpTestString) + Me.Controls.Add(Me.grpModifier) + Me.Controls.Add(Me.grpSymbols) Me.Controls.Add(Me.grpComplex) Me.Controls.Add(Me.grpSummary) Me.Controls.Add(Me.grpTransform) @@ -7736,11 +7741,6 @@ Partial Class ucrCalculator Me.Controls.Add(Me.grpCircular) Me.Controls.Add(Me.grpMaths) Me.Controls.Add(Me.grpProbabilty) - Me.Controls.Add(Me.grpList) - Me.Controls.Add(Me.grpInteger) - Me.Controls.Add(Me.grpTestString) - Me.Controls.Add(Me.grpModifier) - Me.Controls.Add(Me.grpSymbols) Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "ucrCalculator" Me.Size = New System.Drawing.Size(898, 458) From 56f7fd0b3602442efb21f2d4a54d3deb520d9bc5 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 29 Apr 2024 12:46:24 +0300 Subject: [PATCH 49/99] minor code change --- instat/static/InstatObject/R/data_object_R6.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index fc03c39a2c8..bd9af123a80 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -670,7 +670,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)[[i]] + 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 d4d9e8c6f6c69a6b4adbdc6b2852701c5d3f93b2 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 29 Apr 2024 12:48:34 +0300 Subject: [PATCH 50/99] basic --- instat/ucrCalculator.Designer.vb | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 1963b1a51e3..740724c6a75 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -723,10 +723,10 @@ Partial Class ucrCalculator 'cmdClear ' Me.cmdClear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClear.Location = New System.Drawing.Point(150, 70) + Me.cmdClear.Location = New System.Drawing.Point(150, 72) Me.cmdClear.Margin = New System.Windows.Forms.Padding(2) Me.cmdClear.Name = "cmdClear" - Me.cmdClear.Size = New System.Drawing.Size(50, 60) + Me.cmdClear.Size = New System.Drawing.Size(50, 58) Me.cmdClear.TabIndex = 190 Me.cmdClear.Text = "Clear" Me.cmdClear.UseVisualStyleBackColor = True @@ -746,7 +746,7 @@ Partial Class ucrCalculator 'cmdBrackets ' Me.cmdBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrackets.Location = New System.Drawing.Point(78, 100) + Me.cmdBrackets.Location = New System.Drawing.Point(76, 100) Me.cmdBrackets.Margin = New System.Windows.Forms.Padding(2) Me.cmdBrackets.Name = "cmdBrackets" Me.cmdBrackets.Size = New System.Drawing.Size(38, 30) @@ -758,7 +758,7 @@ Partial Class ucrCalculator ' Me.cmdPower.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdPower.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPower.Location = New System.Drawing.Point(150, 42) + Me.cmdPower.Location = New System.Drawing.Point(150, 43) Me.cmdPower.Margin = New System.Windows.Forms.Padding(2) Me.cmdPower.Name = "cmdPower" Me.cmdPower.Size = New System.Drawing.Size(50, 30) @@ -770,7 +770,7 @@ Partial Class ucrCalculator ' Me.cmdDivide.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdDivide.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDivide.Location = New System.Drawing.Point(114, 14) + Me.cmdDivide.Location = New System.Drawing.Point(113, 14) Me.cmdDivide.Margin = New System.Windows.Forms.Padding(2) Me.cmdDivide.Name = "cmdDivide" Me.cmdDivide.Size = New System.Drawing.Size(38, 30) @@ -782,10 +782,10 @@ Partial Class ucrCalculator ' Me.cmdPlus.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdPlus.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlus.Location = New System.Drawing.Point(114, 100) + Me.cmdPlus.Location = New System.Drawing.Point(113, 101) Me.cmdPlus.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlus.Name = "cmdPlus" - Me.cmdPlus.Size = New System.Drawing.Size(38, 30) + Me.cmdPlus.Size = New System.Drawing.Size(38, 29) Me.cmdPlus.TabIndex = 130 Me.cmdPlus.Text = "+" Me.cmdPlus.UseVisualStyleBackColor = True @@ -794,7 +794,7 @@ Partial Class ucrCalculator ' Me.cmdMinus.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdMinus.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMinus.Location = New System.Drawing.Point(114, 70) + Me.cmdMinus.Location = New System.Drawing.Point(113, 72) Me.cmdMinus.Margin = New System.Windows.Forms.Padding(2) Me.cmdMinus.Name = "cmdMinus" Me.cmdMinus.Size = New System.Drawing.Size(38, 30) @@ -806,7 +806,7 @@ Partial Class ucrCalculator ' Me.cmdMultiply.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdMultiply.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMultiply.Location = New System.Drawing.Point(114, 42) + Me.cmdMultiply.Location = New System.Drawing.Point(113, 43) Me.cmdMultiply.Margin = New System.Windows.Forms.Padding(2) Me.cmdMultiply.Name = "cmdMultiply" Me.cmdMultiply.Size = New System.Drawing.Size(38, 30) @@ -829,7 +829,7 @@ Partial Class ucrCalculator 'cmd9 ' Me.cmd9.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd9.Location = New System.Drawing.Point(78, 14) + Me.cmd9.Location = New System.Drawing.Point(76, 14) Me.cmd9.Margin = New System.Windows.Forms.Padding(2) Me.cmd9.Name = "cmd9" Me.cmd9.Size = New System.Drawing.Size(38, 30) @@ -840,7 +840,7 @@ Partial Class ucrCalculator 'cmd8 ' Me.cmd8.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd8.Location = New System.Drawing.Point(40, 14) + Me.cmd8.Location = New System.Drawing.Point(39, 14) Me.cmd8.Margin = New System.Windows.Forms.Padding(2) Me.cmd8.Name = "cmd8" Me.cmd8.Size = New System.Drawing.Size(38, 30) @@ -862,7 +862,7 @@ Partial Class ucrCalculator 'cmd6 ' Me.cmd6.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd6.Location = New System.Drawing.Point(78, 42) + Me.cmd6.Location = New System.Drawing.Point(76, 43) Me.cmd6.Margin = New System.Windows.Forms.Padding(2) Me.cmd6.Name = "cmd6" Me.cmd6.Size = New System.Drawing.Size(38, 30) @@ -873,7 +873,7 @@ Partial Class ucrCalculator 'cmd5 ' Me.cmd5.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd5.Location = New System.Drawing.Point(40, 42) + Me.cmd5.Location = New System.Drawing.Point(39, 43) Me.cmd5.Margin = New System.Windows.Forms.Padding(2) Me.cmd5.Name = "cmd5" Me.cmd5.Size = New System.Drawing.Size(38, 30) @@ -884,7 +884,7 @@ Partial Class ucrCalculator 'cmd4 ' Me.cmd4.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd4.Location = New System.Drawing.Point(2, 42) + Me.cmd4.Location = New System.Drawing.Point(2, 43) Me.cmd4.Margin = New System.Windows.Forms.Padding(2) Me.cmd4.Name = "cmd4" Me.cmd4.Size = New System.Drawing.Size(38, 30) @@ -895,7 +895,7 @@ Partial Class ucrCalculator 'cmd3 ' Me.cmd3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd3.Location = New System.Drawing.Point(78, 70) + Me.cmd3.Location = New System.Drawing.Point(76, 72) Me.cmd3.Margin = New System.Windows.Forms.Padding(2) Me.cmd3.Name = "cmd3" Me.cmd3.Size = New System.Drawing.Size(38, 30) @@ -906,7 +906,7 @@ Partial Class ucrCalculator 'cmd2 ' Me.cmd2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd2.Location = New System.Drawing.Point(40, 70) + Me.cmd2.Location = New System.Drawing.Point(39, 72) Me.cmd2.Margin = New System.Windows.Forms.Padding(2) Me.cmd2.Name = "cmd2" Me.cmd2.Size = New System.Drawing.Size(38, 30) @@ -917,7 +917,7 @@ Partial Class ucrCalculator 'cmd0 ' Me.cmd0.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd0.Location = New System.Drawing.Point(40, 100) + Me.cmd0.Location = New System.Drawing.Point(39, 100) Me.cmd0.Margin = New System.Windows.Forms.Padding(2) Me.cmd0.Name = "cmd0" Me.cmd0.Size = New System.Drawing.Size(38, 30) @@ -928,7 +928,7 @@ Partial Class ucrCalculator 'cmd1 ' Me.cmd1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd1.Location = New System.Drawing.Point(2, 70) + Me.cmd1.Location = New System.Drawing.Point(2, 72) Me.cmd1.Margin = New System.Windows.Forms.Padding(2) Me.cmd1.Name = "cmd1" Me.cmd1.Size = New System.Drawing.Size(38, 30) From 19aff80fea0923daff8108c63d1a686fce200f4e Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:02:01 +0300 Subject: [PATCH 51/99] change --- instat/ucrCalculator.vb | 92 +++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 49 deletions(-) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 21145f77bdd..2992131cafc 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -269,7 +269,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdKTuple, "k_tuple general formula for all these keys. For example k_tuple(0, 10, c(0,2)) gives twin primes") ttCalculator.SetToolTip(cmdRoman, "converts a small(up to 3899) positive integer to Roman numbers. For example as.roman(14)=XIV") ttCalculator.SetToolTip(cmdPalindrome, "generates palindromes to the length of the dataframe. For example the 100th palindromic number is 909") - ttCalculator.SetToolTip(cmdCatalan, "generates Catalan numbers to the length of the data frame. The 5th is 10!/(5!*6!) =7 * 6 = 42") + ttCalculator.SetToolTip(cmdFibonacci2, "generates fibonacci numbers to the length of the data frame. For example the 10th fibonacci number is just 34, but the 50th is much larger, 7778742049") ttCalculator.SetToolTip(cmdAbundant, "when divisors sum to more than the number. So 12 is less than 1+2+3+4+6 = 16. Opposite is Deficient") ttCalculator.SetToolTip(cmdPerfect, "divisors add to the number. So 6 = 1+2+3. Only 51 perfect numbers are currently known.") ttCalculator.SetToolTip(cmdFrugal, "125 is frugal because 125 = 5(cubed) and 5 and 3 are fewer digits (2) than 125 (3).") @@ -593,7 +593,6 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdListDuplicated, "gives TRUE for any duplicates and FALSE otherwise.") ttCalculator.SetToolTip(cmdListFivenum, "gives the same summaries as the boxplot, so minimum, lower and upper hinges (roughly the quartiles), median, and maximum.") ttCalculator.SetToolTip(cmdListSumd, "if the list contains the 2 numbers 34 and 27, then the sum of the digits (individually) is 3 + 4 = 7 and 2 + 7 = 9, so sumd will give 7 + 9 = 16.") - End Sub Public Sub Reset() @@ -1443,7 +1442,7 @@ Public Class ucrCalculator Private Sub cmdQnorm_Click(sender As Object, e As EventArgs) Handles cmdQnorm.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnorm(p= , mean = 0, sd = 1, lower.tail = TRUE, log.p = FALSE)", 53) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnorm(p= , mean = 0, sd = 1, lower.tail = TRUE, log.p = FALSE)", 54) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnorm()", 1) End If @@ -1451,7 +1450,7 @@ Public Class ucrCalculator Private Sub cmdQt_Click(sender As Object, e As EventArgs) Handles cmdQt.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(p= , df= , lower.tail = TRUE)", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(p= , df= , lower.tail = TRUE)", 27) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(,)", 2) End If @@ -1459,7 +1458,7 @@ Public Class ucrCalculator Private Sub cmdQchisq_Click(sender As Object, e As EventArgs) Handles cmdQchisq.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(p= , df= , lower.tail = TRUE)", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(p= , df= , lower.tail = TRUE)", 27) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(,)", 2) End If @@ -1467,7 +1466,7 @@ Public Class ucrCalculator Private Sub cmdqF_Click(sender As Object, e As EventArgs) Handles cmdqF.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(p= , df1= , df2= ,lower.tail = TRUE)", 33) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(p= , df1= , df2= ,lower.tail = TRUE)", 34) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(,,)", 3) End If @@ -1483,7 +1482,7 @@ Public Class ucrCalculator Private Sub cmdPt_Click(sender As Object, e As EventArgs) Handles cmdPt.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(q= , df= , lower.tail = TRUE)", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(q= , df= , lower.tail = TRUE)", 27) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(,)", 2) End If @@ -1491,7 +1490,7 @@ Public Class ucrCalculator Private Sub cmdPChisq_Click(sender As Object, e As EventArgs) Handles cmdPChisq.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(q= , df= , lower.tail = TRUE)", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(q= , df= , lower.tail = TRUE)", 27) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(,)", 2) End If @@ -1499,7 +1498,7 @@ Public Class ucrCalculator Private Sub cmdPf_Click(sender As Object, e As EventArgs) Handles cmdPf.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(q= , df= , lower.tail = TRUE)", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(q= , df1= ,df2=, lower.tail = TRUE)", 33) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(,,)", 3) End If @@ -1507,7 +1506,7 @@ Public Class ucrCalculator Private Sub cmdChoose_Click(sender As Object, e As EventArgs) Handles cmdChoose.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(n= , k= )", 6) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(n= , k= )", 7) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(,)", 2) End If @@ -1515,7 +1514,7 @@ Public Class ucrCalculator Private Sub cmdFact_Click(sender As Object, e As EventArgs) Handles cmdFact.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("factorial(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("factorial(x= )", 2) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("factorial()", 1) End If @@ -1523,7 +1522,7 @@ Public Class ucrCalculator Private Sub cmdBeta_Click(sender As Object, e As EventArgs) Handles cmdBeta.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(a= , b= )", 6) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(a= , b= )", 7) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(,)", 2) End If @@ -1531,7 +1530,7 @@ Public Class ucrCalculator Private Sub cmdLchoose_Click(sender As Object, e As EventArgs) Handles cmdLchoose.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(n= , k= )", 6) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(n= , k= )", 7) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(,)", 2) End If @@ -1539,7 +1538,7 @@ Public Class ucrCalculator Private Sub cmdLfact_Click(sender As Object, e As EventArgs) Handles cmdLfact.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lfactorial(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lfactorial(x= )", 2) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lfactorial()", 1) End If @@ -1547,7 +1546,7 @@ Public Class ucrCalculator Private Sub cmdLbeta_Click(sender As Object, e As EventArgs) Handles cmdLbeta.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(a= , b= )", 6) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(a= , b= )", 7) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(,)", 2) End If @@ -1555,7 +1554,7 @@ Public Class ucrCalculator Private Sub cmdGamma_Click(sender As Object, e As EventArgs) Handles cmdGamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gamma(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gamma(x= )", 2) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gamma()", 1) End If @@ -1563,7 +1562,7 @@ Public Class ucrCalculator Private Sub cmdLgamma_Click(sender As Object, e As EventArgs) Handles cmdLgamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lgamma(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lgamma(x= )", 2) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lgamma()", 1) End If @@ -1571,7 +1570,7 @@ Public Class ucrCalculator Private Sub cmdDigamma_Click(sender As Object, e As EventArgs) Handles cmdDigamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digamma(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digamma(x= )", 2) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digamma()", 1) End If @@ -1579,7 +1578,7 @@ Public Class ucrCalculator Private Sub cmdTrigamma_Click(sender As Object, e As EventArgs) Handles cmdTrigamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trigamma(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trigamma(x= )", 2) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trigamma()", 1) End If @@ -3764,7 +3763,7 @@ Public Class ucrCalculator Private Sub cmdPgamma_Click(sender As Object, e As EventArgs) Handles cmdPgamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(q = , shape = , rate = 1, scale = 1/rate, lower.tail = TRUE,log.p = FALSE)", 71) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(q = , shape = , rate = 1, lower.tail = TRUE,log.p = FALSE)", 55) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(,,)", 3) End If @@ -3772,7 +3771,7 @@ Public Class ucrCalculator Private Sub cmdQgamma_Click(sender As Object, e As EventArgs) Handles cmdQgamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(p = , shape = , rate = 1, scale = 1/rate, lower.tail = TRUE, log.p = FALSE)", 73) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(p = , shape = , rate = 1, lower.tail = TRUE, log.p = FALSE)", 56) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(,)", 2) End If @@ -3780,7 +3779,7 @@ Public Class ucrCalculator Private Sub cmdPbeta_Click(sender As Object, e As EventArgs) Handles cmdPbeta.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(q = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 68) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(q = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 67) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(,,)", 3) End If @@ -3796,7 +3795,7 @@ Public Class ucrCalculator Private Sub cmdPbinom_Click(sender As Object, e As EventArgs) Handles cmdPbinom.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(q = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 55) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(q = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 54) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(,,)", 3) End If @@ -3804,7 +3803,7 @@ Public Class ucrCalculator Private Sub cmdPpois_Click(sender As Object, e As EventArgs) Handles cmdPpois.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(q = , lambda = , lower.tail = TRUE, log.p = FALSE)", 48) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(q = , lambda = , lower.tail = TRUE, log.p = FALSE)", 47) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(,)", 2) End If @@ -3812,7 +3811,7 @@ Public Class ucrCalculator Private Sub cmdPnbin_Click(sender As Object, e As EventArgs) Handles cmdPnbin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(q = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 62) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(q = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 61) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(,,)", 3) End If @@ -3820,7 +3819,7 @@ Public Class ucrCalculator Private Sub cmdQbeta_Click(sender As Object, e As EventArgs) Handles cmdQbeta.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(p = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 68) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(p = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 67) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(,,)", 3) End If @@ -3836,7 +3835,7 @@ Public Class ucrCalculator Private Sub cmdQbinom_Click(sender As Object, e As EventArgs) Handles cmdQbinom.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(p = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 55) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(p = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 54) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(,,)", 3) End If @@ -3844,7 +3843,7 @@ Public Class ucrCalculator Private Sub Button5_Click(sender As Object, e As EventArgs) Handles cmdQpois.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(p = , lambda = , lower.tail = TRUE, log.p = FALSE)", 48) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(p = , lambda = , lower.tail = TRUE, log.p = FALSE)", 47) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(,)", 2) End If @@ -3852,7 +3851,7 @@ Public Class ucrCalculator Private Sub cmdQnbin_Click(sender As Object, e As EventArgs) Handles cmdQnbin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(p = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 62) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(p = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 61) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(,,)", 3) End If @@ -4342,16 +4341,11 @@ Public Class ucrCalculator End Sub Private Sub cmdFibonacci_Click(sender As Object, e As EventArgs) Handles cmdFibonacci.Click - Dim clsFibonacciFunction As New RFunction - - clsDataFunction.SetRCommand("nrow") - clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) - - clsFibonacciFunction.SetPackageName("Zseq") - clsFibonacciFunction.SetRCommand("Fibonacci") - clsFibonacciFunction.AddParameter("n", clsRFunctionParameter:=clsDataFunction, iPosition:=0) - - ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsFibonacciFunction.ToScript, 0) + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Fibonacci(n = )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Fibonacci()", 1) + End If End Sub Private Sub cmdDivisors_Click(sender As Object, e As EventArgs) Handles cmdDivisors.Click @@ -4518,7 +4512,7 @@ Public Class ucrCalculator clsPrimesFunction.SetPackageName("primes") clsPrimesFunction.SetRCommand(strRCommand) clsPrimesFunction.AddParameter("min", "0", iPosition:=0) - clsPrimesFunction.AddParameter("max", "1000000", iPosition:=1) + clsPrimesFunction.AddParameter("max", "100", iPosition:=1) clsDataFunction.SetRCommand("nrow") clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) @@ -4561,12 +4555,11 @@ Public Class ucrCalculator clsTuplePatternFunction.SetRCommand("c") clsTuplePatternFunction.AddParameter("x", "0", iPosition:=0, bIncludeArgumentName:=False) clsTuplePatternFunction.AddParameter("y", "2", iPosition:=1, bIncludeArgumentName:=False) - clsTuplePatternFunction.AddParameter("z", "8", iPosition:=2, bIncludeArgumentName:=False) clsKTuplePrimeFunction.SetPackageName("primes") clsKTuplePrimeFunction.SetRCommand("k_tuple") clsKTuplePrimeFunction.AddParameter("min", "0", iPosition:=0) - clsKTuplePrimeFunction.AddParameter("max", "1000000", iPosition:=1) + clsKTuplePrimeFunction.AddParameter("max", "100", iPosition:=1) clsKTuplePrimeFunction.AddParameter("tuple", clsRFunctionParameter:=clsTuplePatternFunction, iPosition:=2) clsRepFunction.SetRCommand("rep") @@ -4600,17 +4593,17 @@ Public Class ucrCalculator ZseqFunctions("Palindromic") End Sub - Private Sub cmdCatalan_Click(sender As Object, e As EventArgs) Handles cmdCatalan.Click - Dim clsCatalanFunction As New RFunction + Private Sub cmdFibonnaci_Click(sender As Object, e As EventArgs) Handles cmdFibonacci2.Click + Dim clsFibonacciFunction As New RFunction clsDataFunction.SetRCommand("nrow") clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) - clsCatalanFunction.SetPackageName("Zseq") - clsCatalanFunction.SetRCommand("Catalan") - clsCatalanFunction.AddParameter("n", clsRFunctionParameter:=clsDataFunction, iPosition:=0) + clsFibonacciFunction.SetPackageName("Zseq") + clsFibonacciFunction.SetRCommand("Fibonacci") + clsFibonacciFunction.AddParameter("n", clsRFunctionParameter:=clsDataFunction, iPosition:=0) - ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsCatalanFunction.ToScript, 0) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsFibonacciFunction.ToScript, 0) End Sub Private Sub cmdAbundant_Click(sender As Object, e As EventArgs) Handles cmdAbundant.Click @@ -4661,6 +4654,7 @@ Public Class ucrCalculator clsPerfectFunction.SetRCommand("Perfect") clsPerfectFunction.AddParameter("n", "10", iPosition:=0) + clsDataFunction.SetRCommand("nrow") clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) clsRepFunction.SetRCommand("rep") @@ -5453,7 +5447,7 @@ Public Class ucrCalculator End Sub Private Sub cmdPascal_Click(sender As Object, e As EventArgs) Handles cmdPascal.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply( , function(x) {lapply(x, function(i) {choose(i, 0:i)})})", 56) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply( , function(x) {lapply(x, function(i) {choose(i, 0:i)})})", 57) End Sub Private Sub cmdScale_Click(sender As Object, e As EventArgs) Handles cmdScale.Click From 64af65c4a89e86f98aacaa8d4aad7b5ed4deae3f Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:21:00 +0300 Subject: [PATCH 52/99] changes --- instat/ucrCalculator.vb | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 2992131cafc..b67787b4095 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -269,8 +269,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdKTuple, "k_tuple general formula for all these keys. For example k_tuple(0, 10, c(0,2)) gives twin primes") ttCalculator.SetToolTip(cmdRoman, "converts a small(up to 3899) positive integer to Roman numbers. For example as.roman(14)=XIV") ttCalculator.SetToolTip(cmdPalindrome, "generates palindromes to the length of the dataframe. For example the 100th palindromic number is 909") - ttCalculator.SetToolTip(cmdFibonacci2, "generates fibonacci numbers to the length of the data frame. For example the 10th fibonacci number is just 34, but the 50th is much larger, 7778742049") - ttCalculator.SetToolTip(cmdAbundant, "when divisors sum to more than the number. So 12 is less than 1+2+3+4+6 = 16. Opposite is Deficient") + ttCalculator.SetToolTip(cmdCatalan, "generates Catalan numbers to the length of the data frame. The 5th is 10!/(5!*6!) =7 * 6 = 42") ttCalculator.SetToolTip(cmdPerfect, "divisors add to the number. So 6 = 1+2+3. Only 51 perfect numbers are currently known.") ttCalculator.SetToolTip(cmdFrugal, "125 is frugal because 125 = 5(cubed) and 5 and 3 are fewer digits (2) than 125 (3).") ttCalculator.SetToolTip(cmdPowerful, "36 = 2(squared)*3(squared) is powerful because for each divisor, here 2 and 3, its square is also a divisor.") @@ -4341,13 +4340,19 @@ Public Class ucrCalculator End Sub Private Sub cmdFibonacci_Click(sender As Object, e As EventArgs) Handles cmdFibonacci.Click - If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Fibonacci(n = )", 2) - Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Fibonacci()", 1) - End If + Dim clsFibonacciFunction As New RFunction + + clsDataFunction.SetRCommand("nrow") + clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) + + clsFibonacciFunction.SetPackageName("Zseq") + clsFibonacciFunction.SetRCommand("Fibonacci") + clsFibonacciFunction.AddParameter("n", clsRFunctionParameter:=clsDataFunction, iPosition:=0) + + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsFibonacciFunction.ToScript, 0) End Sub + Private Sub cmdDivisors_Click(sender As Object, e As EventArgs) Handles cmdDivisors.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Divisors(x = )", 2) @@ -4512,7 +4517,7 @@ Public Class ucrCalculator clsPrimesFunction.SetPackageName("primes") clsPrimesFunction.SetRCommand(strRCommand) clsPrimesFunction.AddParameter("min", "0", iPosition:=0) - clsPrimesFunction.AddParameter("max", "100", iPosition:=1) + clsPrimesFunction.AddParameter("max", "1000000", iPosition:=1) clsDataFunction.SetRCommand("nrow") clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) @@ -4555,11 +4560,12 @@ Public Class ucrCalculator clsTuplePatternFunction.SetRCommand("c") clsTuplePatternFunction.AddParameter("x", "0", iPosition:=0, bIncludeArgumentName:=False) clsTuplePatternFunction.AddParameter("y", "2", iPosition:=1, bIncludeArgumentName:=False) + clsTuplePatternFunction.AddParameter("z", "8", iPosition:=2, bIncludeArgumentName:=False) clsKTuplePrimeFunction.SetPackageName("primes") clsKTuplePrimeFunction.SetRCommand("k_tuple") clsKTuplePrimeFunction.AddParameter("min", "0", iPosition:=0) - clsKTuplePrimeFunction.AddParameter("max", "100", iPosition:=1) + clsKTuplePrimeFunction.AddParameter("max", "1000000", iPosition:=1) clsKTuplePrimeFunction.AddParameter("tuple", clsRFunctionParameter:=clsTuplePatternFunction, iPosition:=2) clsRepFunction.SetRCommand("rep") @@ -4593,19 +4599,20 @@ Public Class ucrCalculator ZseqFunctions("Palindromic") End Sub - Private Sub cmdFibonnaci_Click(sender As Object, e As EventArgs) Handles cmdFibonacci2.Click - Dim clsFibonacciFunction As New RFunction + Private Sub cmdCatalan_Click(sender As Object, e As EventArgs) Handles cmdCatalan.Click + Dim clsCatalanFunction As New RFunction clsDataFunction.SetRCommand("nrow") clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) - clsFibonacciFunction.SetPackageName("Zseq") - clsFibonacciFunction.SetRCommand("Fibonacci") - clsFibonacciFunction.AddParameter("n", clsRFunctionParameter:=clsDataFunction, iPosition:=0) + clsCatalanFunction.SetPackageName("Zseq") + clsCatalanFunction.SetRCommand("Catalan") + clsCatalanFunction.AddParameter("n", clsRFunctionParameter:=clsDataFunction, iPosition:=0) - ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsFibonacciFunction.ToScript, 0) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsCatalanFunction.ToScript, 0) End Sub + Private Sub cmdAbundant_Click(sender As Object, e As EventArgs) Handles cmdAbundant.Click ZseqFunctions("Abundant") End Sub @@ -4659,7 +4666,7 @@ Public Class ucrCalculator clsRepFunction.SetRCommand("rep") clsRepFunction.AddParameter("x", clsRFunctionParameter:=clsPerfectFunction, iPosition:=0) - clsRepFunction.AddParameter("length", clsRFunctionParameter:=clsDataFunction, iPosition:=1) + ' clsRepFunction.AddParameter("length", clsRFunctionParameter:=clsDataFunction, iPosition:=1) ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsRepFunction.ToScript, 0) End Sub From bfaeec41f8eed40fa00bbfce531ee22812e2e981 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:38:32 +0300 Subject: [PATCH 53/99] integer --- instat/ucrCalculator.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index b67787b4095..582f386de75 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -4666,7 +4666,7 @@ Public Class ucrCalculator clsRepFunction.SetRCommand("rep") clsRepFunction.AddParameter("x", clsRFunctionParameter:=clsPerfectFunction, iPosition:=0) - ' clsRepFunction.AddParameter("length", clsRFunctionParameter:=clsDataFunction, iPosition:=1) + clsRepFunction.AddParameter("length", clsRFunctionParameter:=clsDataFunction, iPosition:=1) ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsRepFunction.ToScript, 0) End Sub From 11dcb546b4eeeef3e42465fe9f7143e8d9930333 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:44:33 +0300 Subject: [PATCH 54/99] final --- instat/ucrCalculator.Designer.vb | 464 +++++++++++++++---------------- instat/ucrCalculator.vb | 2 +- 2 files changed, 233 insertions(+), 233 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 740724c6a75..2e43a7328ea 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -569,22 +569,6 @@ Partial Class ucrCalculator Me.ListStatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ListStatipToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.grpList = New System.Windows.Forms.GroupBox() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.cmdListDuplicated = New System.Windows.Forms.Button() - Me.cmdListOperator = New System.Windows.Forms.Button() - Me.cmdListDiv = New System.Windows.Forms.Button() - Me.cmdListMod = New System.Windows.Forms.Button() - Me.cmdListIfelse = New System.Windows.Forms.Button() - Me.cmdListOmit = New System.Windows.Forms.Button() - Me.cmdListRev = New System.Windows.Forms.Button() - Me.cmdListMovsum = New System.Windows.Forms.Button() - Me.cmdListCumsum = New System.Windows.Forms.Button() - Me.cmdListScale = New System.Windows.Forms.Button() - Me.cmdListDiff = New System.Windows.Forms.Button() - Me.cmdListLead = New System.Windows.Forms.Button() - Me.cmdListLag = New System.Windows.Forms.Button() - Me.cmdListRank = New System.Windows.Forms.Button() - Me.cmdListSort = New System.Windows.Forms.Button() Me.grpMathBloc = New System.Windows.Forms.GroupBox() Me.cmdListSQRT = New System.Windows.Forms.Button() Me.cmdListPercent2 = New System.Windows.Forms.Button() @@ -621,6 +605,22 @@ Partial Class ucrCalculator Me.cmdListSum = New System.Windows.Forms.Button() Me.cmdListSumd = New System.Windows.Forms.Button() Me.cmdListMissing = New System.Windows.Forms.Button() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.cmdListDuplicated = New System.Windows.Forms.Button() + Me.cmdListOperator = New System.Windows.Forms.Button() + Me.cmdListDiv = New System.Windows.Forms.Button() + Me.cmdListMod = New System.Windows.Forms.Button() + Me.cmdListIfelse = New System.Windows.Forms.Button() + Me.cmdListOmit = New System.Windows.Forms.Button() + Me.cmdListRev = New System.Windows.Forms.Button() + Me.cmdListMovsum = New System.Windows.Forms.Button() + Me.cmdListCumsum = New System.Windows.Forms.Button() + Me.cmdListScale = New System.Windows.Forms.Button() + Me.cmdListDiff = New System.Windows.Forms.Button() + Me.cmdListLead = New System.Windows.Forms.Button() + Me.cmdListLag = New System.Windows.Forms.Button() + Me.cmdListRank = New System.Windows.Forms.Button() + Me.cmdListSort = New System.Windows.Forms.Button() Me.cmdRhelpList = New instat.ucrSplitButton() Me.cmdWakefieldHelp = New instat.ucrSplitButton() Me.cmdStringRHelp = New instat.ucrSplitButton() @@ -662,8 +662,8 @@ Partial Class ucrCalculator Me.ContextMenuStripWakefield.SuspendLayout Me.ContextMenuStripList.SuspendLayout Me.grpList.SuspendLayout - Me.GroupBox1.SuspendLayout Me.grpMathBloc.SuspendLayout + Me.GroupBox1.SuspendLayout Me.SuspendLayout ' 'lblExpression @@ -3549,7 +3549,7 @@ Partial Class ucrCalculator Me.grpSummary.Margin = New System.Windows.Forms.Padding(2) Me.grpSummary.Name = "grpSummary" Me.grpSummary.Padding = New System.Windows.Forms.Padding(2) - Me.grpSummary.Size = New System.Drawing.Size(288, 337) + Me.grpSummary.Size = New System.Drawing.Size(295, 337) Me.grpSummary.TabIndex = 185 Me.grpSummary.TabStop = False Me.grpSummary.Text = "Summary" @@ -3998,7 +3998,7 @@ Partial Class ucrCalculator Me.grpFrequencies.Margin = New System.Windows.Forms.Padding(2) Me.grpFrequencies.Name = "grpFrequencies" Me.grpFrequencies.Padding = New System.Windows.Forms.Padding(2) - Me.grpFrequencies.Size = New System.Drawing.Size(282, 106) + Me.grpFrequencies.Size = New System.Drawing.Size(286, 106) Me.grpFrequencies.TabIndex = 184 Me.grpFrequencies.TabStop = False Me.grpFrequencies.Text = "Frequencies" @@ -6930,7 +6930,6 @@ Partial Class ucrCalculator ' 'grpList ' - Me.grpList.Controls.Add(Me.GroupBox1) Me.grpList.Controls.Add(Me.grpMathBloc) Me.grpList.Controls.Add(Me.cmdListNth) Me.grpList.Controls.Add(Me.cmdListLast) @@ -6957,6 +6956,7 @@ Partial Class ucrCalculator Me.grpList.Controls.Add(Me.cmdListSum) Me.grpList.Controls.Add(Me.cmdListSumd) Me.grpList.Controls.Add(Me.cmdListMissing) + Me.grpList.Controls.Add(Me.GroupBox1) Me.grpList.Location = New System.Drawing.Point(438, 52) Me.grpList.Margin = New System.Windows.Forms.Padding(2) Me.grpList.Name = "grpList" @@ -6966,212 +6966,6 @@ Partial Class ucrCalculator Me.grpList.TabStop = False Me.grpList.Text = "Summary" ' - 'GroupBox1 - ' - Me.GroupBox1.Controls.Add(Me.cmdListDuplicated) - Me.GroupBox1.Controls.Add(Me.cmdListOperator) - Me.GroupBox1.Controls.Add(Me.cmdListDiv) - Me.GroupBox1.Controls.Add(Me.cmdListMod) - Me.GroupBox1.Controls.Add(Me.cmdListIfelse) - Me.GroupBox1.Controls.Add(Me.cmdListOmit) - Me.GroupBox1.Controls.Add(Me.cmdListRev) - Me.GroupBox1.Controls.Add(Me.cmdListMovsum) - Me.GroupBox1.Controls.Add(Me.cmdListCumsum) - Me.GroupBox1.Controls.Add(Me.cmdListScale) - Me.GroupBox1.Controls.Add(Me.cmdListDiff) - Me.GroupBox1.Controls.Add(Me.cmdListLead) - Me.GroupBox1.Controls.Add(Me.cmdListLag) - Me.GroupBox1.Controls.Add(Me.cmdListRank) - Me.GroupBox1.Controls.Add(Me.cmdListSort) - Me.GroupBox1.Location = New System.Drawing.Point(4, 248) - Me.GroupBox1.Margin = New System.Windows.Forms.Padding(2) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Padding = New System.Windows.Forms.Padding(2) - Me.GroupBox1.Size = New System.Drawing.Size(310, 110) - Me.GroupBox1.TabIndex = 200 - Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Transform" - ' - 'cmdListDuplicated - ' - Me.cmdListDuplicated.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListDuplicated.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDuplicated.Location = New System.Drawing.Point(242, 72) - Me.cmdListDuplicated.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListDuplicated.Name = "cmdListDuplicated" - Me.cmdListDuplicated.Size = New System.Drawing.Size(66, 30) - Me.cmdListDuplicated.TabIndex = 186 - Me.cmdListDuplicated.Text = "duplicated" - Me.cmdListDuplicated.UseVisualStyleBackColor = True - ' - 'cmdListOperator - ' - Me.cmdListOperator.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListOperator.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListOperator.Location = New System.Drawing.Point(187, 72) - Me.cmdListOperator.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListOperator.Name = "cmdListOperator" - Me.cmdListOperator.Size = New System.Drawing.Size(56, 30) - Me.cmdListOperator.TabIndex = 185 - Me.cmdListOperator.Text = ">" - Me.cmdListOperator.UseVisualStyleBackColor = True - ' - 'cmdListDiv - ' - Me.cmdListDiv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListDiv.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDiv.Location = New System.Drawing.Point(128, 72) - Me.cmdListDiv.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListDiv.Name = "cmdListDiv" - Me.cmdListDiv.Size = New System.Drawing.Size(60, 30) - Me.cmdListDiv.TabIndex = 184 - Me.cmdListDiv.Text = "div (%/%)" - Me.cmdListDiv.UseVisualStyleBackColor = True - ' - 'cmdListMod - ' - Me.cmdListMod.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListMod.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMod.Location = New System.Drawing.Point(59, 72) - Me.cmdListMod.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListMod.Name = "cmdListMod" - Me.cmdListMod.Size = New System.Drawing.Size(70, 30) - Me.cmdListMod.TabIndex = 183 - Me.cmdListMod.Text = "mod (%%)" - Me.cmdListMod.UseVisualStyleBackColor = True - ' - 'cmdListIfelse - ' - Me.cmdListIfelse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListIfelse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListIfelse.Location = New System.Drawing.Point(2, 72) - Me.cmdListIfelse.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListIfelse.Name = "cmdListIfelse" - Me.cmdListIfelse.Size = New System.Drawing.Size(58, 30) - Me.cmdListIfelse.TabIndex = 182 - Me.cmdListIfelse.Text = "ifelse" - Me.cmdListIfelse.UseVisualStyleBackColor = True - ' - 'cmdListOmit - ' - Me.cmdListOmit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListOmit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListOmit.Location = New System.Drawing.Point(242, 43) - Me.cmdListOmit.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListOmit.Name = "cmdListOmit" - Me.cmdListOmit.Size = New System.Drawing.Size(66, 30) - Me.cmdListOmit.TabIndex = 181 - Me.cmdListOmit.Text = "omit.na" - Me.cmdListOmit.UseVisualStyleBackColor = True - ' - 'cmdListRev - ' - Me.cmdListRev.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListRev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRev.Location = New System.Drawing.Point(187, 43) - Me.cmdListRev.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListRev.Name = "cmdListRev" - Me.cmdListRev.Size = New System.Drawing.Size(56, 30) - Me.cmdListRev.TabIndex = 180 - Me.cmdListRev.Text = "rev" - Me.cmdListRev.UseVisualStyleBackColor = True - ' - 'cmdListMovsum - ' - Me.cmdListMovsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListMovsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMovsum.Location = New System.Drawing.Point(128, 43) - Me.cmdListMovsum.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListMovsum.Name = "cmdListMovsum" - Me.cmdListMovsum.Size = New System.Drawing.Size(60, 30) - Me.cmdListMovsum.TabIndex = 179 - Me.cmdListMovsum.Text = "movsum" - Me.cmdListMovsum.UseVisualStyleBackColor = True - ' - 'cmdListCumsum - ' - Me.cmdListCumsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListCumsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListCumsum.Location = New System.Drawing.Point(59, 43) - Me.cmdListCumsum.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListCumsum.Name = "cmdListCumsum" - Me.cmdListCumsum.Size = New System.Drawing.Size(70, 30) - Me.cmdListCumsum.TabIndex = 178 - Me.cmdListCumsum.Text = "cumsum" - Me.cmdListCumsum.UseVisualStyleBackColor = True - ' - 'cmdListScale - ' - Me.cmdListScale.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListScale.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListScale.Location = New System.Drawing.Point(2, 43) - Me.cmdListScale.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListScale.Name = "cmdListScale" - Me.cmdListScale.Size = New System.Drawing.Size(58, 30) - Me.cmdListScale.TabIndex = 177 - Me.cmdListScale.Text = " scale" - Me.cmdListScale.UseVisualStyleBackColor = True - ' - 'cmdListDiff - ' - Me.cmdListDiff.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListDiff.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDiff.Location = New System.Drawing.Point(242, 14) - Me.cmdListDiff.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListDiff.Name = "cmdListDiff" - Me.cmdListDiff.Size = New System.Drawing.Size(66, 30) - Me.cmdListDiff.TabIndex = 176 - Me.cmdListDiff.Text = "diff" - Me.cmdListDiff.UseVisualStyleBackColor = True - ' - 'cmdListLead - ' - Me.cmdListLead.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListLead.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLead.Location = New System.Drawing.Point(187, 14) - Me.cmdListLead.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListLead.Name = "cmdListLead" - Me.cmdListLead.Size = New System.Drawing.Size(56, 30) - Me.cmdListLead.TabIndex = 175 - Me.cmdListLead.Text = "lead" - Me.cmdListLead.UseVisualStyleBackColor = True - ' - 'cmdListLag - ' - Me.cmdListLag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListLag.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLag.Location = New System.Drawing.Point(128, 14) - Me.cmdListLag.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListLag.Name = "cmdListLag" - Me.cmdListLag.Size = New System.Drawing.Size(60, 30) - Me.cmdListLag.TabIndex = 174 - Me.cmdListLag.Text = "lag" - Me.cmdListLag.UseVisualStyleBackColor = True - ' - 'cmdListRank - ' - Me.cmdListRank.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRank.Location = New System.Drawing.Point(59, 14) - Me.cmdListRank.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListRank.Name = "cmdListRank" - Me.cmdListRank.Size = New System.Drawing.Size(70, 30) - Me.cmdListRank.TabIndex = 173 - Me.cmdListRank.Text = "rank" - Me.cmdListRank.UseVisualStyleBackColor = True - ' - 'cmdListSort - ' - Me.cmdListSort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdListSort.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSort.Location = New System.Drawing.Point(2, 14) - Me.cmdListSort.Margin = New System.Windows.Forms.Padding(2) - Me.cmdListSort.Name = "cmdListSort" - Me.cmdListSort.Size = New System.Drawing.Size(58, 30) - Me.cmdListSort.TabIndex = 172 - Me.cmdListSort.Text = "sort" - Me.cmdListSort.UseVisualStyleBackColor = True - ' 'grpMathBloc ' Me.grpMathBloc.Controls.Add(Me.cmdListSQRT) @@ -7614,6 +7408,212 @@ Partial Class ucrCalculator Me.cmdListMissing.Text = "missing" Me.cmdListMissing.UseVisualStyleBackColor = True ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.cmdListDuplicated) + Me.GroupBox1.Controls.Add(Me.cmdListOperator) + Me.GroupBox1.Controls.Add(Me.cmdListDiv) + Me.GroupBox1.Controls.Add(Me.cmdListMod) + Me.GroupBox1.Controls.Add(Me.cmdListIfelse) + Me.GroupBox1.Controls.Add(Me.cmdListOmit) + Me.GroupBox1.Controls.Add(Me.cmdListRev) + Me.GroupBox1.Controls.Add(Me.cmdListMovsum) + Me.GroupBox1.Controls.Add(Me.cmdListCumsum) + Me.GroupBox1.Controls.Add(Me.cmdListScale) + Me.GroupBox1.Controls.Add(Me.cmdListDiff) + Me.GroupBox1.Controls.Add(Me.cmdListLead) + Me.GroupBox1.Controls.Add(Me.cmdListLag) + Me.GroupBox1.Controls.Add(Me.cmdListRank) + Me.GroupBox1.Controls.Add(Me.cmdListSort) + Me.GroupBox1.Location = New System.Drawing.Point(4, 248) + Me.GroupBox1.Margin = New System.Windows.Forms.Padding(2) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Padding = New System.Windows.Forms.Padding(2) + Me.GroupBox1.Size = New System.Drawing.Size(310, 110) + Me.GroupBox1.TabIndex = 200 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Transform" + ' + 'cmdListDuplicated + ' + Me.cmdListDuplicated.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListDuplicated.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListDuplicated.Location = New System.Drawing.Point(242, 72) + Me.cmdListDuplicated.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListDuplicated.Name = "cmdListDuplicated" + Me.cmdListDuplicated.Size = New System.Drawing.Size(66, 30) + Me.cmdListDuplicated.TabIndex = 186 + Me.cmdListDuplicated.Text = "duplicated" + Me.cmdListDuplicated.UseVisualStyleBackColor = True + ' + 'cmdListOperator + ' + Me.cmdListOperator.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListOperator.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListOperator.Location = New System.Drawing.Point(187, 72) + Me.cmdListOperator.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListOperator.Name = "cmdListOperator" + Me.cmdListOperator.Size = New System.Drawing.Size(56, 30) + Me.cmdListOperator.TabIndex = 185 + Me.cmdListOperator.Text = ">" + Me.cmdListOperator.UseVisualStyleBackColor = True + ' + 'cmdListDiv + ' + Me.cmdListDiv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListDiv.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListDiv.Location = New System.Drawing.Point(128, 72) + Me.cmdListDiv.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListDiv.Name = "cmdListDiv" + Me.cmdListDiv.Size = New System.Drawing.Size(60, 30) + Me.cmdListDiv.TabIndex = 184 + Me.cmdListDiv.Text = "div (%/%)" + Me.cmdListDiv.UseVisualStyleBackColor = True + ' + 'cmdListMod + ' + Me.cmdListMod.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListMod.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListMod.Location = New System.Drawing.Point(59, 72) + Me.cmdListMod.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMod.Name = "cmdListMod" + Me.cmdListMod.Size = New System.Drawing.Size(70, 30) + Me.cmdListMod.TabIndex = 183 + Me.cmdListMod.Text = "mod (%%)" + Me.cmdListMod.UseVisualStyleBackColor = True + ' + 'cmdListIfelse + ' + Me.cmdListIfelse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListIfelse.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListIfelse.Location = New System.Drawing.Point(2, 72) + Me.cmdListIfelse.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListIfelse.Name = "cmdListIfelse" + Me.cmdListIfelse.Size = New System.Drawing.Size(58, 30) + Me.cmdListIfelse.TabIndex = 182 + Me.cmdListIfelse.Text = "ifelse" + Me.cmdListIfelse.UseVisualStyleBackColor = True + ' + 'cmdListOmit + ' + Me.cmdListOmit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListOmit.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListOmit.Location = New System.Drawing.Point(242, 43) + Me.cmdListOmit.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListOmit.Name = "cmdListOmit" + Me.cmdListOmit.Size = New System.Drawing.Size(66, 30) + Me.cmdListOmit.TabIndex = 181 + Me.cmdListOmit.Text = "omit.na" + Me.cmdListOmit.UseVisualStyleBackColor = True + ' + 'cmdListRev + ' + Me.cmdListRev.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListRev.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListRev.Location = New System.Drawing.Point(187, 43) + Me.cmdListRev.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListRev.Name = "cmdListRev" + Me.cmdListRev.Size = New System.Drawing.Size(56, 30) + Me.cmdListRev.TabIndex = 180 + Me.cmdListRev.Text = "rev" + Me.cmdListRev.UseVisualStyleBackColor = True + ' + 'cmdListMovsum + ' + Me.cmdListMovsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListMovsum.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListMovsum.Location = New System.Drawing.Point(128, 43) + Me.cmdListMovsum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMovsum.Name = "cmdListMovsum" + Me.cmdListMovsum.Size = New System.Drawing.Size(60, 30) + Me.cmdListMovsum.TabIndex = 179 + Me.cmdListMovsum.Text = "movsum" + Me.cmdListMovsum.UseVisualStyleBackColor = True + ' + 'cmdListCumsum + ' + Me.cmdListCumsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListCumsum.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListCumsum.Location = New System.Drawing.Point(59, 43) + Me.cmdListCumsum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListCumsum.Name = "cmdListCumsum" + Me.cmdListCumsum.Size = New System.Drawing.Size(70, 30) + Me.cmdListCumsum.TabIndex = 178 + Me.cmdListCumsum.Text = "cumsum" + Me.cmdListCumsum.UseVisualStyleBackColor = True + ' + 'cmdListScale + ' + Me.cmdListScale.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListScale.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListScale.Location = New System.Drawing.Point(2, 43) + Me.cmdListScale.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListScale.Name = "cmdListScale" + Me.cmdListScale.Size = New System.Drawing.Size(58, 30) + Me.cmdListScale.TabIndex = 177 + Me.cmdListScale.Text = " scale" + Me.cmdListScale.UseVisualStyleBackColor = True + ' + 'cmdListDiff + ' + Me.cmdListDiff.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListDiff.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListDiff.Location = New System.Drawing.Point(242, 14) + Me.cmdListDiff.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListDiff.Name = "cmdListDiff" + Me.cmdListDiff.Size = New System.Drawing.Size(66, 30) + Me.cmdListDiff.TabIndex = 176 + Me.cmdListDiff.Text = "diff" + Me.cmdListDiff.UseVisualStyleBackColor = True + ' + 'cmdListLead + ' + Me.cmdListLead.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListLead.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListLead.Location = New System.Drawing.Point(187, 14) + Me.cmdListLead.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListLead.Name = "cmdListLead" + Me.cmdListLead.Size = New System.Drawing.Size(56, 30) + Me.cmdListLead.TabIndex = 175 + Me.cmdListLead.Text = "lead" + Me.cmdListLead.UseVisualStyleBackColor = True + ' + 'cmdListLag + ' + Me.cmdListLag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListLag.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListLag.Location = New System.Drawing.Point(128, 14) + Me.cmdListLag.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListLag.Name = "cmdListLag" + Me.cmdListLag.Size = New System.Drawing.Size(60, 30) + Me.cmdListLag.TabIndex = 174 + Me.cmdListLag.Text = "lag" + Me.cmdListLag.UseVisualStyleBackColor = True + ' + 'cmdListRank + ' + Me.cmdListRank.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListRank.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListRank.Location = New System.Drawing.Point(59, 14) + Me.cmdListRank.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListRank.Name = "cmdListRank" + Me.cmdListRank.Size = New System.Drawing.Size(70, 30) + Me.cmdListRank.TabIndex = 173 + Me.cmdListRank.Text = "rank" + Me.cmdListRank.UseVisualStyleBackColor = True + ' + 'cmdListSort + ' + Me.cmdListSort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListSort.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListSort.Location = New System.Drawing.Point(2, 14) + Me.cmdListSort.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListSort.Name = "cmdListSort" + Me.cmdListSort.Size = New System.Drawing.Size(58, 30) + Me.cmdListSort.TabIndex = 172 + Me.cmdListSort.Text = "sort" + Me.cmdListSort.UseVisualStyleBackColor = True + ' 'cmdRhelpList ' Me.cmdRhelpList.AutoSize = True @@ -7726,11 +7726,6 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) - Me.Controls.Add(Me.grpInteger) - Me.Controls.Add(Me.grpTestString) - Me.Controls.Add(Me.grpModifier) - Me.Controls.Add(Me.grpSymbols) - Me.Controls.Add(Me.grpComplex) Me.Controls.Add(Me.grpSummary) Me.Controls.Add(Me.grpTransform) Me.Controls.Add(Me.grpWakefield) @@ -7741,6 +7736,11 @@ Partial Class ucrCalculator Me.Controls.Add(Me.grpCircular) Me.Controls.Add(Me.grpMaths) Me.Controls.Add(Me.grpProbabilty) + Me.Controls.Add(Me.grpInteger) + Me.Controls.Add(Me.grpTestString) + Me.Controls.Add(Me.grpComplex) + Me.Controls.Add(Me.grpSymbols) + Me.Controls.Add(Me.grpModifier) Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "ucrCalculator" Me.Size = New System.Drawing.Size(898, 458) @@ -7788,8 +7788,8 @@ Partial Class ucrCalculator Me.ContextMenuStripWakefield.ResumeLayout(False) Me.ContextMenuStripList.ResumeLayout(False) Me.grpList.ResumeLayout(False) - Me.GroupBox1.ResumeLayout(False) Me.grpMathBloc.ResumeLayout(False) + Me.GroupBox1.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 582f386de75..776aa1b3597 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -4661,7 +4661,6 @@ Public Class ucrCalculator clsPerfectFunction.SetRCommand("Perfect") clsPerfectFunction.AddParameter("n", "10", iPosition:=0) - clsDataFunction.SetRCommand("nrow") clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) clsRepFunction.SetRCommand("rep") @@ -4671,6 +4670,7 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsRepFunction.ToScript, 0) End Sub + Private Sub cmdUgly_Click(sender As Object, e As EventArgs) Handles cmdUgly.Click Dim clsUglyFunction As New RFunction From 36fcc5c8e28ae3f19662ece703abb3bb4ca6a29a Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:58:00 +0300 Subject: [PATCH 55/99] design. --- instat/ucrCalculator.Designer.vb | 314 +++++++++++++++---------------- 1 file changed, 157 insertions(+), 157 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 2e43a7328ea..71f72738cf1 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -86,7 +86,6 @@ Partial Class ucrCalculator Me.cmdMdy = New System.Windows.Forms.Button() Me.cmdYmd = New System.Windows.Forms.Button() Me.cmdLeap = New System.Windows.Forms.Button() - Me.cmdRHelp = New instat.ucrSplitButton() Me.ContextMenuStripDate = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateLubridateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateHmsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -124,7 +123,6 @@ Partial Class ucrCalculator Me.cmdGCD = New System.Windows.Forms.Button() Me.cmdGeneratePrimes = New System.Windows.Forms.Button() Me.cmdNthPrime = New System.Windows.Forms.Button() - Me.cmdIntegerRHelp = New instat.ucrSplitButton() Me.ContextMenuStripInteger = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.GmpToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DescToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -147,7 +145,6 @@ Partial Class ucrCalculator Me.cmdIsPrime = New System.Windows.Forms.Button() Me.cmdBigZ = New System.Windows.Forms.Button() Me.grpFactor = New System.Windows.Forms.GroupBox() - Me.cmdTransformHelp = New instat.ucrSplitButton() Me.ContextMenuStripFactor = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FactorForcatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdShuffle = New System.Windows.Forms.Button() @@ -171,7 +168,6 @@ Partial Class ucrCalculator Me.cmdFactor = New System.Windows.Forms.Button() Me.cmdAnon = New System.Windows.Forms.Button() Me.grpHydroGOF = New System.Windows.Forms.GroupBox() - Me.cmdHydroHelp = New instat.ucrSplitButton() Me.ContextMenuStripHydroGOF = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.HydroGOFToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdVE = New System.Windows.Forms.Button() @@ -252,7 +248,6 @@ Partial Class ucrCalculator Me.cmdGroup = New System.Windows.Forms.Button() Me.cmdGrade = New System.Windows.Forms.Button() Me.grpMaths = New System.Windows.Forms.GroupBox() - Me.cmdMathsHelp = New instat.ucrSplitButton() Me.ContextMenuStripMaths = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MathsBaseStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MathsStatsStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -286,7 +281,6 @@ Partial Class ucrCalculator Me.cmdwhichmax = New System.Windows.Forms.Button() Me.cmdwheremax = New System.Windows.Forms.Button() Me.cmdwhichmin = New System.Windows.Forms.Button() - Me.cmdSummaryRHelp = New instat.ucrSplitButton() Me.ContextMenuStripSummary = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.StatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -340,7 +334,6 @@ Partial Class ucrCalculator Me.cmdFreqLength = New System.Windows.Forms.Button() Me.grpProbabilty = New System.Windows.Forms.GroupBox() Me.cmdPascal = New System.Windows.Forms.Button() - Me.cmdProbRHelp = New instat.ucrSplitButton() Me.ContextMenuStripProbability = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ProbStatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ProbBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -389,7 +382,6 @@ Partial Class ucrCalculator Me.cmdDecimals = New System.Windows.Forms.Button() Me.cmdMASSFractions = New System.Windows.Forms.Button() Me.cmdScale = New System.Windows.Forms.Button() - Me.cmdTransformRHelp = New instat.ucrSplitButton() Me.ContextMenuStripTransform = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -428,7 +420,6 @@ Partial Class ucrCalculator Me.cmdCalcRepelicationFunction = New System.Windows.Forms.Button() Me.cmdCalcSequenceFunction = New System.Windows.Forms.Button() Me.cmdCalcConcantenateFunction = New System.Windows.Forms.Button() - Me.cmdLogicalHelp = New instat.ucrSplitButton() Me.ContextMenuStripLogical = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.LogBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LogDplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -492,7 +483,6 @@ Partial Class ucrCalculator Me.cmdSquishb = New System.Windows.Forms.Button() Me.ttCalculator = New System.Windows.Forms.ToolTip(Me.components) Me.grpCircular = New System.Windows.Forms.GroupBox() - Me.cmdCircularHelp = New instat.ucrSplitButton() Me.ContextMenuStripCircular = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CircularToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdCircular = New System.Windows.Forms.Button() @@ -538,7 +528,6 @@ Partial Class ucrCalculator Me.cmdComplexAcos = New System.Windows.Forms.Button() Me.cmdAsComplex = New System.Windows.Forms.Button() Me.cmdComplexi = New System.Windows.Forms.Button() - Me.cmdComplexRHelp = New instat.ucrSplitButton() Me.cmdComplexTanH = New System.Windows.Forms.Button() Me.cmdComplexTan = New System.Windows.Forms.Button() Me.cmdComplexPi = New System.Windows.Forms.Button() @@ -629,6 +618,17 @@ Partial Class ucrCalculator Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() + Me.cmdSummaryRHelp = New instat.ucrSplitButton() + Me.cmdTransformRHelp = New instat.ucrSplitButton() + Me.cmdLogicalHelp = New instat.ucrSplitButton() + Me.cmdRHelp = New instat.ucrSplitButton() + Me.cmdHydroHelp = New instat.ucrSplitButton() + Me.cmdTransformHelp = New instat.ucrSplitButton() + Me.cmdCircularHelp = New instat.ucrSplitButton() + Me.cmdMathsHelp = New instat.ucrSplitButton() + Me.cmdProbRHelp = New instat.ucrSplitButton() + Me.cmdIntegerRHelp = New instat.ucrSplitButton() + Me.cmdComplexRHelp = New instat.ucrSplitButton() Me.grpBasic.SuspendLayout Me.grpDates.SuspendLayout Me.ContextMenuStripDate.SuspendLayout @@ -735,7 +735,7 @@ Partial Class ucrCalculator ' Me.cmdComma.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.cmdComma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComma.Location = New System.Drawing.Point(2, 100) + Me.cmdComma.Location = New System.Drawing.Point(2, 101) Me.cmdComma.Margin = New System.Windows.Forms.Padding(2) Me.cmdComma.Name = "cmdComma" Me.cmdComma.Size = New System.Drawing.Size(38, 30) @@ -746,7 +746,7 @@ Partial Class ucrCalculator 'cmdBrackets ' Me.cmdBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrackets.Location = New System.Drawing.Point(76, 100) + Me.cmdBrackets.Location = New System.Drawing.Point(76, 101) Me.cmdBrackets.Margin = New System.Windows.Forms.Padding(2) Me.cmdBrackets.Name = "cmdBrackets" Me.cmdBrackets.Size = New System.Drawing.Size(38, 30) @@ -917,7 +917,7 @@ Partial Class ucrCalculator 'cmd0 ' Me.cmd0.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd0.Location = New System.Drawing.Point(39, 100) + Me.cmd0.Location = New System.Drawing.Point(39, 101) Me.cmd0.Margin = New System.Windows.Forms.Padding(2) Me.cmd0.Name = "cmd0" Me.cmd0.Size = New System.Drawing.Size(38, 30) @@ -1239,19 +1239,6 @@ Partial Class ucrCalculator Me.cmdLeap.Text = "leap" Me.cmdLeap.UseVisualStyleBackColor = True ' - 'cmdRHelp - ' - Me.cmdRHelp.AutoSize = True - Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.Location = New System.Drawing.Point(157, 193) - Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.TabIndex = 212 - Me.cmdRHelp.Text = "R Help" - Me.cmdRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripDate ' Me.ContextMenuStripDate.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1678,19 +1665,6 @@ Partial Class ucrCalculator Me.cmdNthPrime.Text = "nth_prime" Me.cmdNthPrime.UseVisualStyleBackColor = True ' - 'cmdIntegerRHelp - ' - Me.cmdIntegerRHelp.AutoSize = True - Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.Location = New System.Drawing.Point(205, 283) - Me.cmdIntegerRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" - Me.cmdIntegerRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.TabIndex = 16 - Me.cmdIntegerRHelp.Text = "R Help" - Me.cmdIntegerRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripInteger ' Me.ContextMenuStripInteger.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1909,19 +1883,6 @@ Partial Class ucrCalculator Me.grpFactor.TabStop = False Me.grpFactor.Text = "Factor" ' - 'cmdTransformHelp - ' - Me.cmdTransformHelp.AutoSize = True - Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.Location = New System.Drawing.Point(150, 172) - Me.cmdTransformHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdTransformHelp.Name = "cmdTransformHelp" - Me.cmdTransformHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.TabIndex = 212 - Me.cmdTransformHelp.Text = "R Help" - Me.cmdTransformHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripFactor ' Me.ContextMenuStripFactor.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2188,19 +2149,6 @@ Partial Class ucrCalculator Me.grpHydroGOF.TabStop = False Me.grpHydroGOF.Text = "Goodness of Fit" ' - 'cmdHydroHelp - ' - Me.cmdHydroHelp.AutoSize = True - Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.Location = New System.Drawing.Point(91, 236) - Me.cmdHydroHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdHydroHelp.Name = "cmdHydroHelp" - Me.cmdHydroHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.TabIndex = 212 - Me.cmdHydroHelp.Text = "R Help" - Me.cmdHydroHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripHydroGOF ' Me.ContextMenuStripHydroGOF.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3206,19 +3154,6 @@ Partial Class ucrCalculator Me.grpMaths.TabStop = False Me.grpMaths.Text = "Maths" ' - 'cmdMathsHelp - ' - Me.cmdMathsHelp.AutoSize = True - Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.Location = New System.Drawing.Point(163, 132) - Me.cmdMathsHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdMathsHelp.Name = "cmdMathsHelp" - Me.cmdMathsHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.TabIndex = 211 - Me.cmdMathsHelp.Text = "R Help" - Me.cmdMathsHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripMaths ' Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3600,19 +3535,6 @@ Partial Class ucrCalculator Me.cmdwhichmin.Text = "which.min" Me.cmdwhichmin.UseVisualStyleBackColor = True ' - 'cmdSummaryRHelp - ' - Me.cmdSummaryRHelp.AutoSize = True - Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.Location = New System.Drawing.Point(194, 189) - Me.cmdSummaryRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" - Me.cmdSummaryRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.TabIndex = 185 - Me.cmdSummaryRHelp.Text = "R Help" - Me.cmdSummaryRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripSummary ' Me.ContextMenuStripSummary.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -4239,19 +4161,6 @@ Partial Class ucrCalculator Me.cmdPascal.Text = "pascal" Me.cmdPascal.UseVisualStyleBackColor = True ' - 'cmdProbRHelp - ' - Me.cmdProbRHelp.AutoSize = True - Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.Location = New System.Drawing.Point(215, 191) - Me.cmdProbRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdProbRHelp.Name = "cmdProbRHelp" - Me.cmdProbRHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.TabIndex = 212 - Me.cmdProbRHelp.Text = "R Help" - Me.cmdProbRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripProbability ' Me.ContextMenuStripProbability.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -4849,19 +4758,6 @@ Partial Class ucrCalculator Me.cmdScale.Text = "scale" Me.cmdScale.UseVisualStyleBackColor = True ' - 'cmdTransformRHelp - ' - Me.cmdTransformRHelp.AutoSize = True - Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.Location = New System.Drawing.Point(218, 189) - Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdTransformRHelp.Name = "cmdTransformRHelp" - Me.cmdTransformRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.TabIndex = 204 - Me.cmdTransformRHelp.Text = "R Help" - Me.cmdTransformRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripTransform ' Me.ContextMenuStripTransform.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -5295,19 +5191,6 @@ Partial Class ucrCalculator Me.cmdCalcConcantenateFunction.Text = "c( )" Me.cmdCalcConcantenateFunction.UseVisualStyleBackColor = True ' - 'cmdLogicalHelp - ' - Me.cmdLogicalHelp.AutoSize = True - Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.Location = New System.Drawing.Point(165, 218) - Me.cmdLogicalHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdLogicalHelp.Name = "cmdLogicalHelp" - Me.cmdLogicalHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.TabIndex = 212 - Me.cmdLogicalHelp.Text = "R Help" - Me.cmdLogicalHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripLogical ' Me.ContextMenuStripLogical.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -6069,19 +5952,6 @@ Partial Class ucrCalculator Me.grpCircular.TabStop = False Me.grpCircular.Text = "Circular" ' - 'cmdCircularHelp - ' - Me.cmdCircularHelp.AutoSize = True - Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.Location = New System.Drawing.Point(158, 142) - Me.cmdCircularHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdCircularHelp.Name = "cmdCircularHelp" - Me.cmdCircularHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.TabIndex = 212 - Me.cmdCircularHelp.Text = "R Help" - Me.cmdCircularHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripCircular ' Me.ContextMenuStripCircular.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -6618,19 +6488,6 @@ Partial Class ucrCalculator Me.cmdComplexi.Text = "i" Me.cmdComplexi.UseVisualStyleBackColor = True ' - 'cmdComplexRHelp - ' - Me.cmdComplexRHelp.AutoSize = True - Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.Location = New System.Drawing.Point(190, 192) - Me.cmdComplexRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdComplexRHelp.Name = "cmdComplexRHelp" - Me.cmdComplexRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.TabIndex = 209 - Me.cmdComplexRHelp.Text = "R Help" - Me.cmdComplexRHelp.UseVisualStyleBackColor = True - ' 'cmdComplexTanH ' Me.cmdComplexTanH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) @@ -7709,6 +7566,149 @@ Partial Class ucrCalculator Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' + 'cmdSummaryRHelp + ' + Me.cmdSummaryRHelp.AutoSize = True + Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.Location = New System.Drawing.Point(194, 189) + Me.cmdSummaryRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" + Me.cmdSummaryRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.TabIndex = 185 + Me.cmdSummaryRHelp.Text = "R Help" + Me.cmdSummaryRHelp.UseVisualStyleBackColor = True + ' + 'cmdTransformRHelp + ' + Me.cmdTransformRHelp.AutoSize = True + Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.Location = New System.Drawing.Point(218, 189) + Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTransformRHelp.Name = "cmdTransformRHelp" + Me.cmdTransformRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.TabIndex = 204 + Me.cmdTransformRHelp.Text = "R Help" + Me.cmdTransformRHelp.UseVisualStyleBackColor = True + ' + 'cmdLogicalHelp + ' + Me.cmdLogicalHelp.AutoSize = True + Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.Location = New System.Drawing.Point(165, 218) + Me.cmdLogicalHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLogicalHelp.Name = "cmdLogicalHelp" + Me.cmdLogicalHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.TabIndex = 212 + Me.cmdLogicalHelp.Text = "R Help" + Me.cmdLogicalHelp.UseVisualStyleBackColor = True + ' + 'cmdRHelp + ' + Me.cmdRHelp.AutoSize = True + Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.Location = New System.Drawing.Point(157, 193) + Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRHelp.Name = "cmdRHelp" + Me.cmdRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.TabIndex = 212 + Me.cmdRHelp.Text = "R Help" + Me.cmdRHelp.UseVisualStyleBackColor = True + ' + 'cmdHydroHelp + ' + Me.cmdHydroHelp.AutoSize = True + Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.Location = New System.Drawing.Point(91, 236) + Me.cmdHydroHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdHydroHelp.Name = "cmdHydroHelp" + Me.cmdHydroHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.TabIndex = 212 + Me.cmdHydroHelp.Text = "R Help" + Me.cmdHydroHelp.UseVisualStyleBackColor = True + ' + 'cmdTransformHelp + ' + Me.cmdTransformHelp.AutoSize = True + Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.Location = New System.Drawing.Point(150, 172) + Me.cmdTransformHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTransformHelp.Name = "cmdTransformHelp" + Me.cmdTransformHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.TabIndex = 212 + Me.cmdTransformHelp.Text = "R Help" + Me.cmdTransformHelp.UseVisualStyleBackColor = True + ' + 'cmdCircularHelp + ' + Me.cmdCircularHelp.AutoSize = True + Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.Location = New System.Drawing.Point(158, 142) + Me.cmdCircularHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircularHelp.Name = "cmdCircularHelp" + Me.cmdCircularHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.TabIndex = 212 + Me.cmdCircularHelp.Text = "R Help" + Me.cmdCircularHelp.UseVisualStyleBackColor = True + ' + 'cmdMathsHelp + ' + Me.cmdMathsHelp.AutoSize = True + Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.Location = New System.Drawing.Point(163, 132) + Me.cmdMathsHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMathsHelp.Name = "cmdMathsHelp" + Me.cmdMathsHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.TabIndex = 211 + Me.cmdMathsHelp.Text = "R Help" + Me.cmdMathsHelp.UseVisualStyleBackColor = True + ' + 'cmdProbRHelp + ' + Me.cmdProbRHelp.AutoSize = True + Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.Location = New System.Drawing.Point(215, 191) + Me.cmdProbRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdProbRHelp.Name = "cmdProbRHelp" + Me.cmdProbRHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.TabIndex = 212 + Me.cmdProbRHelp.Text = "R Help" + Me.cmdProbRHelp.UseVisualStyleBackColor = True + ' + 'cmdIntegerRHelp + ' + Me.cmdIntegerRHelp.AutoSize = True + Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(205, 283) + Me.cmdIntegerRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" + Me.cmdIntegerRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.TabIndex = 16 + Me.cmdIntegerRHelp.Text = "R Help" + Me.cmdIntegerRHelp.UseVisualStyleBackColor = True + ' + 'cmdComplexRHelp + ' + Me.cmdComplexRHelp.AutoSize = True + Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.Location = New System.Drawing.Point(190, 192) + Me.cmdComplexRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexRHelp.Name = "cmdComplexRHelp" + Me.cmdComplexRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.TabIndex = 209 + Me.cmdComplexRHelp.Text = "R Help" + Me.cmdComplexRHelp.UseVisualStyleBackColor = True + ' 'ucrCalculator ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) From 47b89dc753693c79a1aa4694824040907f2d1144 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 1 May 2024 10:41:02 +0300 Subject: [PATCH 56/99] Added more comments --- instat/UserControl/ucrOutputPage.vb | 3 +++ instat/UserControl/ucrOutputPages.vb | 27 +++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index b05936d9d0b..6188b0e197a 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -22,7 +22,10 @@ Imports RInsightF461 ''' Public Class ucrOutputPage Private _checkBoxes As List(Of CheckBox) + + ''' lastCheckedBox used to store a reference to a CheckBox control. Private lastCheckedBox As CheckBox = Nothing + Private _bCanReOrder As Boolean Private _bCanRename As Boolean Private _bCanDelete As Boolean diff --git a/instat/UserControl/ucrOutputPages.vb b/instat/UserControl/ucrOutputPages.vb index 4c24a2b9e4c..167cae2b39c 100644 --- a/instat/UserControl/ucrOutputPages.vb +++ b/instat/UserControl/ucrOutputPages.vb @@ -40,7 +40,7 @@ Public Class ucrOutputPages End Sub Private Sub ucrOutputPages_Load(sender As Object, e As EventArgs) Handles Me.Load - InitializeSelectAllCheckBox() + AddSelectAllCheckBoxToToolStripControl() End Sub ''' @@ -313,42 +313,61 @@ Public Class ucrOutputPages Next End Sub - Private Sub InitializeSelectAllCheckBox() + Private Sub AddSelectAllCheckBoxToToolStripControl() + ' Create a ToolStripControlHost to host the CheckBox Dim checkBoxHost As ToolStripControlHost = New ToolStripControlHost(checkBoxSelectAll) + + ' Insert the CheckBox host at the beginning of tsButtons items tsButtons.Items.Insert(0, checkBoxHost) + ' Create a ToolTip for the checkBoxSelectAll CheckBox Dim ttcheckBoxSelectAll As New ToolTip ttcheckBoxSelectAll.SetToolTip(checkBoxSelectAll, "Toggle selection for all elements") + ' Add a Click event handler to the checkBoxSelectAll CheckBox AddHandler checkBoxSelectAll.Click, AddressOf checkBoxSelectAll_Click End Sub + ''' + ''' Updates the text and state of checkBoxSelectAll based on selected elements and output count. + ''' Private Sub UpdateSelectAllCheckBoxText() + ' Check if _outputLogger is initialized If _outputLogger Is Nothing Then - Exit Sub + Exit Sub ' Exit the sub if logger is not initialized End If + ' Variable to hold the count of output elements Dim iCountOutputElements As Integer = 0 + + ' Determine the count of output elements based on the selected tab If SelectedTab() = "Main" Then iCountOutputElements = _outputLogger.OutputElements.Count Else iCountOutputElements = _outputLogger.GetFilteredList(SelectedTab).Output.Count End If + ' Enable or disable checkBoxSelectAll based on the count of output elements checkBoxSelectAll.Enabled = iCountOutputElements > 0 + + ' Get the count of selected elements Dim iSelectedElements = _selectedOutputPage.SelectedElements.Count + + ' Determine the text and check state of checkBoxSelectAll based on selected and total elements Select Case True Case iSelectedElements > 0 AndAlso iCountOutputElements > iSelectedElements + ' Indeterminate state when some but not all elements are selected checkBoxSelectAll.Text = $"{iSelectedElements} item(s)" checkBoxSelectAll.CheckState = CheckState.Indeterminate Case iSelectedElements > 0 AndAlso iCountOutputElements = iSelectedElements + ' All elements selected checkBoxSelectAll.Text = "Deselect All" checkBoxSelectAll.CheckState = CheckState.Checked Case Else + ' No elements selected checkBoxSelectAll.Text = "Select All" checkBoxSelectAll.CheckState = CheckState.Unchecked End Select - End Sub Private Sub checkBoxSelectAll_Click(sender As Object, e As EventArgs) From ae375f57a378cc831bf2d65b6708f852aa577b3c Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Wed, 1 May 2024 11:17:17 +0300 Subject: [PATCH 57/99] changes --- instat/frmMain.Designer.vb | 19 ++++--------------- instat/frmMain.vb | 4 ---- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index ecf06650717..7f10ad794d1 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -449,7 +449,6 @@ Partial Class frmMain Me.mnuPrepareDataFrameInsertColumnsRows = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataFrameDeleteColumnsRows = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataFrameProtectColumn = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuPrepareDataFrameHideColumns = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataFrameFreezeColumns = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataframeColourByProperty = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareCheckData = New System.Windows.Forms.ToolStripMenuItem() @@ -2929,8 +2928,8 @@ Partial Class frmMain 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(192, 22) - Me.mnuEditPasteNew.Text = "Paste New Data Frame" + Me.mnuEditPasteNew.Size = New System.Drawing.Size(180, 22) + Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' @@ -3399,7 +3398,7 @@ Partial Class frmMain ' 'mnuPrepareDataFrame ' - 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.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.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataFrame.Tag = "Data_Frame" @@ -3512,13 +3511,6 @@ Partial Class frmMain Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False ' - 'mnuPrepareDataFrameHideColumns - ' - Me.mnuPrepareDataFrameHideColumns.Name = "mnuPrepareDataFrameHideColumns" - Me.mnuPrepareDataFrameHideColumns.Size = New System.Drawing.Size(201, 22) - Me.mnuPrepareDataFrameHideColumns.Tag = "Hide_Columns..." - Me.mnuPrepareDataFrameHideColumns.Text = "Hide/Show Columns..." - ' 'mnuPrepareDataFrameFreezeColumns ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False @@ -5119,9 +5111,7 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + - My.Application.Info.Version.Minor.ToString + "." + - My.Application.Info.Version.Build.ToString + Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() @@ -5267,7 +5257,6 @@ Partial Class frmMain Friend WithEvents mnuPrepareDataFrameInsertColumnsRows As ToolStripMenuItem Friend WithEvents mnuPrepareDataFrameDeleteColumnsRows As ToolStripMenuItem Friend WithEvents mnuPrepareDataFrameProtectColumn As ToolStripMenuItem - Friend WithEvents mnuPrepareDataFrameHideColumns As ToolStripMenuItem Friend WithEvents mnuPrepareDataFrameFreezeColumns As ToolStripMenuItem Friend WithEvents mnuPrepareColumnNumericRegularSequence As ToolStripMenuItem Friend WithEvents mnuPrepareColumnNumericRandomSamples As ToolStripMenuItem diff --git a/instat/frmMain.vb b/instat/frmMain.vb index ffb7a193f45..8e968457c32 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -937,10 +937,6 @@ Public Class frmMain mnuIncludeComments.Checked = dlgOptions.ucrChkIncludeCommentsbyDefault.chkCheck.Checked End Sub - Private Sub mnuOrganiseDataFrameHideColumns_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataFrameHideColumns.Click - dlgHideShowColumns.ShowDialog() - End Sub - Private Sub mnuModelProbabilityDistributionsRandomSamplesUseModel_Click(sender As Object, e As EventArgs) Handles mnuModelProbabilityDistributionsRandomSamplesUseModel.Click dlgRandomSample.enumRandomsampleMode = dlgRandomSample.RandomsampleMode.Model dlgRandomSample.ShowDialog() From d4e7a0c8d48c61247a18d1a8790e6c08d86566b2 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 2 May 2024 16:12:50 +0300 Subject: [PATCH 58/99] changes to the code --- instat/dlgCluster.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgCluster.vb b/instat/dlgCluster.vb index bbf683ad0c2..a6b090c6139 100644 --- a/instat/dlgCluster.vb +++ b/instat/dlgCluster.vb @@ -103,7 +103,7 @@ Public Class dlgCluster ucrPnlPrepareData.AddToLinkedControls({ucrChkMatrix, ucrSaveDistance}, {rdoDistanceData}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlPrepareData.AddToLinkedControls(ucrInputMethod, {rdoDistanceData}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrSaveNewDataFrame.SetSaveTypeAsModel() + ucrSaveNewDataFrame.SetSaveTypeAsDataFrame() ucrSaveNewDataFrame.SetDataFrameSelector(ucrSelectorPrepareData.ucrAvailableDataFrames) ucrSaveNewDataFrame.SetLabelText("New Data Frame Name:") ucrSaveNewDataFrame.SetPrefix("scale") From 4866e526609be9536de858a8f0271a7619194436 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 2 May 2024 18:08:34 +0200 Subject: [PATCH 59/99] Code Changes --- instat/dlgRestoreBackup.Designer.vb | 17 ++++- instat/dlgRestoreBackup.vb | 101 ++++++++++++++++++++++------ instat/frmMain.vb | 94 +------------------------- 3 files changed, 97 insertions(+), 115 deletions(-) diff --git a/instat/dlgRestoreBackup.Designer.vb b/instat/dlgRestoreBackup.Designer.vb index 36f80c846b2..5e9bebf3f98 100644 --- a/instat/dlgRestoreBackup.Designer.vb +++ b/instat/dlgRestoreBackup.Designer.vb @@ -35,6 +35,7 @@ Partial Class dlgRestoreBackup Me.rdoRunBackupLog = New System.Windows.Forms.RadioButton() Me.ucrBase = New instat.ucrButtons() Me.ucrChkSendInternalLog = New instat.ucrCheck() + Me.ucrPnlRecoveryOption = New instat.UcrPanel() Me.grpSavingOptions.SuspendLayout() Me.grpEndChoice.SuspendLayout() Me.SuspendLayout() @@ -131,9 +132,10 @@ Partial Class dlgRestoreBackup ' 'grpEndChoice ' - Me.grpEndChoice.Controls.Add(Me.rdoNeither) - Me.grpEndChoice.Controls.Add(Me.rdoLoadBackupData) Me.grpEndChoice.Controls.Add(Me.rdoRunBackupLog) + Me.grpEndChoice.Controls.Add(Me.rdoLoadBackupData) + Me.grpEndChoice.Controls.Add(Me.rdoNeither) + Me.grpEndChoice.Controls.Add(Me.ucrPnlRecoveryOption) Me.grpEndChoice.Location = New System.Drawing.Point(136, 209) Me.grpEndChoice.Name = "grpEndChoice" Me.grpEndChoice.Size = New System.Drawing.Size(358, 66) @@ -193,14 +195,22 @@ Partial Class dlgRestoreBackup Me.ucrChkSendInternalLog.Size = New System.Drawing.Size(266, 23) Me.ucrChkSendInternalLog.TabIndex = 21 ' + 'ucrPnlRecoveryOption + ' + Me.ucrPnlRecoveryOption.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlRecoveryOption.Location = New System.Drawing.Point(17, 19) + Me.ucrPnlRecoveryOption.Name = "ucrPnlRecoveryOption" + Me.ucrPnlRecoveryOption.Size = New System.Drawing.Size(314, 36) + Me.ucrPnlRecoveryOption.TabIndex = 25 + ' 'dlgRestoreBackup ' 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(627, 340) - Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.grpEndChoice) + Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrChkSendInternalLog) Me.Controls.Add(Me.grpSavingOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow @@ -229,4 +239,5 @@ Partial Class dlgRestoreBackup Friend WithEvents ucrInputSavedPathData As ucrFilePath Friend WithEvents ucrInputSavedPathLog As ucrFilePath Friend WithEvents ucrInputSavedPathInternalLog As ucrFilePath + Friend WithEvents ucrPnlRecoveryOption As UcrPanel End Class diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 98fe8570fd7..c341fe54de0 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -16,6 +16,7 @@ Imports instat.Translations Imports System.IO +Imports RDotNet Public Class dlgRestoreBackup Private strScript As String @@ -92,10 +93,17 @@ Public Class dlgRestoreBackup ucrChkSendInternalLog.Visible = False ucrChkSendInternalLog.Checked = False End If + ucrPnlRecoveryOption.AddRadioButton(rdoLoadBackupData) + ucrPnlRecoveryOption.AddRadioButton(rdoRunBackupLog) + ucrPnlRecoveryOption.AddRadioButton(rdoNeither) + ucrPnlRecoveryOption.AddFunctionNamesCondition(rdoLoadBackupData, "Load_Backup") + ucrPnlRecoveryOption.AddFunctionNamesCondition(rdoRunBackupLog, "Run_Backup") + ucrPnlRecoveryOption.AddFunctionNamesCondition(rdoNeither, "Neither") rdoNeither.Enabled = True autoTranslate(Me) TestOKEnabled() + End Sub Public Function GetScript() As String @@ -158,16 +166,15 @@ Public Class dlgRestoreBackup Else ucrBase.OKEnabled(False) End If - End Sub - Private Sub ucrChkShowDataFile_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkShowDataFile.ControlValueChanged, ucrChkShowInternalLogFile.ControlValueChanged, ucrChkShowLogFile.ControlValueChanged + Private Sub ucrChkShowDataFile_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkShowLogFile.ControlValueChanged, ucrChkShowInternalLogFile.ControlValueChanged, ucrChkShowDataFile.ControlValueChanged ucrInputSavedPathData.Visible = ucrChkShowDataFile.Checked ucrInputSavedPathLog.Visible = ucrChkShowLogFile.Checked ucrInputSavedPathInternalLog.Visible = ucrChkShowInternalLogFile.Checked End Sub - Private Sub rdoRunBackupLog_CheckedChanged(sender As Object, e As EventArgs) Handles rdoRunBackupLog.CheckedChanged + Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlRecoveryOption.ControlContentsChanged If rdoRunBackupLog.Checked Then SaveFiles() If File.Exists(strAutoSavedLogFilePaths(0)) Then @@ -178,12 +185,7 @@ Public Class dlgRestoreBackup strScript = "" End Try End If - End If - TestOKEnabled() - End Sub - - Private Sub rdoLoadBackupData_CheckedChanged(sender As Object, e As EventArgs) Handles rdoLoadBackupData.CheckedChanged - If rdoLoadBackupData.Checked Then + ElseIf rdoLoadBackupData.Checked Then SaveFiles() strLoadDateFilePath = strAutoSavedDataFilePaths(0) bUserClose = False @@ -191,20 +193,12 @@ Public Class dlgRestoreBackup TestOKEnabled() End Sub - Private Sub GetLogPath() - frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathLog.FilePath, "\", "/")) - End Sub - - Private Sub GetDataPath() - frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathData.FilePath, "\", "/")) - End Sub - Private Sub ucrInputSavedPathData_Leave(sender As Object, e As EventArgs) Handles ucrInputSavedPathData.Leave - GetDataPath() + frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathData.FilePath, "\", "/")) End Sub Private Sub ucrInputSavedPathLog_Leave(sender As Object, e As EventArgs) Handles ucrInputSavedPathLog.Leave - GetLogPath() + frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathLog.FilePath, "\", "/")) End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -217,4 +211,73 @@ Public Class dlgRestoreBackup ucrChkShowInternalLogFile.Checked = False ucrChkShowLogFile.Checked = False End Sub + + Public Sub GetRecoveryFiles() + Dim strRScripts As String = "" + Dim strDataFilePath As String = "" + + PromptRestoreData(strRScripts, strDataFilePath) + + 'if data file recovered then add it as part of the initial R set up script + If Not String.IsNullOrEmpty(strDataFilePath) Then + strRScripts = strRScripts & Environment.NewLine & + "# Importing auto recovered data" & Environment.NewLine & + frmMain.clsRLink.GetImportRDSRScript(strDataFilePath, False) + End If + + + 'execute the R-Instat set up R scripts + For Each strLine As String In strRScripts.Split({Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) + frmMain.clsRLink.RunScript(strScript:=strLine.Trim(), bSeparateThread:=True, bSilent:=True) + Next + + 'as of 16/05/2023. clsDataBook depends on clsRLink.bInstatObjectExists property + 'to check if R object has been set up at R level. + + 'grids are only updated when clsRLink.bInstatObjectExists = True + If frmMain.clsRLink.RunInternalScriptGetValue(strScript:="exists('" & frmMain.clsRLink.strInstatDataObject & "')", + bSeparateThread:=True, bSilent:=True).AsCharacter(0) = "TRUE" Then + 'set R-Instat R object as exists if it has been set up in R level and refresh the grids + 'refreshing grids internally updates the .Net databook object as well. + frmMain.clsRLink.bInstatObjectExists = True + frmMain.UpdateAllGrids() + End If + End Sub + + Private Sub PromptRestoreData(ByRef strScript As String, ByRef strDataFilePath As String) + + 'if there is another R-Instat process in the machine then no need to check for autorecovery files + If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then + Return + End If + 'this is the copy of the original code used for PromptAndSetAutoRecoveredPrevSessionData function + Dim strAutoSavedLogFilePaths() As String = {} + Dim strAutoSavedInternalLogFilePaths() As String = {} + Dim strAutoSavedDataFilePaths() As String = {} + + If (Directory.Exists(strAutoSaveLogFolderPath)) Then + strAutoSavedLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveLogFolderPath).ToArray + End If + If Directory.Exists(strAutoSaveDataFolderPath) Then + strAutoSavedDataFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveDataFolderPath).ToArray + End If + If (Directory.Exists(strAutoSaveInternalLogFolderPath)) Then + strAutoSavedInternalLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveInternalLogFolderPath).ToArray + End If + + '--------------------------------------- + 'prompt user for recovery selection + If (strAutoSavedLogFilePaths.Length > 0 OrElse + strAutoSavedDataFilePaths.Length > 0) Then + + + 'todo. the dialog design is meant to only return just one option; script, data file path or new session. + 'refactor the dialog to enforce the design + + 'get the R script from read file if selected by the user + strScript = GetScript() + 'get the data file path if selected by the user + strDataFilePath = GetDataFilePath() + End If + End Sub End Class \ No newline at end of file diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 0689d41e952..87c522a6a35 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -512,100 +512,8 @@ Public Class frmMain End Sub Private Sub mnuToolsRestoreBackup_Click(sender As Object, e As EventArgs) Handles mnuToolsRestoreBackup.Click - Dim strRScripts As String = "" - Dim strDataFilePath As String = "" dlgRestoreBackup.ShowDialog() - PromptRestoreData(strRScripts, strDataFilePath) - - 'if no script recovered then use the default R set up script - If String.IsNullOrEmpty(strRScripts) Then - strRScripts = "# Initialising R (e.g Loading R packages)" & Environment.NewLine & clsRLink.GetRSetupScript() - End If - - 'if data file recovered then add it as part of the initial R set up script - If Not String.IsNullOrEmpty(strDataFilePath) Then - strRScripts = strRScripts & Environment.NewLine & - "# Importing auto recovered data" & Environment.NewLine & - clsRLink.GetImportRDSRScript(strDataFilePath, False) - End If - - - 'execute the R-Instat set up R scripts - For Each strLine As String In strRScripts.Split({Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) - clsRLink.RunScript(strScript:=strLine.Trim(), bSeparateThread:=True, bSilent:=True) - Next - - 'as of 16/05/2023. clsDataBook depends on clsRLink.bInstatObjectExists property - 'to check if R object has been set up at R level. - - 'grids are only updated when clsRLink.bInstatObjectExists = True - If clsRLink.RunInternalScriptGetValue(strScript:="exists('" & clsRLink.strInstatDataObject & "')", - bSeparateThread:=True, bSilent:=True).AsCharacter(0) = "TRUE" Then - 'set R-Instat R object as exists if it has been set up in R level and refresh the grids - 'refreshing grids internally updates the .Net databook object as well. - clsRLink.bInstatObjectExists = True - UpdateAllGrids() - End If - End Sub - - Private Sub PromptRestoreData(ByRef strScript As String, ByRef strDataFilePath As String) - - 'if there is another R-Instat process in the machine then no need to check for autorecovery files - If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then - Return - End If - 'this is the copy of the original code used for PromptAndSetAutoRecoveredPrevSessionData function - Dim strAutoSavedLogFilePaths() As String = {} - Dim strAutoSavedInternalLogFilePaths() As String = {} - Dim strAutoSavedDataFilePaths() As String = {} - - If (Directory.Exists(strAutoSaveLogFolderPath)) Then - strAutoSavedLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveLogFolderPath).ToArray - End If - If Directory.Exists(strAutoSaveDataFolderPath) Then - strAutoSavedDataFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveDataFolderPath).ToArray - End If - If (Directory.Exists(strAutoSaveInternalLogFolderPath)) Then - strAutoSavedInternalLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveInternalLogFolderPath).ToArray - End If - - '--------------------------------------- - 'prompt user for recovery selection - If (strAutoSavedLogFilePaths.Length > 0 OrElse - strAutoSavedDataFilePaths.Length > 0) Then - - - dlgRestoreBackup.strAutoSavedLogFilePaths = strAutoSavedLogFilePaths - dlgRestoreBackup.strAutoSavedDataFilePaths = strAutoSavedDataFilePaths - dlgRestoreBackup.strAutoSavedInternalLogFilePaths = strAutoSavedInternalLogFilePaths - - - 'todo. the dialog design is meant to only return just one option; script, data file path or new session. - 'refactor the dialog to enforce the design - - 'get the R script from read file if selected by the user - strScript = dlgRestoreBackup.GetScript() - 'get the data file path if selected by the user - strDataFilePath = dlgRestoreBackup.GetDataFilePath() - End If - '--------------------------------------- - - '--------------------------------------- - - If strAutoSavedInternalLogFilePaths.Length > 0 Then - Try - For Each strFilePath As String In strAutoSavedInternalLogFilePaths - 'debug log is created when checking r version. - 'so always delete the previous session debug file only - If strFilePath <> clsRLink.strAutoSaveDebugLogFilePath Then - File.Delete(strFilePath) - End If - Next - Catch ex As Exception - MsgBox("Could not delete backup internal log file." & Environment.NewLine & ex.Message, "Error deleting file") - End Try - End If - + dlgRestoreBackup.GetRecoveryFiles() End Sub ''' From e870a2b5736fcc98851c3c014e361e8105843507 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 2 May 2024 18:09:57 +0200 Subject: [PATCH 60/99] removing unnecessary code --- instat/dlgRestoreBackup.vb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index c341fe54de0..64a03ce0687 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -225,15 +225,11 @@ Public Class dlgRestoreBackup frmMain.clsRLink.GetImportRDSRScript(strDataFilePath, False) End If - 'execute the R-Instat set up R scripts For Each strLine As String In strRScripts.Split({Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) frmMain.clsRLink.RunScript(strScript:=strLine.Trim(), bSeparateThread:=True, bSilent:=True) Next - 'as of 16/05/2023. clsDataBook depends on clsRLink.bInstatObjectExists property - 'to check if R object has been set up at R level. - 'grids are only updated when clsRLink.bInstatObjectExists = True If frmMain.clsRLink.RunInternalScriptGetValue(strScript:="exists('" & frmMain.clsRLink.strInstatDataObject & "')", bSeparateThread:=True, bSilent:=True).AsCharacter(0) = "TRUE" Then @@ -245,7 +241,6 @@ Public Class dlgRestoreBackup End Sub Private Sub PromptRestoreData(ByRef strScript As String, ByRef strDataFilePath As String) - 'if there is another R-Instat process in the machine then no need to check for autorecovery files If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then Return From adc1ddef6dea0b52d9df90235d42fe14f8642c85 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 2 May 2024 18:14:15 +0200 Subject: [PATCH 61/99] Removing the option which deletes log files when restarting R-instat --- instat/frmMain.vb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 87c522a6a35..d6fa46ccfd6 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -479,13 +479,7 @@ Public Class frmMain '--------------------------------------- 'delete the recovery files 'This was done to prevent the previous autolog file from being overwritten by the new autolog file- Derrick - If strAutoSavedLogFilePaths.Length > 1 Then - Try - File.Delete(strAutoSavedLogFilePaths(1)) - Catch ex As Exception - MsgBox("Could not delete backup log file" & Environment.NewLine, "Error deleting file") - End Try - End If + If strAutoSavedInternalLogFilePaths.Length > 0 Then Try From 14009838a7bbee0a322d8f5e1cb593ac4a98c01b Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 2 May 2024 18:14:53 +0200 Subject: [PATCH 62/99] code changes --- instat/frmMain.vb | 2 -- 1 file changed, 2 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d6fa46ccfd6..5b225b88e74 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -478,8 +478,6 @@ Public Class frmMain '--------------------------------------- 'delete the recovery files - 'This was done to prevent the previous autolog file from being overwritten by the new autolog file- Derrick - If strAutoSavedInternalLogFilePaths.Length > 0 Then Try From c784d96d62cb231840f39d0d08e44f2548214e4f Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 2 May 2024 18:24:21 +0200 Subject: [PATCH 63/99] Code Changes --- instat/frmMain.vb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 5b225b88e74..eb21944df56 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -478,7 +478,13 @@ Public Class frmMain '--------------------------------------- 'delete the recovery files - + If strAutoSavedLogFilePaths.Length > 1 Then + Try + File.Delete(strAutoSavedLogFilePaths(1)) + Catch ex As Exception + MsgBox("Could not delete backup log file" & Environment.NewLine, "Error deleting file") + End Try + End If If strAutoSavedInternalLogFilePaths.Length > 0 Then Try For Each strFilePath As String In strAutoSavedInternalLogFilePaths From fe62bd208fc64b31f58242b7dc8bd2c1729078bd Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 3 May 2024 12:51:58 +0300 Subject: [PATCH 64/99] code improvement --- instat/dlgRestoreBackup.vb | 93 +++++++++++--------------------------- instat/frmMain.vb | 1 - 2 files changed, 27 insertions(+), 67 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 64a03ce0687..334db745d43 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -19,16 +19,16 @@ Imports System.IO Imports RDotNet Public Class dlgRestoreBackup + Private strAutoSavedLogScript As String + Private strAutoSavedDataFilePaths() As String + Private strAutoSavedLogFilePaths() As String + Private strAutoSavedInternalLogFilePaths() As String Private strScript As String - Public strAutoSavedLogScript As String Private strLoadDateFilePath As String - Public strAutoSavedDataFilePaths() As String - Public strAutoSavedLogFilePaths() As String - Public strAutoSavedInternalLogFilePaths() As String Private bUserClose As Boolean = True - Public strAutoSaveDataFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_data_auto_save") - Public strAutoSaveLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_log_auto_save") - Public strAutoSaveInternalLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_debug_log_auto_save") + Private strAutoSaveDataFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_data_auto_save") + Private strAutoSaveLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_log_auto_save") + Private strAutoSaveInternalLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_debug_log_auto_save") Private bReset As Boolean = True Private Sub dlgRestoreBackup_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -60,8 +60,6 @@ Public Class dlgRestoreBackup ucrChkSendInternalLog.SetText("Send Debugging Log to R-Instat Team") - strScript = "" - strLoadDateFilePath = "" If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 Then ucrChkShowDataFile.SetText("Backup Data File Detected") rdoLoadBackupData.Enabled = True @@ -106,14 +104,6 @@ Public Class dlgRestoreBackup End Sub - Public Function GetScript() As String - Return strScript - End Function - - Public Function GetDataFilePath() As String - Return strLoadDateFilePath - End Function - Private Sub SetDefaults() ReopenDialog() rdoNeither.Checked = True @@ -129,6 +119,7 @@ Public Class dlgRestoreBackup ucrInputSavedPathLog.SetPathControlRcode(ucrBase.clsRsyntax.clsBaseFunction, bReset) TestOKEnabled() End Sub + Private Sub SaveFiles() If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedDataFilePaths(0)) Then Try @@ -175,30 +166,34 @@ Public Class dlgRestoreBackup End Sub Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlRecoveryOption.ControlContentsChanged + strScript = "" + strLoadDateFilePath = "" If rdoRunBackupLog.Checked Then - SaveFiles() If File.Exists(strAutoSavedLogFilePaths(0)) Then Try strScript = File.ReadAllText(strAutoSavedLogFilePaths(0)) Catch ex As Exception MsgBox("Could not read log file." & Environment.NewLine & ex.Message, "Cannot read file") - strScript = "" End Try End If ElseIf rdoLoadBackupData.Checked Then - SaveFiles() strLoadDateFilePath = strAutoSavedDataFilePaths(0) bUserClose = False End If + TestOKEnabled() End Sub Private Sub ucrInputSavedPathData_Leave(sender As Object, e As EventArgs) Handles ucrInputSavedPathData.Leave - frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathData.FilePath, "\", "/")) + If Not String.IsNullOrEmpty(ucrInputSavedPathData.IsEmpty) Then + frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathData.FilePath, "\", "/")) + End If End Sub Private Sub ucrInputSavedPathLog_Leave(sender As Object, e As EventArgs) Handles ucrInputSavedPathLog.Leave - frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathLog.FilePath, "\", "/")) + If Not String.IsNullOrEmpty(ucrInputSavedPathLog.IsEmpty) Then + frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathLog.FilePath, "\", "/")) + End If End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -212,12 +207,7 @@ Public Class dlgRestoreBackup ucrChkShowLogFile.Checked = False End Sub - Public Sub GetRecoveryFiles() - Dim strRScripts As String = "" - Dim strDataFilePath As String = "" - - PromptRestoreData(strRScripts, strDataFilePath) - + Private Sub GetRecoveryFiles(strRScripts As String, strDataFilePath As String) 'if data file recovered then add it as part of the initial R set up script If Not String.IsNullOrEmpty(strDataFilePath) Then strRScripts = strRScripts & Environment.NewLine & @@ -225,10 +215,12 @@ Public Class dlgRestoreBackup frmMain.clsRLink.GetImportRDSRScript(strDataFilePath, False) End If - 'execute the R-Instat set up R scripts - For Each strLine As String In strRScripts.Split({Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) - frmMain.clsRLink.RunScript(strScript:=strLine.Trim(), bSeparateThread:=True, bSilent:=True) - Next + ''execute the R-Instat set up R scripts + If Not String.IsNullOrEmpty(strRScripts) Then + For Each strLine As String In strRScripts.Split({Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) + frmMain.clsRLink.RunScript(strScript:=strLine.Trim(), bSeparateThread:=True, bSilent:=True) + Next + End If 'grids are only updated when clsRLink.bInstatObjectExists = True If frmMain.clsRLink.RunInternalScriptGetValue(strScript:="exists('" & frmMain.clsRLink.strInstatDataObject & "')", @@ -240,39 +232,8 @@ Public Class dlgRestoreBackup End If End Sub - Private Sub PromptRestoreData(ByRef strScript As String, ByRef strDataFilePath As String) - 'if there is another R-Instat process in the machine then no need to check for autorecovery files - If Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Reflection.Assembly.GetEntryAssembly().Location)).Count() > 1 Then - Return - End If - 'this is the copy of the original code used for PromptAndSetAutoRecoveredPrevSessionData function - Dim strAutoSavedLogFilePaths() As String = {} - Dim strAutoSavedInternalLogFilePaths() As String = {} - Dim strAutoSavedDataFilePaths() As String = {} - - If (Directory.Exists(strAutoSaveLogFolderPath)) Then - strAutoSavedLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveLogFolderPath).ToArray - End If - If Directory.Exists(strAutoSaveDataFolderPath) Then - strAutoSavedDataFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveDataFolderPath).ToArray - End If - If (Directory.Exists(strAutoSaveInternalLogFolderPath)) Then - strAutoSavedInternalLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveInternalLogFolderPath).ToArray - End If - - '--------------------------------------- - 'prompt user for recovery selection - If (strAutoSavedLogFilePaths.Length > 0 OrElse - strAutoSavedDataFilePaths.Length > 0) Then - - - 'todo. the dialog design is meant to only return just one option; script, data file path or new session. - 'refactor the dialog to enforce the design - - 'get the R script from read file if selected by the user - strScript = GetScript() - 'get the data file path if selected by the user - strDataFilePath = GetDataFilePath() - End If + Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk + GetRecoveryFiles(strScript, strLoadDateFilePath) + SaveFiles() End Sub End Class \ No newline at end of file diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 10cde6cffde..e353aaa7417 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -511,7 +511,6 @@ Public Class frmMain End Sub Private Sub mnuToolsRestoreBackup_Click(sender As Object, e As EventArgs) Handles mnuToolsRestoreBackup.Click dlgRestoreBackup.ShowDialog() - dlgRestoreBackup.GetRecoveryFiles() End Sub ''' From c984bfaed6a9aa6df0875971e4e4b1e24df3c3b6 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 3 May 2024 12:17:46 +0200 Subject: [PATCH 65/99] Fixes issue with Random Split having overlapping groups --- instat/dlgRandomSplit.vb | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 7af7a1f3610..0310ca32fe0 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -132,8 +132,7 @@ Public Class dlgRandomSplit clsTesting.SetPackageName("rsample") clsTesting.SetRCommand("testing") ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) - ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) - ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1) + End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -153,7 +152,7 @@ Public Class dlgRandomSplit ucrChkStratifyingFactor.SetRCode(clsInitialSplit, bReset) If bReset Then - ucrChkTest.SetRCode(clsInitialSplit, bReset) + ucrChkTest.SetRCode(clsTesting, bReset) End If End Sub @@ -190,24 +189,35 @@ Public Class dlgRandomSplit Private Sub SetBaseFunction() ucrBase.clsRsyntax.ClearCodes() If rdoSample.Checked Then - If ucrSaveTestingData.IsComplete Then - clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) + If ucrChkTest.Checked AndAlso ucrSaveTestingData.IsComplete Then + clsTesting.AddParameter("x", "rsample") + ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) + Else + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsTesting) End If If ucrSaveTrainingData.IsComplete Then - clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) + clsTraining.AddParameter("x", "rsample") + ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1) + Else + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsTraining) End If ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) Else - If ucrSaveTestingData.IsComplete Then - clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) + If ucrChkTest.Checked AndAlso ucrSaveTestingData.IsComplete Then + clsTesting.AddParameter("x", "rsample") + ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) + Else + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsTesting) End If If ucrSaveTrainingData.IsComplete Then - clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) + clsTraining.AddParameter("x", "rsample") + ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1) + Else + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsTraining) End If ucrBase.clsRsyntax.SetBaseRFunction(clsInitialTimeSplit) End If - ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) - ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1) + End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -233,4 +243,7 @@ Public Class dlgRandomSplit SetBaseFunction() End Sub + Private Sub ucrChkTest_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkTest.ControlValueChanged + SetBaseFunction() + End Sub End Class \ No newline at end of file From 20bac80fdeee89aeba53e9dd1d393abab15455a4 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 3 May 2024 14:30:53 +0300 Subject: [PATCH 66/99] minor addition --- instat/dlgRestoreBackup.vb | 72 +++++++++++++++++++------------------- instat/frmMain.vb | 6 ++-- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 334db745d43..23b7691ae46 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -26,25 +26,39 @@ Public Class dlgRestoreBackup Private strScript As String Private strLoadDateFilePath As String Private bUserClose As Boolean = True + Private clsDummyFunction As New RFunction Private strAutoSaveDataFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_data_auto_save") Private strAutoSaveLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_log_auto_save") Private strAutoSaveInternalLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_debug_log_auto_save") Private bReset As Boolean = True + Private bFirstload As Boolean = True Private Sub dlgRestoreBackup_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If If bReset Then SetDefaults() End If SetRCodeForControls(bReset) - ReopenDialog() bReset = False + autoTranslate(Me) + TestOKEnabled() + End Sub + + Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 411 + + ucrChkShowDataFile.Checked = False + ucrChkShowInternalLogFile.Checked = False + ucrChkShowLogFile.Checked = False + 'temporary - not yet implemented ucrChkSendInternalLog.Visible = False - ucrInputSavedPathData.Visible = ucrChkShowDataFile.Checked - ucrInputSavedPathLog.Visible = ucrChkShowLogFile.Checked - ucrInputSavedPathInternalLog.Visible = ucrChkShowInternalLogFile.Checked - rdoNeither.Checked = True + ucrInputSavedPathData.Visible = False + ucrInputSavedPathLog.Visible = False + ucrInputSavedPathInternalLog.Visible = False If (Directory.Exists(strAutoSaveLogFolderPath)) Then strAutoSavedLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveLogFolderPath).ToArray @@ -95,35 +109,31 @@ Public Class dlgRestoreBackup ucrPnlRecoveryOption.AddRadioButton(rdoRunBackupLog) ucrPnlRecoveryOption.AddRadioButton(rdoNeither) - ucrPnlRecoveryOption.AddFunctionNamesCondition(rdoLoadBackupData, "Load_Backup") - ucrPnlRecoveryOption.AddFunctionNamesCondition(rdoRunBackupLog, "Run_Backup") - ucrPnlRecoveryOption.AddFunctionNamesCondition(rdoNeither, "Neither") - rdoNeither.Enabled = True - autoTranslate(Me) - TestOKEnabled() - + ucrPnlRecoveryOption.AddParameterValuesCondition(rdoLoadBackupData, "backup", "data") + ucrPnlRecoveryOption.AddParameterValuesCondition(rdoRunBackupLog, "backup", "log") + ucrPnlRecoveryOption.AddParameterValuesCondition(rdoNeither, "backup", "neither") End Sub Private Sub SetDefaults() - ReopenDialog() - rdoNeither.Checked = True - ucrInputSavedPathData.IsEmpty() - ucrInputSavedPathLog.IsEmpty() - ucrInputSavedPathInternalLog.IsEmpty() - rdoRunBackupLog.Refresh() - rdoLoadBackupData.Refresh() + ucrInputSavedPathData.Clear() + ucrInputSavedPathLog.Clear() + ucrInputSavedPathInternalLog.Clear() + ucrChkShowDataFile.Checked = False + ucrChkShowLogFile.Checked = False + ucrChkSendInternalLog.Checked = False + clsDummyFunction.AddParameter("backup", "neither") End Sub Private Sub SetRCodeForControls(bReset As Boolean) ucrInputSavedPathData.SetPathControlRcode(ucrBase.clsRsyntax.clsBaseFunction, bReset) ucrInputSavedPathLog.SetPathControlRcode(ucrBase.clsRsyntax.clsBaseFunction, bReset) - TestOKEnabled() + ucrPnlRecoveryOption.SetRCode(clsDummyFunction, bReset) End Sub Private Sub SaveFiles() If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedDataFilePaths(0)) Then Try - If Not ucrInputSavedPathData.IsEmpty() Then + If Not ucrInputSavedPathData.IsEmpty() AndAlso ucrChkShowDataFile.Checked Then File.Copy(strAutoSavedDataFilePaths(0), ucrInputSavedPathData.FilePath(), True) End If Catch ex As Exception @@ -132,7 +142,7 @@ Public Class dlgRestoreBackup End If If strAutoSavedLogFilePaths IsNot Nothing AndAlso strAutoSavedLogFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedLogFilePaths(0)) Then Try - If Not ucrInputSavedPathLog.IsEmpty() Then + If Not ucrInputSavedPathLog.IsEmpty() AndAlso ucrChkShowLogFile.Checked Then File.Copy(strAutoSavedLogFilePaths(0), ucrInputSavedPathLog.FilePath(), True) End If Catch ex As Exception @@ -141,7 +151,7 @@ Public Class dlgRestoreBackup End If If strAutoSavedInternalLogFilePaths IsNot Nothing AndAlso strAutoSavedInternalLogFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedInternalLogFilePaths(0)) Then Try - If Not ucrInputSavedPathInternalLog.IsEmpty() Then + If Not ucrInputSavedPathInternalLog.IsEmpty() AndAlso ucrChkSendInternalLog.Checked Then File.Copy(strAutoSavedInternalLogFilePaths(0), ucrInputSavedPathInternalLog.FilePath(), True) End If Catch ex As Exception @@ -151,12 +161,7 @@ Public Class dlgRestoreBackup End Sub Private Sub TestOKEnabled() - If rdoRunBackupLog.Checked OrElse rdoLoadBackupData.Checked OrElse rdoNeither.Checked Then - ucrBase.OKEnabled(True) - bUserClose = False - Else - ucrBase.OKEnabled(False) - End If + ucrBase.OKEnabled(rdoRunBackupLog.Checked OrElse rdoLoadBackupData.Checked OrElse rdoNeither.Checked) End Sub Private Sub ucrChkShowDataFile_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkShowLogFile.ControlValueChanged, ucrChkShowInternalLogFile.ControlValueChanged, ucrChkShowDataFile.ControlValueChanged @@ -176,9 +181,10 @@ Public Class dlgRestoreBackup MsgBox("Could not read log file." & Environment.NewLine & ex.Message, "Cannot read file") End Try End If + clsDummyFunction.AddParameter("backup", "log") ElseIf rdoLoadBackupData.Checked Then strLoadDateFilePath = strAutoSavedDataFilePaths(0) - bUserClose = False + clsDummyFunction.AddParameter("backup", "data") End If TestOKEnabled() @@ -201,12 +207,6 @@ Public Class dlgRestoreBackup SetRCodeForControls(True) End Sub - Private Sub ReopenDialog() - ucrChkShowDataFile.Checked = False - ucrChkShowInternalLogFile.Checked = False - ucrChkShowLogFile.Checked = False - End Sub - Private Sub GetRecoveryFiles(strRScripts As String, strDataFilePath As String) 'if data file recovered then add it as part of the initial R set up script If Not String.IsNullOrEmpty(strDataFilePath) Then diff --git a/instat/frmMain.vb b/instat/frmMain.vb index e353aaa7417..b4f55f4448a 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1068,9 +1068,9 @@ Public Class frmMain If clsInstatOptions IsNot Nothing Then SaveInstatOptions(Path.Combine(strAppDataPath, strInstatOptionsFile)) End If - DeleteAutoSaveData() - DeleteAutoSaveLog() - DeleteAutoSaveDebugLog() + 'DeleteAutoSaveData() + 'DeleteAutoSaveLog() + 'DeleteAutoSaveDebugLog() clsRLink.CloseREngine() End If From e138aafa70c04f56c7b87f54860c5a88656907c5 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 3 May 2024 17:40:56 +0300 Subject: [PATCH 67/99] more code addition --- instat/dlgRestoreBackup.vb | 19 ++++++++++++------- instat/frmMain.vb | 27 ++++++++++++--------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 23b7691ae46..5b912735e13 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -175,16 +175,21 @@ Public Class dlgRestoreBackup strLoadDateFilePath = "" If rdoRunBackupLog.Checked Then If File.Exists(strAutoSavedLogFilePaths(0)) Then - Try - strScript = File.ReadAllText(strAutoSavedLogFilePaths(0)) - Catch ex As Exception - MsgBox("Could not read log file." & Environment.NewLine & ex.Message, "Cannot read file") - End Try + 'Retrieve the latest autosaved file based on the stored timestamp + Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveDataFolderPath) + Dim strLatestLogFile As FileInfo = autoSaveDirectory.GetFiles("log_*.R").OrderByDescending(Function(f) f.LastWriteTime).FirstOrDefault() + strScript = strLatestLogFile.FullName End If clsDummyFunction.AddParameter("backup", "log") ElseIf rdoLoadBackupData.Checked Then - strLoadDateFilePath = strAutoSavedDataFilePaths(0) + 'Retrieve the latest autosaved file based on the stored timestamp + Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveDataFolderPath) + Dim strLatestDataFile As FileInfo = autoSaveDirectory.GetFiles("data_*.rds").OrderByDescending(Function(f) f.LastWriteTime).FirstOrDefault() + + strLoadDateFilePath = strLatestDataFile.FullName clsDummyFunction.AddParameter("backup", "data") + Else + clsDummyFunction.AddParameter("backup", "neither") End If TestOKEnabled() @@ -215,7 +220,7 @@ Public Class dlgRestoreBackup frmMain.clsRLink.GetImportRDSRScript(strDataFilePath, False) End If - ''execute the R-Instat set up R scripts + 'execute the R-Instat set up R scripts If Not String.IsNullOrEmpty(strRScripts) Then For Each strLine As String In strRScripts.Split({Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) frmMain.clsRLink.RunScript(strScript:=strLine.Trim(), bSeparateThread:=True, bSilent:=True) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index b4f55f4448a..1a03da7697f 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -499,13 +499,13 @@ Public Class frmMain End Try End If - If strAutoSavedDataFilePaths.Length > 1 Then - Try - File.Delete(strAutoSavedDataFilePaths(1)) - Catch ex As Exception - MsgBox("Could not delete back data file." & Environment.NewLine & ex.Message, "Error deleting file") - End Try - End If + 'If strAutoSavedDataFilePaths.Length > 1 Then + ' Try + ' ' File.Delete(strAutoSavedDataFilePaths(1)) + ' Catch ex As Exception + ' MsgBox("Could not delete back data file." & Environment.NewLine & ex.Message, "Error deleting file") + ' End Try + 'End If '--------------------------------------- End Sub @@ -1098,14 +1098,11 @@ Public Class frmMain If Not Directory.Exists(strAutoSaveDataFolderPath) Then Directory.CreateDirectory(strAutoSaveDataFolderPath) End If - If strCurrentAutoSaveDataFilePath = "" Then - strTempFile = "data.rds" - While File.Exists(Path.Combine(strAutoSaveDataFolderPath, strTempFile)) - i = i + 1 - strTempFile = "data" & i & ".rds" - End While - strCurrentAutoSaveDataFilePath = Path.Combine(strAutoSaveDataFolderPath, strTempFile) - End If + + ' Generate a unique filename with timestamp + strTempFile = "data_" & DateTime.Now.ToString("yyyyMMdd_HHmmss") & ".rds" + strCurrentAutoSaveDataFilePath = Path.Combine(strAutoSaveDataFolderPath, strTempFile) + Dim strBackupMessage As String = $"##########{vbCrLf}## Backing up data and log files on: {DateTime.Now}{vbCrLf}##########" Me.ucrScriptWindow.LogText(strBackupMessage) clsRLink.AppendToAutoSaveLog(strBackupMessage) From bd9843b2db3d7b8811808774b4e7ec2b3a93972d Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 3 May 2024 17:58:18 +0300 Subject: [PATCH 68/99] Improve the deleting of the files --- instat/frmMain.vb | 96 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 72 insertions(+), 24 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 1a03da7697f..49938a1e58b 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1068,9 +1068,9 @@ Public Class frmMain If clsInstatOptions IsNot Nothing Then SaveInstatOptions(Path.Combine(strAppDataPath, strInstatOptionsFile)) End If - 'DeleteAutoSaveData() - 'DeleteAutoSaveLog() - 'DeleteAutoSaveDebugLog() + DeleteAutoSaveData() + DeleteAutoSaveLog() + DeleteAutoSaveDebugLog() clsRLink.CloseREngine() End If @@ -1118,33 +1118,81 @@ Public Class frmMain End Sub Public Sub DeleteAutoSaveData() - If strCurrentAutoSaveDataFilePath <> "" Then - Try - File.Delete(strCurrentAutoSaveDataFilePath) - Catch ex As Exception - MsgBox("Could not delete auto save data file at: " & strCurrentAutoSaveDataFilePath & Environment.NewLine & ex.Message) - End Try - End If + Try + If Directory.Exists(strAutoSaveDataFolderPath) Then + ' Define the retention policy (keep last N autosaves) + Dim retentionCount As Integer = 5 ' Example: Keep the last 5 autosaves + + ' Retrieve autosaved files + Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveDataFolderPath) + Dim files As FileInfo() = autoSaveDirectory.GetFiles("data_*.rds") ' Adjust pattern to match actual filenames + + ' Sort files by last write time in descending order + Dim sortedFiles = files.OrderByDescending(Function(f) f.LastWriteTime) + + ' Determine files to delete based on retention policy + Dim filesToDelete = sortedFiles.Skip(retentionCount) + + ' Delete older autosaved files + For Each file In filesToDelete + file.Delete() + Next + End If + Catch ex As Exception + MsgBox("Could not delete auto save data file at: " & strCurrentAutoSaveDataFilePath & Environment.NewLine & ex.Message) + End Try End Sub Public Sub DeleteAutoSaveLog() - If clsRLink.strAutoSaveLogFilePath <> "" Then - Try - File.Delete(clsRLink.strAutoSaveLogFilePath) - Catch ex As Exception - MsgBox("Could not delete auto save log file at: " & clsRLink.strAutoSaveLogFilePath & Environment.NewLine & ex.Message) - End Try - End If + Try + If Directory.Exists(strAutoSaveLogFolderPath) Then + ' Define the retention policy (keep last N autosaves) + Dim retentionCount As Integer = 5 ' Example: Keep the last 5 autosaves + + ' Retrieve autosaved files + Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveLogFolderPath) + Dim files As FileInfo() = autoSaveDirectory.GetFiles("log*.R") ' Adjust pattern to match actual filenames + + ' Sort files by last write time in descending order + Dim sortedFiles = files.OrderByDescending(Function(f) f.LastWriteTime) + + ' Determine files to delete based on retention policy + Dim filesToDelete = sortedFiles.Skip(retentionCount) + + ' Delete older autosaved files + For Each file In filesToDelete + file.Delete() + Next + End If + Catch ex As Exception + MsgBox("Could not delete auto save data file at: " & strCurrentAutoSaveDataFilePath & Environment.NewLine & ex.Message) + End Try End Sub Public Sub DeleteAutoSaveDebugLog() - If clsRLink.strAutoSaveDebugLogFilePath <> "" Then - Try - File.Delete(clsRLink.strAutoSaveDebugLogFilePath) - Catch ex As Exception - MsgBox("Could not delete auto save debug log file at: " & clsRLink.strAutoSaveDebugLogFilePath & Environment.NewLine & ex.Message) - End Try - End If + Try + If Directory.Exists(strAutoSaveInternalLogFolderPath) Then + ' Define the retention policy (keep last N autosaves) + Dim retentionCount As Integer = 5 ' Example: Keep the last 5 autosaves + + ' Retrieve autosaved files + Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveInternalLogFolderPath) + Dim files As FileInfo() = autoSaveDirectory.GetFiles("debug_log*.R") ' Adjust pattern to match actual filenames + + ' Sort files by last write time in descending order + Dim sortedFiles = files.OrderByDescending(Function(f) f.LastWriteTime) + + ' Determine files to delete based on retention policy + Dim filesToDelete = sortedFiles.Skip(retentionCount) + + ' Delete older autosaved files + For Each file In filesToDelete + file.Delete() + Next + End If + Catch ex As Exception + MsgBox("Could not delete auto save data file at: " & strCurrentAutoSaveDataFilePath & Environment.NewLine & ex.Message) + End Try End Sub Private Sub mnuOrganiseDataObjectHideDataframes_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataObjectHideDataframes.Click From 8aa8a86de5c9883025489259ce5dc92ec3837862 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 6 May 2024 13:38:44 +0300 Subject: [PATCH 69/99] minor change --- instat/dlgRestoreBackup.vb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 5b912735e13..d11ea507650 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -174,12 +174,10 @@ Public Class dlgRestoreBackup strScript = "" strLoadDateFilePath = "" If rdoRunBackupLog.Checked Then - If File.Exists(strAutoSavedLogFilePaths(0)) Then - 'Retrieve the latest autosaved file based on the stored timestamp - Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveDataFolderPath) - Dim strLatestLogFile As FileInfo = autoSaveDirectory.GetFiles("log_*.R").OrderByDescending(Function(f) f.LastWriteTime).FirstOrDefault() - strScript = strLatestLogFile.FullName - End If + 'Retrieve the latest autosaved file based on the stored timestamp + Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveLogFolderPath) + Dim strLatestLogFile As FileInfo = autoSaveDirectory.GetFiles("log*.R").OrderByDescending(Function(f) f.LastWriteTime).FirstOrDefault() + strScript = strLatestLogFile.FullName clsDummyFunction.AddParameter("backup", "log") ElseIf rdoLoadBackupData.Checked Then 'Retrieve the latest autosaved file based on the stored timestamp From cf08c419a48eee9867c15b4549d1c81247e8d913 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 6 May 2024 14:01:12 +0300 Subject: [PATCH 70/99] code improvements --- instat/dlgRestoreBackup.vb | 46 +++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index d11ea507650..3619feaf9ae 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -173,26 +173,46 @@ Public Class dlgRestoreBackup Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlRecoveryOption.ControlContentsChanged strScript = "" strLoadDateFilePath = "" + Dim backupType As String = "" + If rdoRunBackupLog.Checked Then - 'Retrieve the latest autosaved file based on the stored timestamp - Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveLogFolderPath) - Dim strLatestLogFile As FileInfo = autoSaveDirectory.GetFiles("log*.R").OrderByDescending(Function(f) f.LastWriteTime).FirstOrDefault() - strScript = strLatestLogFile.FullName - clsDummyFunction.AddParameter("backup", "log") + backupType = "log" + GetBackupFromLastSession(strAutoSaveLogFolderPath, "log*.R", True) ElseIf rdoLoadBackupData.Checked Then - 'Retrieve the latest autosaved file based on the stored timestamp - Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveDataFolderPath) - Dim strLatestDataFile As FileInfo = autoSaveDirectory.GetFiles("data_*.rds").OrderByDescending(Function(f) f.LastWriteTime).FirstOrDefault() - - strLoadDateFilePath = strLatestDataFile.FullName - clsDummyFunction.AddParameter("backup", "data") + backupType = "data" + GetBackupFromLastSession(strAutoSaveDataFolderPath, "data_*.rds", False) Else - clsDummyFunction.AddParameter("backup", "neither") + backupType = "neither" End If - + clsDummyFunction.AddParameter("backup", backupType) TestOKEnabled() End Sub + Private Sub GetBackupFromLastSession(autoSaveFolderPath As String, searchPattern As String, bLogFile As Boolean) + Dim autoSaveDirectory As New DirectoryInfo(autoSaveFolderPath) + Dim files As FileInfo() = autoSaveDirectory.GetFiles(searchPattern) + + If files.Length > 1 Then + Array.Sort(files, Function(x, y) y.LastWriteTime.CompareTo(x.LastWriteTime)) + Dim strLatestBackupFile As FileInfo = files(1) ' Get the backup from the last session + If bLogFile Then + strScript = File.ReadAllText(strLatestBackupFile.FullName) + Else + strLoadDateFilePath = strLatestBackupFile.FullName ' Pass the full path for data files + End If + ElseIf files.Length = 1 Then + Dim strLatestBackupFile As FileInfo = files(0) + If bLogFile Then + strScript = File.ReadAllText(strLatestBackupFile.FullName) + Else + strLoadDateFilePath = strLatestBackupFile.FullName ' Pass the full path for data files + End If + Else + ' No backup found from the last session + strScript = "" + End If + End Sub + Private Sub ucrInputSavedPathData_Leave(sender As Object, e As EventArgs) Handles ucrInputSavedPathData.Leave If Not String.IsNullOrEmpty(ucrInputSavedPathData.IsEmpty) Then frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathData.FilePath, "\", "/")) From 9182941eed9694e6408ac72cd5cc4cde3ee28d2e Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 6 May 2024 14:04:19 +0300 Subject: [PATCH 71/99] minor change --- instat/dlgRestoreBackup.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 3619feaf9ae..89a8a45ce15 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -210,6 +210,7 @@ Public Class dlgRestoreBackup Else ' No backup found from the last session strScript = "" + strLoadDateFilePath = "" End If End Sub From db10fb18cd90fa64add12cde6cda7656e1335723 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 6 May 2024 14:30:49 +0300 Subject: [PATCH 72/99] help --- instat/dlgTransform.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgTransform.vb b/instat/dlgTransform.vb index fc8147d6f9c..1cfaa690e96 100644 --- a/instat/dlgTransform.vb +++ b/instat/dlgTransform.vb @@ -112,7 +112,6 @@ Public Class dlgTransform End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 25 Dim dctSubtractValues As New Dictionary(Of String, String) Dim dctMultiplyValues As New Dictionary(Of String, String) @@ -120,6 +119,7 @@ Public Class dlgTransform Dim dctAddValues As New Dictionary(Of String, String) Dim dctPowerValues As New Dictionary(Of String, String) + ucrBase.iHelpTopicID = 42 ucrPnlTransformOptions.AddRadioButton(rdoRank) ucrPnlTransformOptions.AddRadioButton(rdoNumeric) From 515b326e94a4f4bf05740f4fec9d4472b1e41c04 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 6 May 2024 14:33:05 +0300 Subject: [PATCH 73/99] calculator --- instat/frmMain.Designer.vb | 53 +++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 7f10ad794d1..05ddcf264fa 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -682,6 +682,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.ToolStripSeparator79 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -2905,7 +2906,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(192, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2913,7 +2914,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(192, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2921,27 +2922,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(192, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(180, 22) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(192, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(192, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -3390,7 +3391,7 @@ Partial Class frmMain ' '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.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.ToolStripSeparator79, 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(59, 22) Me.mnuPrepare.Tag = "Prepare" @@ -3400,7 +3401,7 @@ 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.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(186, 22) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' @@ -3531,7 +3532,7 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, 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(186, 22) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData @@ -3652,20 +3653,20 @@ Partial Class frmMain 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(183, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(177, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(186, 22) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareCalculator.Tag = "Calculator..." - Me.mnuPrepareCalculator.Text = "Column: Calculator..." + Me.mnuPrepareCalculator.Text = "Calculator..." ' 'mnuPrepareColumnCalculate ' 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(186, 22) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' @@ -3730,7 +3731,7 @@ 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(186, 22) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' @@ -3836,7 +3837,7 @@ 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(186, 22) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' @@ -3895,7 +3896,7 @@ 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(186, 22) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate @@ -3942,7 +3943,7 @@ 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(186, 22) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns @@ -3965,13 +3966,13 @@ Partial Class frmMain 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(183, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(177, 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(186, 22) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' @@ -4061,13 +4062,13 @@ Partial Class frmMain 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(183, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(177, 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(186, 22) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey @@ -4104,7 +4105,7 @@ Partial Class frmMain ' 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(186, 22) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4194,7 +4195,7 @@ 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(186, 22) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' @@ -5098,6 +5099,11 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' + 'ToolStripSeparator79 + ' + Me.ToolStripSeparator79.Name = "ToolStripSeparator79" + Me.ToolStripSeparator79.Size = New System.Drawing.Size(177, 6) + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5796,4 +5802,5 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator27 As ToolStripSeparator Friend WithEvents mnuClimaticPICSAGeneralGrap As ToolStripMenuItem Friend WithEvents mnuClimaticFileExportToGoogleBucketsToolStrip As ToolStripMenuItem + Friend WithEvents ToolStripSeparator79 As ToolStripSeparator End Class From e935c96a79ee933d2c9417b721407c2b28070726 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 6 May 2024 14:58:55 +0300 Subject: [PATCH 74/99] minor code change --- instat/dlgRestoreBackup.vb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 89a8a45ce15..6855d33479d 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -192,16 +192,9 @@ Public Class dlgRestoreBackup Dim autoSaveDirectory As New DirectoryInfo(autoSaveFolderPath) Dim files As FileInfo() = autoSaveDirectory.GetFiles(searchPattern) - If files.Length > 1 Then + If files.Length > 0 Then Array.Sort(files, Function(x, y) y.LastWriteTime.CompareTo(x.LastWriteTime)) - Dim strLatestBackupFile As FileInfo = files(1) ' Get the backup from the last session - If bLogFile Then - strScript = File.ReadAllText(strLatestBackupFile.FullName) - Else - strLoadDateFilePath = strLatestBackupFile.FullName ' Pass the full path for data files - End If - ElseIf files.Length = 1 Then - Dim strLatestBackupFile As FileInfo = files(0) + Dim strLatestBackupFile As FileInfo = files(0) ' Get the backup from the last session If bLogFile Then strScript = File.ReadAllText(strLatestBackupFile.FullName) Else From 0132ca39550810e844f58f0ab96d86a28e4193f4 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 6 May 2024 15:26:22 +0300 Subject: [PATCH 75/99] translation --- instat/translations/rInstatTranslations.db | Bin 8302592 -> 8302592 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 7ec022bba6923d3f4390a8d30a5d46b9ac6e4f9f..143a9a22f5a028dc72eed04a4d62704f8d0be805 100644 GIT binary patch delta 514 zcmWN=xlWV;0EN+6K#)NZ6%b}dM0NyRaQtx>Ssg$H5f`?rD54CYxGyAF+|Xh*H4kBE zdiSA5Mke9L!y&kq~Pt>s_e{sX6e)Fl7_ delta 506 zcmWN=%QKY$0LEdTqlgqjaU8jIDx?egN>L%Cq9Q4kw~OncR4z$oSiED=CabgVAFyj| z>{~L^*1}9P&G;8u^?PQXmA!wF6@HHfiS?4UAh9Yduu`pvm1Z5V4qE9}hIPoww6d(j zR!ej?m0J~7rB!8}vf|ch>x^~Q zsw(Pn_i(=efYo QT;vxn@#|)6clpon|9KzLvj6}9 From 9ee89d4baaf514393ccea97ab62d994c5ac8b3d5 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 6 May 2024 16:27:38 +0300 Subject: [PATCH 76/99] code changes --- instat/dlgRestoreBackup.vb | 16 ++++++++++------ instat/frmMain.vb | 12 +++++++++--- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 6855d33479d..59b50d68bc2 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -43,6 +43,7 @@ Public Class dlgRestoreBackup End If SetRCodeForControls(bReset) bReset = False + SetLogControlsDisable(frmMain.GetFirstBackupDone) autoTranslate(Me) TestOKEnabled() End Sub @@ -173,21 +174,24 @@ Public Class dlgRestoreBackup Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlRecoveryOption.ControlContentsChanged strScript = "" strLoadDateFilePath = "" - Dim backupType As String = "" If rdoRunBackupLog.Checked Then - backupType = "log" GetBackupFromLastSession(strAutoSaveLogFolderPath, "log*.R", True) ElseIf rdoLoadBackupData.Checked Then - backupType = "data" GetBackupFromLastSession(strAutoSaveDataFolderPath, "data_*.rds", False) - Else - backupType = "neither" End If - clsDummyFunction.AddParameter("backup", backupType) TestOKEnabled() End Sub + Private Sub SetLogControlsDisable(bEnable As Boolean) + ucrChkShowLogFile.Checked = Not bEnable + ucrChkShowInternalLogFile.Checked = Not bEnable + rdoRunBackupLog.Checked = Not bEnable + ucrChkShowLogFile.Enabled = Not bEnable + ucrChkShowInternalLogFile.Enabled = Not bEnable + rdoRunBackupLog.Enabled = Not bEnable + End Sub + Private Sub GetBackupFromLastSession(autoSaveFolderPath As String, searchPattern As String, bLogFile As Boolean) Dim autoSaveDirectory As New DirectoryInfo(autoSaveFolderPath) Dim files As FileInfo() = autoSaveDirectory.GetFiles(searchPattern) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 49938a1e58b..7c9c307565c 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -43,6 +43,7 @@ Public Class frmMain Private iAutoSaveDataMilliseconds As Integer Private clsDataBook As clsDataBook Private Shared ReadOnly Logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger() + Private Shared isFirstBackupDone As Boolean = False Public ReadOnly Property DataBook As clsDataBook Get Return clsDataBook @@ -655,7 +656,7 @@ Public Class frmMain End Sub Private Sub mnuPrepareColumnNumericRandomSamples_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnNumericRandomSamples.Click - dlgRandomSample.enumRandomsampleMode = dlgRandomSample.RandomsampleMode.Prepare + dlgRandomSample.enumRandomSampleMode = dlgRandomSample.RandomSampleMode.Prepare dlgRandomSample.ShowDialog() End Sub @@ -944,7 +945,7 @@ Public Class frmMain End Sub Private Sub mnuModelProbabilityDistributionsRandomSamplesUseModel_Click(sender As Object, e As EventArgs) Handles mnuModelProbabilityDistributionsRandomSamplesUseModel.Click - dlgRandomSample.enumRandomsampleMode = dlgRandomSample.RandomsampleMode.Model + dlgRandomSample.enumRandomSampleMode = dlgRandomSample.RandomSampleMode.Model dlgRandomSample.ShowDialog() End Sub @@ -1085,6 +1086,10 @@ Public Class frmMain End If End Sub + Public Shared Function GetFirstBackupDone() As Boolean + Return isFirstBackupDone + End Function + Public Sub AutoSaveData() Dim clsSaveRDS As New RFunction Dim strTempFile As String @@ -1106,13 +1111,14 @@ Public Class frmMain Dim strBackupMessage As String = $"##########{vbCrLf}## Backing up data and log files on: {DateTime.Now}{vbCrLf}##########" Me.ucrScriptWindow.LogText(strBackupMessage) clsRLink.AppendToAutoSaveLog(strBackupMessage) - + clsSaveRDS.SetRCommand("saveRDS") clsSaveRDS.AddParameter("object", clsRLink.strInstatDataObject) clsSaveRDS.AddParameter("file", Chr(34) & strCurrentAutoSaveDataFilePath.Replace("\", "/") & Chr(34)) clsRLink.RunInternalScript(clsSaveRDS.ToScript(), bSilent:=True, bShowWaitDialogOverride:=False) tstatus.Text = strCurrentStatus Cursor = Cursors.Default + isFirstBackupDone = True End If autoTranslate(Me) End Sub From 974287e279c8b54ce90ea1443742f41f45b304c4 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 6 May 2024 17:04:18 +0300 Subject: [PATCH 77/99] minor code change --- instat/dlgRestoreBackup.vb | 2 +- instat/frmMain.vb | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 59b50d68bc2..08592efef44 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -43,7 +43,7 @@ Public Class dlgRestoreBackup End If SetRCodeForControls(bReset) bReset = False - SetLogControlsDisable(frmMain.GetFirstBackupDone) + SetLogControlsDisable(frmMain.bFirstBackupDone) autoTranslate(Me) TestOKEnabled() End Sub diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 7c9c307565c..9c4833fc4a5 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -43,7 +43,7 @@ Public Class frmMain Private iAutoSaveDataMilliseconds As Integer Private clsDataBook As clsDataBook Private Shared ReadOnly Logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger() - Private Shared isFirstBackupDone As Boolean = False + Public bFirstBackupDone As Boolean = False Public ReadOnly Property DataBook As clsDataBook Get Return clsDataBook @@ -1086,10 +1086,6 @@ Public Class frmMain End If End Sub - Public Shared Function GetFirstBackupDone() As Boolean - Return isFirstBackupDone - End Function - Public Sub AutoSaveData() Dim clsSaveRDS As New RFunction Dim strTempFile As String @@ -1118,7 +1114,7 @@ Public Class frmMain clsRLink.RunInternalScript(clsSaveRDS.ToScript(), bSilent:=True, bShowWaitDialogOverride:=False) tstatus.Text = strCurrentStatus Cursor = Cursors.Default - isFirstBackupDone = True + bFirstBackupDone = True End If autoTranslate(Me) End Sub From 195be4d5d2d20657bd439e3d1dbe8dcbe65bab52 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 6 May 2024 17:41:20 +0300 Subject: [PATCH 78/99] minor change --- instat/dlgRestoreBackup.vb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 08592efef44..fd7f99fb475 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -184,12 +184,11 @@ Public Class dlgRestoreBackup End Sub Private Sub SetLogControlsDisable(bEnable As Boolean) - ucrChkShowLogFile.Checked = Not bEnable - ucrChkShowInternalLogFile.Checked = Not bEnable - rdoRunBackupLog.Checked = Not bEnable ucrChkShowLogFile.Enabled = Not bEnable ucrChkShowInternalLogFile.Enabled = Not bEnable rdoRunBackupLog.Enabled = Not bEnable + ucrChkShowLogFile.Checked = False + ucrChkShowInternalLogFile.Checked = False End Sub Private Sub GetBackupFromLastSession(autoSaveFolderPath As String, searchPattern As String, bLogFile As Boolean) From b688b1e18bf5a5e10f0ec2c5002551795c75299d Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Fri, 10 May 2024 07:06:06 +0300 Subject: [PATCH 79/99] changes --- .../dlgExportClimaticDefinitions.Designer.vb | 445 +++++++++++++++++- 1 file changed, 444 insertions(+), 1 deletion(-) diff --git a/instat/dlgExportClimaticDefinitions.Designer.vb b/instat/dlgExportClimaticDefinitions.Designer.vb index b6e8c0cb7c8..1590fc407d6 100644 --- a/instat/dlgExportClimaticDefinitions.Designer.vb +++ b/instat/dlgExportClimaticDefinitions.Designer.vb @@ -22,21 +22,464 @@ Partial Class dlgExportClimaticDefinitions 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Me.lblStationID = New System.Windows.Forms.Label() + Me.lblCountry = New System.Windows.Forms.Label() + Me.ucrInputCountry = New instat.ucrInputTextBox() + Me.ucrInputStationID = New instat.ucrInputTextBox() + Me.ucrChkSeasonStartProp = New instat.ucrCheck() + Me.ucrChkExtremes = New instat.ucrCheck() + Me.ucrChkCropSuccessProp = New instat.ucrCheck() + Me.ucrChkAnnualTemp = New instat.ucrCheck() + Me.ucrChkAnnualRainfall = New instat.ucrCheck() + Me.lblMonth = New System.Windows.Forms.Label() + Me.lblYear = New System.Windows.Forms.Label() + Me.ucrReceiverMonth = New instat.ucrReceiverSingle() + Me.ucrReceiverYear = New instat.ucrReceiverSingle() + Me.Label1 = New System.Windows.Forms.Label() + Me.ucrChkIncludeSummaryData = New instat.ucrCheck() + Me.grpSummaries = New System.Windows.Forms.GroupBox() + Me.ucrChkMonthlyTemp = New instat.ucrCheck() + Me.lblMaxTemp = New System.Windows.Forms.Label() + Me.lblCropData = New System.Windows.Forms.Label() + Me.lblDataByYearMonth = New System.Windows.Forms.Label() + Me.lblDataByYear = New System.Windows.Forms.Label() + Me.lblRain = New System.Windows.Forms.Label() + Me.lblMinTemp = New System.Windows.Forms.Label() + Me.lblData = New System.Windows.Forms.Label() + Me.ucrReceiverRain = New instat.ucrReceiverSingle() + Me.ucrReceiverMinTemp = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxTemp = New instat.ucrReceiverSingle() + Me.ucrReceiverData = New instat.ucrReceiverSingle() + Me.ucrSelectorExportDefinitions = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrBase = New instat.ucrButtons() + Me.ucrReceiverDataYear = New instat.ucrReceiverSingle() + Me.ucrReceiverDataYearMonth = New instat.ucrReceiverSingle() + Me.ucrReceiverCropData = New instat.ucrReceiverSingle() + Me.grpSummaries.SuspendLayout() Me.SuspendLayout() ' + 'lblStationID + ' + Me.lblStationID.AutoSize = True + Me.lblStationID.Location = New System.Drawing.Point(331, 378) + Me.lblStationID.Name = "lblStationID" + Me.lblStationID.Size = New System.Drawing.Size(57, 13) + Me.lblStationID.TabIndex = 56 + Me.lblStationID.Text = "Station ID:" + ' + 'lblCountry + ' + Me.lblCountry.AutoSize = True + Me.lblCountry.Location = New System.Drawing.Point(333, 415) + Me.lblCountry.Name = "lblCountry" + Me.lblCountry.Size = New System.Drawing.Size(46, 13) + Me.lblCountry.TabIndex = 55 + Me.lblCountry.Text = "Country:" + ' + 'ucrInputCountry + ' + Me.ucrInputCountry.AddQuotesIfUnrecognised = True + Me.ucrInputCountry.AutoSize = True + Me.ucrInputCountry.IsMultiline = False + Me.ucrInputCountry.IsReadOnly = False + Me.ucrInputCountry.Location = New System.Drawing.Point(331, 430) + Me.ucrInputCountry.Name = "ucrInputCountry" + Me.ucrInputCountry.Size = New System.Drawing.Size(118, 21) + Me.ucrInputCountry.TabIndex = 54 + ' + 'ucrInputStationID + ' + Me.ucrInputStationID.AddQuotesIfUnrecognised = True + Me.ucrInputStationID.AutoSize = True + Me.ucrInputStationID.IsMultiline = False + Me.ucrInputStationID.IsReadOnly = False + Me.ucrInputStationID.Location = New System.Drawing.Point(331, 394) + Me.ucrInputStationID.Name = "ucrInputStationID" + Me.ucrInputStationID.Size = New System.Drawing.Size(118, 21) + Me.ucrInputStationID.TabIndex = 53 + ' + 'ucrChkSeasonStartProp + ' + Me.ucrChkSeasonStartProp.AutoSize = True + Me.ucrChkSeasonStartProp.Checked = False + Me.ucrChkSeasonStartProp.Location = New System.Drawing.Point(154, 46) + Me.ucrChkSeasonStartProp.Name = "ucrChkSeasonStartProp" + Me.ucrChkSeasonStartProp.Size = New System.Drawing.Size(151, 23) + Me.ucrChkSeasonStartProp.TabIndex = 4 + ' + 'ucrChkExtremes + ' + Me.ucrChkExtremes.AutoSize = True + Me.ucrChkExtremes.Checked = False + Me.ucrChkExtremes.Location = New System.Drawing.Point(154, 78) + Me.ucrChkExtremes.Name = "ucrChkExtremes" + Me.ucrChkExtremes.Size = New System.Drawing.Size(147, 23) + Me.ucrChkExtremes.TabIndex = 5 + ' + 'ucrChkCropSuccessProp + ' + Me.ucrChkCropSuccessProp.AutoSize = True + Me.ucrChkCropSuccessProp.Checked = False + Me.ucrChkCropSuccessProp.Location = New System.Drawing.Point(154, 18) + Me.ucrChkCropSuccessProp.Name = "ucrChkCropSuccessProp" + Me.ucrChkCropSuccessProp.Size = New System.Drawing.Size(153, 23) + Me.ucrChkCropSuccessProp.TabIndex = 3 + ' + 'ucrChkAnnualTemp + ' + Me.ucrChkAnnualTemp.AutoSize = True + Me.ucrChkAnnualTemp.Checked = False + Me.ucrChkAnnualTemp.Location = New System.Drawing.Point(5, 46) + Me.ucrChkAnnualTemp.Name = "ucrChkAnnualTemp" + Me.ucrChkAnnualTemp.Size = New System.Drawing.Size(149, 23) + Me.ucrChkAnnualTemp.TabIndex = 1 + ' + 'ucrChkAnnualRainfall + ' + Me.ucrChkAnnualRainfall.AutoSize = True + Me.ucrChkAnnualRainfall.Checked = False + Me.ucrChkAnnualRainfall.Location = New System.Drawing.Point(5, 18) + Me.ucrChkAnnualRainfall.Name = "ucrChkAnnualRainfall" + Me.ucrChkAnnualRainfall.Size = New System.Drawing.Size(149, 23) + Me.ucrChkAnnualRainfall.TabIndex = 0 + ' + 'lblMonth + ' + Me.lblMonth.AutoSize = True + Me.lblMonth.Location = New System.Drawing.Point(333, 339) + Me.lblMonth.Name = "lblMonth" + Me.lblMonth.Size = New System.Drawing.Size(40, 13) + Me.lblMonth.TabIndex = 47 + Me.lblMonth.Text = "Month:" + ' + 'lblYear + ' + Me.lblYear.AutoSize = True + Me.lblYear.Location = New System.Drawing.Point(334, 301) + Me.lblYear.Name = "lblYear" + Me.lblYear.Size = New System.Drawing.Size(32, 13) + Me.lblYear.TabIndex = 45 + Me.lblYear.Text = "Year:" + ' + 'ucrReceiverMonth + ' + Me.ucrReceiverMonth.AutoSize = True + Me.ucrReceiverMonth.frmParent = Me + Me.ucrReceiverMonth.Location = New System.Drawing.Point(329, 356) + Me.ucrReceiverMonth.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonth.Name = "ucrReceiverMonth" + Me.ucrReceiverMonth.Selector = Nothing + Me.ucrReceiverMonth.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMonth.strNcFilePath = "" + Me.ucrReceiverMonth.TabIndex = 48 + Me.ucrReceiverMonth.ucrSelector = Nothing + ' + 'ucrReceiverYear + ' + Me.ucrReceiverYear.AutoSize = True + Me.ucrReceiverYear.frmParent = Me + Me.ucrReceiverYear.Location = New System.Drawing.Point(330, 317) + Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYear.Name = "ucrReceiverYear" + Me.ucrReceiverYear.Selector = Nothing + Me.ucrReceiverYear.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.TabIndex = 46 + Me.ucrReceiverYear.ucrSelector = Nothing + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label1.Location = New System.Drawing.Point(76, 457) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(0, 13) + Me.Label1.TabIndex = 52 + ' + 'ucrChkIncludeSummaryData + ' + Me.ucrChkIncludeSummaryData.AutoSize = True + Me.ucrChkIncludeSummaryData.Checked = False + Me.ucrChkIncludeSummaryData.Location = New System.Drawing.Point(1, 331) + Me.ucrChkIncludeSummaryData.Name = "ucrChkIncludeSummaryData" + Me.ucrChkIncludeSummaryData.Size = New System.Drawing.Size(221, 31) + Me.ucrChkIncludeSummaryData.TabIndex = 50 + ' + 'grpSummaries + ' + Me.grpSummaries.Controls.Add(Me.ucrChkMonthlyTemp) + Me.grpSummaries.Controls.Add(Me.ucrChkSeasonStartProp) + Me.grpSummaries.Controls.Add(Me.ucrChkExtremes) + Me.grpSummaries.Controls.Add(Me.ucrChkCropSuccessProp) + Me.grpSummaries.Controls.Add(Me.ucrChkAnnualTemp) + Me.grpSummaries.Controls.Add(Me.ucrChkAnnualRainfall) + Me.grpSummaries.Location = New System.Drawing.Point(1, 211) + Me.grpSummaries.Name = "grpSummaries" + Me.grpSummaries.Size = New System.Drawing.Size(313, 111) + Me.grpSummaries.TabIndex = 49 + Me.grpSummaries.TabStop = False + Me.grpSummaries.Text = "Summaries" + ' + 'ucrChkMonthlyTemp + ' + Me.ucrChkMonthlyTemp.AutoSize = True + Me.ucrChkMonthlyTemp.Checked = False + Me.ucrChkMonthlyTemp.Location = New System.Drawing.Point(5, 78) + Me.ucrChkMonthlyTemp.Name = "ucrChkMonthlyTemp" + Me.ucrChkMonthlyTemp.Size = New System.Drawing.Size(147, 23) + Me.ucrChkMonthlyTemp.TabIndex = 2 + ' + 'lblMaxTemp + ' + Me.lblMaxTemp.AutoSize = True + Me.lblMaxTemp.Location = New System.Drawing.Point(329, 262) + Me.lblMaxTemp.Name = "lblMaxTemp" + Me.lblMaxTemp.Size = New System.Drawing.Size(60, 13) + Me.lblMaxTemp.TabIndex = 43 + Me.lblMaxTemp.Text = "Max Temp:" + ' + 'lblCropData + ' + Me.lblCropData.AutoSize = True + Me.lblCropData.Location = New System.Drawing.Point(329, 136) + Me.lblCropData.Name = "lblCropData" + Me.lblCropData.Size = New System.Drawing.Size(58, 13) + Me.lblCropData.TabIndex = 37 + Me.lblCropData.Text = "Crop Data:" + ' + 'lblDataByYearMonth + ' + Me.lblDataByYearMonth.AutoSize = True + Me.lblDataByYearMonth.Location = New System.Drawing.Point(326, 94) + Me.lblDataByYearMonth.Name = "lblDataByYearMonth" + Me.lblDataByYearMonth.Size = New System.Drawing.Size(127, 13) + Me.lblDataByYearMonth.TabIndex = 35 + Me.lblDataByYearMonth.Text = "Data By Year and Month:" + ' + 'lblDataByYear + ' + Me.lblDataByYear.AutoSize = True + Me.lblDataByYear.Location = New System.Drawing.Point(329, 51) + Me.lblDataByYear.Name = "lblDataByYear" + Me.lblDataByYear.Size = New System.Drawing.Size(73, 13) + Me.lblDataByYear.TabIndex = 33 + Me.lblDataByYear.Text = "Data By Year:" + ' + 'lblRain + ' + Me.lblRain.AutoSize = True + Me.lblRain.Location = New System.Drawing.Point(329, 177) + Me.lblRain.Name = "lblRain" + Me.lblRain.Size = New System.Drawing.Size(32, 13) + Me.lblRain.TabIndex = 39 + Me.lblRain.Text = "Rain:" + ' + 'lblMinTemp + ' + Me.lblMinTemp.AutoSize = True + Me.lblMinTemp.Location = New System.Drawing.Point(329, 220) + Me.lblMinTemp.Name = "lblMinTemp" + Me.lblMinTemp.Size = New System.Drawing.Size(57, 13) + Me.lblMinTemp.TabIndex = 41 + Me.lblMinTemp.Text = "Min Temp:" + ' + 'lblData + ' + Me.lblData.AutoSize = True + Me.lblData.Location = New System.Drawing.Point(329, 9) + Me.lblData.Name = "lblData" + Me.lblData.Size = New System.Drawing.Size(33, 13) + Me.lblData.TabIndex = 31 + Me.lblData.Text = "Data:" + ' + 'ucrReceiverRain + ' + Me.ucrReceiverRain.AutoSize = True + Me.ucrReceiverRain.frmParent = Me + Me.ucrReceiverRain.Location = New System.Drawing.Point(327, 194) + Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRain.Name = "ucrReceiverRain" + Me.ucrReceiverRain.Selector = Nothing + Me.ucrReceiverRain.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverRain.strNcFilePath = "" + Me.ucrReceiverRain.TabIndex = 40 + Me.ucrReceiverRain.ucrSelector = Nothing + ' + 'ucrReceiverMinTemp + ' + Me.ucrReceiverMinTemp.AutoSize = True + Me.ucrReceiverMinTemp.frmParent = Me + Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(327, 237) + Me.ucrReceiverMinTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinTemp.Name = "ucrReceiverMinTemp" + Me.ucrReceiverMinTemp.Selector = Nothing + Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMinTemp.strNcFilePath = "" + Me.ucrReceiverMinTemp.TabIndex = 42 + Me.ucrReceiverMinTemp.ucrSelector = Nothing + ' + 'ucrReceiverMaxTemp + ' + Me.ucrReceiverMaxTemp.AutoSize = True + Me.ucrReceiverMaxTemp.frmParent = Me + Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(327, 280) + Me.ucrReceiverMaxTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxTemp.Name = "ucrReceiverMaxTemp" + Me.ucrReceiverMaxTemp.Selector = Nothing + Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMaxTemp.strNcFilePath = "" + Me.ucrReceiverMaxTemp.TabIndex = 44 + Me.ucrReceiverMaxTemp.ucrSelector = Nothing + ' + 'ucrReceiverData + ' + Me.ucrReceiverData.AutoSize = True + Me.ucrReceiverData.frmParent = Me + Me.ucrReceiverData.Location = New System.Drawing.Point(327, 26) + Me.ucrReceiverData.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverData.Name = "ucrReceiverData" + Me.ucrReceiverData.Selector = Nothing + Me.ucrReceiverData.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverData.strNcFilePath = "" + Me.ucrReceiverData.TabIndex = 32 + Me.ucrReceiverData.ucrSelector = Nothing + ' + 'ucrSelectorExportDefinitions + ' + Me.ucrSelectorExportDefinitions.AutoSize = True + Me.ucrSelectorExportDefinitions.bDropUnusedFilterLevels = False + Me.ucrSelectorExportDefinitions.bShowHiddenColumns = False + Me.ucrSelectorExportDefinitions.bUseCurrentFilter = True + Me.ucrSelectorExportDefinitions.Location = New System.Drawing.Point(1, 8) + Me.ucrSelectorExportDefinitions.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorExportDefinitions.Name = "ucrSelectorExportDefinitions" + Me.ucrSelectorExportDefinitions.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorExportDefinitions.TabIndex = 30 + ' + 'ucrBase + ' + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(1, 458) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 60) + Me.ucrBase.TabIndex = 51 + ' + 'ucrReceiverDataYear + ' + Me.ucrReceiverDataYear.AutoSize = True + Me.ucrReceiverDataYear.frmParent = Me + Me.ucrReceiverDataYear.Location = New System.Drawing.Point(327, 68) + Me.ucrReceiverDataYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverDataYear.Name = "ucrReceiverDataYear" + Me.ucrReceiverDataYear.Selector = Nothing + Me.ucrReceiverDataYear.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverDataYear.strNcFilePath = "" + Me.ucrReceiverDataYear.TabIndex = 34 + Me.ucrReceiverDataYear.ucrSelector = Nothing + ' + 'ucrReceiverDataYearMonth + ' + Me.ucrReceiverDataYearMonth.AutoSize = True + Me.ucrReceiverDataYearMonth.frmParent = Me + Me.ucrReceiverDataYearMonth.Location = New System.Drawing.Point(327, 111) + Me.ucrReceiverDataYearMonth.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverDataYearMonth.Name = "ucrReceiverDataYearMonth" + Me.ucrReceiverDataYearMonth.Selector = Nothing + Me.ucrReceiverDataYearMonth.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverDataYearMonth.strNcFilePath = "" + Me.ucrReceiverDataYearMonth.TabIndex = 36 + Me.ucrReceiverDataYearMonth.ucrSelector = Nothing + ' + 'ucrReceiverCropData + ' + Me.ucrReceiverCropData.AutoSize = True + Me.ucrReceiverCropData.frmParent = Me + Me.ucrReceiverCropData.Location = New System.Drawing.Point(327, 152) + Me.ucrReceiverCropData.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverCropData.Name = "ucrReceiverCropData" + Me.ucrReceiverCropData.Selector = Nothing + Me.ucrReceiverCropData.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverCropData.strNcFilePath = "" + Me.ucrReceiverCropData.TabIndex = 38 + Me.ucrReceiverCropData.ucrSelector = Nothing + ' 'dlgExportClimaticDefinitions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(464, 360) + Me.ClientSize = New System.Drawing.Size(455, 527) + Me.Controls.Add(Me.lblStationID) + Me.Controls.Add(Me.lblCountry) + Me.Controls.Add(Me.ucrInputCountry) + Me.Controls.Add(Me.ucrInputStationID) + Me.Controls.Add(Me.lblMonth) + Me.Controls.Add(Me.lblYear) + Me.Controls.Add(Me.ucrReceiverMonth) + Me.Controls.Add(Me.ucrReceiverYear) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.ucrChkIncludeSummaryData) + Me.Controls.Add(Me.grpSummaries) + Me.Controls.Add(Me.lblMaxTemp) + Me.Controls.Add(Me.lblCropData) + Me.Controls.Add(Me.lblDataByYearMonth) + Me.Controls.Add(Me.lblDataByYear) + Me.Controls.Add(Me.lblRain) + Me.Controls.Add(Me.lblMinTemp) + Me.Controls.Add(Me.lblData) + Me.Controls.Add(Me.ucrReceiverRain) + Me.Controls.Add(Me.ucrReceiverMinTemp) + Me.Controls.Add(Me.ucrReceiverMaxTemp) + Me.Controls.Add(Me.ucrReceiverData) + Me.Controls.Add(Me.ucrSelectorExportDefinitions) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.ucrReceiverDataYear) + Me.Controls.Add(Me.ucrReceiverDataYearMonth) + Me.Controls.Add(Me.ucrReceiverCropData) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgExportClimaticDefinitions" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Export Climatic Definitions" + Me.grpSummaries.ResumeLayout(False) + Me.grpSummaries.PerformLayout() Me.ResumeLayout(False) + Me.PerformLayout() End Sub + + Friend WithEvents lblStationID As Label + Friend WithEvents lblCountry As Label + Friend WithEvents ucrInputCountry As ucrInputTextBox + Friend WithEvents ucrInputStationID As ucrInputTextBox + Friend WithEvents ucrChkSeasonStartProp As ucrCheck + Friend WithEvents ucrChkExtremes As ucrCheck + Friend WithEvents ucrChkCropSuccessProp As ucrCheck + Friend WithEvents ucrChkAnnualTemp As ucrCheck + Friend WithEvents ucrChkAnnualRainfall As ucrCheck + Friend WithEvents lblMonth As Label + Friend WithEvents lblYear As Label + Friend WithEvents ucrReceiverMonth As ucrReceiverSingle + Friend WithEvents ucrReceiverYear As ucrReceiverSingle + Friend WithEvents Label1 As Label + Friend WithEvents ucrChkIncludeSummaryData As ucrCheck + Friend WithEvents grpSummaries As GroupBox + Friend WithEvents ucrChkMonthlyTemp As ucrCheck + Friend WithEvents lblMaxTemp As Label + Friend WithEvents lblCropData As Label + Friend WithEvents lblDataByYearMonth As Label + Friend WithEvents lblDataByYear As Label + Friend WithEvents lblRain As Label + Friend WithEvents lblMinTemp As Label + Friend WithEvents lblData As Label + Friend WithEvents ucrReceiverRain As ucrReceiverSingle + Friend WithEvents ucrReceiverMinTemp As ucrReceiverSingle + Friend WithEvents ucrReceiverMaxTemp As ucrReceiverSingle + Friend WithEvents ucrReceiverData As ucrReceiverSingle + Friend WithEvents ucrSelectorExportDefinitions As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrReceiverDataYear As ucrReceiverSingle + Friend WithEvents ucrReceiverDataYearMonth As ucrReceiverSingle + Friend WithEvents ucrReceiverCropData As ucrReceiverSingle End Class From 80fd9feb4ffbe9aaacfd0bb0920fb1acb4d76253 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Fri, 10 May 2024 07:25:17 +0300 Subject: [PATCH 80/99] changes to the code --- .../dlgExportClimaticDefinitions.Designer.vb | 54 +++ instat/dlgExportClimaticDefinitions.vb | 383 +++++++++++++++++- instat/instat.vbproj | 9 + instat/sdgDefineAnnualRainfall.Designer.vb | 41 ++ instat/sdgDefineAnnualRainfall.resx | 120 ++++++ instat/sdgDefineAnnualRainfall.vb | 3 + 6 files changed, 609 insertions(+), 1 deletion(-) create mode 100644 instat/sdgDefineAnnualRainfall.Designer.vb create mode 100644 instat/sdgDefineAnnualRainfall.resx create mode 100644 instat/sdgDefineAnnualRainfall.vb diff --git a/instat/dlgExportClimaticDefinitions.Designer.vb b/instat/dlgExportClimaticDefinitions.Designer.vb index 1590fc407d6..8ede3b89d2b 100644 --- a/instat/dlgExportClimaticDefinitions.Designer.vb +++ b/instat/dlgExportClimaticDefinitions.Designer.vb @@ -55,6 +55,10 @@ Partial Class dlgExportClimaticDefinitions Me.ucrReceiverDataYear = New instat.ucrReceiverSingle() Me.ucrReceiverDataYearMonth = New instat.ucrReceiverSingle() Me.ucrReceiverCropData = New instat.ucrReceiverSingle() + Me.lblExport = New System.Windows.Forms.Label() + Me.cmdChooseFile = New System.Windows.Forms.Button() + Me.ucrInputTokenPath = New instat.ucrInputTextBox() + Me.cmdDefine = New System.Windows.Forms.Button() Me.grpSummaries.SuspendLayout() Me.SuspendLayout() ' @@ -403,12 +407,58 @@ Partial Class dlgExportClimaticDefinitions Me.ucrReceiverCropData.TabIndex = 38 Me.ucrReceiverCropData.ucrSelector = Nothing ' + 'lblExport + ' + Me.lblExport.AutoSize = True + Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblExport.Location = New System.Drawing.Point(4, 398) + Me.lblExport.Name = "lblExport" + Me.lblExport.Size = New System.Drawing.Size(59, 13) + Me.lblExport.TabIndex = 57 + Me.lblExport.Text = "Export File:" + ' + 'cmdChooseFile + ' + Me.cmdChooseFile.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdChooseFile.Location = New System.Drawing.Point(250, 392) + Me.cmdChooseFile.Name = "cmdChooseFile" + Me.cmdChooseFile.Size = New System.Drawing.Size(80, 23) + Me.cmdChooseFile.TabIndex = 59 + Me.cmdChooseFile.Text = "Browse" + Me.cmdChooseFile.UseVisualStyleBackColor = True + ' + 'ucrInputTokenPath + ' + Me.ucrInputTokenPath.AddQuotesIfUnrecognised = True + Me.ucrInputTokenPath.AutoSize = True + Me.ucrInputTokenPath.IsMultiline = False + Me.ucrInputTokenPath.IsReadOnly = False + Me.ucrInputTokenPath.Location = New System.Drawing.Point(64, 394) + Me.ucrInputTokenPath.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputTokenPath.Name = "ucrInputTokenPath" + Me.ucrInputTokenPath.Size = New System.Drawing.Size(182, 21) + Me.ucrInputTokenPath.TabIndex = 58 + ' + 'cmdDefine + ' + Me.cmdDefine.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdDefine.Location = New System.Drawing.Point(219, 329) + Me.cmdDefine.Name = "cmdDefine" + Me.cmdDefine.Size = New System.Drawing.Size(80, 23) + Me.cmdDefine.TabIndex = 60 + Me.cmdDefine.Text = "Define" + Me.cmdDefine.UseVisualStyleBackColor = True + ' 'dlgExportClimaticDefinitions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(455, 527) + Me.Controls.Add(Me.cmdDefine) + Me.Controls.Add(Me.lblExport) + Me.Controls.Add(Me.cmdChooseFile) + Me.Controls.Add(Me.ucrInputTokenPath) Me.Controls.Add(Me.lblStationID) Me.Controls.Add(Me.lblCountry) Me.Controls.Add(Me.ucrInputCountry) @@ -482,4 +532,8 @@ Partial Class dlgExportClimaticDefinitions Friend WithEvents ucrReceiverDataYear As ucrReceiverSingle Friend WithEvents ucrReceiverDataYearMonth As ucrReceiverSingle Friend WithEvents ucrReceiverCropData As ucrReceiverSingle + Friend WithEvents lblExport As Label + Friend WithEvents cmdChooseFile As Button + Friend WithEvents ucrInputTokenPath As ucrInputTextBox + Friend WithEvents cmdDefine As Button End Class diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index 89b1ba24c26..d9cadffa4a5 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -1,3 +1,384 @@ -Public Class dlgExportClimaticDefinitions +' 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 instat.Translations +Public Class dlgExportClimaticDefinitions + Private bFirstLoad As Boolean = True + Private bReset As Boolean = True + Private bResetRCode As Boolean = True + Private bResetSubdialog As Boolean = False + Private clsDummyFunction As New RFunction + Public clsExportRinstatToBucketFunction, ClsGcsAuthFileFunction, clsSummariesFunction As New RFunction + Public clsReforMattAnnualSummariesFunction, clsReformatCropSuccessFunction, clsReformatSeasonStartFunction, clsReformatTempSummariesFunction, clsReformatMonthlyTempSummaries As New RFunction + + Private Sub dlgExportClimaticDefinitions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstLoad Then + InitialiseDialog() + bFirstLoad = False + End If + If bReset Then + SetDefaults() + End If + SetRCodeForControls(bReset) + bReset = False + TestOkEnabled() + autoTranslate(Me) + End Sub + + Private Sub InitialiseDialog() + + ucrReceiverData.SetParameter(New RParameter("data", 0)) + ucrReceiverData.Selector = ucrSelectorExportDefinitions + ucrReceiverData.SetParameterIsString() + ucrReceiverData.SetMeAsReceiver() + ucrReceiverData.SetItemType("dataframe") + + ucrReceiverDataYear.SetParameter(New RParameter("data_by_year", 1)) + ucrReceiverDataYear.Selector = ucrSelectorExportDefinitions + ucrReceiverDataYear.SetParameterIsString() + ucrReceiverDataYear.SetItemType("dataframe") + ucrReceiverDataYear.SetLinkedDisplayControl(lblDataByYear) + + ucrReceiverDataYearMonth.SetParameter(New RParameter("data_by_year_month", 2)) + ucrReceiverDataYearMonth.Selector = ucrSelectorExportDefinitions + ucrReceiverDataYearMonth.SetParameterIsString() + ucrReceiverDataYearMonth.SetItemType("dataframe") + ucrReceiverDataYearMonth.SetLinkedDisplayControl(lblDataByYearMonth) + + ucrReceiverCropData.SetParameter(New RParameter("crop_data", 3)) + ucrReceiverCropData.Selector = ucrSelectorExportDefinitions + ucrReceiverCropData.SetParameterIsString() + ucrReceiverCropData.SetItemType("dataframe") + ucrReceiverCropData.SetLinkedDisplayControl(lblCropData) + + ucrReceiverMinTemp.SetParameter(New RParameter("tmin", 4)) + ucrReceiverMinTemp.Selector = ucrSelectorExportDefinitions + ucrReceiverMinTemp.SetParameterIsString() + ucrReceiverMinTemp.SetLinkedDisplayControl(lblMinTemp) + + ucrReceiverMaxTemp.SetParameter(New RParameter("tmax", 5)) + ucrReceiverMaxTemp.Selector = ucrSelectorExportDefinitions + ucrReceiverMaxTemp.SetParameterIsString() + ucrReceiverMaxTemp.SetLinkedDisplayControl(lblMaxTemp) + + ucrReceiverRain.SetParameter(New RParameter("rain", 6)) + ucrReceiverRain.Selector = ucrSelectorExportDefinitions + ucrReceiverRain.SetParameterIsString() + ucrReceiverRain.SetLinkedDisplayControl(lblRain) + + ucrReceiverYear.SetParameter(New RParameter("year", 7)) + ucrReceiverYear.Selector = ucrSelectorExportDefinitions + ucrReceiverYear.SetParameterIsString() + ucrReceiverYear.SetLinkedDisplayControl(lblYear) + + ucrReceiverMonth.SetParameter(New RParameter("month", 8)) + ucrReceiverMonth.Selector = ucrSelectorExportDefinitions + ucrReceiverMonth.SetParameterIsString() + ucrReceiverMonth.SetLinkedDisplayControl(lblMonth) + + ucrChkAnnualRainfall.SetText("Annual Rainfall") + ucrChkAnnualRainfall.AddParameterValuesCondition(True, "rain", "True") + ucrChkAnnualRainfall.AddParameterValuesCondition(False, "rain", "False") + + ucrChkAnnualTemp.SetText("Annual Temperature") + ucrChkAnnualTemp.AddParameterValuesCondition(True, "temp", "True") + ucrChkAnnualTemp.AddParameterValuesCondition(False, "temp", "False") + + ucrChkExtremes.SetText("Extremes") + ucrChkExtremes.AddParameterValuesCondition(True, "extrem", "True") + ucrChkExtremes.AddParameterValuesCondition(False, "extrem", "False") + + ucrChkMonthlyTemp.SetText("Monthly Temperature") + ucrChkMonthlyTemp.AddParameterValuesCondition(True, "monthly_temp", "True") + ucrChkMonthlyTemp.AddParameterValuesCondition(False, "monthly_temp", "False") + + ucrChkSeasonStartProp.SetText("Season Start Probabilities") + ucrChkSeasonStartProp.AddParameterValuesCondition(True, "season", "True") + ucrChkSeasonStartProp.AddParameterValuesCondition(False, "season", "False") + + ucrChkCropSuccessProp.SetText("Crop Success Probabilities") + ucrChkCropSuccessProp.AddParameterValuesCondition(True, "crop", "True") + ucrChkCropSuccessProp.AddParameterValuesCondition(False, "crop", "False") + + ucrChkIncludeSummaryData.SetText("Include Summary Data") + ucrChkIncludeSummaryData.SetParameter(New RParameter("include_summary_data", 17)) + ucrChkIncludeSummaryData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkIncludeSummaryData.SetRDefault("FALSE") + + ucrInputStationID.SetParameter(New RParameter("station_id", 18)) + + ucrInputCountry.SetParameter(New RParameter("country", 19)) + + ucrInputTokenPath.SetParameter(New RParameter("file", 0)) + + End Sub + + Private Sub SetDefaults() + clsExportRinstatToBucketFunction = New RFunction + clsSummariesFunction = New RFunction + clsReformatCropSuccessFunction = New RFunction + clsReformatMonthlyTempSummaries = New RFunction + clsReformatSeasonStartFunction = New RFunction + clsReforMattAnnualSummariesFunction = New RFunction + clsReformatTempSummariesFunction = New RFunction + ClsGcsAuthFileFunction = New RFunction + clsDummyFunction = New RFunction + bResetSubdialog = True + + ucrSelectorExportDefinitions.Reset() + ucrReceiverData.SetMeAsReceiver() + + clsDummyFunction.AddParameter("rain", "False", iPosition:=0) + clsDummyFunction.AddParameter("temp", "False", iPosition:=1) + clsDummyFunction.AddParameter("monthly_temp", "False", iPosition:=2) + clsDummyFunction.AddParameter("extrem", "False", iPosition:=3) + clsDummyFunction.AddParameter("season", "False", iPosition:=4) + clsDummyFunction.AddParameter("crop", "False", iPosition:=5) + + + clsReformatTempSummariesFunction.SetPackageName("epicsawrap") + clsReformatTempSummariesFunction.SetRCommand("reformat_temperature_summaries") + clsReformatTempSummariesFunction.SetAssignTo("crop_prop") + + clsReforMattAnnualSummariesFunction.SetPackageName("epicsawrap") + clsReforMattAnnualSummariesFunction.SetRCommand("reformat_annual_summaries") + clsReforMattAnnualSummariesFunction.SetAssignTo("annual_rain") + + clsReformatSeasonStartFunction.SetPackageName("epicsawrap") + clsReformatSeasonStartFunction.SetRCommand("reformat_season_start") + clsReformatSeasonStartFunction.SetAssignTo("crop_def") + + clsReformatMonthlyTempSummaries.SetPackageName("epicsawrap") + clsReformatMonthlyTempSummaries.SetRCommand("reformat_temperature_summaries") + clsReformatMonthlyTempSummaries.SetAssignTo("monthly_temp") + + clsReformatCropSuccessFunction.SetPackageName("epicsawrap") + clsReformatCropSuccessFunction.SetRCommand("reformat_crop_success") + clsReformatCropSuccessFunction.SetAssignTo("crop_prop") + + + clsSummariesFunction.SetRCommand("c") + + clsExportRinstatToBucketFunction.SetPackageName("epicsawrap") + clsExportRinstatToBucketFunction.SetRCommand("export_r_instat_to_bucket") + + ClsGcsAuthFileFunction.SetPackageName("epicsawrap") + ClsGcsAuthFileFunction.SetRCommand("gcs_auth_file") + + ucrBase.clsRsyntax.ClearCodes() + ucrBase.clsRsyntax.AddToBeforeCodes(ClsGcsAuthFileFunction, 0) + ucrBase.clsRsyntax.SetBaseRFunction(clsExportRinstatToBucketFunction) + End Sub + + Private Sub SetRCodeForControls(bReset As Boolean) + ucrReceiverCropData.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverData.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverDataYear.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverDataYearMonth.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverMaxTemp.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverMinTemp.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverMonth.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverRain.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverYear.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrSelectorExportDefinitions.SetRCode(clsExportRinstatToBucketFunction) + ucrInputTokenPath.SetRCode(ClsGcsAuthFileFunction, bReset) + + ucrInputStationID.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrInputCountry.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrChkIncludeSummaryData.SetRCode(clsExportRinstatToBucketFunction, bReset) + If bReset Then + ucrChkAnnualRainfall.SetRCode(clsDummyFunction, bReset) + ucrChkAnnualTemp.SetRCode(clsDummyFunction, bReset) + ucrChkCropSuccessProp.SetRCode(clsDummyFunction, bReset) + ucrChkExtremes.SetRCode(clsDummyFunction, bReset) + ucrChkMonthlyTemp.SetRCode(clsDummyFunction, bReset) + ucrChkSeasonStartProp.SetRCode(clsDummyFunction, bReset) + End If + AddRemoveSummary() + EnableDisableDefineButton() + End Sub + + Private Sub TestOkEnabled() + ucrBase.OKEnabled( + Not ucrReceiverData.IsEmpty _ + AndAlso Not ucrReceiverMonth.IsEmpty _ + AndAlso Not ucrReceiverYear.IsEmpty _ + AndAlso Not ucrInputCountry.IsEmpty _ + AndAlso Not ucrInputStationID.IsEmpty _ + AndAlso ucrChkIncludeSummaryData.Checked _ + AndAlso Not ucrInputTokenPath.IsEmpty _ + AndAlso ( + ((ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked) AndAlso Not ucrReceiverCropData.IsEmpty) _ + OrElse (ucrChkAnnualRainfall.Checked AndAlso Not ucrReceiverRain.IsEmpty) _ + OrElse ((ucrChkAnnualTemp.Checked OrElse ucrChkMonthlyTemp.Checked) AndAlso Not ucrReceiverMinTemp.IsEmpty) _ + OrElse ((ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked) AndAlso Not ucrReceiverDataYear.IsEmpty) _ + OrElse (ucrChkMonthlyTemp.Checked AndAlso Not ucrReceiverDataYearMonth.IsEmpty) _ + OrElse ((ucrChkAnnualTemp.Checked OrElse ucrChkMonthlyTemp.Checked) AndAlso Not ucrReceiverMaxTemp.IsEmpty) + ) +) + + End Sub + + Private Sub AddRemoveSummary() + If ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked OrElse ucrChkCropSuccessProp.Checked OrElse ucrChkExtremes.Checked OrElse ucrChkMonthlyTemp.Checked OrElse ucrChkSeasonStartProp.Checked Then + clsExportRinstatToBucketFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesFunction, iPosition:=0) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("summaries") + End If + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOkEnabled() + EnableDisableDefineButton() + End Sub + + Private Sub cmdDefine_Click(sender As Object, e As EventArgs) Handles cmdDefine.Click + sdgDefineAnnualRainfall.SetRCode(clsNewReformatCropSuccessFunction:=clsReformatCropSuccessFunction, clsNewReformatSeasonStartFunction:=clsReformatSeasonStartFunction, clsNewReformatMonthlyTempSummaries:=clsReformatMonthlyTempSummaries, + clsNewReforMattAnnualSummaries:=clsReforMattAnnualSummariesFunction, clsNewReformatTempSummariesFunction:=clsReformatTempSummariesFunction, clsNewExportRinstatToBucketFunction:=clsExportRinstatToBucketFunction, bReset:=bResetSubdialog) + sdgDefineAnnualRainfall.ShowDialog() + bResetSubdialog = False + End Sub + + Private Sub ucrChkAnnualRainfall_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAnnualRainfall.ControlValueChanged + If ucrChkAnnualRainfall.Checked Then + clsSummariesFunction.AddParameter("rain", Chr(34) & "annual_rainfall" & Chr(34), iPosition:=0, bIncludeArgumentName:=False) + Else + clsSummariesFunction.RemoveParameterByName("rain") + End If + AddRemoveSummary() + EnableDisableDefineButton() + TestOkEnabled() + End Sub + + Private Sub ucrChkAnnualTemp_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAnnualTemp.ControlValueChanged + If ucrChkAnnualTemp.Checked Then + clsSummariesFunction.AddParameter("temp", Chr(34) & "annual_temperature" & Chr(34), iPosition:=1, bIncludeArgumentName:=False) + Else + clsSummariesFunction.RemoveParameterByName("temp") + End If + AddRemoveSummary() + EnableDisableDefineButton() + TestOkEnabled() + End Sub + + Private Sub ucrChkCropSuccessProp_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkCropSuccessProp.ControlValueChanged + If ucrChkCropSuccessProp.Checked Then + clsSummariesFunction.AddParameter("prop", Chr(34) & "crop_success" & Chr(34), iPosition:=2, bIncludeArgumentName:=False) + Else + clsSummariesFunction.RemoveParameterByName("prop") + End If + AddRemoveSummary() + EnableDisableDefineButton() + TestOkEnabled() + End Sub + + Private Sub ucrChkExtremes_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkExtremes.ControlValueChanged + If ucrChkExtremes.Checked Then + clsSummariesFunction.AddParameter("extreme", Chr(34) & "extremes" & Chr(34), iPosition:=3, bIncludeArgumentName:=False) + Else + clsSummariesFunction.RemoveParameterByName("extreme") + End If + AddRemoveSummary() + EnableDisableDefineButton() + End Sub + + Private Sub ucrChkMonthlyTemp_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkMonthlyTemp.ControlValueChanged + If ucrChkMonthlyTemp.Checked Then + clsSummariesFunction.AddParameter("month_temp", Chr(34) & "monthly_temperature" & Chr(34), iPosition:=4, bIncludeArgumentName:=False) + Else + clsSummariesFunction.RemoveParameterByName("month_temp") + End If + AddRemoveSummary() + EnableDisableDefineButton() + TestOkEnabled() + End Sub + + Private Sub ucrChkSeasonStartProp_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSeasonStartProp.ControlValueChanged + If ucrChkSeasonStartProp.Checked Then + clsSummariesFunction.AddParameter("start_prop", Chr(34) & "start_season" & Chr(34), iPosition:=5, bIncludeArgumentName:=False) + Else + clsSummariesFunction.RemoveParameterByName("start_prop") + End If + AddRemoveSummary() + EnableDisableDefineButton() + TestOkEnabled() + End Sub + + Private Sub ucrInputCountry_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCountry.ControlValueChanged + If Not ucrInputCountry.IsEmpty Then + clsExportRinstatToBucketFunction.AddParameter("country", Chr(34) & ucrInputCountry.GetText & Chr(34), iPosition:=19) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("country") + End If + End Sub + + Private Sub ucrInputStationID_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputStationID.ControlValueChanged + If Not ucrInputStationID.IsEmpty Then + clsExportRinstatToBucketFunction.AddParameter("station_id", Chr(34) & ucrInputStationID.GetText & Chr(34), iPosition:=18) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("station_id") + End If + End Sub + Private Sub EnableDisableDefineButton() + cmdDefine.Enabled = ucrChkIncludeSummaryData.Checked AndAlso (ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked OrElse ucrChkCropSuccessProp.Checked OrElse ucrChkExtremes.Checked OrElse ucrChkMonthlyTemp.Checked OrElse ucrChkSeasonStartProp.Checked) + ucrReceiverDataYearMonth.Visible = ucrChkMonthlyTemp.Checked + ucrReceiverDataYear.Visible = ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked + ucrReceiverRain.Visible = ucrChkAnnualRainfall.Checked + ucrReceiverCropData.Visible = ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked + ucrReceiverMaxTemp.Visible = ucrChkMonthlyTemp.Checked OrElse ucrChkAnnualTemp.Checked + ucrReceiverMinTemp.Visible = ucrChkMonthlyTemp.Checked OrElse ucrChkAnnualTemp.Checked + + End Sub + + Private Sub ucrChkIncludeSummaryData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeSummaryData.ControlValueChanged + EnableDisableDefineButton() + End Sub + + Private Sub SelectFileToSave() + Using dlgSave As New SaveFileDialog + dlgSave.Title = "Save JSON File" + dlgSave.Filter = "JSON Files|*.json" + If ucrInputTokenPath.GetText() <> "" Then + dlgSave.InitialDirectory = ucrInputTokenPath.GetText().Replace("/", "\") + Else + dlgSave.InitialDirectory = frmMain.clsInstatOptions.strWorkingDirectory + End If + If dlgSave.ShowDialog() = DialogResult.OK Then + ucrInputTokenPath.SetName(dlgSave.FileName.Replace("\", "/")) + End If + TestOkEnabled() + End Using + End Sub + + Private Sub ucrInputTokenPath_Click(sender As Object, e As EventArgs) Handles ucrInputTokenPath.Click + If ucrInputTokenPath.IsEmpty() Then + SelectFileToSave() + End If + End Sub + + Private Sub cmdChooseFile_Click(sender As Object, e As EventArgs) Handles cmdChooseFile.Click + SelectFileToSave() + End Sub + Private Sub ucrReceiverData_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, + ucrReceiverMaxTemp.ControlContentsChanged, ucrReceiverMinTemp.ControlContentsChanged, ucrReceiverCropData.ControlContentsChanged, ucrReceiverDataYearMonth.ControlContentsChanged, ucrReceiverDataYear.ControlContentsChanged, + ucrReceiverMonth.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrChkSeasonStartProp.ControlContentsChanged, ucrInputCountry.ControlContentsChanged, ucrInputStationID.ControlContentsChanged, ucrChkIncludeSummaryData.ControlContentsChanged, + ucrChkMonthlyTemp.ControlContentsChanged, ucrChkCropSuccessProp.ControlContentsChanged, ucrChkAnnualTemp.ControlContentsChanged, ucrChkAnnualRainfall.ControlContentsChanged, ucrInputTokenPath.ControlContentsChanged + TestOkEnabled() + End Sub End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index a9f2605da8b..12d44a0e9d4 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -307,6 +307,12 @@ + + sdgDefineAnnualRainfall.vb + + + Form + sdgHSConstants.vb @@ -3185,6 +3191,9 @@ dlgThreeVariablePivotTable.vb + + sdgDefineAnnualRainfall.vb + sdgHSConstants.vb diff --git a/instat/sdgDefineAnnualRainfall.Designer.vb b/instat/sdgDefineAnnualRainfall.Designer.vb new file mode 100644 index 00000000000..b39969aef87 --- /dev/null +++ b/instat/sdgDefineAnnualRainfall.Designer.vb @@ -0,0 +1,41 @@ + _ +Partial Class sdgDefineAnnualRainfall + 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.SuspendLayout() + ' + 'sdgDefineAnnualRainfall + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(575, 466) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "sdgDefineAnnualRainfall" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "sdgDefineAnnualRainfall" + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/instat/sdgDefineAnnualRainfall.resx b/instat/sdgDefineAnnualRainfall.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgDefineAnnualRainfall.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/sdgDefineAnnualRainfall.vb b/instat/sdgDefineAnnualRainfall.vb new file mode 100644 index 00000000000..559f1d5c09c --- /dev/null +++ b/instat/sdgDefineAnnualRainfall.vb @@ -0,0 +1,3 @@ +Public Class sdgDefineAnnualRainfall + +End Class \ No newline at end of file From 219e7eddf7a144807743adf2190f7e05e1048623 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Fri, 10 May 2024 07:25:39 +0300 Subject: [PATCH 81/99] changes --- instat/dlgExportClimaticDefinitions.vb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index d9cadffa4a5..d5c1ef66d4a 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -247,12 +247,12 @@ Public Class dlgExportClimaticDefinitions EnableDisableDefineButton() End Sub - Private Sub cmdDefine_Click(sender As Object, e As EventArgs) Handles cmdDefine.Click - sdgDefineAnnualRainfall.SetRCode(clsNewReformatCropSuccessFunction:=clsReformatCropSuccessFunction, clsNewReformatSeasonStartFunction:=clsReformatSeasonStartFunction, clsNewReformatMonthlyTempSummaries:=clsReformatMonthlyTempSummaries, - clsNewReforMattAnnualSummaries:=clsReforMattAnnualSummariesFunction, clsNewReformatTempSummariesFunction:=clsReformatTempSummariesFunction, clsNewExportRinstatToBucketFunction:=clsExportRinstatToBucketFunction, bReset:=bResetSubdialog) - sdgDefineAnnualRainfall.ShowDialog() - bResetSubdialog = False - End Sub + 'Private Sub cmdDefine_Click(sender As Object, e As EventArgs) Handles cmdDefine.Click + ' sdgDefineAnnualRainfall.SetRCode(clsNewReformatCropSuccessFunction:=clsReformatCropSuccessFunction, clsNewReformatSeasonStartFunction:=clsReformatSeasonStartFunction, clsNewReformatMonthlyTempSummaries:=clsReformatMonthlyTempSummaries, + ' clsNewReforMattAnnualSummaries:=clsReforMattAnnualSummariesFunction, clsNewReformatTempSummariesFunction:=clsReformatTempSummariesFunction, clsNewExportRinstatToBucketFunction:=clsExportRinstatToBucketFunction, bReset:=bResetSubdialog) + ' sdgDefineAnnualRainfall.ShowDialog() + ' bResetSubdialog = False + 'End Sub Private Sub ucrChkAnnualRainfall_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAnnualRainfall.ControlValueChanged If ucrChkAnnualRainfall.Checked Then From cac0135a076517952108a919cc94bc0da038fcd4 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Fri, 10 May 2024 07:39:15 +0300 Subject: [PATCH 82/99] changes --- instat/dlgExportClimaticDefinitions.vb | 12 +- instat/sdgDefineAnnualRainfall.Designer.vb | 1278 +++++++++++++++++++- instat/sdgDefineAnnualRainfall.vb | 318 ++++- 3 files changed, 1599 insertions(+), 9 deletions(-) diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index d5c1ef66d4a..d9cadffa4a5 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -247,12 +247,12 @@ Public Class dlgExportClimaticDefinitions EnableDisableDefineButton() End Sub - 'Private Sub cmdDefine_Click(sender As Object, e As EventArgs) Handles cmdDefine.Click - ' sdgDefineAnnualRainfall.SetRCode(clsNewReformatCropSuccessFunction:=clsReformatCropSuccessFunction, clsNewReformatSeasonStartFunction:=clsReformatSeasonStartFunction, clsNewReformatMonthlyTempSummaries:=clsReformatMonthlyTempSummaries, - ' clsNewReforMattAnnualSummaries:=clsReforMattAnnualSummariesFunction, clsNewReformatTempSummariesFunction:=clsReformatTempSummariesFunction, clsNewExportRinstatToBucketFunction:=clsExportRinstatToBucketFunction, bReset:=bResetSubdialog) - ' sdgDefineAnnualRainfall.ShowDialog() - ' bResetSubdialog = False - 'End Sub + Private Sub cmdDefine_Click(sender As Object, e As EventArgs) Handles cmdDefine.Click + sdgDefineAnnualRainfall.SetRCode(clsNewReformatCropSuccessFunction:=clsReformatCropSuccessFunction, clsNewReformatSeasonStartFunction:=clsReformatSeasonStartFunction, clsNewReformatMonthlyTempSummaries:=clsReformatMonthlyTempSummaries, + clsNewReforMattAnnualSummaries:=clsReforMattAnnualSummariesFunction, clsNewReformatTempSummariesFunction:=clsReformatTempSummariesFunction, clsNewExportRinstatToBucketFunction:=clsExportRinstatToBucketFunction, bReset:=bResetSubdialog) + sdgDefineAnnualRainfall.ShowDialog() + bResetSubdialog = False + End Sub Private Sub ucrChkAnnualRainfall_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAnnualRainfall.ControlValueChanged If ucrChkAnnualRainfall.Checked Then diff --git a/instat/sdgDefineAnnualRainfall.Designer.vb b/instat/sdgDefineAnnualRainfall.Designer.vb index b39969aef87..e03002e434a 100644 --- a/instat/sdgDefineAnnualRainfall.Designer.vb +++ b/instat/sdgDefineAnnualRainfall.Designer.vb @@ -22,20 +22,1294 @@ Partial Class sdgDefineAnnualRainfall 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Me.ucrReceiverPlantingDayCondition = New instat.ucrReceiverSingle() + Me.lblMinMinAnnual = New System.Windows.Forms.Label() + Me.ucrReceiverMinMinAnnual = New instat.ucrReceiverSingle() + Me.lblMeanAnnualTemp = New System.Windows.Forms.Label() + Me.lblMaxMinAnnual = New System.Windows.Forms.Label() + Me.lblAnnualTempYear = New System.Windows.Forms.Label() + Me.lblAnnualTempStation = New System.Windows.Forms.Label() + Me.lblMaxMaxAnnual = New System.Windows.Forms.Label() + Me.ucrSelecetorMonthlyTemp = New instat.ucrSelectorByDataFrame() + Me.lblMinMaxAnnual = New System.Windows.Forms.Label() + Me.lblMeanMaxAnnual = New System.Windows.Forms.Label() + Me.ucrReceiverMaxMaxAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanMaxAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMinMaxAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxMinAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverAnnualTempYr = New instat.ucrReceiverSingle() + Me.ucrReceiverAnnualTempStation = New instat.ucrReceiverSingle() + Me.tbAnnualTempSummaries = New System.Windows.Forms.TabPage() + Me.ucrSelectorAnnualTemp = New instat.ucrSelectorByDataFrame() + Me.lblPlantingDayCond = New System.Windows.Forms.Label() + Me.tbMonthlyTemp = New System.Windows.Forms.TabPage() + Me.lblMonth = New System.Windows.Forms.Label() + Me.ucrReceiverMonthMonthly = New instat.ucrReceiverSingle() + Me.lblMinMInMonthly = New System.Windows.Forms.Label() + Me.ucrReceiverMinMinMonthly = New instat.ucrReceiverSingle() + Me.lblMeanMinMonthly = New System.Windows.Forms.Label() + Me.lblMaxMinMonthly = New System.Windows.Forms.Label() + Me.lblYearMonthTemp = New System.Windows.Forms.Label() + Me.lblStationMonthTemp = New System.Windows.Forms.Label() + Me.lblMaxMaxMonthly = New System.Windows.Forms.Label() + Me.lblMinMaxMonthly = New System.Windows.Forms.Label() + Me.lblMeanMaxMonthly = New System.Windows.Forms.Label() + Me.ucrReceiverMaxMaxMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanmaxMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMinMaxMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxMinMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanminMontly = New instat.ucrReceiverSingle() + Me.ucrReceiverYearMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMonthlyTemp = New instat.ucrReceiverSingle() + Me.ucrBase = New instat.ucrButtonsSubdialogue() + Me.lblSeasonPlantingDay = New System.Windows.Forms.Label() + Me.lblRainyDaysYear = New System.Windows.Forms.Label() + Me.ucrReceiverRainDaysYear = New instat.ucrReceiverSingle() + Me.lblNoRainDaysSeason = New System.Windows.Forms.Label() + Me.lblSeasonalLength = New System.Windows.Forms.Label() + Me.lblSeasonalRain = New System.Windows.Forms.Label() + Me.lblAnnualRain = New System.Windows.Forms.Label() + Me.lblEndSeasonDate = New System.Windows.Forms.Label() + Me.lblEndSeasonDOY = New System.Windows.Forms.Label() + Me.lblEndRainDate = New System.Windows.Forms.Label() + Me.lblEndRainsDOY = New System.Windows.Forms.Label() + Me.lblStartRainDate = New System.Windows.Forms.Label() + Me.lblStartRainDOY = New System.Windows.Forms.Label() + Me.lblYear = New System.Windows.Forms.Label() + Me.lblStation = New System.Windows.Forms.Label() + Me.ucrReceiverStartRainDate = New instat.ucrReceiverSingle() + Me.ucrReceiverStartRainDOY = New instat.ucrReceiverSingle() + Me.ucrReceiverYear = New instat.ucrReceiverSingle() + Me.ucrReceiverStation = New instat.ucrReceiverSingle() + Me.ucrReceiverEndSeasonDate = New instat.ucrReceiverSingle() + Me.ucrReceiverEndSeasonDOY = New instat.ucrReceiverSingle() + Me.ucrReceiverEndRainsDOY = New instat.ucrReceiverSingle() + Me.tbSummaries = New System.Windows.Forms.TabControl() + Me.tbAnnualRainfall = New System.Windows.Forms.TabPage() + Me.ucrReceiverEndRainsDate = New instat.ucrReceiverSingle() + Me.ucrReceiverSeasonalLength = New instat.ucrReceiverSingle() + Me.ucrReceiverRainDaysSeason = New instat.ucrReceiverSingle() + Me.ucrReceiverSeasonalRain = New instat.ucrReceiverSingle() + Me.ucrReceiverAnnualRain = New instat.ucrReceiverSingle() + Me.ucrSelectorDefineAnnualRain = New instat.ucrSelectorByDataFrame() + Me.tbCropSuccessProp = New System.Windows.Forms.TabPage() + Me.lblPlantingLength = New System.Windows.Forms.Label() + Me.ucrReceiverPlantingLenghth = New instat.ucrReceiverSingle() + Me.lblPlantingDay = New System.Windows.Forms.Label() + Me.lblProbSuccess = New System.Windows.Forms.Label() + Me.lblTotalRain = New System.Windows.Forms.Label() + Me.lblCropStation = New System.Windows.Forms.Label() + Me.ucrReceiverPropSuccess = New instat.ucrReceiverSingle() + Me.ucrReceiverPlantingDay = New instat.ucrReceiverSingle() + Me.ucrReceiverTotalRain = New instat.ucrReceiverSingle() + Me.ucrReceiverStationCrop = New instat.ucrReceiverSingle() + Me.ucrSelectorCropProp = New instat.ucrSelectorByDataFrame() + Me.tbSeasonStartProb = New System.Windows.Forms.TabPage() + Me.lblSeasonYear = New System.Windows.Forms.Label() + Me.lblStationSeasonProb = New System.Windows.Forms.Label() + Me.ucrReceiverSeasonPlantingDay = New instat.ucrReceiverSingle() + Me.ucrReceiverSeasonYear = New instat.ucrReceiverSingle() + Me.ucrReceiverSeasonStationProb = New instat.ucrReceiverSingle() + Me.ucrSelectorSeasonStartProp = New instat.ucrSelectorByDataFrame() + Me.tbAnnualTempSummaries.SuspendLayout() + Me.tbMonthlyTemp.SuspendLayout() + Me.tbSummaries.SuspendLayout() + Me.tbAnnualRainfall.SuspendLayout() + Me.tbCropSuccessProp.SuspendLayout() + Me.tbSeasonStartProb.SuspendLayout() Me.SuspendLayout() ' + 'ucrReceiverPlantingDayCondition + ' + Me.ucrReceiverPlantingDayCondition.AutoSize = True + Me.ucrReceiverPlantingDayCondition.frmParent = Nothing + Me.ucrReceiverPlantingDayCondition.Location = New System.Drawing.Point(252, 155) + Me.ucrReceiverPlantingDayCondition.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPlantingDayCondition.Name = "ucrReceiverPlantingDayCondition" + Me.ucrReceiverPlantingDayCondition.Selector = Nothing + Me.ucrReceiverPlantingDayCondition.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverPlantingDayCondition.strNcFilePath = "" + Me.ucrReceiverPlantingDayCondition.TabIndex = 8 + Me.ucrReceiverPlantingDayCondition.ucrSelector = Nothing + ' + 'lblMinMinAnnual + ' + Me.lblMinMinAnnual.AutoSize = True + Me.lblMinMinAnnual.Location = New System.Drawing.Point(249, 135) + Me.lblMinMinAnnual.Name = "lblMinMinAnnual" + Me.lblMinMinAnnual.Size = New System.Drawing.Size(98, 13) + Me.lblMinMinAnnual.TabIndex = 7 + Me.lblMinMinAnnual.Text = "Min Minimum Temp" + ' + 'ucrReceiverMinMinAnnual + ' + Me.ucrReceiverMinMinAnnual.AutoSize = True + Me.ucrReceiverMinMinAnnual.frmParent = Nothing + Me.ucrReceiverMinMinAnnual.Location = New System.Drawing.Point(250, 151) + Me.ucrReceiverMinMinAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMinAnnual.Name = "ucrReceiverMinMinAnnual" + Me.ucrReceiverMinMinAnnual.Selector = Nothing + Me.ucrReceiverMinMinAnnual.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMinMinAnnual.strNcFilePath = "" + Me.ucrReceiverMinMinAnnual.TabIndex = 8 + Me.ucrReceiverMinMinAnnual.ucrSelector = Nothing + ' + 'lblMeanAnnualTemp + ' + Me.lblMeanAnnualTemp.AutoSize = True + Me.lblMeanAnnualTemp.Location = New System.Drawing.Point(245, 93) + Me.lblMeanAnnualTemp.Name = "lblMeanAnnualTemp" + Me.lblMeanAnnualTemp.Size = New System.Drawing.Size(108, 13) + Me.lblMeanAnnualTemp.TabIndex = 5 + Me.lblMeanAnnualTemp.Text = "Mean Minimum Temp" + ' + 'lblMaxMinAnnual + ' + Me.lblMaxMinAnnual.AutoSize = True + Me.lblMaxMinAnnual.Location = New System.Drawing.Point(251, 174) + Me.lblMaxMinAnnual.Name = "lblMaxMinAnnual" + Me.lblMaxMinAnnual.Size = New System.Drawing.Size(101, 13) + Me.lblMaxMinAnnual.TabIndex = 9 + Me.lblMaxMinAnnual.Text = "Max Minimum Temp" + ' + 'lblAnnualTempYear + ' + Me.lblAnnualTempYear.AutoSize = True + Me.lblAnnualTempYear.Location = New System.Drawing.Point(249, 52) + Me.lblAnnualTempYear.Name = "lblAnnualTempYear" + Me.lblAnnualTempYear.Size = New System.Drawing.Size(32, 13) + Me.lblAnnualTempYear.TabIndex = 3 + Me.lblAnnualTempYear.Text = "Year:" + ' + 'lblAnnualTempStation + ' + Me.lblAnnualTempStation.AutoSize = True + Me.lblAnnualTempStation.Location = New System.Drawing.Point(248, 9) + Me.lblAnnualTempStation.Name = "lblAnnualTempStation" + Me.lblAnnualTempStation.Size = New System.Drawing.Size(43, 13) + Me.lblAnnualTempStation.TabIndex = 1 + Me.lblAnnualTempStation.Text = "Station:" + ' + 'lblMaxMaxAnnual + ' + Me.lblMaxMaxAnnual.AutoSize = True + Me.lblMaxMaxAnnual.Location = New System.Drawing.Point(255, 295) + Me.lblMaxMaxAnnual.Name = "lblMaxMaxAnnual" + Me.lblMaxMaxAnnual.Size = New System.Drawing.Size(104, 13) + Me.lblMaxMaxAnnual.TabIndex = 15 + Me.lblMaxMaxAnnual.Text = "Max Maximum Temp" + ' + 'ucrSelecetorMonthlyTemp + ' + Me.ucrSelecetorMonthlyTemp.AutoSize = True + Me.ucrSelecetorMonthlyTemp.bDropUnusedFilterLevels = False + Me.ucrSelecetorMonthlyTemp.bShowHiddenColumns = False + Me.ucrSelecetorMonthlyTemp.bUseCurrentFilter = True + Me.ucrSelecetorMonthlyTemp.Location = New System.Drawing.Point(10, 12) + Me.ucrSelecetorMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelecetorMonthlyTemp.Name = "ucrSelecetorMonthlyTemp" + Me.ucrSelecetorMonthlyTemp.Size = New System.Drawing.Size(151, 185) + Me.ucrSelecetorMonthlyTemp.TabIndex = 0 + ' + 'lblMinMaxAnnual + ' + Me.lblMinMaxAnnual.AutoSize = True + Me.lblMinMaxAnnual.Location = New System.Drawing.Point(254, 253) + Me.lblMinMaxAnnual.Name = "lblMinMaxAnnual" + Me.lblMinMaxAnnual.Size = New System.Drawing.Size(104, 13) + Me.lblMinMaxAnnual.TabIndex = 13 + Me.lblMinMaxAnnual.Text = "Min Maximum Temp:" + ' + 'lblMeanMaxAnnual + ' + Me.lblMeanMaxAnnual.AutoSize = True + Me.lblMeanMaxAnnual.Location = New System.Drawing.Point(254, 214) + Me.lblMeanMaxAnnual.Name = "lblMeanMaxAnnual" + Me.lblMeanMaxAnnual.Size = New System.Drawing.Size(111, 13) + Me.lblMeanMaxAnnual.TabIndex = 11 + Me.lblMeanMaxAnnual.Text = "Mean Maximum Temp" + ' + 'ucrReceiverMaxMaxAnnual + ' + Me.ucrReceiverMaxMaxAnnual.AutoSize = True + Me.ucrReceiverMaxMaxAnnual.frmParent = Nothing + Me.ucrReceiverMaxMaxAnnual.Location = New System.Drawing.Point(254, 308) + Me.ucrReceiverMaxMaxAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMaxAnnual.Name = "ucrReceiverMaxMaxAnnual" + Me.ucrReceiverMaxMaxAnnual.Selector = Nothing + Me.ucrReceiverMaxMaxAnnual.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMaxMaxAnnual.strNcFilePath = "" + Me.ucrReceiverMaxMaxAnnual.TabIndex = 16 + Me.ucrReceiverMaxMaxAnnual.ucrSelector = Nothing + ' + 'ucrReceiverMeanMaxAnnual + ' + Me.ucrReceiverMeanMaxAnnual.AutoSize = True + Me.ucrReceiverMeanMaxAnnual.frmParent = Nothing + Me.ucrReceiverMeanMaxAnnual.Location = New System.Drawing.Point(253, 231) + Me.ucrReceiverMeanMaxAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanMaxAnnual.Name = "ucrReceiverMeanMaxAnnual" + Me.ucrReceiverMeanMaxAnnual.Selector = Nothing + Me.ucrReceiverMeanMaxAnnual.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMeanMaxAnnual.strNcFilePath = "" + Me.ucrReceiverMeanMaxAnnual.TabIndex = 12 + Me.ucrReceiverMeanMaxAnnual.ucrSelector = Nothing + ' + 'ucrReceiverMinMaxAnnual + ' + Me.ucrReceiverMinMaxAnnual.AutoSize = True + Me.ucrReceiverMinMaxAnnual.frmParent = Nothing + Me.ucrReceiverMinMaxAnnual.Location = New System.Drawing.Point(251, 271) + Me.ucrReceiverMinMaxAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMaxAnnual.Name = "ucrReceiverMinMaxAnnual" + Me.ucrReceiverMinMaxAnnual.Selector = Nothing + Me.ucrReceiverMinMaxAnnual.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMinMaxAnnual.strNcFilePath = "" + Me.ucrReceiverMinMaxAnnual.TabIndex = 14 + Me.ucrReceiverMinMaxAnnual.ucrSelector = Nothing + ' + 'ucrReceiverMaxMinAnnual + ' + Me.ucrReceiverMaxMinAnnual.AutoSize = True + Me.ucrReceiverMaxMinAnnual.frmParent = Nothing + Me.ucrReceiverMaxMinAnnual.Location = New System.Drawing.Point(249, 192) + Me.ucrReceiverMaxMinAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMinAnnual.Name = "ucrReceiverMaxMinAnnual" + Me.ucrReceiverMaxMinAnnual.Selector = Nothing + Me.ucrReceiverMaxMinAnnual.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMaxMinAnnual.strNcFilePath = "" + Me.ucrReceiverMaxMinAnnual.TabIndex = 10 + Me.ucrReceiverMaxMinAnnual.ucrSelector = Nothing + ' + 'ucrReceiverMeanAnnual + ' + Me.ucrReceiverMeanAnnual.AutoSize = True + Me.ucrReceiverMeanAnnual.frmParent = Nothing + Me.ucrReceiverMeanAnnual.Location = New System.Drawing.Point(248, 112) + Me.ucrReceiverMeanAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanAnnual.Name = "ucrReceiverMeanAnnual" + Me.ucrReceiverMeanAnnual.Selector = Nothing + Me.ucrReceiverMeanAnnual.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMeanAnnual.strNcFilePath = "" + Me.ucrReceiverMeanAnnual.TabIndex = 6 + Me.ucrReceiverMeanAnnual.ucrSelector = Nothing + ' + 'ucrReceiverAnnualTempYr + ' + Me.ucrReceiverAnnualTempYr.AutoSize = True + Me.ucrReceiverAnnualTempYr.frmParent = Nothing + Me.ucrReceiverAnnualTempYr.Location = New System.Drawing.Point(247, 69) + Me.ucrReceiverAnnualTempYr.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAnnualTempYr.Name = "ucrReceiverAnnualTempYr" + Me.ucrReceiverAnnualTempYr.Selector = Nothing + Me.ucrReceiverAnnualTempYr.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverAnnualTempYr.strNcFilePath = "" + Me.ucrReceiverAnnualTempYr.TabIndex = 4 + Me.ucrReceiverAnnualTempYr.ucrSelector = Nothing + ' + 'ucrReceiverAnnualTempStation + ' + Me.ucrReceiverAnnualTempStation.AutoSize = True + Me.ucrReceiverAnnualTempStation.frmParent = Nothing + Me.ucrReceiverAnnualTempStation.Location = New System.Drawing.Point(246, 26) + Me.ucrReceiverAnnualTempStation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAnnualTempStation.Name = "ucrReceiverAnnualTempStation" + Me.ucrReceiverAnnualTempStation.Selector = Nothing + Me.ucrReceiverAnnualTempStation.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverAnnualTempStation.strNcFilePath = "" + Me.ucrReceiverAnnualTempStation.TabIndex = 2 + Me.ucrReceiverAnnualTempStation.ucrSelector = Nothing + ' + 'tbAnnualTempSummaries + ' + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanAnnualTemp) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempYear) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempStation) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempYr) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempStation) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrSelectorAnnualTemp) + Me.tbAnnualTempSummaries.Location = New System.Drawing.Point(4, 22) + Me.tbAnnualTempSummaries.Name = "tbAnnualTempSummaries" + Me.tbAnnualTempSummaries.Padding = New System.Windows.Forms.Padding(3) + Me.tbAnnualTempSummaries.Size = New System.Drawing.Size(515, 404) + Me.tbAnnualTempSummaries.TabIndex = 3 + Me.tbAnnualTempSummaries.Text = "Annual Temperature" + Me.tbAnnualTempSummaries.UseVisualStyleBackColor = True + ' + 'ucrSelectorAnnualTemp + ' + Me.ucrSelectorAnnualTemp.AutoSize = True + Me.ucrSelectorAnnualTemp.bDropUnusedFilterLevels = False + Me.ucrSelectorAnnualTemp.bShowHiddenColumns = False + Me.ucrSelectorAnnualTemp.bUseCurrentFilter = True + Me.ucrSelectorAnnualTemp.Location = New System.Drawing.Point(11, 6) + Me.ucrSelectorAnnualTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorAnnualTemp.Name = "ucrSelectorAnnualTemp" + Me.ucrSelectorAnnualTemp.Size = New System.Drawing.Size(151, 185) + Me.ucrSelectorAnnualTemp.TabIndex = 0 + ' + 'lblPlantingDayCond + ' + Me.lblPlantingDayCond.AutoSize = True + Me.lblPlantingDayCond.Location = New System.Drawing.Point(254, 139) + Me.lblPlantingDayCond.Name = "lblPlantingDayCond" + Me.lblPlantingDayCond.Size = New System.Drawing.Size(117, 13) + Me.lblPlantingDayCond.TabIndex = 7 + Me.lblPlantingDayCond.Text = "Planting Day Condition:" + ' + 'tbMonthlyTemp + ' + Me.tbMonthlyTemp.Controls.Add(Me.lblMonth) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMinMInMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblYearMonthTemp) + Me.tbMonthlyTemp.Controls.Add(Me.lblStationMonthTemp) + Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMinMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanmaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanminMontly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverYearMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthlyTemp) + Me.tbMonthlyTemp.Controls.Add(Me.ucrSelecetorMonthlyTemp) + Me.tbMonthlyTemp.Location = New System.Drawing.Point(4, 22) + Me.tbMonthlyTemp.Name = "tbMonthlyTemp" + Me.tbMonthlyTemp.Padding = New System.Windows.Forms.Padding(3) + Me.tbMonthlyTemp.Size = New System.Drawing.Size(515, 404) + Me.tbMonthlyTemp.TabIndex = 4 + Me.tbMonthlyTemp.Text = "Monthly Temperature" + Me.tbMonthlyTemp.UseVisualStyleBackColor = True + ' + 'lblMonth + ' + Me.lblMonth.AutoSize = True + Me.lblMonth.Location = New System.Drawing.Point(247, 95) + Me.lblMonth.Name = "lblMonth" + Me.lblMonth.Size = New System.Drawing.Size(40, 13) + Me.lblMonth.TabIndex = 5 + Me.lblMonth.Text = "Month:" + ' + 'ucrReceiverMonthMonthly + ' + Me.ucrReceiverMonthMonthly.AutoSize = True + Me.ucrReceiverMonthMonthly.frmParent = Nothing + Me.ucrReceiverMonthMonthly.Location = New System.Drawing.Point(245, 112) + Me.ucrReceiverMonthMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonthMonthly.Name = "ucrReceiverMonthMonthly" + Me.ucrReceiverMonthMonthly.Selector = Nothing + Me.ucrReceiverMonthMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMonthMonthly.strNcFilePath = "" + Me.ucrReceiverMonthMonthly.TabIndex = 6 + Me.ucrReceiverMonthMonthly.ucrSelector = Nothing + ' + 'lblMinMInMonthly + ' + Me.lblMinMInMonthly.AutoSize = True + Me.lblMinMInMonthly.Location = New System.Drawing.Point(248, 181) + Me.lblMinMInMonthly.Name = "lblMinMInMonthly" + Me.lblMinMInMonthly.Size = New System.Drawing.Size(98, 13) + Me.lblMinMInMonthly.TabIndex = 9 + Me.lblMinMInMonthly.Text = "Min Minimum Temp" + ' + 'ucrReceiverMinMinMonthly + ' + Me.ucrReceiverMinMinMonthly.AutoSize = True + Me.ucrReceiverMinMinMonthly.frmParent = Nothing + Me.ucrReceiverMinMinMonthly.Location = New System.Drawing.Point(249, 197) + Me.ucrReceiverMinMinMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMinMonthly.Name = "ucrReceiverMinMinMonthly" + Me.ucrReceiverMinMinMonthly.Selector = Nothing + Me.ucrReceiverMinMinMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMinMinMonthly.strNcFilePath = "" + Me.ucrReceiverMinMinMonthly.TabIndex = 10 + Me.ucrReceiverMinMinMonthly.ucrSelector = Nothing + ' + 'lblMeanMinMonthly + ' + Me.lblMeanMinMonthly.AutoSize = True + Me.lblMeanMinMonthly.Location = New System.Drawing.Point(244, 139) + Me.lblMeanMinMonthly.Name = "lblMeanMinMonthly" + Me.lblMeanMinMonthly.Size = New System.Drawing.Size(108, 13) + Me.lblMeanMinMonthly.TabIndex = 7 + Me.lblMeanMinMonthly.Text = "Mean Minimum Temp" + ' + 'lblMaxMinMonthly + ' + Me.lblMaxMinMonthly.AutoSize = True + Me.lblMaxMinMonthly.Location = New System.Drawing.Point(250, 220) + Me.lblMaxMinMonthly.Name = "lblMaxMinMonthly" + Me.lblMaxMinMonthly.Size = New System.Drawing.Size(101, 13) + Me.lblMaxMinMonthly.TabIndex = 11 + Me.lblMaxMinMonthly.Text = "Max Minimum Temp" + ' + 'lblYearMonthTemp + ' + Me.lblYearMonthTemp.AutoSize = True + Me.lblYearMonthTemp.Location = New System.Drawing.Point(248, 54) + Me.lblYearMonthTemp.Name = "lblYearMonthTemp" + Me.lblYearMonthTemp.Size = New System.Drawing.Size(32, 13) + Me.lblYearMonthTemp.TabIndex = 3 + Me.lblYearMonthTemp.Text = "Year:" + ' + 'lblStationMonthTemp + ' + Me.lblStationMonthTemp.AutoSize = True + Me.lblStationMonthTemp.Location = New System.Drawing.Point(247, 15) + Me.lblStationMonthTemp.Name = "lblStationMonthTemp" + Me.lblStationMonthTemp.Size = New System.Drawing.Size(43, 13) + Me.lblStationMonthTemp.TabIndex = 1 + Me.lblStationMonthTemp.Text = "Station:" + ' + 'lblMaxMaxMonthly + ' + Me.lblMaxMaxMonthly.AutoSize = True + Me.lblMaxMaxMonthly.Location = New System.Drawing.Point(254, 341) + Me.lblMaxMaxMonthly.Name = "lblMaxMaxMonthly" + Me.lblMaxMaxMonthly.Size = New System.Drawing.Size(104, 13) + Me.lblMaxMaxMonthly.TabIndex = 17 + Me.lblMaxMaxMonthly.Text = "Max Maximum Temp" + ' + 'lblMinMaxMonthly + ' + Me.lblMinMaxMonthly.AutoSize = True + Me.lblMinMaxMonthly.Location = New System.Drawing.Point(253, 299) + Me.lblMinMaxMonthly.Name = "lblMinMaxMonthly" + Me.lblMinMaxMonthly.Size = New System.Drawing.Size(104, 13) + Me.lblMinMaxMonthly.TabIndex = 15 + Me.lblMinMaxMonthly.Text = "Min Maximum Temp:" + ' + 'lblMeanMaxMonthly + ' + Me.lblMeanMaxMonthly.AutoSize = True + Me.lblMeanMaxMonthly.Location = New System.Drawing.Point(253, 260) + Me.lblMeanMaxMonthly.Name = "lblMeanMaxMonthly" + Me.lblMeanMaxMonthly.Size = New System.Drawing.Size(111, 13) + Me.lblMeanMaxMonthly.TabIndex = 13 + Me.lblMeanMaxMonthly.Text = "Mean Maximum Temp" + ' + 'ucrReceiverMaxMaxMonthly + ' + Me.ucrReceiverMaxMaxMonthly.AutoSize = True + Me.ucrReceiverMaxMaxMonthly.frmParent = Nothing + Me.ucrReceiverMaxMaxMonthly.Location = New System.Drawing.Point(253, 354) + Me.ucrReceiverMaxMaxMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMaxMonthly.Name = "ucrReceiverMaxMaxMonthly" + Me.ucrReceiverMaxMaxMonthly.Selector = Nothing + Me.ucrReceiverMaxMaxMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMaxMaxMonthly.strNcFilePath = "" + Me.ucrReceiverMaxMaxMonthly.TabIndex = 18 + Me.ucrReceiverMaxMaxMonthly.ucrSelector = Nothing + ' + 'ucrReceiverMeanmaxMonthly + ' + Me.ucrReceiverMeanmaxMonthly.AutoSize = True + Me.ucrReceiverMeanmaxMonthly.frmParent = Nothing + Me.ucrReceiverMeanmaxMonthly.Location = New System.Drawing.Point(252, 277) + Me.ucrReceiverMeanmaxMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanmaxMonthly.Name = "ucrReceiverMeanmaxMonthly" + Me.ucrReceiverMeanmaxMonthly.Selector = Nothing + Me.ucrReceiverMeanmaxMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMeanmaxMonthly.strNcFilePath = "" + Me.ucrReceiverMeanmaxMonthly.TabIndex = 14 + Me.ucrReceiverMeanmaxMonthly.ucrSelector = Nothing + ' + 'ucrReceiverMinMaxMonthly + ' + Me.ucrReceiverMinMaxMonthly.AutoSize = True + Me.ucrReceiverMinMaxMonthly.frmParent = Nothing + Me.ucrReceiverMinMaxMonthly.Location = New System.Drawing.Point(250, 317) + Me.ucrReceiverMinMaxMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMaxMonthly.Name = "ucrReceiverMinMaxMonthly" + Me.ucrReceiverMinMaxMonthly.Selector = Nothing + Me.ucrReceiverMinMaxMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMinMaxMonthly.strNcFilePath = "" + Me.ucrReceiverMinMaxMonthly.TabIndex = 16 + Me.ucrReceiverMinMaxMonthly.ucrSelector = Nothing + ' + 'ucrReceiverMaxMinMonthly + ' + Me.ucrReceiverMaxMinMonthly.AutoSize = True + Me.ucrReceiverMaxMinMonthly.frmParent = Nothing + Me.ucrReceiverMaxMinMonthly.Location = New System.Drawing.Point(248, 238) + Me.ucrReceiverMaxMinMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMinMonthly.Name = "ucrReceiverMaxMinMonthly" + Me.ucrReceiverMaxMinMonthly.Selector = Nothing + Me.ucrReceiverMaxMinMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMaxMinMonthly.strNcFilePath = "" + Me.ucrReceiverMaxMinMonthly.TabIndex = 12 + Me.ucrReceiverMaxMinMonthly.ucrSelector = Nothing + ' + 'ucrReceiverMeanminMontly + ' + Me.ucrReceiverMeanminMontly.AutoSize = True + Me.ucrReceiverMeanminMontly.frmParent = Nothing + Me.ucrReceiverMeanminMontly.Location = New System.Drawing.Point(247, 158) + Me.ucrReceiverMeanminMontly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanminMontly.Name = "ucrReceiverMeanminMontly" + Me.ucrReceiverMeanminMontly.Selector = Nothing + Me.ucrReceiverMeanminMontly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMeanminMontly.strNcFilePath = "" + Me.ucrReceiverMeanminMontly.TabIndex = 8 + Me.ucrReceiverMeanminMontly.ucrSelector = Nothing + ' + 'ucrReceiverYearMonthly + ' + Me.ucrReceiverYearMonthly.AutoSize = True + Me.ucrReceiverYearMonthly.frmParent = Nothing + Me.ucrReceiverYearMonthly.Location = New System.Drawing.Point(246, 71) + Me.ucrReceiverYearMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYearMonthly.Name = "ucrReceiverYearMonthly" + Me.ucrReceiverYearMonthly.Selector = Nothing + Me.ucrReceiverYearMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverYearMonthly.strNcFilePath = "" + Me.ucrReceiverYearMonthly.TabIndex = 4 + Me.ucrReceiverYearMonthly.ucrSelector = Nothing + ' + 'ucrReceiverMonthlyTemp + ' + Me.ucrReceiverMonthlyTemp.AutoSize = True + Me.ucrReceiverMonthlyTemp.frmParent = Nothing + Me.ucrReceiverMonthlyTemp.Location = New System.Drawing.Point(245, 32) + Me.ucrReceiverMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonthlyTemp.Name = "ucrReceiverMonthlyTemp" + Me.ucrReceiverMonthlyTemp.Selector = Nothing + Me.ucrReceiverMonthlyTemp.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMonthlyTemp.strNcFilePath = "" + Me.ucrReceiverMonthlyTemp.TabIndex = 2 + Me.ucrReceiverMonthlyTemp.ucrSelector = Nothing + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.Location = New System.Drawing.Point(157, 455) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(224, 30) + Me.ucrBase.TabIndex = 1 + ' + 'lblSeasonPlantingDay + ' + Me.lblSeasonPlantingDay.AutoSize = True + Me.lblSeasonPlantingDay.Location = New System.Drawing.Point(247, 97) + Me.lblSeasonPlantingDay.Name = "lblSeasonPlantingDay" + Me.lblSeasonPlantingDay.Size = New System.Drawing.Size(70, 13) + Me.lblSeasonPlantingDay.TabIndex = 5 + Me.lblSeasonPlantingDay.Text = "Planting Day:" + ' + 'lblRainyDaysYear + ' + Me.lblRainyDaysYear.AutoSize = True + Me.lblRainyDaysYear.Location = New System.Drawing.Point(248, 137) + Me.lblRainyDaysYear.Name = "lblRainyDaysYear" + Me.lblRainyDaysYear.Size = New System.Drawing.Size(103, 13) + Me.lblRainyDaysYear.TabIndex = 7 + Me.lblRainyDaysYear.Text = " Rainy Days in Year:" + ' + 'ucrReceiverRainDaysYear + ' + Me.ucrReceiverRainDaysYear.AutoSize = True + Me.ucrReceiverRainDaysYear.frmParent = Nothing + Me.ucrReceiverRainDaysYear.Location = New System.Drawing.Point(246, 153) + Me.ucrReceiverRainDaysYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRainDaysYear.Name = "ucrReceiverRainDaysYear" + Me.ucrReceiverRainDaysYear.Selector = Nothing + Me.ucrReceiverRainDaysYear.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverRainDaysYear.strNcFilePath = "" + Me.ucrReceiverRainDaysYear.TabIndex = 8 + Me.ucrReceiverRainDaysYear.ucrSelector = Nothing + ' + 'lblNoRainDaysSeason + ' + Me.lblNoRainDaysSeason.AutoSize = True + Me.lblNoRainDaysSeason.Location = New System.Drawing.Point(241, 95) + Me.lblNoRainDaysSeason.Name = "lblNoRainDaysSeason" + Me.lblNoRainDaysSeason.Size = New System.Drawing.Size(117, 13) + Me.lblNoRainDaysSeason.TabIndex = 5 + Me.lblNoRainDaysSeason.Text = " Rainy Days in Season:" + ' + 'lblSeasonalLength + ' + Me.lblSeasonalLength.AutoSize = True + Me.lblSeasonalLength.Location = New System.Drawing.Point(247, 176) + Me.lblSeasonalLength.Name = "lblSeasonalLength" + Me.lblSeasonalLength.Size = New System.Drawing.Size(90, 13) + Me.lblSeasonalLength.TabIndex = 9 + Me.lblSeasonalLength.Text = "Seasonal Length:" + ' + 'lblSeasonalRain + ' + Me.lblSeasonalRain.AutoSize = True + Me.lblSeasonalRain.Location = New System.Drawing.Point(245, 54) + Me.lblSeasonalRain.Name = "lblSeasonalRain" + Me.lblSeasonalRain.Size = New System.Drawing.Size(79, 13) + Me.lblSeasonalRain.TabIndex = 3 + Me.lblSeasonalRain.Text = "Seasonal Rain:" + ' + 'lblAnnualRain + ' + Me.lblAnnualRain.AutoSize = True + Me.lblAnnualRain.Location = New System.Drawing.Point(244, 11) + Me.lblAnnualRain.Name = "lblAnnualRain" + Me.lblAnnualRain.Size = New System.Drawing.Size(68, 13) + Me.lblAnnualRain.TabIndex = 1 + Me.lblAnnualRain.Text = "Annual Rain:" + ' + 'lblEndSeasonDate + ' + Me.lblEndSeasonDate.AutoSize = True + Me.lblEndSeasonDate.Location = New System.Drawing.Point(250, 331) + Me.lblEndSeasonDate.Name = "lblEndSeasonDate" + Me.lblEndSeasonDate.Size = New System.Drawing.Size(97, 13) + Me.lblEndSeasonDate.TabIndex = 17 + Me.lblEndSeasonDate.Text = "End Season(Date):" + ' + 'lblEndSeasonDOY + ' + Me.lblEndSeasonDOY.AutoSize = True + Me.lblEndSeasonDOY.Location = New System.Drawing.Point(251, 297) + Me.lblEndSeasonDOY.Name = "lblEndSeasonDOY" + Me.lblEndSeasonDOY.Size = New System.Drawing.Size(97, 13) + Me.lblEndSeasonDOY.TabIndex = 15 + Me.lblEndSeasonDOY.Text = "End Season(DOY):" + ' + 'lblEndRainDate + ' + Me.lblEndRainDate.AutoSize = True + Me.lblEndRainDate.Location = New System.Drawing.Point(250, 255) + Me.lblEndRainDate.Name = "lblEndRainDate" + Me.lblEndRainDate.Size = New System.Drawing.Size(83, 13) + Me.lblEndRainDate.TabIndex = 13 + Me.lblEndRainDate.Text = "End Rain(Date):" + ' + 'lblEndRainsDOY + ' + Me.lblEndRainsDOY.AutoSize = True + Me.lblEndRainsDOY.Location = New System.Drawing.Point(250, 216) + Me.lblEndRainsDOY.Name = "lblEndRainsDOY" + Me.lblEndRainsDOY.Size = New System.Drawing.Size(83, 13) + Me.lblEndRainsDOY.TabIndex = 11 + Me.lblEndRainsDOY.Text = "End Rain(DOY):" + ' + 'lblStartRainDate + ' + Me.lblStartRainDate.AutoSize = True + Me.lblStartRainDate.Location = New System.Drawing.Point(11, 326) + Me.lblStartRainDate.Name = "lblStartRainDate" + Me.lblStartRainDate.Size = New System.Drawing.Size(86, 13) + Me.lblStartRainDate.TabIndex = 25 + Me.lblStartRainDate.Text = "Start Rain(Date):" + ' + 'lblStartRainDOY + ' + Me.lblStartRainDOY.AutoSize = True + Me.lblStartRainDOY.Location = New System.Drawing.Point(12, 285) + Me.lblStartRainDOY.Name = "lblStartRainDOY" + Me.lblStartRainDOY.Size = New System.Drawing.Size(86, 13) + Me.lblStartRainDOY.TabIndex = 23 + Me.lblStartRainDOY.Text = "Start Rain(DOY):" + ' + 'lblYear + ' + Me.lblYear.AutoSize = True + Me.lblYear.Location = New System.Drawing.Point(14, 239) + Me.lblYear.Name = "lblYear" + Me.lblYear.Size = New System.Drawing.Size(32, 13) + Me.lblYear.TabIndex = 21 + Me.lblYear.Text = "Year:" + ' + 'lblStation + ' + Me.lblStation.AutoSize = True + Me.lblStation.Location = New System.Drawing.Point(15, 198) + Me.lblStation.Name = "lblStation" + Me.lblStation.Size = New System.Drawing.Size(43, 13) + Me.lblStation.TabIndex = 19 + Me.lblStation.Text = "Station:" + ' + 'ucrReceiverStartRainDate + ' + Me.ucrReceiverStartRainDate.AutoSize = True + Me.ucrReceiverStartRainDate.frmParent = Nothing + Me.ucrReceiverStartRainDate.Location = New System.Drawing.Point(9, 344) + Me.ucrReceiverStartRainDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStartRainDate.Name = "ucrReceiverStartRainDate" + Me.ucrReceiverStartRainDate.Selector = Nothing + Me.ucrReceiverStartRainDate.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverStartRainDate.strNcFilePath = "" + Me.ucrReceiverStartRainDate.TabIndex = 26 + Me.ucrReceiverStartRainDate.ucrSelector = Nothing + ' + 'ucrReceiverStartRainDOY + ' + Me.ucrReceiverStartRainDOY.AutoSize = True + Me.ucrReceiverStartRainDOY.frmParent = Nothing + Me.ucrReceiverStartRainDOY.Location = New System.Drawing.Point(9, 302) + Me.ucrReceiverStartRainDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStartRainDOY.Name = "ucrReceiverStartRainDOY" + Me.ucrReceiverStartRainDOY.Selector = Nothing + Me.ucrReceiverStartRainDOY.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverStartRainDOY.strNcFilePath = "" + Me.ucrReceiverStartRainDOY.TabIndex = 24 + Me.ucrReceiverStartRainDOY.ucrSelector = Nothing + ' + 'ucrReceiverYear + ' + Me.ucrReceiverYear.AutoSize = True + Me.ucrReceiverYear.frmParent = Nothing + Me.ucrReceiverYear.Location = New System.Drawing.Point(9, 258) + Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYear.Name = "ucrReceiverYear" + Me.ucrReceiverYear.Selector = Nothing + Me.ucrReceiverYear.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.TabIndex = 22 + Me.ucrReceiverYear.ucrSelector = Nothing + ' + 'ucrReceiverStation + ' + Me.ucrReceiverStation.AutoSize = True + Me.ucrReceiverStation.frmParent = Nothing + Me.ucrReceiverStation.Location = New System.Drawing.Point(11, 215) + Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStation.Name = "ucrReceiverStation" + Me.ucrReceiverStation.Selector = Nothing + Me.ucrReceiverStation.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.TabIndex = 20 + Me.ucrReceiverStation.ucrSelector = Nothing + ' + 'ucrReceiverEndSeasonDate + ' + Me.ucrReceiverEndSeasonDate.AutoSize = True + Me.ucrReceiverEndSeasonDate.frmParent = Nothing + Me.ucrReceiverEndSeasonDate.Location = New System.Drawing.Point(246, 348) + Me.ucrReceiverEndSeasonDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndSeasonDate.Name = "ucrReceiverEndSeasonDate" + Me.ucrReceiverEndSeasonDate.Selector = Nothing + Me.ucrReceiverEndSeasonDate.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverEndSeasonDate.strNcFilePath = "" + Me.ucrReceiverEndSeasonDate.TabIndex = 18 + Me.ucrReceiverEndSeasonDate.ucrSelector = Nothing + ' + 'ucrReceiverEndSeasonDOY + ' + Me.ucrReceiverEndSeasonDOY.AutoSize = True + Me.ucrReceiverEndSeasonDOY.frmParent = Nothing + Me.ucrReceiverEndSeasonDOY.Location = New System.Drawing.Point(250, 310) + Me.ucrReceiverEndSeasonDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndSeasonDOY.Name = "ucrReceiverEndSeasonDOY" + Me.ucrReceiverEndSeasonDOY.Selector = Nothing + Me.ucrReceiverEndSeasonDOY.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverEndSeasonDOY.strNcFilePath = "" + Me.ucrReceiverEndSeasonDOY.TabIndex = 16 + Me.ucrReceiverEndSeasonDOY.ucrSelector = Nothing + ' + 'ucrReceiverEndRainsDOY + ' + Me.ucrReceiverEndRainsDOY.AutoSize = True + Me.ucrReceiverEndRainsDOY.frmParent = Nothing + Me.ucrReceiverEndRainsDOY.Location = New System.Drawing.Point(249, 233) + Me.ucrReceiverEndRainsDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndRainsDOY.Name = "ucrReceiverEndRainsDOY" + Me.ucrReceiverEndRainsDOY.Selector = Nothing + Me.ucrReceiverEndRainsDOY.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverEndRainsDOY.strNcFilePath = "" + Me.ucrReceiverEndRainsDOY.TabIndex = 12 + Me.ucrReceiverEndRainsDOY.ucrSelector = Nothing + ' + 'tbSummaries + ' + Me.tbSummaries.Controls.Add(Me.tbAnnualRainfall) + Me.tbSummaries.Controls.Add(Me.tbCropSuccessProp) + Me.tbSummaries.Controls.Add(Me.tbSeasonStartProb) + Me.tbSummaries.Controls.Add(Me.tbAnnualTempSummaries) + Me.tbSummaries.Controls.Add(Me.tbMonthlyTemp) + Me.tbSummaries.Location = New System.Drawing.Point(12, 17) + Me.tbSummaries.Name = "tbSummaries" + Me.tbSummaries.SelectedIndex = 0 + Me.tbSummaries.Size = New System.Drawing.Size(523, 430) + Me.tbSummaries.TabIndex = 7 + ' + 'tbAnnualRainfall + ' + Me.tbAnnualRainfall.Controls.Add(Me.lblRainyDaysYear) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverRainDaysYear) + Me.tbAnnualRainfall.Controls.Add(Me.lblNoRainDaysSeason) + Me.tbAnnualRainfall.Controls.Add(Me.lblSeasonalLength) + Me.tbAnnualRainfall.Controls.Add(Me.lblSeasonalRain) + Me.tbAnnualRainfall.Controls.Add(Me.lblAnnualRain) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonDate) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonDOY) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainDate) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainsDOY) + Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainDate) + Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainDOY) + Me.tbAnnualRainfall.Controls.Add(Me.lblYear) + Me.tbAnnualRainfall.Controls.Add(Me.lblStation) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainDate) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainDOY) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverYear) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStation) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonDate) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonDOY) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainsDOY) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainsDate) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverSeasonalLength) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverRainDaysSeason) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverSeasonalRain) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverAnnualRain) + Me.tbAnnualRainfall.Controls.Add(Me.ucrSelectorDefineAnnualRain) + Me.tbAnnualRainfall.Location = New System.Drawing.Point(4, 22) + Me.tbAnnualRainfall.Name = "tbAnnualRainfall" + Me.tbAnnualRainfall.Padding = New System.Windows.Forms.Padding(3) + Me.tbAnnualRainfall.Size = New System.Drawing.Size(515, 404) + Me.tbAnnualRainfall.TabIndex = 0 + Me.tbAnnualRainfall.Text = "Annual Rainfall" + Me.tbAnnualRainfall.UseVisualStyleBackColor = True + ' + 'ucrReceiverEndRainsDate + ' + Me.ucrReceiverEndRainsDate.AutoSize = True + Me.ucrReceiverEndRainsDate.frmParent = Nothing + Me.ucrReceiverEndRainsDate.Location = New System.Drawing.Point(247, 273) + Me.ucrReceiverEndRainsDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndRainsDate.Name = "ucrReceiverEndRainsDate" + Me.ucrReceiverEndRainsDate.Selector = Nothing + Me.ucrReceiverEndRainsDate.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverEndRainsDate.strNcFilePath = "" + Me.ucrReceiverEndRainsDate.TabIndex = 14 + Me.ucrReceiverEndRainsDate.ucrSelector = Nothing + ' + 'ucrReceiverSeasonalLength + ' + Me.ucrReceiverSeasonalLength.AutoSize = True + Me.ucrReceiverSeasonalLength.frmParent = Nothing + Me.ucrReceiverSeasonalLength.Location = New System.Drawing.Point(245, 194) + Me.ucrReceiverSeasonalLength.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonalLength.Name = "ucrReceiverSeasonalLength" + Me.ucrReceiverSeasonalLength.Selector = Nothing + Me.ucrReceiverSeasonalLength.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverSeasonalLength.strNcFilePath = "" + Me.ucrReceiverSeasonalLength.TabIndex = 10 + Me.ucrReceiverSeasonalLength.ucrSelector = Nothing + ' + 'ucrReceiverRainDaysSeason + ' + Me.ucrReceiverRainDaysSeason.AutoSize = True + Me.ucrReceiverRainDaysSeason.frmParent = Nothing + Me.ucrReceiverRainDaysSeason.Location = New System.Drawing.Point(244, 114) + Me.ucrReceiverRainDaysSeason.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRainDaysSeason.Name = "ucrReceiverRainDaysSeason" + Me.ucrReceiverRainDaysSeason.Selector = Nothing + Me.ucrReceiverRainDaysSeason.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverRainDaysSeason.strNcFilePath = "" + Me.ucrReceiverRainDaysSeason.TabIndex = 6 + Me.ucrReceiverRainDaysSeason.ucrSelector = Nothing + ' + 'ucrReceiverSeasonalRain + ' + Me.ucrReceiverSeasonalRain.AutoSize = True + Me.ucrReceiverSeasonalRain.frmParent = Nothing + Me.ucrReceiverSeasonalRain.Location = New System.Drawing.Point(243, 71) + Me.ucrReceiverSeasonalRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonalRain.Name = "ucrReceiverSeasonalRain" + Me.ucrReceiverSeasonalRain.Selector = Nothing + Me.ucrReceiverSeasonalRain.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverSeasonalRain.strNcFilePath = "" + Me.ucrReceiverSeasonalRain.TabIndex = 4 + Me.ucrReceiverSeasonalRain.ucrSelector = Nothing + ' + 'ucrReceiverAnnualRain + ' + Me.ucrReceiverAnnualRain.AutoSize = True + Me.ucrReceiverAnnualRain.frmParent = Nothing + Me.ucrReceiverAnnualRain.Location = New System.Drawing.Point(242, 28) + Me.ucrReceiverAnnualRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAnnualRain.Name = "ucrReceiverAnnualRain" + Me.ucrReceiverAnnualRain.Selector = Nothing + Me.ucrReceiverAnnualRain.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverAnnualRain.strNcFilePath = "" + Me.ucrReceiverAnnualRain.TabIndex = 2 + Me.ucrReceiverAnnualRain.ucrSelector = Nothing + ' + 'ucrSelectorDefineAnnualRain + ' + Me.ucrSelectorDefineAnnualRain.AutoSize = True + Me.ucrSelectorDefineAnnualRain.bDropUnusedFilterLevels = False + Me.ucrSelectorDefineAnnualRain.bShowHiddenColumns = False + Me.ucrSelectorDefineAnnualRain.bUseCurrentFilter = True + Me.ucrSelectorDefineAnnualRain.Location = New System.Drawing.Point(7, 8) + Me.ucrSelectorDefineAnnualRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorDefineAnnualRain.Name = "ucrSelectorDefineAnnualRain" + Me.ucrSelectorDefineAnnualRain.Size = New System.Drawing.Size(151, 185) + Me.ucrSelectorDefineAnnualRain.TabIndex = 0 + ' + 'tbCropSuccessProp + ' + Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingLength) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingLenghth) + Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingDay) + Me.tbCropSuccessProp.Controls.Add(Me.lblProbSuccess) + Me.tbCropSuccessProp.Controls.Add(Me.lblTotalRain) + Me.tbCropSuccessProp.Controls.Add(Me.lblCropStation) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPropSuccess) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingDay) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverTotalRain) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverStationCrop) + Me.tbCropSuccessProp.Controls.Add(Me.ucrSelectorCropProp) + Me.tbCropSuccessProp.Location = New System.Drawing.Point(4, 22) + Me.tbCropSuccessProp.Name = "tbCropSuccessProp" + Me.tbCropSuccessProp.Padding = New System.Windows.Forms.Padding(3) + Me.tbCropSuccessProp.Size = New System.Drawing.Size(515, 404) + Me.tbCropSuccessProp.TabIndex = 1 + Me.tbCropSuccessProp.Text = "Crop Success Prop" + Me.tbCropSuccessProp.UseVisualStyleBackColor = True + ' + 'lblPlantingLength + ' + Me.lblPlantingLength.AutoSize = True + Me.lblPlantingLength.Location = New System.Drawing.Point(252, 137) + Me.lblPlantingLength.Name = "lblPlantingLength" + Me.lblPlantingLength.Size = New System.Drawing.Size(84, 13) + Me.lblPlantingLength.TabIndex = 7 + Me.lblPlantingLength.Text = "Planting Length:" + ' + 'ucrReceiverPlantingLenghth + ' + Me.ucrReceiverPlantingLenghth.AutoSize = True + Me.ucrReceiverPlantingLenghth.frmParent = Nothing + Me.ucrReceiverPlantingLenghth.Location = New System.Drawing.Point(250, 153) + Me.ucrReceiverPlantingLenghth.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPlantingLenghth.Name = "ucrReceiverPlantingLenghth" + Me.ucrReceiverPlantingLenghth.Selector = Nothing + Me.ucrReceiverPlantingLenghth.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverPlantingLenghth.strNcFilePath = "" + Me.ucrReceiverPlantingLenghth.TabIndex = 8 + Me.ucrReceiverPlantingLenghth.ucrSelector = Nothing + ' + 'lblPlantingDay + ' + Me.lblPlantingDay.AutoSize = True + Me.lblPlantingDay.Location = New System.Drawing.Point(245, 95) + Me.lblPlantingDay.Name = "lblPlantingDay" + Me.lblPlantingDay.Size = New System.Drawing.Size(70, 13) + Me.lblPlantingDay.TabIndex = 5 + Me.lblPlantingDay.Text = "Planting Day:" + ' + 'lblProbSuccess + ' + Me.lblProbSuccess.AutoSize = True + Me.lblProbSuccess.Location = New System.Drawing.Point(251, 176) + Me.lblProbSuccess.Name = "lblProbSuccess" + Me.lblProbSuccess.Size = New System.Drawing.Size(117, 13) + Me.lblProbSuccess.TabIndex = 9 + Me.lblProbSuccess.Text = "Proportion of Success :" + ' + 'lblTotalRain + ' + Me.lblTotalRain.AutoSize = True + Me.lblTotalRain.Location = New System.Drawing.Point(249, 54) + Me.lblTotalRain.Name = "lblTotalRain" + Me.lblTotalRain.Size = New System.Drawing.Size(59, 13) + Me.lblTotalRain.TabIndex = 3 + Me.lblTotalRain.Text = "Total Rain:" + ' + 'lblCropStation + ' + Me.lblCropStation.AutoSize = True + Me.lblCropStation.Location = New System.Drawing.Point(248, 11) + Me.lblCropStation.Name = "lblCropStation" + Me.lblCropStation.Size = New System.Drawing.Size(43, 13) + Me.lblCropStation.TabIndex = 1 + Me.lblCropStation.Text = "Station:" + ' + 'ucrReceiverPropSuccess + ' + Me.ucrReceiverPropSuccess.AutoSize = True + Me.ucrReceiverPropSuccess.frmParent = Nothing + Me.ucrReceiverPropSuccess.Location = New System.Drawing.Point(249, 194) + Me.ucrReceiverPropSuccess.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPropSuccess.Name = "ucrReceiverPropSuccess" + Me.ucrReceiverPropSuccess.Selector = Nothing + Me.ucrReceiverPropSuccess.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverPropSuccess.strNcFilePath = "" + Me.ucrReceiverPropSuccess.TabIndex = 10 + Me.ucrReceiverPropSuccess.ucrSelector = Nothing + ' + 'ucrReceiverPlantingDay + ' + Me.ucrReceiverPlantingDay.AutoSize = True + Me.ucrReceiverPlantingDay.frmParent = Nothing + Me.ucrReceiverPlantingDay.Location = New System.Drawing.Point(248, 114) + Me.ucrReceiverPlantingDay.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPlantingDay.Name = "ucrReceiverPlantingDay" + Me.ucrReceiverPlantingDay.Selector = Nothing + Me.ucrReceiverPlantingDay.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverPlantingDay.strNcFilePath = "" + Me.ucrReceiverPlantingDay.TabIndex = 6 + Me.ucrReceiverPlantingDay.ucrSelector = Nothing + ' + 'ucrReceiverTotalRain + ' + Me.ucrReceiverTotalRain.AutoSize = True + Me.ucrReceiverTotalRain.frmParent = Nothing + Me.ucrReceiverTotalRain.Location = New System.Drawing.Point(247, 71) + Me.ucrReceiverTotalRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverTotalRain.Name = "ucrReceiverTotalRain" + Me.ucrReceiverTotalRain.Selector = Nothing + Me.ucrReceiverTotalRain.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverTotalRain.strNcFilePath = "" + Me.ucrReceiverTotalRain.TabIndex = 4 + Me.ucrReceiverTotalRain.ucrSelector = Nothing + ' + 'ucrReceiverStationCrop + ' + Me.ucrReceiverStationCrop.AutoSize = True + Me.ucrReceiverStationCrop.frmParent = Nothing + Me.ucrReceiverStationCrop.Location = New System.Drawing.Point(246, 28) + Me.ucrReceiverStationCrop.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStationCrop.Name = "ucrReceiverStationCrop" + Me.ucrReceiverStationCrop.Selector = Nothing + Me.ucrReceiverStationCrop.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverStationCrop.strNcFilePath = "" + Me.ucrReceiverStationCrop.TabIndex = 2 + Me.ucrReceiverStationCrop.ucrSelector = Nothing + ' + 'ucrSelectorCropProp + ' + Me.ucrSelectorCropProp.AutoSize = True + Me.ucrSelectorCropProp.bDropUnusedFilterLevels = False + Me.ucrSelectorCropProp.bShowHiddenColumns = False + Me.ucrSelectorCropProp.bUseCurrentFilter = True + Me.ucrSelectorCropProp.Location = New System.Drawing.Point(11, 8) + Me.ucrSelectorCropProp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCropProp.Name = "ucrSelectorCropProp" + Me.ucrSelectorCropProp.Size = New System.Drawing.Size(151, 185) + Me.ucrSelectorCropProp.TabIndex = 0 + ' + 'tbSeasonStartProb + ' + Me.tbSeasonStartProb.Controls.Add(Me.lblPlantingDayCond) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverPlantingDayCondition) + Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonPlantingDay) + Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonYear) + Me.tbSeasonStartProb.Controls.Add(Me.lblStationSeasonProb) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonPlantingDay) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonYear) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonStationProb) + Me.tbSeasonStartProb.Controls.Add(Me.ucrSelectorSeasonStartProp) + Me.tbSeasonStartProb.Location = New System.Drawing.Point(4, 22) + Me.tbSeasonStartProb.Name = "tbSeasonStartProb" + Me.tbSeasonStartProb.Padding = New System.Windows.Forms.Padding(3) + Me.tbSeasonStartProb.Size = New System.Drawing.Size(515, 404) + Me.tbSeasonStartProb.TabIndex = 2 + Me.tbSeasonStartProb.Text = "Season Start Prob" + Me.tbSeasonStartProb.UseVisualStyleBackColor = True + ' + 'lblSeasonYear + ' + Me.lblSeasonYear.AutoSize = True + Me.lblSeasonYear.Location = New System.Drawing.Point(251, 56) + Me.lblSeasonYear.Name = "lblSeasonYear" + Me.lblSeasonYear.Size = New System.Drawing.Size(32, 13) + Me.lblSeasonYear.TabIndex = 3 + Me.lblSeasonYear.Text = "Year:" + ' + 'lblStationSeasonProb + ' + Me.lblStationSeasonProb.AutoSize = True + Me.lblStationSeasonProb.Location = New System.Drawing.Point(250, 13) + Me.lblStationSeasonProb.Name = "lblStationSeasonProb" + Me.lblStationSeasonProb.Size = New System.Drawing.Size(43, 13) + Me.lblStationSeasonProb.TabIndex = 1 + Me.lblStationSeasonProb.Text = "Station:" + ' + 'ucrReceiverSeasonPlantingDay + ' + Me.ucrReceiverSeasonPlantingDay.AutoSize = True + Me.ucrReceiverSeasonPlantingDay.frmParent = Nothing + Me.ucrReceiverSeasonPlantingDay.Location = New System.Drawing.Point(250, 116) + Me.ucrReceiverSeasonPlantingDay.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonPlantingDay.Name = "ucrReceiverSeasonPlantingDay" + Me.ucrReceiverSeasonPlantingDay.Selector = Nothing + Me.ucrReceiverSeasonPlantingDay.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverSeasonPlantingDay.strNcFilePath = "" + Me.ucrReceiverSeasonPlantingDay.TabIndex = 6 + Me.ucrReceiverSeasonPlantingDay.ucrSelector = Nothing + ' + 'ucrReceiverSeasonYear + ' + Me.ucrReceiverSeasonYear.AutoSize = True + Me.ucrReceiverSeasonYear.frmParent = Nothing + Me.ucrReceiverSeasonYear.Location = New System.Drawing.Point(249, 73) + Me.ucrReceiverSeasonYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonYear.Name = "ucrReceiverSeasonYear" + Me.ucrReceiverSeasonYear.Selector = Nothing + Me.ucrReceiverSeasonYear.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverSeasonYear.strNcFilePath = "" + Me.ucrReceiverSeasonYear.TabIndex = 4 + Me.ucrReceiverSeasonYear.ucrSelector = Nothing + ' + 'ucrReceiverSeasonStationProb + ' + Me.ucrReceiverSeasonStationProb.AutoSize = True + Me.ucrReceiverSeasonStationProb.frmParent = Nothing + Me.ucrReceiverSeasonStationProb.Location = New System.Drawing.Point(248, 30) + Me.ucrReceiverSeasonStationProb.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonStationProb.Name = "ucrReceiverSeasonStationProb" + Me.ucrReceiverSeasonStationProb.Selector = Nothing + Me.ucrReceiverSeasonStationProb.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverSeasonStationProb.strNcFilePath = "" + Me.ucrReceiverSeasonStationProb.TabIndex = 2 + Me.ucrReceiverSeasonStationProb.ucrSelector = Nothing + ' + 'ucrSelectorSeasonStartProp + ' + Me.ucrSelectorSeasonStartProp.AutoSize = True + Me.ucrSelectorSeasonStartProp.bDropUnusedFilterLevels = False + Me.ucrSelectorSeasonStartProp.bShowHiddenColumns = False + Me.ucrSelectorSeasonStartProp.bUseCurrentFilter = True + Me.ucrSelectorSeasonStartProp.Location = New System.Drawing.Point(13, 10) + Me.ucrSelectorSeasonStartProp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorSeasonStartProp.Name = "ucrSelectorSeasonStartProp" + Me.ucrSelectorSeasonStartProp.Size = New System.Drawing.Size(151, 185) + Me.ucrSelectorSeasonStartProp.TabIndex = 0 + ' 'sdgDefineAnnualRainfall ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(575, 466) + Me.ClientSize = New System.Drawing.Size(547, 503) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.tbSummaries) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgDefineAnnualRainfall" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "sdgDefineAnnualRainfall" + Me.Text = "Define Elements" + Me.tbAnnualTempSummaries.ResumeLayout(False) + Me.tbAnnualTempSummaries.PerformLayout() + Me.tbMonthlyTemp.ResumeLayout(False) + Me.tbMonthlyTemp.PerformLayout() + Me.tbSummaries.ResumeLayout(False) + Me.tbAnnualRainfall.ResumeLayout(False) + Me.tbAnnualRainfall.PerformLayout() + Me.tbCropSuccessProp.ResumeLayout(False) + Me.tbCropSuccessProp.PerformLayout() + Me.tbSeasonStartProb.ResumeLayout(False) + Me.tbSeasonStartProb.PerformLayout() Me.ResumeLayout(False) + Me.PerformLayout() End Sub + + Friend WithEvents ucrReceiverPlantingDayCondition As ucrReceiverSingle + Friend WithEvents lblMinMinAnnual As Label + Friend WithEvents ucrReceiverMinMinAnnual As ucrReceiverSingle + Friend WithEvents lblMeanAnnualTemp As Label + Friend WithEvents lblMaxMinAnnual As Label + Friend WithEvents lblAnnualTempYear As Label + Friend WithEvents lblAnnualTempStation As Label + Friend WithEvents lblMaxMaxAnnual As Label + Friend WithEvents ucrSelecetorMonthlyTemp As ucrSelectorByDataFrame + Friend WithEvents lblMinMaxAnnual As Label + Friend WithEvents lblMeanMaxAnnual As Label + Friend WithEvents ucrReceiverMaxMaxAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanMaxAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMinMaxAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMaxMinAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverAnnualTempYr As ucrReceiverSingle + Friend WithEvents ucrReceiverAnnualTempStation As ucrReceiverSingle + Friend WithEvents tbAnnualTempSummaries As TabPage + Friend WithEvents ucrSelectorAnnualTemp As ucrSelectorByDataFrame + Friend WithEvents lblPlantingDayCond As Label + Friend WithEvents tbMonthlyTemp As TabPage + Friend WithEvents lblMonth As Label + Friend WithEvents ucrReceiverMonthMonthly As ucrReceiverSingle + Friend WithEvents lblMinMInMonthly As Label + Friend WithEvents ucrReceiverMinMinMonthly As ucrReceiverSingle + Friend WithEvents lblMeanMinMonthly As Label + Friend WithEvents lblMaxMinMonthly As Label + Friend WithEvents lblYearMonthTemp As Label + Friend WithEvents lblStationMonthTemp As Label + Friend WithEvents lblMaxMaxMonthly As Label + Friend WithEvents lblMinMaxMonthly As Label + Friend WithEvents lblMeanMaxMonthly As Label + Friend WithEvents ucrReceiverMaxMaxMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanmaxMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMinMaxMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMaxMinMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanminMontly As ucrReceiverSingle + Friend WithEvents ucrReceiverYearMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMonthlyTemp As ucrReceiverSingle + Friend WithEvents ucrBase As ucrButtonsSubdialogue + Friend WithEvents lblSeasonPlantingDay As Label + Friend WithEvents lblRainyDaysYear As Label + Friend WithEvents ucrReceiverRainDaysYear As ucrReceiverSingle + Friend WithEvents lblNoRainDaysSeason As Label + Friend WithEvents lblSeasonalLength As Label + Friend WithEvents lblSeasonalRain As Label + Friend WithEvents lblAnnualRain As Label + Friend WithEvents lblEndSeasonDate As Label + Friend WithEvents lblEndSeasonDOY As Label + Friend WithEvents lblEndRainDate As Label + Friend WithEvents lblEndRainsDOY As Label + Friend WithEvents lblStartRainDate As Label + Friend WithEvents lblStartRainDOY As Label + Friend WithEvents lblYear As Label + Friend WithEvents lblStation As Label + Friend WithEvents ucrReceiverStartRainDate As ucrReceiverSingle + Friend WithEvents ucrReceiverStartRainDOY As ucrReceiverSingle + Friend WithEvents ucrReceiverYear As ucrReceiverSingle + Friend WithEvents ucrReceiverStation As ucrReceiverSingle + Friend WithEvents ucrReceiverEndSeasonDate As ucrReceiverSingle + Friend WithEvents ucrReceiverEndSeasonDOY As ucrReceiverSingle + Friend WithEvents ucrReceiverEndRainsDOY As ucrReceiverSingle + Friend WithEvents tbSummaries As TabControl + Friend WithEvents tbAnnualRainfall As TabPage + Friend WithEvents ucrReceiverEndRainsDate As ucrReceiverSingle + Friend WithEvents ucrReceiverSeasonalLength As ucrReceiverSingle + Friend WithEvents ucrReceiverRainDaysSeason As ucrReceiverSingle + Friend WithEvents ucrReceiverSeasonalRain As ucrReceiverSingle + Friend WithEvents ucrReceiverAnnualRain As ucrReceiverSingle + Friend WithEvents ucrSelectorDefineAnnualRain As ucrSelectorByDataFrame + Friend WithEvents tbCropSuccessProp As TabPage + Friend WithEvents lblPlantingLength As Label + Friend WithEvents ucrReceiverPlantingLenghth As ucrReceiverSingle + Friend WithEvents lblPlantingDay As Label + Friend WithEvents lblProbSuccess As Label + Friend WithEvents lblTotalRain As Label + Friend WithEvents lblCropStation As Label + Friend WithEvents ucrReceiverPropSuccess As ucrReceiverSingle + Friend WithEvents ucrReceiverPlantingDay As ucrReceiverSingle + Friend WithEvents ucrReceiverTotalRain As ucrReceiverSingle + Friend WithEvents ucrReceiverStationCrop As ucrReceiverSingle + Friend WithEvents ucrSelectorCropProp As ucrSelectorByDataFrame + Friend WithEvents tbSeasonStartProb As TabPage + Friend WithEvents lblSeasonYear As Label + Friend WithEvents lblStationSeasonProb As Label + Friend WithEvents ucrReceiverSeasonPlantingDay As ucrReceiverSingle + Friend WithEvents ucrReceiverSeasonYear As ucrReceiverSingle + Friend WithEvents ucrReceiverSeasonStationProb As ucrReceiverSingle + Friend WithEvents ucrSelectorSeasonStartProp As ucrSelectorByDataFrame End Class diff --git a/instat/sdgDefineAnnualRainfall.vb b/instat/sdgDefineAnnualRainfall.vb index 559f1d5c09c..f46d9cf3e49 100644 --- a/instat/sdgDefineAnnualRainfall.vb +++ b/instat/sdgDefineAnnualRainfall.vb @@ -1,3 +1,319 @@ -Public Class sdgDefineAnnualRainfall +'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 instat.Translations +Public Class sdgDefineAnnualRainfall + + Public clsReforMattAnnualSummariesFunction, clsExportRinstatToBucketFunction, clsReformatCropSuccessFunction, clsReformatSeasonStartFunction, clsReformatTempSummariesFunction, clsReformatMonthlyTempSummaries As New RFunction + Public clsRsyntax As New RSyntax + Public bControlsInitialised As Boolean = False + + Private Sub sdgDefineAnnualRainfall_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub + + Public Sub InitialiseControls() + ucrSelectorDefineAnnualRain.SetParameter(New RParameter("data", 0)) + ucrSelectorDefineAnnualRain.SetParameterIsrfunction() + + ucrSelectorAnnualTemp.SetParameter(New RParameter("data", 0)) + ucrSelectorAnnualTemp.SetParameterIsrfunction() + + ucrSelectorCropProp.SetParameter(New RParameter("data", 0)) + ucrSelectorCropProp.SetParameterIsrfunction() + + ucrSelectorSeasonStartProp.SetParameter(New RParameter("data", 0)) + ucrSelectorSeasonStartProp.SetParameterIsrfunction() + + ucrSelecetorMonthlyTemp.SetParameter(New RParameter("data", 0)) + ucrSelecetorMonthlyTemp.SetParameterIsrfunction() + + ucrReceiverStation.SetParameter(New RParameter("station_col", 1)) + ucrReceiverStation.Selector = ucrSelectorDefineAnnualRain + ucrReceiverStation.SetParameterIsString() + + ucrReceiverYear.SetParameter(New RParameter("year_col", 2)) + ucrReceiverYear.Selector = ucrSelectorDefineAnnualRain + ucrReceiverYear.SetParameterIsString() + + ucrReceiverStartRainDOY.SetParameter(New RParameter("start_rains_doy_col", 3)) + ucrReceiverStartRainDOY.Selector = ucrSelectorDefineAnnualRain + ucrReceiverStartRainDOY.SetParameterIsString() + + ucrReceiverStartRainDate.SetParameter(New RParameter("start_rains_date_col", 4)) + ucrReceiverStartRainDate.Selector = ucrSelectorDefineAnnualRain + ucrReceiverStartRainDate.SetParameterIsString() + + ucrReceiverEndRainsDOY.SetParameter(New RParameter("end_rains_doy_col", 5)) + ucrReceiverEndRainsDOY.Selector = ucrSelectorDefineAnnualRain + ucrReceiverEndRainsDOY.SetParameterIsString() + + ucrReceiverEndRainsDate.SetParameter(New RParameter("end_rains_date_col", 6)) + ucrReceiverEndRainsDate.Selector = ucrSelectorDefineAnnualRain + ucrReceiverEndRainsDate.SetParameterIsString() + + ucrReceiverEndSeasonDOY.SetParameter(New RParameter("end_season_doy_col", 7)) + ucrReceiverEndSeasonDOY.Selector = ucrSelectorDefineAnnualRain + ucrReceiverEndSeasonDOY.SetParameterIsString() + + ucrReceiverEndSeasonDate.SetParameter(New RParameter("end_season_date_col", 8)) + ucrReceiverEndSeasonDate.Selector = ucrSelectorDefineAnnualRain + ucrReceiverEndSeasonDate.SetParameterIsString() + + ucrReceiverSeasonalRain.SetParameter(New RParameter("seasonal_rain_col", 9)) + ucrReceiverSeasonalRain.Selector = ucrSelectorDefineAnnualRain + ucrReceiverSeasonalRain.SetParameterIsString() + + ucrReceiverRainDaysSeason.SetParameter(New RParameter("n_seasonal_rain_col", 10)) + ucrReceiverRainDaysSeason.Selector = ucrSelectorDefineAnnualRain + ucrReceiverRainDaysSeason.SetParameterIsString() + + ucrReceiverRainDaysYear.SetParameter(New RParameter("n_rain_col", 11)) + ucrReceiverRainDaysYear.Selector = ucrSelectorDefineAnnualRain + ucrReceiverRainDaysYear.SetParameterIsString() + + ucrReceiverSeasonalLength.SetParameter(New RParameter("season_length_col", 12)) + ucrReceiverSeasonalLength.Selector = ucrSelectorDefineAnnualRain + ucrReceiverSeasonalLength.SetParameterIsString() + + ucrReceiverAnnualRain.SetParameter(New RParameter("annual_rain_col", 13)) + ucrReceiverAnnualRain.Selector = ucrSelectorDefineAnnualRain + ucrReceiverAnnualRain.SetParameterIsString() + + ucrReceiverStationCrop.SetParameter(New RParameter("station_col", 1)) + ucrReceiverStationCrop.Selector = ucrSelectorCropProp + ucrReceiverStationCrop.SetParameterIsString() + + ucrReceiverTotalRain.SetParameter(New RParameter("total_rain_col", 2)) + ucrReceiverTotalRain.Selector = ucrSelectorCropProp + ucrReceiverTotalRain.SetParameterIsString() + + ucrReceiverPlantingDay.SetParameter(New RParameter("plant_day_col", 3)) + ucrReceiverPlantingDay.Selector = ucrSelectorCropProp + ucrReceiverPlantingDay.SetParameterIsString() + + ucrReceiverPlantingLenghth.SetParameter(New RParameter("plant_length_col", 4)) + ucrReceiverPlantingLenghth.Selector = ucrSelectorCropProp + ucrReceiverPlantingLenghth.SetParameterIsString() + + ucrReceiverPropSuccess.SetParameter(New RParameter("prop_success_col", 5)) + ucrReceiverPropSuccess.Selector = ucrSelectorCropProp + ucrReceiverPropSuccess.SetParameterIsString() + + 'Season start + ucrReceiverSeasonStationProb.SetParameter(New RParameter("station_col", 1)) + ucrReceiverSeasonStationProb.Selector = ucrSelectorSeasonStartProp + ucrReceiverSeasonStationProb.SetParameterIsString() + + ucrReceiverSeasonYear.SetParameter(New RParameter("year_col", 2)) + ucrReceiverSeasonYear.Selector = ucrSelectorSeasonStartProp + ucrReceiverSeasonYear.SetParameterIsString() + + + ucrReceiverSeasonPlantingDay.SetParameter(New RParameter("plant_day_col", 3)) + ucrReceiverSeasonPlantingDay.Selector = ucrSelectorSeasonStartProp + ucrReceiverSeasonPlantingDay.SetParameterIsString() + + + ucrReceiverPlantingDayCondition.SetParameter(New RParameter("plant_day_cond_col", 5)) + ucrReceiverPlantingDayCondition.Selector = ucrSelectorSeasonStartProp + ucrReceiverPlantingDayCondition.SetParameterIsString() + + 'Annual Temp + ucrReceiverAnnualTempStation.SetParameter(New RParameter("station_col", 1)) + ucrReceiverAnnualTempStation.Selector = ucrSelectorAnnualTemp + ucrReceiverAnnualTempStation.SetParameterIsString() + + ucrReceiverAnnualTempYr.SetParameter(New RParameter("year_col", 2)) + ucrReceiverAnnualTempYr.Selector = ucrSelectorAnnualTemp + ucrReceiverAnnualTempYr.SetParameterIsString() + + ucrReceiverMeanAnnual.SetParameter(New RParameter("mean_tmin_col", 3)) + ucrReceiverMeanAnnual.Selector = ucrSelectorAnnualTemp + ucrReceiverMeanAnnual.SetParameterIsString() + + ucrReceiverMinMinAnnual.SetParameter(New RParameter("min_tmin_col", 4)) + ucrReceiverMinMinAnnual.Selector = ucrSelectorAnnualTemp + ucrReceiverMinMinAnnual.SetParameterIsString() + + ucrReceiverMaxMinAnnual.SetParameter(New RParameter("max_tmin_col", 5)) + ucrReceiverMaxMinAnnual.Selector = ucrSelectorAnnualTemp + ucrReceiverMaxMinAnnual.SetParameterIsString() + + ucrReceiverMeanMaxAnnual.SetParameter(New RParameter("mean_tmax_col", 6)) + ucrReceiverMeanMaxAnnual.Selector = ucrSelectorAnnualTemp + ucrReceiverMeanMaxAnnual.SetParameterIsString() + + ucrReceiverMinMaxAnnual.SetParameter(New RParameter("min_tmax_col", 7)) + ucrReceiverMinMaxAnnual.Selector = ucrSelectorAnnualTemp + ucrReceiverMinMaxAnnual.SetParameterIsString() + + ucrReceiverMaxMaxAnnual.SetParameter(New RParameter("max_tmax_col", 8)) + ucrReceiverMaxMaxAnnual.Selector = ucrSelectorAnnualTemp + ucrReceiverMaxMaxAnnual.SetParameterIsString() + + 'Monthly Temp + ucrReceiverMonthlyTemp.SetParameter(New RParameter("station_col", 1)) + ucrReceiverMonthlyTemp.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMonthlyTemp.SetParameterIsString() + + ucrReceiverYearMonthly.SetParameter(New RParameter("year_col", 2)) + ucrReceiverYearMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverYearMonthly.SetParameterIsString() + + ucrReceiverMonthMonthly.SetParameter(New RParameter("month_col", 3)) + ucrReceiverMonthMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMonthMonthly.SetParameterIsString() + + + ucrReceiverMeanminMontly.SetParameter(New RParameter("mean_tmin_col", 4)) + ucrReceiverMeanminMontly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMeanminMontly.SetParameterIsString() + + ucrReceiverMinMinMonthly.SetParameter(New RParameter("min_tmin_col", 5)) + ucrReceiverMinMinMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMinMinMonthly.SetParameterIsString() + + ucrReceiverMaxMinMonthly.SetParameter(New RParameter("max_tmin_col", 6)) + ucrReceiverMaxMinMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMaxMinMonthly.SetParameterIsString() + + ucrReceiverMeanmaxMonthly.SetParameter(New RParameter("mean_tmax_col", 7)) + ucrReceiverMeanmaxMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMeanmaxMonthly.SetParameterIsString() + + ucrReceiverMinMaxMonthly.SetParameter(New RParameter("min_tmax_col", 8)) + ucrReceiverMinMaxMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMinMaxMonthly.SetParameterIsString() + + ucrReceiverMaxMaxMonthly.SetParameter(New RParameter("max_tmax_col", 9)) + ucrReceiverMaxMaxMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMaxMaxMonthly.SetParameterIsString() + + End Sub + Public Sub SetRCode(clsNewReforMattAnnualSummaries As RFunction, clsNewExportRinstatToBucketFunction As RFunction, clsNewReformatCropSuccessFunction As RFunction, clsNewReformatMonthlyTempSummaries As RFunction, clsNewReformatSeasonStartFunction As RFunction, clsNewReformatTempSummariesFunction As RFunction, Optional bReset As Boolean = False) + If Not bControlsInitialised Then + InitialiseControls() + End If + + clsReforMattAnnualSummariesFunction = clsNewReforMattAnnualSummaries + clsReformatCropSuccessFunction = clsNewReformatCropSuccessFunction + clsReformatMonthlyTempSummaries = clsNewReformatMonthlyTempSummaries + clsReformatSeasonStartFunction = clsNewReformatSeasonStartFunction + clsReformatTempSummariesFunction = clsNewReformatTempSummariesFunction + clsExportRinstatToBucketFunction = clsNewExportRinstatToBucketFunction + + ucrReceiverAnnualRain.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverEndRainsDate.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverEndRainsDOY.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverEndSeasonDate.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverEndSeasonDOY.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverRainDaysSeason.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverRainDaysYear.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverSeasonalLength.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverSeasonalRain.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverStartRainDate.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverStartRainDOY.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverStation.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverYear.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrSelectorAnnualTemp.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + + ucrReceiverStationCrop.SetRCode(clsReformatCropSuccessFunction, bReset) + ucrReceiverTotalRain.SetRCode(clsReformatCropSuccessFunction, bReset) + ucrReceiverPlantingDay.SetRCode(clsReformatCropSuccessFunction, bReset) + ucrReceiverPlantingLenghth.SetRCode(clsReformatCropSuccessFunction, bReset) + ucrReceiverPropSuccess.SetRCode(clsReformatCropSuccessFunction, bReset) + ucrSelectorCropProp.SetRCode(clsReformatCropSuccessFunction, bReset) + + ucrReceiverSeasonStationProb.SetRCode(clsReformatSeasonStartFunction, bReset) + ucrReceiverSeasonYear.SetRCode(clsReformatSeasonStartFunction, bReset) + ucrReceiverSeasonPlantingDay.SetRCode(clsReformatSeasonStartFunction, bReset) + ucrReceiverPlantingDayCondition.SetRCode(clsReformatSeasonStartFunction, bReset) + ucrSelectorSeasonStartProp.SetRCode(clsReformatSeasonStartFunction, bReset) + + ucrReceiverAnnualTempStation.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverAnnualTempYr.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverMeanAnnual.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverMinMaxAnnual.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverMaxMinAnnual.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverMaxMaxAnnual.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverMinMinAnnual.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverMeanMaxAnnual.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrSelectorAnnualTemp.SetRCode(clsReformatTempSummariesFunction, bReset) + + ucrReceiverMonthlyTemp.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverYearMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMonthMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMeanmaxMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMinMaxMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMaxMinMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMaxMaxMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMinMinMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMeanminMontly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrSelecetorMonthlyTemp.SetRCode(clsReformatMonthlyTempSummaries, bReset) + End Sub + + Private Sub ucrReceiverAnnualRain_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverAnnualRain.ControlValueChanged, ucrReceiverEndRainsDate.ControlValueChanged, ucrReceiverEndRainsDOY.ControlValueChanged, ucrReceiverEndSeasonDate.ControlValueChanged, + ucrReceiverEndSeasonDOY.ControlValueChanged, ucrReceiverRainDaysSeason.ControlValueChanged, ucrReceiverRainDaysYear.ControlValueChanged, ucrReceiverSeasonalLength.ControlValueChanged, ucrReceiverSeasonalRain.ControlValueChanged, + ucrReceiverStartRainDate.ControlValueChanged, ucrReceiverStartRainDOY.ControlValueChanged, ucrReceiverStation.ControlValueChanged, ucrReceiverYear.ControlValueChanged + + If Not (ucrReceiverAnnualRain.IsEmpty AndAlso ucrReceiverEndRainsDate.IsEmpty AndAlso ucrReceiverEndRainsDOY.IsEmpty AndAlso ucrReceiverSeasonalLength.IsEmpty AndAlso ucrReceiverSeasonalRain.IsEmpty AndAlso + ucrReceiverEndSeasonDate.IsEmpty AndAlso ucrReceiverEndSeasonDOY.IsEmpty AndAlso ucrReceiverRainDaysSeason.IsEmpty AndAlso ucrReceiverRainDaysYear.IsEmpty AndAlso ucrReceiverStartRainDate.IsEmpty AndAlso + ucrReceiverStartRainDOY.IsEmpty AndAlso ucrReceiverStation.IsEmpty AndAlso ucrReceiverYear.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("annual_rainfall_data", clsRFunctionParameter:=clsReforMattAnnualSummariesFunction, iPosition:=1) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("annual_rainfall_data") + End If + End Sub + + Private Sub ucrReceiverStationCrop_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStationCrop.ControlValueChanged, ucrReceiverTotalRain.ControlValueChanged, ucrReceiverPlantingDay.ControlValueChanged, ucrReceiverPlantingLenghth.ControlValueChanged, + ucrReceiverPropSuccess.ControlValueChanged + + If Not (ucrReceiverStationCrop.IsEmpty AndAlso ucrReceiverTotalRain.IsEmpty AndAlso ucrReceiverPlantingDay.IsEmpty AndAlso ucrReceiverPlantingLenghth.IsEmpty AndAlso ucrReceiverPropSuccess.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("crop_success_data", clsRFunctionParameter:=clsReformatCropSuccessFunction, iPosition:=2) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("crop_success_data") + End If + End Sub + + Private Sub ucrReceiverSeasonStationProb_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSeasonStationProb.ControlValueChanged, ucrReceiverSeasonPlantingDay.ControlValueChanged, ucrReceiverPlantingDayCondition.ControlValueChanged, ucrReceiverSeasonYear.ControlValueChanged + + If Not (ucrReceiverSeasonStationProb.IsEmpty AndAlso ucrReceiverSeasonPlantingDay.IsEmpty AndAlso ucrReceiverPlantingDayCondition.IsEmpty AndAlso ucrReceiverSeasonYear.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("season_start_data", clsRFunctionParameter:=clsReformatSeasonStartFunction, iPosition:=3) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("season_start_data") + End If + End Sub + + Private Sub ucrReceiverAnnualTempStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverAnnualTempStation.ControlValueChanged, ucrReceiverAnnualTempYr.ControlValueChanged, ucrReceiverMaxMaxAnnual.ControlValueChanged, ucrReceiverMaxMinAnnual.ControlValueChanged, ucrReceiverMeanAnnual.ControlValueChanged, ucrReceiverMeanMaxAnnual.ControlValueChanged, ucrReceiverMinMaxAnnual.ControlValueChanged, ucrReceiverMinMinAnnual.ControlValueChanged + If Not (ucrReceiverAnnualTempStation.IsEmpty AndAlso ucrReceiverAnnualTempYr.IsEmpty AndAlso ucrReceiverMaxMaxAnnual.IsEmpty AndAlso + ucrReceiverMaxMinAnnual.IsEmpty AndAlso ucrReceiverMeanAnnual.IsEmpty AndAlso ucrReceiverMeanMaxAnnual.IsEmpty AndAlso ucrReceiverMinMaxAnnual.IsEmpty AndAlso ucrReceiverMinMinAnnual.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("annual_temperature_data", clsRFunctionParameter:=clsReformatTempSummariesFunction, iPosition:=4) + Else + + clsExportRinstatToBucketFunction.RemoveParameterByName("annual_temperature_data") + End If + End Sub + + Private Sub ucrReceiverMonthlyTemp_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMonthlyTemp.ControlValueChanged, ucrReceiverYearMonthly.ControlValueChanged, ucrReceiverMonthMonthly.ControlValueChanged, ucrReceiverMeanmaxMonthly.ControlValueChanged, ucrReceiverMeanminMontly.ControlValueChanged, ucrReceiverMinMaxMonthly.ControlValueChanged, ucrReceiverMinMinMonthly.ControlValueChanged, ucrReceiverMaxMinMonthly.ControlValueChanged, ucrReceiverMaxMaxMonthly.ControlValueChanged + If Not (ucrReceiverMonthlyTemp.IsEmpty AndAlso ucrReceiverYearMonthly.IsEmpty AndAlso ucrReceiverMonthMonthly.IsEmpty AndAlso ucrReceiverMeanmaxMonthly.IsEmpty AndAlso ucrReceiverMeanminMontly.IsEmpty AndAlso ucrReceiverMinMaxMonthly.IsEmpty AndAlso ucrReceiverMinMinMonthly.IsEmpty AndAlso ucrReceiverMaxMinMonthly.IsEmpty AndAlso ucrReceiverMaxMaxMonthly.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("monthly_temperature_data", clsRFunctionParameter:=clsReformatMonthlyTempSummaries, iPosition:=5) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("monthly_temperature_data") + End If + End Sub End Class \ No newline at end of file From ab27c7ab49263e59cc22ce048deedb2a6d0dd467 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Fri, 10 May 2024 10:55:40 +0300 Subject: [PATCH 83/99] changes to the code --- .../dlgExportClimaticDefinitions.Designer.vb | 146 +++++++++--------- instat/dlgExportClimaticDefinitions.vb | 11 +- 2 files changed, 81 insertions(+), 76 deletions(-) diff --git a/instat/dlgExportClimaticDefinitions.Designer.vb b/instat/dlgExportClimaticDefinitions.Designer.vb index 8ede3b89d2b..6d16ea8c7e4 100644 --- a/instat/dlgExportClimaticDefinitions.Designer.vb +++ b/instat/dlgExportClimaticDefinitions.Designer.vb @@ -65,19 +65,19 @@ Partial Class dlgExportClimaticDefinitions 'lblStationID ' Me.lblStationID.AutoSize = True - Me.lblStationID.Location = New System.Drawing.Point(331, 378) + Me.lblStationID.Location = New System.Drawing.Point(334, 126) Me.lblStationID.Name = "lblStationID" Me.lblStationID.Size = New System.Drawing.Size(57, 13) - Me.lblStationID.TabIndex = 56 + Me.lblStationID.TabIndex = 7 Me.lblStationID.Text = "Station ID:" ' 'lblCountry ' Me.lblCountry.AutoSize = True - Me.lblCountry.Location = New System.Drawing.Point(333, 415) + Me.lblCountry.Location = New System.Drawing.Point(336, 163) Me.lblCountry.Name = "lblCountry" Me.lblCountry.Size = New System.Drawing.Size(46, 13) - Me.lblCountry.TabIndex = 55 + Me.lblCountry.TabIndex = 9 Me.lblCountry.Text = "Country:" ' 'ucrInputCountry @@ -86,10 +86,10 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputCountry.AutoSize = True Me.ucrInputCountry.IsMultiline = False Me.ucrInputCountry.IsReadOnly = False - Me.ucrInputCountry.Location = New System.Drawing.Point(331, 430) + Me.ucrInputCountry.Location = New System.Drawing.Point(334, 178) Me.ucrInputCountry.Name = "ucrInputCountry" Me.ucrInputCountry.Size = New System.Drawing.Size(118, 21) - Me.ucrInputCountry.TabIndex = 54 + Me.ucrInputCountry.TabIndex = 10 ' 'ucrInputStationID ' @@ -97,25 +97,25 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputStationID.AutoSize = True Me.ucrInputStationID.IsMultiline = False Me.ucrInputStationID.IsReadOnly = False - Me.ucrInputStationID.Location = New System.Drawing.Point(331, 394) + Me.ucrInputStationID.Location = New System.Drawing.Point(334, 142) Me.ucrInputStationID.Name = "ucrInputStationID" Me.ucrInputStationID.Size = New System.Drawing.Size(118, 21) - Me.ucrInputStationID.TabIndex = 53 + Me.ucrInputStationID.TabIndex = 8 ' 'ucrChkSeasonStartProp ' Me.ucrChkSeasonStartProp.AutoSize = True Me.ucrChkSeasonStartProp.Checked = False - Me.ucrChkSeasonStartProp.Location = New System.Drawing.Point(154, 46) + Me.ucrChkSeasonStartProp.Location = New System.Drawing.Point(157, 46) Me.ucrChkSeasonStartProp.Name = "ucrChkSeasonStartProp" Me.ucrChkSeasonStartProp.Size = New System.Drawing.Size(151, 23) - Me.ucrChkSeasonStartProp.TabIndex = 4 + Me.ucrChkSeasonStartProp.TabIndex = 3 ' 'ucrChkExtremes ' Me.ucrChkExtremes.AutoSize = True Me.ucrChkExtremes.Checked = False - Me.ucrChkExtremes.Location = New System.Drawing.Point(154, 78) + Me.ucrChkExtremes.Location = New System.Drawing.Point(157, 78) Me.ucrChkExtremes.Name = "ucrChkExtremes" Me.ucrChkExtremes.Size = New System.Drawing.Size(147, 23) Me.ucrChkExtremes.TabIndex = 5 @@ -124,25 +124,25 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrChkCropSuccessProp.AutoSize = True Me.ucrChkCropSuccessProp.Checked = False - Me.ucrChkCropSuccessProp.Location = New System.Drawing.Point(154, 18) + Me.ucrChkCropSuccessProp.Location = New System.Drawing.Point(157, 18) Me.ucrChkCropSuccessProp.Name = "ucrChkCropSuccessProp" Me.ucrChkCropSuccessProp.Size = New System.Drawing.Size(153, 23) - Me.ucrChkCropSuccessProp.TabIndex = 3 + Me.ucrChkCropSuccessProp.TabIndex = 1 ' 'ucrChkAnnualTemp ' Me.ucrChkAnnualTemp.AutoSize = True Me.ucrChkAnnualTemp.Checked = False - Me.ucrChkAnnualTemp.Location = New System.Drawing.Point(5, 46) + Me.ucrChkAnnualTemp.Location = New System.Drawing.Point(8, 46) Me.ucrChkAnnualTemp.Name = "ucrChkAnnualTemp" Me.ucrChkAnnualTemp.Size = New System.Drawing.Size(149, 23) - Me.ucrChkAnnualTemp.TabIndex = 1 + Me.ucrChkAnnualTemp.TabIndex = 2 ' 'ucrChkAnnualRainfall ' Me.ucrChkAnnualRainfall.AutoSize = True Me.ucrChkAnnualRainfall.Checked = False - Me.ucrChkAnnualRainfall.Location = New System.Drawing.Point(5, 18) + Me.ucrChkAnnualRainfall.Location = New System.Drawing.Point(8, 18) Me.ucrChkAnnualRainfall.Name = "ucrChkAnnualRainfall" Me.ucrChkAnnualRainfall.Size = New System.Drawing.Size(149, 23) Me.ucrChkAnnualRainfall.TabIndex = 0 @@ -150,64 +150,64 @@ Partial Class dlgExportClimaticDefinitions 'lblMonth ' Me.lblMonth.AutoSize = True - Me.lblMonth.Location = New System.Drawing.Point(333, 339) + Me.lblMonth.Location = New System.Drawing.Point(336, 87) Me.lblMonth.Name = "lblMonth" Me.lblMonth.Size = New System.Drawing.Size(40, 13) - Me.lblMonth.TabIndex = 47 + Me.lblMonth.TabIndex = 5 Me.lblMonth.Text = "Month:" ' 'lblYear ' Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(334, 301) + Me.lblYear.Location = New System.Drawing.Point(337, 49) Me.lblYear.Name = "lblYear" Me.lblYear.Size = New System.Drawing.Size(32, 13) - Me.lblYear.TabIndex = 45 + Me.lblYear.TabIndex = 3 Me.lblYear.Text = "Year:" ' 'ucrReceiverMonth ' Me.ucrReceiverMonth.AutoSize = True Me.ucrReceiverMonth.frmParent = Me - Me.ucrReceiverMonth.Location = New System.Drawing.Point(329, 356) + Me.ucrReceiverMonth.Location = New System.Drawing.Point(332, 104) Me.ucrReceiverMonth.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMonth.Name = "ucrReceiverMonth" Me.ucrReceiverMonth.Selector = Nothing Me.ucrReceiverMonth.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverMonth.strNcFilePath = "" - Me.ucrReceiverMonth.TabIndex = 48 + Me.ucrReceiverMonth.TabIndex = 6 Me.ucrReceiverMonth.ucrSelector = Nothing ' 'ucrReceiverYear ' Me.ucrReceiverYear.AutoSize = True Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(330, 317) + Me.ucrReceiverYear.Location = New System.Drawing.Point(333, 65) Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYear.Name = "ucrReceiverYear" Me.ucrReceiverYear.Selector = Nothing Me.ucrReceiverYear.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.TabIndex = 46 + Me.ucrReceiverYear.TabIndex = 4 Me.ucrReceiverYear.ucrSelector = Nothing ' 'Label1 ' Me.Label1.AutoSize = True Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(76, 457) + Me.Label1.Location = New System.Drawing.Point(79, 457) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(0, 13) - Me.Label1.TabIndex = 52 + Me.Label1.TabIndex = 30 ' 'ucrChkIncludeSummaryData ' Me.ucrChkIncludeSummaryData.AutoSize = True Me.ucrChkIncludeSummaryData.Checked = False - Me.ucrChkIncludeSummaryData.Location = New System.Drawing.Point(1, 331) + Me.ucrChkIncludeSummaryData.Location = New System.Drawing.Point(4, 329) Me.ucrChkIncludeSummaryData.Name = "ucrChkIncludeSummaryData" Me.ucrChkIncludeSummaryData.Size = New System.Drawing.Size(221, 31) - Me.ucrChkIncludeSummaryData.TabIndex = 50 + Me.ucrChkIncludeSummaryData.TabIndex = 24 ' 'grpSummaries ' @@ -217,10 +217,10 @@ Partial Class dlgExportClimaticDefinitions Me.grpSummaries.Controls.Add(Me.ucrChkCropSuccessProp) Me.grpSummaries.Controls.Add(Me.ucrChkAnnualTemp) Me.grpSummaries.Controls.Add(Me.ucrChkAnnualRainfall) - Me.grpSummaries.Location = New System.Drawing.Point(1, 211) + Me.grpSummaries.Location = New System.Drawing.Point(4, 211) Me.grpSummaries.Name = "grpSummaries" Me.grpSummaries.Size = New System.Drawing.Size(313, 111) - Me.grpSummaries.TabIndex = 49 + Me.grpSummaries.TabIndex = 23 Me.grpSummaries.TabStop = False Me.grpSummaries.Text = "Summaries" ' @@ -228,124 +228,124 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrChkMonthlyTemp.AutoSize = True Me.ucrChkMonthlyTemp.Checked = False - Me.ucrChkMonthlyTemp.Location = New System.Drawing.Point(5, 78) + Me.ucrChkMonthlyTemp.Location = New System.Drawing.Point(8, 78) Me.ucrChkMonthlyTemp.Name = "ucrChkMonthlyTemp" Me.ucrChkMonthlyTemp.Size = New System.Drawing.Size(147, 23) - Me.ucrChkMonthlyTemp.TabIndex = 2 + Me.ucrChkMonthlyTemp.TabIndex = 4 ' 'lblMaxTemp ' Me.lblMaxTemp.AutoSize = True - Me.lblMaxTemp.Location = New System.Drawing.Point(329, 262) + Me.lblMaxTemp.Location = New System.Drawing.Point(336, 413) Me.lblMaxTemp.Name = "lblMaxTemp" Me.lblMaxTemp.Size = New System.Drawing.Size(60, 13) - Me.lblMaxTemp.TabIndex = 43 + Me.lblMaxTemp.TabIndex = 21 Me.lblMaxTemp.Text = "Max Temp:" ' 'lblCropData ' Me.lblCropData.AutoSize = True - Me.lblCropData.Location = New System.Drawing.Point(329, 136) + Me.lblCropData.Location = New System.Drawing.Point(336, 287) Me.lblCropData.Name = "lblCropData" Me.lblCropData.Size = New System.Drawing.Size(58, 13) - Me.lblCropData.TabIndex = 37 + Me.lblCropData.TabIndex = 15 Me.lblCropData.Text = "Crop Data:" ' 'lblDataByYearMonth ' Me.lblDataByYearMonth.AutoSize = True - Me.lblDataByYearMonth.Location = New System.Drawing.Point(326, 94) + Me.lblDataByYearMonth.Location = New System.Drawing.Point(333, 245) Me.lblDataByYearMonth.Name = "lblDataByYearMonth" Me.lblDataByYearMonth.Size = New System.Drawing.Size(127, 13) - Me.lblDataByYearMonth.TabIndex = 35 + Me.lblDataByYearMonth.TabIndex = 13 Me.lblDataByYearMonth.Text = "Data By Year and Month:" ' 'lblDataByYear ' Me.lblDataByYear.AutoSize = True - Me.lblDataByYear.Location = New System.Drawing.Point(329, 51) + Me.lblDataByYear.Location = New System.Drawing.Point(336, 202) Me.lblDataByYear.Name = "lblDataByYear" Me.lblDataByYear.Size = New System.Drawing.Size(73, 13) - Me.lblDataByYear.TabIndex = 33 + Me.lblDataByYear.TabIndex = 11 Me.lblDataByYear.Text = "Data By Year:" ' 'lblRain ' Me.lblRain.AutoSize = True - Me.lblRain.Location = New System.Drawing.Point(329, 177) + Me.lblRain.Location = New System.Drawing.Point(336, 328) Me.lblRain.Name = "lblRain" Me.lblRain.Size = New System.Drawing.Size(32, 13) - Me.lblRain.TabIndex = 39 + Me.lblRain.TabIndex = 17 Me.lblRain.Text = "Rain:" ' 'lblMinTemp ' Me.lblMinTemp.AutoSize = True - Me.lblMinTemp.Location = New System.Drawing.Point(329, 220) + Me.lblMinTemp.Location = New System.Drawing.Point(336, 371) Me.lblMinTemp.Name = "lblMinTemp" Me.lblMinTemp.Size = New System.Drawing.Size(57, 13) - Me.lblMinTemp.TabIndex = 41 + Me.lblMinTemp.TabIndex = 19 Me.lblMinTemp.Text = "Min Temp:" ' 'lblData ' Me.lblData.AutoSize = True - Me.lblData.Location = New System.Drawing.Point(329, 9) + Me.lblData.Location = New System.Drawing.Point(332, 9) Me.lblData.Name = "lblData" Me.lblData.Size = New System.Drawing.Size(33, 13) - Me.lblData.TabIndex = 31 + Me.lblData.TabIndex = 1 Me.lblData.Text = "Data:" ' 'ucrReceiverRain ' Me.ucrReceiverRain.AutoSize = True Me.ucrReceiverRain.frmParent = Me - Me.ucrReceiverRain.Location = New System.Drawing.Point(327, 194) + Me.ucrReceiverRain.Location = New System.Drawing.Point(334, 345) Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRain.Name = "ucrReceiverRain" Me.ucrReceiverRain.Selector = Nothing Me.ucrReceiverRain.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverRain.strNcFilePath = "" - Me.ucrReceiverRain.TabIndex = 40 + Me.ucrReceiverRain.TabIndex = 18 Me.ucrReceiverRain.ucrSelector = Nothing ' 'ucrReceiverMinTemp ' Me.ucrReceiverMinTemp.AutoSize = True Me.ucrReceiverMinTemp.frmParent = Me - Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(327, 237) + Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(334, 388) Me.ucrReceiverMinTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinTemp.Name = "ucrReceiverMinTemp" Me.ucrReceiverMinTemp.Selector = Nothing Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverMinTemp.strNcFilePath = "" - Me.ucrReceiverMinTemp.TabIndex = 42 + Me.ucrReceiverMinTemp.TabIndex = 20 Me.ucrReceiverMinTemp.ucrSelector = Nothing ' 'ucrReceiverMaxTemp ' Me.ucrReceiverMaxTemp.AutoSize = True Me.ucrReceiverMaxTemp.frmParent = Me - Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(327, 280) + Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(334, 431) Me.ucrReceiverMaxTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxTemp.Name = "ucrReceiverMaxTemp" Me.ucrReceiverMaxTemp.Selector = Nothing Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverMaxTemp.strNcFilePath = "" - Me.ucrReceiverMaxTemp.TabIndex = 44 + Me.ucrReceiverMaxTemp.TabIndex = 22 Me.ucrReceiverMaxTemp.ucrSelector = Nothing ' 'ucrReceiverData ' Me.ucrReceiverData.AutoSize = True Me.ucrReceiverData.frmParent = Me - Me.ucrReceiverData.Location = New System.Drawing.Point(327, 26) + Me.ucrReceiverData.Location = New System.Drawing.Point(330, 26) Me.ucrReceiverData.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverData.Name = "ucrReceiverData" Me.ucrReceiverData.Selector = Nothing Me.ucrReceiverData.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverData.strNcFilePath = "" - Me.ucrReceiverData.TabIndex = 32 + Me.ucrReceiverData.TabIndex = 2 Me.ucrReceiverData.ucrSelector = Nothing ' 'ucrSelectorExportDefinitions @@ -354,76 +354,76 @@ Partial Class dlgExportClimaticDefinitions Me.ucrSelectorExportDefinitions.bDropUnusedFilterLevels = False Me.ucrSelectorExportDefinitions.bShowHiddenColumns = False Me.ucrSelectorExportDefinitions.bUseCurrentFilter = True - Me.ucrSelectorExportDefinitions.Location = New System.Drawing.Point(1, 8) + Me.ucrSelectorExportDefinitions.Location = New System.Drawing.Point(4, 8) Me.ucrSelectorExportDefinitions.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorExportDefinitions.Name = "ucrSelectorExportDefinitions" Me.ucrSelectorExportDefinitions.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorExportDefinitions.TabIndex = 30 + Me.ucrSelectorExportDefinitions.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(1, 458) + Me.ucrBase.Location = New System.Drawing.Point(4, 458) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 60) - Me.ucrBase.TabIndex = 51 + Me.ucrBase.TabIndex = 29 ' 'ucrReceiverDataYear ' Me.ucrReceiverDataYear.AutoSize = True Me.ucrReceiverDataYear.frmParent = Me - Me.ucrReceiverDataYear.Location = New System.Drawing.Point(327, 68) + Me.ucrReceiverDataYear.Location = New System.Drawing.Point(334, 219) Me.ucrReceiverDataYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDataYear.Name = "ucrReceiverDataYear" Me.ucrReceiverDataYear.Selector = Nothing Me.ucrReceiverDataYear.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverDataYear.strNcFilePath = "" - Me.ucrReceiverDataYear.TabIndex = 34 + Me.ucrReceiverDataYear.TabIndex = 12 Me.ucrReceiverDataYear.ucrSelector = Nothing ' 'ucrReceiverDataYearMonth ' Me.ucrReceiverDataYearMonth.AutoSize = True Me.ucrReceiverDataYearMonth.frmParent = Me - Me.ucrReceiverDataYearMonth.Location = New System.Drawing.Point(327, 111) + Me.ucrReceiverDataYearMonth.Location = New System.Drawing.Point(334, 262) Me.ucrReceiverDataYearMonth.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDataYearMonth.Name = "ucrReceiverDataYearMonth" Me.ucrReceiverDataYearMonth.Selector = Nothing Me.ucrReceiverDataYearMonth.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverDataYearMonth.strNcFilePath = "" - Me.ucrReceiverDataYearMonth.TabIndex = 36 + Me.ucrReceiverDataYearMonth.TabIndex = 14 Me.ucrReceiverDataYearMonth.ucrSelector = Nothing ' 'ucrReceiverCropData ' Me.ucrReceiverCropData.AutoSize = True Me.ucrReceiverCropData.frmParent = Me - Me.ucrReceiverCropData.Location = New System.Drawing.Point(327, 152) + Me.ucrReceiverCropData.Location = New System.Drawing.Point(334, 303) Me.ucrReceiverCropData.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverCropData.Name = "ucrReceiverCropData" Me.ucrReceiverCropData.Selector = Nothing Me.ucrReceiverCropData.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverCropData.strNcFilePath = "" - Me.ucrReceiverCropData.TabIndex = 38 + Me.ucrReceiverCropData.TabIndex = 16 Me.ucrReceiverCropData.ucrSelector = Nothing ' 'lblExport ' Me.lblExport.AutoSize = True Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExport.Location = New System.Drawing.Point(4, 398) + Me.lblExport.Location = New System.Drawing.Point(7, 393) Me.lblExport.Name = "lblExport" Me.lblExport.Size = New System.Drawing.Size(59, 13) - Me.lblExport.TabIndex = 57 + Me.lblExport.TabIndex = 26 Me.lblExport.Text = "Export File:" ' 'cmdChooseFile ' Me.cmdChooseFile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdChooseFile.Location = New System.Drawing.Point(250, 392) + Me.cmdChooseFile.Location = New System.Drawing.Point(253, 387) Me.cmdChooseFile.Name = "cmdChooseFile" Me.cmdChooseFile.Size = New System.Drawing.Size(80, 23) - Me.cmdChooseFile.TabIndex = 59 + Me.cmdChooseFile.TabIndex = 28 Me.cmdChooseFile.Text = "Browse" Me.cmdChooseFile.UseVisualStyleBackColor = True ' @@ -433,19 +433,19 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputTokenPath.AutoSize = True Me.ucrInputTokenPath.IsMultiline = False Me.ucrInputTokenPath.IsReadOnly = False - Me.ucrInputTokenPath.Location = New System.Drawing.Point(64, 394) + Me.ucrInputTokenPath.Location = New System.Drawing.Point(67, 389) Me.ucrInputTokenPath.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrInputTokenPath.Name = "ucrInputTokenPath" Me.ucrInputTokenPath.Size = New System.Drawing.Size(182, 21) - Me.ucrInputTokenPath.TabIndex = 58 + Me.ucrInputTokenPath.TabIndex = 27 ' 'cmdDefine ' Me.cmdDefine.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDefine.Location = New System.Drawing.Point(219, 329) + Me.cmdDefine.Location = New System.Drawing.Point(225, 328) Me.cmdDefine.Name = "cmdDefine" - Me.cmdDefine.Size = New System.Drawing.Size(80, 23) - Me.cmdDefine.TabIndex = 60 + Me.cmdDefine.Size = New System.Drawing.Size(80, 29) + Me.cmdDefine.TabIndex = 25 Me.cmdDefine.Text = "Define" Me.cmdDefine.UseVisualStyleBackColor = True ' diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index d9cadffa4a5..abf235e33f2 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -139,7 +139,7 @@ Public Class dlgExportClimaticDefinitions bResetSubdialog = True ucrSelectorExportDefinitions.Reset() - ucrReceiverData.SetMeAsReceiver() + 'ucrReceiverData.SetMeAsReceiver() clsDummyFunction.AddParameter("rain", "False", iPosition:=0) clsDummyFunction.AddParameter("temp", "False", iPosition:=1) @@ -148,7 +148,6 @@ Public Class dlgExportClimaticDefinitions clsDummyFunction.AddParameter("season", "False", iPosition:=4) clsDummyFunction.AddParameter("crop", "False", iPosition:=5) - clsReformatTempSummariesFunction.SetPackageName("epicsawrap") clsReformatTempSummariesFunction.SetRCommand("reformat_temperature_summaries") clsReformatTempSummariesFunction.SetAssignTo("crop_prop") @@ -169,7 +168,6 @@ Public Class dlgExportClimaticDefinitions clsReformatCropSuccessFunction.SetRCommand("reformat_crop_success") clsReformatCropSuccessFunction.SetAssignTo("crop_prop") - clsSummariesFunction.SetRCommand("c") clsExportRinstatToBucketFunction.SetPackageName("epicsawrap") @@ -381,4 +379,11 @@ Public Class dlgExportClimaticDefinitions TestOkEnabled() End Sub + Private Sub ucrReceiverData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlValueChanged + ucrReceiverData.SetMeAsReceiver() + End Sub + + Private Sub ucrSelectorExportDefinitions_DataFrameChanged() Handles ucrSelectorExportDefinitions.DataFrameChanged + TestOkEnabled() + End Sub End Class \ No newline at end of file From 053880fa54c3558f150b5325d8d6b1bd1fb35c25 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 13 May 2024 10:19:12 +0300 Subject: [PATCH 84/99] changes --- .../dlgExportClimaticDefinitions.Designer.vb | 185 ++++++++++-------- instat/dlgExportClimaticDefinitions.vb | 2 +- 2 files changed, 108 insertions(+), 79 deletions(-) diff --git a/instat/dlgExportClimaticDefinitions.Designer.vb b/instat/dlgExportClimaticDefinitions.Designer.vb index 6d16ea8c7e4..0925525f03e 100644 --- a/instat/dlgExportClimaticDefinitions.Designer.vb +++ b/instat/dlgExportClimaticDefinitions.Designer.vb @@ -65,18 +65,20 @@ Partial Class dlgExportClimaticDefinitions 'lblStationID ' Me.lblStationID.AutoSize = True - Me.lblStationID.Location = New System.Drawing.Point(334, 126) + Me.lblStationID.Location = New System.Drawing.Point(501, 194) + Me.lblStationID.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblStationID.Name = "lblStationID" - Me.lblStationID.Size = New System.Drawing.Size(57, 13) + Me.lblStationID.Size = New System.Drawing.Size(85, 20) Me.lblStationID.TabIndex = 7 Me.lblStationID.Text = "Station ID:" ' 'lblCountry ' Me.lblCountry.AutoSize = True - Me.lblCountry.Location = New System.Drawing.Point(336, 163) + Me.lblCountry.Location = New System.Drawing.Point(504, 251) + Me.lblCountry.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCountry.Name = "lblCountry" - Me.lblCountry.Size = New System.Drawing.Size(46, 13) + Me.lblCountry.Size = New System.Drawing.Size(68, 20) Me.lblCountry.TabIndex = 9 Me.lblCountry.Text = "Country:" ' @@ -86,9 +88,10 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputCountry.AutoSize = True Me.ucrInputCountry.IsMultiline = False Me.ucrInputCountry.IsReadOnly = False - Me.ucrInputCountry.Location = New System.Drawing.Point(334, 178) + Me.ucrInputCountry.Location = New System.Drawing.Point(501, 274) + Me.ucrInputCountry.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) Me.ucrInputCountry.Name = "ucrInputCountry" - Me.ucrInputCountry.Size = New System.Drawing.Size(118, 21) + Me.ucrInputCountry.Size = New System.Drawing.Size(177, 32) Me.ucrInputCountry.TabIndex = 10 ' 'ucrInputStationID @@ -97,71 +100,80 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputStationID.AutoSize = True Me.ucrInputStationID.IsMultiline = False Me.ucrInputStationID.IsReadOnly = False - Me.ucrInputStationID.Location = New System.Drawing.Point(334, 142) + Me.ucrInputStationID.Location = New System.Drawing.Point(501, 218) + Me.ucrInputStationID.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) Me.ucrInputStationID.Name = "ucrInputStationID" - Me.ucrInputStationID.Size = New System.Drawing.Size(118, 21) + Me.ucrInputStationID.Size = New System.Drawing.Size(177, 32) Me.ucrInputStationID.TabIndex = 8 ' 'ucrChkSeasonStartProp ' Me.ucrChkSeasonStartProp.AutoSize = True Me.ucrChkSeasonStartProp.Checked = False - Me.ucrChkSeasonStartProp.Location = New System.Drawing.Point(157, 46) + Me.ucrChkSeasonStartProp.Location = New System.Drawing.Point(236, 71) + Me.ucrChkSeasonStartProp.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkSeasonStartProp.Name = "ucrChkSeasonStartProp" - Me.ucrChkSeasonStartProp.Size = New System.Drawing.Size(151, 23) + Me.ucrChkSeasonStartProp.Size = New System.Drawing.Size(226, 52) Me.ucrChkSeasonStartProp.TabIndex = 3 ' 'ucrChkExtremes ' Me.ucrChkExtremes.AutoSize = True Me.ucrChkExtremes.Checked = False - Me.ucrChkExtremes.Location = New System.Drawing.Point(157, 78) + Me.ucrChkExtremes.Location = New System.Drawing.Point(236, 120) + Me.ucrChkExtremes.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkExtremes.Name = "ucrChkExtremes" - Me.ucrChkExtremes.Size = New System.Drawing.Size(147, 23) + Me.ucrChkExtremes.Size = New System.Drawing.Size(220, 52) Me.ucrChkExtremes.TabIndex = 5 + Me.ucrChkExtremes.Visible = False ' 'ucrChkCropSuccessProp ' Me.ucrChkCropSuccessProp.AutoSize = True Me.ucrChkCropSuccessProp.Checked = False - Me.ucrChkCropSuccessProp.Location = New System.Drawing.Point(157, 18) + Me.ucrChkCropSuccessProp.Location = New System.Drawing.Point(236, 28) + Me.ucrChkCropSuccessProp.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkCropSuccessProp.Name = "ucrChkCropSuccessProp" - Me.ucrChkCropSuccessProp.Size = New System.Drawing.Size(153, 23) + Me.ucrChkCropSuccessProp.Size = New System.Drawing.Size(230, 52) Me.ucrChkCropSuccessProp.TabIndex = 1 ' 'ucrChkAnnualTemp ' Me.ucrChkAnnualTemp.AutoSize = True Me.ucrChkAnnualTemp.Checked = False - Me.ucrChkAnnualTemp.Location = New System.Drawing.Point(8, 46) + Me.ucrChkAnnualTemp.Location = New System.Drawing.Point(12, 71) + Me.ucrChkAnnualTemp.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkAnnualTemp.Name = "ucrChkAnnualTemp" - Me.ucrChkAnnualTemp.Size = New System.Drawing.Size(149, 23) + Me.ucrChkAnnualTemp.Size = New System.Drawing.Size(224, 52) Me.ucrChkAnnualTemp.TabIndex = 2 ' 'ucrChkAnnualRainfall ' Me.ucrChkAnnualRainfall.AutoSize = True Me.ucrChkAnnualRainfall.Checked = False - Me.ucrChkAnnualRainfall.Location = New System.Drawing.Point(8, 18) + Me.ucrChkAnnualRainfall.Location = New System.Drawing.Point(12, 28) + Me.ucrChkAnnualRainfall.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkAnnualRainfall.Name = "ucrChkAnnualRainfall" - Me.ucrChkAnnualRainfall.Size = New System.Drawing.Size(149, 23) + Me.ucrChkAnnualRainfall.Size = New System.Drawing.Size(224, 52) Me.ucrChkAnnualRainfall.TabIndex = 0 ' 'lblMonth ' Me.lblMonth.AutoSize = True - Me.lblMonth.Location = New System.Drawing.Point(336, 87) + Me.lblMonth.Location = New System.Drawing.Point(504, 134) + Me.lblMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMonth.Name = "lblMonth" - Me.lblMonth.Size = New System.Drawing.Size(40, 13) + Me.lblMonth.Size = New System.Drawing.Size(58, 20) Me.lblMonth.TabIndex = 5 Me.lblMonth.Text = "Month:" ' 'lblYear ' Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(337, 49) + Me.lblYear.Location = New System.Drawing.Point(506, 75) + Me.lblYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblYear.Name = "lblYear" - Me.lblYear.Size = New System.Drawing.Size(32, 13) + Me.lblYear.Size = New System.Drawing.Size(47, 20) Me.lblYear.TabIndex = 3 Me.lblYear.Text = "Year:" ' @@ -169,11 +181,11 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverMonth.AutoSize = True Me.ucrReceiverMonth.frmParent = Me - Me.ucrReceiverMonth.Location = New System.Drawing.Point(332, 104) + Me.ucrReceiverMonth.Location = New System.Drawing.Point(498, 160) Me.ucrReceiverMonth.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMonth.Name = "ucrReceiverMonth" Me.ucrReceiverMonth.Selector = Nothing - Me.ucrReceiverMonth.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMonth.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverMonth.strNcFilePath = "" Me.ucrReceiverMonth.TabIndex = 6 Me.ucrReceiverMonth.ucrSelector = Nothing @@ -182,11 +194,11 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverYear.AutoSize = True Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(333, 65) + Me.ucrReceiverYear.Location = New System.Drawing.Point(500, 100) Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYear.Name = "ucrReceiverYear" Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverYear.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverYear.strNcFilePath = "" Me.ucrReceiverYear.TabIndex = 4 Me.ucrReceiverYear.ucrSelector = Nothing @@ -195,18 +207,20 @@ Partial Class dlgExportClimaticDefinitions ' Me.Label1.AutoSize = True Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(79, 457) + Me.Label1.Location = New System.Drawing.Point(118, 703) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(0, 13) + Me.Label1.Size = New System.Drawing.Size(0, 20) Me.Label1.TabIndex = 30 ' 'ucrChkIncludeSummaryData ' Me.ucrChkIncludeSummaryData.AutoSize = True Me.ucrChkIncludeSummaryData.Checked = False - Me.ucrChkIncludeSummaryData.Location = New System.Drawing.Point(4, 329) + Me.ucrChkIncludeSummaryData.Location = New System.Drawing.Point(6, 506) + Me.ucrChkIncludeSummaryData.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkIncludeSummaryData.Name = "ucrChkIncludeSummaryData" - Me.ucrChkIncludeSummaryData.Size = New System.Drawing.Size(221, 31) + Me.ucrChkIncludeSummaryData.Size = New System.Drawing.Size(332, 48) Me.ucrChkIncludeSummaryData.TabIndex = 24 ' 'grpSummaries @@ -217,9 +231,11 @@ Partial Class dlgExportClimaticDefinitions Me.grpSummaries.Controls.Add(Me.ucrChkCropSuccessProp) Me.grpSummaries.Controls.Add(Me.ucrChkAnnualTemp) Me.grpSummaries.Controls.Add(Me.ucrChkAnnualRainfall) - Me.grpSummaries.Location = New System.Drawing.Point(4, 211) + Me.grpSummaries.Location = New System.Drawing.Point(6, 325) + Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Size = New System.Drawing.Size(313, 111) + Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.grpSummaries.Size = New System.Drawing.Size(470, 171) Me.grpSummaries.TabIndex = 23 Me.grpSummaries.TabStop = False Me.grpSummaries.Text = "Summaries" @@ -228,71 +244,79 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrChkMonthlyTemp.AutoSize = True Me.ucrChkMonthlyTemp.Checked = False - Me.ucrChkMonthlyTemp.Location = New System.Drawing.Point(8, 78) + Me.ucrChkMonthlyTemp.Location = New System.Drawing.Point(12, 120) + Me.ucrChkMonthlyTemp.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkMonthlyTemp.Name = "ucrChkMonthlyTemp" - Me.ucrChkMonthlyTemp.Size = New System.Drawing.Size(147, 23) + Me.ucrChkMonthlyTemp.Size = New System.Drawing.Size(220, 52) Me.ucrChkMonthlyTemp.TabIndex = 4 ' 'lblMaxTemp ' Me.lblMaxTemp.AutoSize = True - Me.lblMaxTemp.Location = New System.Drawing.Point(336, 413) + Me.lblMaxTemp.Location = New System.Drawing.Point(504, 635) + Me.lblMaxTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMaxTemp.Name = "lblMaxTemp" - Me.lblMaxTemp.Size = New System.Drawing.Size(60, 13) + Me.lblMaxTemp.Size = New System.Drawing.Size(86, 20) Me.lblMaxTemp.TabIndex = 21 Me.lblMaxTemp.Text = "Max Temp:" ' 'lblCropData ' Me.lblCropData.AutoSize = True - Me.lblCropData.Location = New System.Drawing.Point(336, 287) + Me.lblCropData.Location = New System.Drawing.Point(504, 442) + Me.lblCropData.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCropData.Name = "lblCropData" - Me.lblCropData.Size = New System.Drawing.Size(58, 13) + Me.lblCropData.Size = New System.Drawing.Size(86, 20) Me.lblCropData.TabIndex = 15 Me.lblCropData.Text = "Crop Data:" ' 'lblDataByYearMonth ' Me.lblDataByYearMonth.AutoSize = True - Me.lblDataByYearMonth.Location = New System.Drawing.Point(333, 245) + Me.lblDataByYearMonth.Location = New System.Drawing.Point(500, 377) + Me.lblDataByYearMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDataByYearMonth.Name = "lblDataByYearMonth" - Me.lblDataByYearMonth.Size = New System.Drawing.Size(127, 13) + Me.lblDataByYearMonth.Size = New System.Drawing.Size(188, 20) Me.lblDataByYearMonth.TabIndex = 13 Me.lblDataByYearMonth.Text = "Data By Year and Month:" ' 'lblDataByYear ' Me.lblDataByYear.AutoSize = True - Me.lblDataByYear.Location = New System.Drawing.Point(336, 202) + Me.lblDataByYear.Location = New System.Drawing.Point(504, 311) + Me.lblDataByYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDataByYear.Name = "lblDataByYear" - Me.lblDataByYear.Size = New System.Drawing.Size(73, 13) + Me.lblDataByYear.Size = New System.Drawing.Size(108, 20) Me.lblDataByYear.TabIndex = 11 Me.lblDataByYear.Text = "Data By Year:" ' 'lblRain ' Me.lblRain.AutoSize = True - Me.lblRain.Location = New System.Drawing.Point(336, 328) + Me.lblRain.Location = New System.Drawing.Point(504, 505) + Me.lblRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRain.Name = "lblRain" - Me.lblRain.Size = New System.Drawing.Size(32, 13) + Me.lblRain.Size = New System.Drawing.Size(46, 20) Me.lblRain.TabIndex = 17 Me.lblRain.Text = "Rain:" ' 'lblMinTemp ' Me.lblMinTemp.AutoSize = True - Me.lblMinTemp.Location = New System.Drawing.Point(336, 371) + Me.lblMinTemp.Location = New System.Drawing.Point(504, 571) + Me.lblMinTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMinTemp.Name = "lblMinTemp" - Me.lblMinTemp.Size = New System.Drawing.Size(57, 13) + Me.lblMinTemp.Size = New System.Drawing.Size(82, 20) Me.lblMinTemp.TabIndex = 19 Me.lblMinTemp.Text = "Min Temp:" ' 'lblData ' Me.lblData.AutoSize = True - Me.lblData.Location = New System.Drawing.Point(332, 9) + Me.lblData.Location = New System.Drawing.Point(498, 14) + Me.lblData.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblData.Name = "lblData" - Me.lblData.Size = New System.Drawing.Size(33, 13) + Me.lblData.Size = New System.Drawing.Size(48, 20) Me.lblData.TabIndex = 1 Me.lblData.Text = "Data:" ' @@ -300,11 +324,11 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverRain.AutoSize = True Me.ucrReceiverRain.frmParent = Me - Me.ucrReceiverRain.Location = New System.Drawing.Point(334, 345) + Me.ucrReceiverRain.Location = New System.Drawing.Point(501, 531) Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRain.Name = "ucrReceiverRain" Me.ucrReceiverRain.Selector = Nothing - Me.ucrReceiverRain.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverRain.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverRain.strNcFilePath = "" Me.ucrReceiverRain.TabIndex = 18 Me.ucrReceiverRain.ucrSelector = Nothing @@ -313,11 +337,11 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverMinTemp.AutoSize = True Me.ucrReceiverMinTemp.frmParent = Me - Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(334, 388) + Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(501, 597) Me.ucrReceiverMinTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinTemp.Name = "ucrReceiverMinTemp" Me.ucrReceiverMinTemp.Selector = Nothing - Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverMinTemp.strNcFilePath = "" Me.ucrReceiverMinTemp.TabIndex = 20 Me.ucrReceiverMinTemp.ucrSelector = Nothing @@ -326,11 +350,11 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverMaxTemp.AutoSize = True Me.ucrReceiverMaxTemp.frmParent = Me - Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(334, 431) + Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(501, 663) Me.ucrReceiverMaxTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxTemp.Name = "ucrReceiverMaxTemp" Me.ucrReceiverMaxTemp.Selector = Nothing - Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverMaxTemp.strNcFilePath = "" Me.ucrReceiverMaxTemp.TabIndex = 22 Me.ucrReceiverMaxTemp.ucrSelector = Nothing @@ -339,11 +363,11 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverData.AutoSize = True Me.ucrReceiverData.frmParent = Me - Me.ucrReceiverData.Location = New System.Drawing.Point(330, 26) + Me.ucrReceiverData.Location = New System.Drawing.Point(495, 40) Me.ucrReceiverData.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverData.Name = "ucrReceiverData" Me.ucrReceiverData.Selector = Nothing - Me.ucrReceiverData.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverData.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverData.strNcFilePath = "" Me.ucrReceiverData.TabIndex = 2 Me.ucrReceiverData.ucrSelector = Nothing @@ -354,29 +378,30 @@ Partial Class dlgExportClimaticDefinitions Me.ucrSelectorExportDefinitions.bDropUnusedFilterLevels = False Me.ucrSelectorExportDefinitions.bShowHiddenColumns = False Me.ucrSelectorExportDefinitions.bUseCurrentFilter = True - Me.ucrSelectorExportDefinitions.Location = New System.Drawing.Point(4, 8) + Me.ucrSelectorExportDefinitions.Location = New System.Drawing.Point(6, 12) Me.ucrSelectorExportDefinitions.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorExportDefinitions.Name = "ucrSelectorExportDefinitions" - Me.ucrSelectorExportDefinitions.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorExportDefinitions.Size = New System.Drawing.Size(320, 282) Me.ucrSelectorExportDefinitions.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(4, 458) + Me.ucrBase.Location = New System.Drawing.Point(6, 705) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 60) + Me.ucrBase.Size = New System.Drawing.Size(615, 92) Me.ucrBase.TabIndex = 29 ' 'ucrReceiverDataYear ' Me.ucrReceiverDataYear.AutoSize = True Me.ucrReceiverDataYear.frmParent = Me - Me.ucrReceiverDataYear.Location = New System.Drawing.Point(334, 219) + Me.ucrReceiverDataYear.Location = New System.Drawing.Point(501, 337) Me.ucrReceiverDataYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDataYear.Name = "ucrReceiverDataYear" Me.ucrReceiverDataYear.Selector = Nothing - Me.ucrReceiverDataYear.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverDataYear.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverDataYear.strNcFilePath = "" Me.ucrReceiverDataYear.TabIndex = 12 Me.ucrReceiverDataYear.ucrSelector = Nothing @@ -385,11 +410,11 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverDataYearMonth.AutoSize = True Me.ucrReceiverDataYearMonth.frmParent = Me - Me.ucrReceiverDataYearMonth.Location = New System.Drawing.Point(334, 262) + Me.ucrReceiverDataYearMonth.Location = New System.Drawing.Point(501, 403) Me.ucrReceiverDataYearMonth.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDataYearMonth.Name = "ucrReceiverDataYearMonth" Me.ucrReceiverDataYearMonth.Selector = Nothing - Me.ucrReceiverDataYearMonth.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverDataYearMonth.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverDataYearMonth.strNcFilePath = "" Me.ucrReceiverDataYearMonth.TabIndex = 14 Me.ucrReceiverDataYearMonth.ucrSelector = Nothing @@ -398,11 +423,11 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverCropData.AutoSize = True Me.ucrReceiverCropData.frmParent = Me - Me.ucrReceiverCropData.Location = New System.Drawing.Point(334, 303) + Me.ucrReceiverCropData.Location = New System.Drawing.Point(501, 466) Me.ucrReceiverCropData.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverCropData.Name = "ucrReceiverCropData" Me.ucrReceiverCropData.Selector = Nothing - Me.ucrReceiverCropData.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverCropData.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverCropData.strNcFilePath = "" Me.ucrReceiverCropData.TabIndex = 16 Me.ucrReceiverCropData.ucrSelector = Nothing @@ -411,18 +436,20 @@ Partial Class dlgExportClimaticDefinitions ' Me.lblExport.AutoSize = True Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExport.Location = New System.Drawing.Point(7, 393) + Me.lblExport.Location = New System.Drawing.Point(10, 603) + Me.lblExport.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblExport.Name = "lblExport" - Me.lblExport.Size = New System.Drawing.Size(59, 13) + Me.lblExport.Size = New System.Drawing.Size(57, 20) Me.lblExport.TabIndex = 26 - Me.lblExport.Text = "Export File:" + Me.lblExport.Text = "Token:" ' 'cmdChooseFile ' Me.cmdChooseFile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdChooseFile.Location = New System.Drawing.Point(253, 387) + Me.cmdChooseFile.Location = New System.Drawing.Point(380, 595) + Me.cmdChooseFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.cmdChooseFile.Name = "cmdChooseFile" - Me.cmdChooseFile.Size = New System.Drawing.Size(80, 23) + Me.cmdChooseFile.Size = New System.Drawing.Size(120, 35) Me.cmdChooseFile.TabIndex = 28 Me.cmdChooseFile.Text = "Browse" Me.cmdChooseFile.UseVisualStyleBackColor = True @@ -433,28 +460,29 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputTokenPath.AutoSize = True Me.ucrInputTokenPath.IsMultiline = False Me.ucrInputTokenPath.IsReadOnly = False - Me.ucrInputTokenPath.Location = New System.Drawing.Point(67, 389) - Me.ucrInputTokenPath.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputTokenPath.Location = New System.Drawing.Point(100, 598) + Me.ucrInputTokenPath.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) Me.ucrInputTokenPath.Name = "ucrInputTokenPath" - Me.ucrInputTokenPath.Size = New System.Drawing.Size(182, 21) + Me.ucrInputTokenPath.Size = New System.Drawing.Size(273, 32) Me.ucrInputTokenPath.TabIndex = 27 ' 'cmdDefine ' Me.cmdDefine.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDefine.Location = New System.Drawing.Point(225, 328) + Me.cmdDefine.Location = New System.Drawing.Point(338, 505) + Me.cmdDefine.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.cmdDefine.Name = "cmdDefine" - Me.cmdDefine.Size = New System.Drawing.Size(80, 29) + Me.cmdDefine.Size = New System.Drawing.Size(120, 45) Me.cmdDefine.TabIndex = 25 Me.cmdDefine.Text = "Define" Me.cmdDefine.UseVisualStyleBackColor = True ' 'dlgExportClimaticDefinitions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(455, 527) + Me.ClientSize = New System.Drawing.Size(682, 811) Me.Controls.Add(Me.cmdDefine) Me.Controls.Add(Me.lblExport) Me.Controls.Add(Me.cmdChooseFile) @@ -487,6 +515,7 @@ Partial Class dlgExportClimaticDefinitions Me.Controls.Add(Me.ucrReceiverDataYearMonth) Me.Controls.Add(Me.ucrReceiverCropData) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgExportClimaticDefinitions" diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index abf235e33f2..045b2af230c 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -122,7 +122,7 @@ Public Class dlgExportClimaticDefinitions ucrInputCountry.SetParameter(New RParameter("country", 19)) - ucrInputTokenPath.SetParameter(New RParameter("file", 0)) + ucrInputTokenPath.SetParameter(New RParameter("filename", 0)) End Sub From b4f185e4870d5da206d174edce380753beb4545d Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 13 May 2024 11:01:17 +0300 Subject: [PATCH 85/99] changes to the code --- .../dlgExportClimaticDefinitions.Designer.vb | 26 +++++++++---------- instat/dlgExportClimaticDefinitions.vb | 2 -- instat/sdgDefineAnnualRainfall.vb | 2 +- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/instat/dlgExportClimaticDefinitions.Designer.vb b/instat/dlgExportClimaticDefinitions.Designer.vb index 0925525f03e..edd151ed5b3 100644 --- a/instat/dlgExportClimaticDefinitions.Designer.vb +++ b/instat/dlgExportClimaticDefinitions.Designer.vb @@ -89,7 +89,7 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputCountry.IsMultiline = False Me.ucrInputCountry.IsReadOnly = False Me.ucrInputCountry.Location = New System.Drawing.Point(501, 274) - Me.ucrInputCountry.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) + Me.ucrInputCountry.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputCountry.Name = "ucrInputCountry" Me.ucrInputCountry.Size = New System.Drawing.Size(177, 32) Me.ucrInputCountry.TabIndex = 10 @@ -101,7 +101,7 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputStationID.IsMultiline = False Me.ucrInputStationID.IsReadOnly = False Me.ucrInputStationID.Location = New System.Drawing.Point(501, 218) - Me.ucrInputStationID.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) + Me.ucrInputStationID.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputStationID.Name = "ucrInputStationID" Me.ucrInputStationID.Size = New System.Drawing.Size(177, 32) Me.ucrInputStationID.TabIndex = 8 @@ -111,7 +111,7 @@ Partial Class dlgExportClimaticDefinitions Me.ucrChkSeasonStartProp.AutoSize = True Me.ucrChkSeasonStartProp.Checked = False Me.ucrChkSeasonStartProp.Location = New System.Drawing.Point(236, 71) - Me.ucrChkSeasonStartProp.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkSeasonStartProp.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkSeasonStartProp.Name = "ucrChkSeasonStartProp" Me.ucrChkSeasonStartProp.Size = New System.Drawing.Size(226, 52) Me.ucrChkSeasonStartProp.TabIndex = 3 @@ -121,7 +121,7 @@ Partial Class dlgExportClimaticDefinitions Me.ucrChkExtremes.AutoSize = True Me.ucrChkExtremes.Checked = False Me.ucrChkExtremes.Location = New System.Drawing.Point(236, 120) - Me.ucrChkExtremes.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkExtremes.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkExtremes.Name = "ucrChkExtremes" Me.ucrChkExtremes.Size = New System.Drawing.Size(220, 52) Me.ucrChkExtremes.TabIndex = 5 @@ -132,7 +132,7 @@ Partial Class dlgExportClimaticDefinitions Me.ucrChkCropSuccessProp.AutoSize = True Me.ucrChkCropSuccessProp.Checked = False Me.ucrChkCropSuccessProp.Location = New System.Drawing.Point(236, 28) - Me.ucrChkCropSuccessProp.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkCropSuccessProp.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkCropSuccessProp.Name = "ucrChkCropSuccessProp" Me.ucrChkCropSuccessProp.Size = New System.Drawing.Size(230, 52) Me.ucrChkCropSuccessProp.TabIndex = 1 @@ -142,7 +142,7 @@ Partial Class dlgExportClimaticDefinitions Me.ucrChkAnnualTemp.AutoSize = True Me.ucrChkAnnualTemp.Checked = False Me.ucrChkAnnualTemp.Location = New System.Drawing.Point(12, 71) - Me.ucrChkAnnualTemp.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkAnnualTemp.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkAnnualTemp.Name = "ucrChkAnnualTemp" Me.ucrChkAnnualTemp.Size = New System.Drawing.Size(224, 52) Me.ucrChkAnnualTemp.TabIndex = 2 @@ -152,7 +152,7 @@ Partial Class dlgExportClimaticDefinitions Me.ucrChkAnnualRainfall.AutoSize = True Me.ucrChkAnnualRainfall.Checked = False Me.ucrChkAnnualRainfall.Location = New System.Drawing.Point(12, 28) - Me.ucrChkAnnualRainfall.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkAnnualRainfall.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkAnnualRainfall.Name = "ucrChkAnnualRainfall" Me.ucrChkAnnualRainfall.Size = New System.Drawing.Size(224, 52) Me.ucrChkAnnualRainfall.TabIndex = 0 @@ -217,8 +217,8 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrChkIncludeSummaryData.AutoSize = True Me.ucrChkIncludeSummaryData.Checked = False - Me.ucrChkIncludeSummaryData.Location = New System.Drawing.Point(6, 506) - Me.ucrChkIncludeSummaryData.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkIncludeSummaryData.Location = New System.Drawing.Point(6, 513) + Me.ucrChkIncludeSummaryData.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkIncludeSummaryData.Name = "ucrChkIncludeSummaryData" Me.ucrChkIncludeSummaryData.Size = New System.Drawing.Size(332, 48) Me.ucrChkIncludeSummaryData.TabIndex = 24 @@ -235,7 +235,7 @@ Partial Class dlgExportClimaticDefinitions Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.grpSummaries.Name = "grpSummaries" Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.grpSummaries.Size = New System.Drawing.Size(470, 171) + Me.grpSummaries.Size = New System.Drawing.Size(470, 177) Me.grpSummaries.TabIndex = 23 Me.grpSummaries.TabStop = False Me.grpSummaries.Text = "Summaries" @@ -245,7 +245,7 @@ Partial Class dlgExportClimaticDefinitions Me.ucrChkMonthlyTemp.AutoSize = True Me.ucrChkMonthlyTemp.Checked = False Me.ucrChkMonthlyTemp.Location = New System.Drawing.Point(12, 120) - Me.ucrChkMonthlyTemp.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkMonthlyTemp.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkMonthlyTemp.Name = "ucrChkMonthlyTemp" Me.ucrChkMonthlyTemp.Size = New System.Drawing.Size(220, 52) Me.ucrChkMonthlyTemp.TabIndex = 4 @@ -388,7 +388,7 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(6, 705) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(615, 92) Me.ucrBase.TabIndex = 29 @@ -469,7 +469,7 @@ Partial Class dlgExportClimaticDefinitions 'cmdDefine ' Me.cmdDefine.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDefine.Location = New System.Drawing.Point(338, 505) + Me.cmdDefine.Location = New System.Drawing.Point(338, 512) Me.cmdDefine.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.cmdDefine.Name = "cmdDefine" Me.cmdDefine.Size = New System.Drawing.Size(120, 45) diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index 045b2af230c..40e0b75a804 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -139,7 +139,6 @@ Public Class dlgExportClimaticDefinitions bResetSubdialog = True ucrSelectorExportDefinitions.Reset() - 'ucrReceiverData.SetMeAsReceiver() clsDummyFunction.AddParameter("rain", "False", iPosition:=0) clsDummyFunction.AddParameter("temp", "False", iPosition:=1) @@ -216,7 +215,6 @@ Public Class dlgExportClimaticDefinitions AndAlso Not ucrReceiverYear.IsEmpty _ AndAlso Not ucrInputCountry.IsEmpty _ AndAlso Not ucrInputStationID.IsEmpty _ - AndAlso ucrChkIncludeSummaryData.Checked _ AndAlso Not ucrInputTokenPath.IsEmpty _ AndAlso ( ((ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked) AndAlso Not ucrReceiverCropData.IsEmpty) _ diff --git a/instat/sdgDefineAnnualRainfall.vb b/instat/sdgDefineAnnualRainfall.vb index f46d9cf3e49..f5b9c623b36 100644 --- a/instat/sdgDefineAnnualRainfall.vb +++ b/instat/sdgDefineAnnualRainfall.vb @@ -229,7 +229,7 @@ Public Class sdgDefineAnnualRainfall ucrReceiverStartRainDOY.SetRCode(clsReforMattAnnualSummariesFunction, bReset) ucrReceiverStation.SetRCode(clsReforMattAnnualSummariesFunction, bReset) ucrReceiverYear.SetRCode(clsReforMattAnnualSummariesFunction, bReset) - ucrSelectorAnnualTemp.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrSelectorDefineAnnualRain.SetRCode(clsReforMattAnnualSummariesFunction, bReset) ucrReceiverStationCrop.SetRCode(clsReformatCropSuccessFunction, bReset) ucrReceiverTotalRain.SetRCode(clsReformatCropSuccessFunction, bReset) From 3fdc2432a7a2b56d9c50c7ea01136987de944684 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 13 May 2024 11:12:01 +0200 Subject: [PATCH 86/99] Code changes --- instat/dlgRestoreBackup.vb | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index fd7f99fb475..f1aa79df431 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -171,18 +171,6 @@ Public Class dlgRestoreBackup ucrInputSavedPathInternalLog.Visible = ucrChkShowInternalLogFile.Checked End Sub - Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlRecoveryOption.ControlContentsChanged - strScript = "" - strLoadDateFilePath = "" - - If rdoRunBackupLog.Checked Then - GetBackupFromLastSession(strAutoSaveLogFolderPath, "log*.R", True) - ElseIf rdoLoadBackupData.Checked Then - GetBackupFromLastSession(strAutoSaveDataFolderPath, "data_*.rds", False) - End If - TestOKEnabled() - End Sub - Private Sub SetLogControlsDisable(bEnable As Boolean) ucrChkShowLogFile.Enabled = Not bEnable ucrChkShowInternalLogFile.Enabled = Not bEnable @@ -253,6 +241,15 @@ Public Class dlgRestoreBackup End Sub Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk + strScript = "" + strLoadDateFilePath = "" + + If rdoRunBackupLog.Checked Then + GetBackupFromLastSession(strAutoSaveLogFolderPath, "log*.R", True) + ElseIf rdoLoadBackupData.Checked Then + GetBackupFromLastSession(strAutoSaveDataFolderPath, "data_*.rds", False) + End If + GetRecoveryFiles(strScript, strLoadDateFilePath) SaveFiles() End Sub From 9f8c9a60cc3bdfc6f0bc93ac46f136f6caa115a7 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 14 May 2024 11:45:51 +0300 Subject: [PATCH 87/99] changes --- instat/dlgExportClimaticDefinitions.vb | 31 +++++++++----------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index 40e0b75a804..78d57c7abb1 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -15,6 +15,7 @@ ' along with this program. If not, see . Imports instat.Translations +Imports System.IO Public Class dlgExportClimaticDefinitions Private bFirstLoad As Boolean = True Private bReset As Boolean = True @@ -330,6 +331,7 @@ Public Class dlgExportClimaticDefinitions clsExportRinstatToBucketFunction.RemoveParameterByName("station_id") End If End Sub + Private Sub EnableDisableDefineButton() cmdDefine.Enabled = ucrChkIncludeSummaryData.Checked AndAlso (ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked OrElse ucrChkCropSuccessProp.Checked OrElse ucrChkExtremes.Checked OrElse ucrChkMonthlyTemp.Checked OrElse ucrChkSeasonStartProp.Checked) ucrReceiverDataYearMonth.Visible = ucrChkMonthlyTemp.Checked @@ -345,31 +347,20 @@ Public Class dlgExportClimaticDefinitions EnableDisableDefineButton() End Sub - Private Sub SelectFileToSave() - Using dlgSave As New SaveFileDialog - dlgSave.Title = "Save JSON File" - dlgSave.Filter = "JSON Files|*.json" - If ucrInputTokenPath.GetText() <> "" Then - dlgSave.InitialDirectory = ucrInputTokenPath.GetText().Replace("/", "\") - Else - dlgSave.InitialDirectory = frmMain.clsInstatOptions.strWorkingDirectory - End If - If dlgSave.ShowDialog() = DialogResult.OK Then - ucrInputTokenPath.SetName(dlgSave.FileName.Replace("\", "/")) + Private Sub cmdChooseFile_Click(sender As Object, e As EventArgs) Handles cmdChooseFile.Click + Using dlgOpen As New OpenFileDialog + dlgOpen.Filter = "JSON Files|*.json" + dlgOpen.Title = "Import JSON File" + + dlgOpen.InitialDirectory = Path.GetDirectoryName(Replace(ucrInputTokenPath.GetText(), "/", "\")) + + If dlgOpen.ShowDialog() = DialogResult.OK AndAlso dlgOpen.FileName <> "" Then + ucrInputTokenPath.SetName(Replace(dlgOpen.FileName, "\", "/")) End If - TestOkEnabled() End Using - End Sub - Private Sub ucrInputTokenPath_Click(sender As Object, e As EventArgs) Handles ucrInputTokenPath.Click - If ucrInputTokenPath.IsEmpty() Then - SelectFileToSave() - End If End Sub - Private Sub cmdChooseFile_Click(sender As Object, e As EventArgs) Handles cmdChooseFile.Click - SelectFileToSave() - End Sub Private Sub ucrReceiverData_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverMaxTemp.ControlContentsChanged, ucrReceiverMinTemp.ControlContentsChanged, ucrReceiverCropData.ControlContentsChanged, ucrReceiverDataYearMonth.ControlContentsChanged, ucrReceiverDataYear.ControlContentsChanged, ucrReceiverMonth.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrChkSeasonStartProp.ControlContentsChanged, ucrInputCountry.ControlContentsChanged, ucrInputStationID.ControlContentsChanged, ucrChkIncludeSummaryData.ControlContentsChanged, From 7870dea25d90bf7a3f6f29f775d73b0d9b4797a0 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 14 May 2024 15:00:23 +0300 Subject: [PATCH 88/99] changes to the code --- instat/dlgExportClimaticDefinitions.vb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index 78d57c7abb1..226f0de72cc 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -46,23 +46,27 @@ Public Class dlgExportClimaticDefinitions ucrReceiverData.SetParameterIsString() ucrReceiverData.SetMeAsReceiver() ucrReceiverData.SetItemType("dataframe") + ucrReceiverData.strSelectorHeading = "Data Sets" ucrReceiverDataYear.SetParameter(New RParameter("data_by_year", 1)) ucrReceiverDataYear.Selector = ucrSelectorExportDefinitions ucrReceiverDataYear.SetParameterIsString() ucrReceiverDataYear.SetItemType("dataframe") + ucrReceiverDataYear.strSelectorHeading = "Data Sets" ucrReceiverDataYear.SetLinkedDisplayControl(lblDataByYear) ucrReceiverDataYearMonth.SetParameter(New RParameter("data_by_year_month", 2)) ucrReceiverDataYearMonth.Selector = ucrSelectorExportDefinitions ucrReceiverDataYearMonth.SetParameterIsString() ucrReceiverDataYearMonth.SetItemType("dataframe") + ucrReceiverDataYearMonth.strSelectorHeading = "Data Sets" ucrReceiverDataYearMonth.SetLinkedDisplayControl(lblDataByYearMonth) ucrReceiverCropData.SetParameter(New RParameter("crop_data", 3)) ucrReceiverCropData.Selector = ucrSelectorExportDefinitions ucrReceiverCropData.SetParameterIsString() ucrReceiverCropData.SetItemType("dataframe") + ucrReceiverCropData.strSelectorHeading = "Data Sets" ucrReceiverCropData.SetLinkedDisplayControl(lblCropData) ucrReceiverMinTemp.SetParameter(New RParameter("tmin", 4)) @@ -150,7 +154,7 @@ Public Class dlgExportClimaticDefinitions clsReformatTempSummariesFunction.SetPackageName("epicsawrap") clsReformatTempSummariesFunction.SetRCommand("reformat_temperature_summaries") - clsReformatTempSummariesFunction.SetAssignTo("crop_prop") + clsReformatTempSummariesFunction.SetAssignTo("annual_temp") clsReforMattAnnualSummariesFunction.SetPackageName("epicsawrap") clsReforMattAnnualSummariesFunction.SetRCommand("reformat_annual_summaries") From 9e1fbe537004cf90be5fbfdc4938cb1e5e46e468 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 14 May 2024 15:14:55 +0300 Subject: [PATCH 89/99] changes to the code --- instat/dlgExportClimaticDefinitions.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index 226f0de72cc..1eb0316149d 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -19,7 +19,6 @@ Imports System.IO Public Class dlgExportClimaticDefinitions Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private bResetRCode As Boolean = True Private bResetSubdialog As Boolean = False Private clsDummyFunction As New RFunction Public clsExportRinstatToBucketFunction, ClsGcsAuthFileFunction, clsSummariesFunction As New RFunction From 7996b3d175e2e4f371b5f072913ee9a59b359a0d Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 14 May 2024 15:24:03 +0300 Subject: [PATCH 90/99] changes --- instat/frmMain.Designer.vb | 1320 ++++++++++++++++++------------------ instat/frmMain.resx | 4 +- 2 files changed, 665 insertions(+), 659 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 05ddcf264fa..7503dd34c86 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -473,6 +473,7 @@ Partial Class frmMain Me.mnuPrepareCheckDataAnonymiseIDColumn = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator() Me.mnuPrepareCalculator = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator79 = New System.Windows.Forms.ToolStripSeparator() Me.mnuPrepareColumnCalculate = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareColumnNumericRegularSequence = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareColumnNumericEnter = New System.Windows.Forms.ToolStripMenuItem() @@ -682,7 +683,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.ToolStripSeparator79 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -708,7 +708,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, 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(64, 22) + Me.mnuDescribe.Size = New System.Drawing.Size(96, 29) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -716,25 +716,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(178, 22) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' 'mnuDescribeOneVariableVisualiseData ' Me.mnuDescribeOneVariableVisualiseData.Name = "mnuDescribeOneVariableVisualiseData" - Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableVisualiseData.Text = "Visualise Data..." ' 'ToolStripSeparator72 ' Me.ToolStripSeparator72.Name = "ToolStripSeparator72" - Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator72.Size = New System.Drawing.Size(232, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..." Me.mnuDescribeOneVariableSummarise.Text = "Summarise..." Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised" @@ -742,26 +742,26 @@ Partial Class frmMain 'mnuDescribeOneVariableGraph ' Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph" - Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableGraph.Tag = "Graph..." Me.mnuDescribeOneVariableGraph.Text = "Graph..." ' 'ToolStripSeparator33 ' Me.ToolStripSeparator33.Name = "ToolStripSeparator33" - Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator33.Size = New System.Drawing.Size(232, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(235, 34) 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(155, 22) + Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -769,26 +769,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(178, 22) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoThreeVariablesPivotTable ' Me.mnuDescribeTwoThreeVariablesPivotTable.Name = "mnuDescribeTwoThreeVariablesPivotTable" - Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator36 ' Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(203, 6) + Me.ToolStripSeparator36.Size = New System.Drawing.Size(305, 6) ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables" @@ -796,19 +796,19 @@ Partial Class frmMain 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(305, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' @@ -816,14 +816,14 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Name = "mnuDescribeTwoThreeVariablesTwoWayFrequencies" - Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Text = "Two-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.ToolTipText = "Table or Graph" ' 'mnuDescribeTwoThreeVariablesThreeWayFrequencies ' Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Name = "mnuDescribeTwoThreeVariablesThreeWayFrequencies" - Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Text = "Three-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.ToolTipText = "Table or Graph" ' @@ -831,25 +831,25 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneral, Me.ToolStripSeparator38, Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' 'mnuDescribeGeneral ' Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeGeneral.Text = "General..." ' 'ToolStripSeparator38 ' Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator38.Size = New System.Drawing.Size(309, 6) ' 'mnuDescribeSpecificBarPieChart ' Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart" - Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificBarPieChart.Tag = "Bar_Chart" Me.mnuDescribeSpecificBarPieChart.Text = "Bar Chart..." Me.mnuDescribeSpecificBarPieChart.ToolTipText = "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds" @@ -857,7 +857,7 @@ Partial Class frmMain 'mnuDescribeSpecificBoxplotJitterViolinPlot ' Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot" - Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Tag = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Text = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.ToolTipText = "Boxplot (including Tufte), Jitter and Violin Plots" @@ -865,7 +865,7 @@ Partial Class frmMain 'mnuDescribeSpecificHistogramDensityFrequencyPlot ' Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot" - Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Tag = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Text = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.ToolTipText = "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons" @@ -873,7 +873,7 @@ Partial Class frmMain 'mnuDescribeSpecificPointPlot ' Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot" - Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..." Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..." Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot" @@ -881,7 +881,7 @@ Partial Class frmMain 'mnuDescribeSpecificLineSmoothPlot ' Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot" - Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificLineSmoothPlot.Tag = "Line_Plot..." Me.mnuDescribeSpecificLineSmoothPlot.Text = "Line Plot..." Me.mnuDescribeSpecificLineSmoothPlot.ToolTipText = "Line Plots, Smoothed Plots, Dumbbell and Slope Plots" @@ -889,12 +889,12 @@ Partial Class frmMain 'ToolStripSeparator26 ' Me.ToolStripSeparator26.Name = "ToolStripSeparator26" - Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator26.Size = New System.Drawing.Size(309, 6) ' 'mnuDescribeSpecificMapPlot ' Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot" - Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..." Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map" ' @@ -902,7 +902,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificDotPlot.Enabled = False Me.mnuDescribeSpecificDotPlot.Name = "mnuDescribeSpecificDotPlot" - Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificDotPlot.Tag = "Dotplot..." Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False @@ -910,27 +910,27 @@ Partial Class frmMain 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" - Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificMosaic.Text = "Mosaic Plot..." Me.mnuDescribeSpecificMosaic.ToolTipText = "Mosaic Plot" ' 'mnuDescribeSpecificCummulativeDistribution ' Me.mnuDescribeSpecificCummulativeDistribution.Name = "mnuDescribeSpecificCummulativeDistribution" - Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(312, 34) 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(209, 22) + Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" @@ -938,83 +938,83 @@ Partial Class frmMain 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(175, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(268, 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(271, 34) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations ' Me.mnuDescribeMultivariateCorrelations.Name = "mnuDescribeMultivariateCorrelations" - Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateCorrelations.Text = "Correlations..." Me.mnuDescribeMultivariateCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' 'mnuDescribeMultivariateprincipalComponents ' Me.mnuDescribeMultivariateprincipalComponents.Name = "mnuDescribeMultivariateprincipalComponents" - Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateprincipalComponents.Text = "Principal Components..." ' 'mnuDescribeMultivariateCanonicalCorrelations ' Me.mnuDescribeMultivariateCanonicalCorrelations.Name = "mnuDescribeMultivariateCanonicalCorrelations" - Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuDescribeMultivariateClusterAnalysis ' Me.mnuDescribeMultivariateClusterAnalysis.Name = "mnuDescribeMultivariateClusterAnalysis" - Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateClusterAnalysis.Text = "Cluster Analysis..." Me.mnuDescribeMultivariateClusterAnalysis.ToolTipText = "Partitioning or Hierarchical" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(175, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(268, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(271, 34) 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(271, 34) 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(271, 34) 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(271, 34) 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(271, 34) 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(53, 22) + Me.mnuModel.Size = New System.Drawing.Size(79, 29) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1022,168 +1022,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(201, 22) + Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(305, 34) Me.mnuModelProbabilityDistributions.Tag = "Probability_Distributions" Me.mnuModelProbabilityDistributions.Text = "Probability Distributions" ' 'mnuModelProbabilityDistributionsShowModel ' Me.mnuModelProbabilityDistributionsShowModel.Name = "mnuModelProbabilityDistributionsShowModel" - Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsShowModel.Text = "Show Model..." ' 'mnuModelProbabilityDistributionsCompareModels ' Me.mnuModelProbabilityDistributionsCompareModels.Enabled = False Me.mnuModelProbabilityDistributionsCompareModels.Name = "mnuModelProbabilityDistributionsCompareModels" - Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsCompareModels.Tag = "Show_Models..." Me.mnuModelProbabilityDistributionsCompareModels.Text = "Compare Models..." ' 'mnuModelProbabilityDistributionsRandomSamplesUseModel ' Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Name = "mnuModelProbabilityDistributionsRandomSamplesUseModel" - Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..." Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples ..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(302, 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(201, 22) + Me.mnuModelFitModel.Size = New System.Drawing.Size(305, 34) Me.mnuModelFitModel.Tag = "Fit_Model..." Me.mnuModelFitModel.Text = "Fit Model" ' 'mnuModelFitModelOneVariable ' Me.mnuModelFitModelOneVariable.Name = "mnuModelFitModelOneVariable" - Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelOneVariable.Text = "One Variable..." ' 'mnuModelFitModelTwoVariables ' Me.mnuModelFitModelTwoVariables.Name = "mnuModelFitModelTwoVariables" - Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelTwoVariables.Text = "Two Variables..." ' 'mnuModelFitModelThreeVariables ' Me.mnuModelFitModelThreeVariables.Name = "mnuModelFitModelThreeVariables" - Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelThreeVariables.Text = "Three Variables..." ' 'mnuModelFitModelFourVariables ' Me.mnuModelFitModelFourVariables.Name = "mnuModelFitModelFourVariables" - Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelFourVariables.Text = "Four Variables..." ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(344, 6) ' 'mnuModelFitModelGeneral ' Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral" - Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelGeneral.Text = "General..." ' 'mnuModelFitModelMachineLearning ' Me.mnuModelFitModelMachineLearning.Enabled = False Me.mnuModelFitModelMachineLearning.Name = "mnuModelFitModelMachineLearning" - Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelMachineLearning.Text = "Machine Learning (Caret)..." Me.mnuModelFitModelMachineLearning.Visible = False ' 'ToolStripSeparator57 ' Me.ToolStripSeparator57.Name = "ToolStripSeparator57" - Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6) + Me.ToolStripSeparator57.Size = New System.Drawing.Size(344, 6) ' 'mnuModelFitModelHypothesisTestsKeyboard ' Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard" - Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelHypothesisTestsKeyboard.Text = "Hypothesis Tests Keyboards..." ' 'mnuModelFitModelModelKeyboard ' Me.mnuModelFitModelModelKeyboard.Name = "mnuModelFitModelModelKeyboard" - Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(347, 34) 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(201, 22) + Me.mnuModelCompareModels.Size = New System.Drawing.Size(305, 34) Me.mnuModelCompareModels.Text = "Compare Models" ' 'mnuModelCompareModelsOneVariable ' Me.mnuModelCompareModelsOneVariable.Name = "mnuModelCompareModelsOneVariable" - Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(226, 34) 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(201, 22) + Me.mnuModelUseModel.Size = New System.Drawing.Size(305, 34) Me.mnuModelUseModel.Text = "Use Model" ' 'mnuModelUseModelOneVariable ' Me.mnuModelUseModelOneVariable.Name = "mnuModelUseModelOneVariable" - Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelOneVariable.Text = "One Variable..." ' 'mnuModelUseModelTwoVariables ' Me.mnuModelUseModelTwoVariables.Name = "mnuModelUseModelTwoVariables" - Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelTwoVariables.Text = "Two Variables..." ' 'ToolStripSeparator59 ' Me.ToolStripSeparator59.Name = "ToolStripSeparator59" - Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator59.Size = New System.Drawing.Size(297, 6) ' 'mnuModelUseModelGlance ' Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance" - Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelGlance.Text = "Glance..." ' 'mnuModelUseModelTidy ' Me.mnuModelUseModelTidy.Name = "mnuModelUseModelTidy" - Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelTidy.Text = "Tidy..." ' 'mnuModelUseModelAugment ' Me.mnuModelUseModelAugment.Name = "mnuModelUseModelAugment" - Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelAugment.Text = "Augment..." ' 'ToolStripSeparator58 ' Me.ToolStripSeparator58.Name = "ToolStripSeparator58" - Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator58.Size = New System.Drawing.Size(297, 6) ' 'mnuModelUseModelUseModelKeyboard ' Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard" - Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..." ' 'mnuModelOtherOneVariable @@ -1191,14 +1191,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(201, 22) + Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)" Me.mnuModelOtherOneVariable.Text = "Other (One Variable)" ' 'mnuModelOtherOneVariableExactResults ' Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults" - Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1206,7 +1206,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1214,7 +1214,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1222,7 +1222,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -1231,7 +1231,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(201, 22) + Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" ' @@ -1239,7 +1239,7 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples" - Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..." Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..." ' @@ -1247,21 +1247,21 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData" - Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherTwoVariablesSummaryData.Text = "Summary Data..." ' 'mnuModelOtherTwoVariablesSimpleRegression ' Me.mnuModelOtherTwoVariablesSimpleRegression.Name = "mnuModelOtherTwoVariablesSimpleRegression" - Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesSimpleRegression.Tag = "Simple_Regression..." Me.mnuModelOtherTwoVariablesSimpleRegression.Text = "Simple Regression..." ' 'mnuModelOtherTwoVariablesOneWayANOVA ' Me.mnuModelOtherTwoVariablesOneWayANOVA.Name = "mnuModelOtherTwoVariablesOneWayANOVA" - Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..." ' @@ -1269,14 +1269,14 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples" - Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(399, 34) 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(266, 22) + Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Tag = "Non_Parameteric_One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Text = "Non Parameteric One Way ANOVA..." ' @@ -1285,7 +1285,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(201, 22) + Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" ' @@ -1293,21 +1293,21 @@ Partial Class frmMain ' Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups" - Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesSimpleWithGroups.Tag = "Simple_with_groups..." Me.mnuModelOtherThreeVariablesSimpleWithGroups.Text = "Simple With Groups..." ' 'mnuModelOtherThreeVariablesNonParametricTwoWayANOVA ' Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Name = "mnuModelOtherThreeVariablesNonParametricTwoWayANOVA" - Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(389, 34) 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(259, 22) + Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test" Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..." ' @@ -1316,7 +1316,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(201, 22) + Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" ' @@ -1324,7 +1324,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral" - Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..." Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..." ' @@ -1332,7 +1332,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralRegression.Enabled = False Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression" - Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralRegression.Tag = "Regression..." Me.mnuModelOtherGeneralRegression.Text = "Regression..." ' @@ -1340,7 +1340,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralLogLinear.Enabled = False Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear" - Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' @@ -1348,7 +1348,7 @@ Partial Class frmMain ' Me.mnuClimaticExamine.Enabled = False Me.mnuClimaticExamine.Name = "mnuClimaticExamine" - Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticExamine.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticExamine.Tag = "Examine" Me.mnuClimaticExamine.Text = "Examine..." Me.mnuClimaticExamine.Visible = False @@ -1357,7 +1357,7 @@ Partial Class frmMain ' Me.mnuClimaticProcess.Enabled = False Me.mnuClimaticProcess.Name = "mnuClimaticProcess" - Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticProcess.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticProcess.Tag = "Process" Me.mnuClimaticProcess.Text = "Process..." Me.mnuClimaticProcess.Visible = False @@ -1366,7 +1366,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(212, 22) + Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticEvaporation.Tag = "Evaporation" Me.mnuClimaticEvaporation.Text = "Evaporation" Me.mnuClimaticEvaporation.Visible = False @@ -1375,7 +1375,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationSite.Enabled = False Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite" - Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22) + Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(189, 34) Me.mnuClimaticEvaporationSite.Tag = "Site" Me.mnuClimaticEvaporationSite.Text = "Site..." ' @@ -1383,7 +1383,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationPenman.Enabled = False Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman" - Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22) + Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(189, 34) Me.mnuClimaticEvaporationPenman.Tag = "Penman" Me.mnuClimaticEvaporationPenman.Text = "Penman..." ' @@ -1391,7 +1391,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(212, 22) + Me.mnuClimaticCrop.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCrop.Tag = "Crop" Me.mnuClimaticCrop.Text = "Crop" Me.mnuClimaticCrop.Visible = False @@ -1400,21 +1400,21 @@ Partial Class frmMain ' Me.mnuClimaticCropCropCoefficients.Enabled = False Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients" - Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticCropCropCoefficients.Text = "Crop Coefficients..." ' 'mnuClimaticCropWaterSatisfactionIndex ' Me.mnuClimaticCropWaterSatisfactionIndex.Enabled = False Me.mnuClimaticCropWaterSatisfactionIndex.Name = "mnuClimaticCropWaterSatisfactionIndex" - Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticCropWaterSatisfactionIndex.Text = "Water Satisfaction Index..." ' 'mnuClimaticHeatSum ' Me.mnuClimaticHeatSum.Enabled = False Me.mnuClimaticHeatSum.Name = "mnuClimaticHeatSum" - Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticHeatSum.Tag = "Heat_Sum" Me.mnuClimaticHeatSum.Text = "Heat Sum..." Me.mnuClimaticHeatSum.Visible = False @@ -1423,7 +1423,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.mnuViewSwapDataAndScript}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(44, 22) + Me.mnuView.Size = New System.Drawing.Size(65, 29) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1431,7 +1431,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(213, 22) + Me.mnuViewDataView.Size = New System.Drawing.Size(326, 34) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1439,21 +1439,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(213, 22) + Me.mnuViewOutput.Size = New System.Drawing.Size(326, 34) Me.mnuViewOutput.Text = "Output" ' 'mnuViewLogScript ' Me.mnuViewLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewLogScript.Name = "mnuViewLogScript" - Me.mnuViewLogScript.Size = New System.Drawing.Size(213, 22) + Me.mnuViewLogScript.Size = New System.Drawing.Size(326, 34) 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(213, 22) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1461,7 +1461,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1469,19 +1469,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(210, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(323, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1489,7 +1489,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1497,137 +1497,137 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(210, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(323, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(213, 22) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(326, 34) 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(213, 22) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuViewSwapDataAndScript ' Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript" - Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22) + Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(326, 34) Me.mnuViewSwapDataAndScript.Text = "Swap Data and Log/Script" ' '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(44, 22) + Me.mnuHelp.Size = New System.Drawing.Size(65, 29) Me.mnuHelp.Tag = "Help" Me.mnuHelp.Text = "Help" ' 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(314, 34) Me.mnuHelpHelpIntroduction.Text = "Introduction" ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpFAQ.Size = New System.Drawing.Size(314, 34) Me.mnuHelpFAQ.Text = "FAQ" ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(314, 34) Me.mnuHelpGetingStarted.Text = "Getting Started" ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(311, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpWindows.Size = New System.Drawing.Size(314, 34) Me.mnuHelpWindows.Text = "Windows" ' 'mnuHelpMenus ' Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpMenus.Size = New System.Drawing.Size(314, 34) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(314, 34) Me.mnuHelpAboutR.Text = "About R" Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(314, 34) Me.mnuHelpLearningStatistics.Text = "Learning Statistics" Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpRPackages.Size = New System.Drawing.Size(314, 34) Me.mnuHelpRPackages.Text = "R Packages" ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpGlossary.Size = New System.Drawing.Size(314, 34) Me.mnuHelpGlossary.Text = "Glossary" ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpData.Size = New System.Drawing.Size(314, 34) Me.mnuHelpData.Text = "Data" ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpLicence.Size = New System.Drawing.Size(314, 34) Me.mnuHelpLicence.Tag = "Licence..." Me.mnuHelpLicence.Text = "Licence" ' 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(311, 6) ' 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(314, 34) Me.mnuHelpPackagesDocumentation.Text = "Packages Documentation" ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(322, 6) ' 'mnuClimatic ' Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuExamineEditData, Me.mnuClimaticTidyandExamine, 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(63, 22) + Me.mnuClimatic.Size = New System.Drawing.Size(90, 29) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' @@ -1635,300 +1635,299 @@ 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.mnuClimaticFileExportToClimpact, Me.mnuClimaticFileExportToGoogleBucketsToolStrip}) Me.mnuClimaticFile.Name = "mnuClimaticFile" - Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticFile.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticFile.Text = "File" ' 'mnuClimaticFileImportSST ' Me.mnuClimaticFileImportSST.Name = "mnuClimaticFileImportSST" - Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportSST.Text = "Import SST..." ' 'mnuClimaticFileImportfromIRIDataLibrary ' Me.mnuClimaticFileImportfromIRIDataLibrary.Name = "mnuClimaticFileImportfromIRIDataLibrary" - Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromIRIDataLibrary.Text = "Import from IRI Data Library..." ' 'mnuClimaticFileImportfromClimateDataStore ' Me.mnuClimaticFileImportfromClimateDataStore.Name = "mnuClimaticFileImportfromClimateDataStore" - Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromClimateDataStore.Text = "Import from CDS (Climate Data Store)..." ' 'mnuClimaticFileImportandTidyNetCDF ' Me.mnuClimaticFileImportandTidyNetCDF.Name = "mnuClimaticFileImportandTidyNetCDF" - Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportandTidyNetCDF.Text = "Import and Tidy NetCDF..." ' 'mnuClimaticFileImportandTidyShapefile ' Me.mnuClimaticFileImportandTidyShapefile.Name = "mnuClimaticFileImportandTidyShapefile" - Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportandTidyShapefile.Text = "Import and Tidy Shapefile..." ' 'ToolStripSeparator20 ' Me.ToolStripSeparator20.Name = "ToolStripSeparator20" - Me.ToolStripSeparator20.Size = New System.Drawing.Size(279, 6) + Me.ToolStripSeparator20.Size = New System.Drawing.Size(423, 6) ' 'mnuClimateFileImportfromClimSoft ' Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft" - Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(282, 22) + Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(426, 34) Me.mnuClimateFileImportfromClimSoft.Text = "Import from Climsoft..." ' 'mnuClimateFileImportfromClimSoftWizard ' Me.mnuClimateFileImportfromClimSoftWizard.Name = "mnuClimateFileImportfromClimSoftWizard" - Me.mnuClimateFileImportfromClimSoftWizard.Size = New System.Drawing.Size(282, 22) + Me.mnuClimateFileImportfromClimSoftWizard.Size = New System.Drawing.Size(426, 34) Me.mnuClimateFileImportfromClimSoftWizard.Text = "Import from Climsoft Wizard..." ' 'mnuClimaticFileImportfromCliData ' Me.mnuClimaticFileImportfromCliData.Enabled = False Me.mnuClimaticFileImportfromCliData.Name = "mnuClimaticFileImportfromCliData" - Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..." Me.mnuClimaticFileImportfromCliData.Visible = False ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(423, 6) ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" - Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToClimsoft.Text = "Export to Climsoft..." ' 'mnuClimaticFileExportToCPT ' Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" - Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." ' 'mnuExportToWWRToolStrip ' Me.mnuExportToWWRToolStrip.Name = "mnuExportToWWRToolStrip" - Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) + Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(426, 34) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' 'mnuClimaticFileExportToClimpact ' Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact" - Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..." ' 'mnuClimaticFileExportToGoogleBucketsToolStrip ' - Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Enabled = False Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Name = "mnuClimaticFileExportToGoogleBucketsToolStrip" - Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Text = "Export to Google Buckets..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(322, 6) ' 'mnuExamineEditData ' Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticExamineEditDataVisualiseData, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator27, Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns}) Me.mnuExamineEditData.Name = "mnuExamineEditData" - Me.mnuExamineEditData.Size = New System.Drawing.Size(212, 22) + Me.mnuExamineEditData.Size = New System.Drawing.Size(325, 34) Me.mnuExamineEditData.Text = "Examine/Edit Data" ' 'mnuClimaticExamineEditDataVisualiseData ' Me.mnuClimaticExamineEditDataVisualiseData.Name = "mnuClimaticExamineEditDataVisualiseData" - Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(215, 22) + Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(324, 34) Me.mnuClimaticExamineEditDataVisualiseData.Text = "Visualise Data..." ' 'mnuExamineEditDataPivotTable ' Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" - Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(321, 6) ' 'mnuExamineEditDataOneVariableSummarise ' Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" - Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuExamineEditDataOneVariableGraph ' Me.mnuExamineEditDataOneVariableGraph.Name = "mnuExamineEditDataOneVariableGraph" - Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuExamineEditDataOneVariableFrequencies ' Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies" - Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'ToolStripSeparator78 ' Me.ToolStripSeparator78.Name = "ToolStripSeparator78" - Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator78.Size = New System.Drawing.Size(321, 6) ' 'mnuExamineEditDataSetupForDataEditing ' Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" - Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataSetupForDataEditing.Text = "Setup for Data Editing..." ' 'mnuExamineEditDataDailyDataEditing ' Me.mnuExamineEditDataDailyDataEditing.Name = "mnuExamineEditDataDailyDataEditing" - Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..." ' 'mnuExamineEditDataCompareColumns ' Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns" - Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." ' 'mnuClimaticTidyandExamine ' Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineTidyDailyData, Me.ToolStripSeparator71, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.mnuClimaticTidyandExamineNonNumericCases, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText, Me.ToolStripSeparator80, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyDataKey}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" - Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticTidyandExamine.Text = "Tidy Data" ' 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(295, 34) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(292, 6) ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(295, 34) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(295, 34) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(295, 34) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(292, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(295, 34) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(295, 34) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator80.Size = New System.Drawing.Size(292, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(295, 34) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(295, 34) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(295, 34) Me.mnuClimaticTidyandExamineMerge.Text = "Merge..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(295, 34) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(292, 6) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(295, 34) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' '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(212, 22) + Me.mnuClimaticDates.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDates.Text = "Dates" ' 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -1936,169 +1935,169 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' 'mnuClimaticDefineClimaticData ' Me.mnuClimaticDefineClimaticData.Name = "mnuClimaticDefineClimaticData" - Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(325, 34) 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(212, 22) + Me.mnuClimaticCheckData.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCheckData.Text = "Check Data" ' 'mnuClimaticCheckDataInventory ' Me.mnuClimaticCheckDataInventory.Name = "mnuClimaticCheckDataInventory" - Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataInventory.Text = "Inventory..." ' 'mnuClimaticCheckDataDisplayDaily ' Me.mnuClimaticCheckDataDisplayDaily.Name = "mnuClimaticCheckDataDisplayDaily" - Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataDisplayDaily.Text = "Display Daily..." ' 'ToolStripSeparator65 ' Me.ToolStripSeparator65.Name = "ToolStripSeparator65" - Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator65.Size = New System.Drawing.Size(310, 6) ' 'mnuClimaticCheckDataFillMissingValues ' Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues" - Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataFillMissingValues.Text = "Fill Missing Values..." ' 'mnuClimaticCheckDataBoxplot ' Me.mnuClimaticCheckDataBoxplot.Name = "mnuClimaticCheckDataBoxplot" - Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataBoxplot.Text = "Boxplot..." ' 'mnuClimaticCheckDataQCTemperatures ' Me.mnuClimaticCheckDataQCTemperatures.Name = "mnuClimaticCheckDataQCTemperatures" - Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataQCTemperatures.Text = "QC Temperatures..." ' 'mnuClimaticCheckDataQCRainfall ' Me.mnuClimaticCheckDataQCRainfall.Name = "mnuClimaticCheckDataQCRainfall" - Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataQCRainfall.Text = "QC Rainfall..." ' 'ToolStripSeparator70 ' Me.ToolStripSeparator70.Name = "ToolStripSeparator70" - Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator70.Size = New System.Drawing.Size(310, 6) ' 'mnuClimaticCheckDataHomogenization ' Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization" - Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataHomogenization.Text = "Homogenization..." ' 'mnuClimaticCheckDataCheckStationLocations ' Me.mnuClimaticCheckDataCheckStationLocations.Name = "mnuClimaticCheckDataCheckStationLocations" - Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(313, 34) 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.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(212, 22) + Me.mnuClimaticPrepare.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticPrepare.Tag = "Prepare" Me.mnuClimaticPrepare.Text = "Prepare" ' 'mnuCimaticPrepareTransform ' Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" - Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) + Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(281, 34) Me.mnuCimaticPrepareTransform.Text = "Transform..." ' 'mnuClimaticPrepareConversions ' Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions" - Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareConversions.Text = "Conversions..." ' 'ToolStripSeparator37 ' Me.ToolStripSeparator37.Name = "ToolStripSeparator37" - Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator37.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareClimaticSummaries ' Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." ' 'mnuClimaticPrepareStartoftheRains ' Me.mnuClimaticPrepareStartoftheRains.Name = "mnuClimaticPrepareStartoftheRains" - Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareStartoftheRains.Text = "Start of the Rains..." ' 'mnuClimaticPrepareEndOfRains ' Me.mnuClimaticPrepareEndOfRains.Name = "mnuClimaticPrepareEndOfRains" - Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareEndOfRains.Text = "End of Rains..." ' 'mnuClimaticPrepareLengthOfSeason ' Me.mnuClimaticPrepareLengthOfSeason.Name = "mnuClimaticPrepareLengthOfSeason" - Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareLengthOfSeason.Text = "Length of Season..." ' 'mnuClimaticPrepareSpells ' Me.mnuClimaticPrepareSpells.Name = "mnuClimaticPrepareSpells" - Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareSpells.Text = "Spells..." ' 'mnuClimaticPrepareExtremes ' Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" - Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareExtremes.Text = "Extremes..." ' 'ToolStripSeparator64 ' Me.ToolStripSeparator64.Name = "ToolStripSeparator64" - Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator64.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareClimdex ' Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex" - Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareClimdex.Text = "Climdex..." ' 'ToolStripSeparator51 ' Me.ToolStripSeparator51.Name = "ToolStripSeparator51" - Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator51.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareEvapotranspiration ' Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration" - Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareEvapotranspiration.Text = "Evapotranspiration..." ' 'mnuClimaticPrepareSummary ' Me.mnuClimaticPrepareSummary.Enabled = False Me.mnuClimaticPrepareSummary.Name = "mnuClimaticPrepareSummary" - Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareSummary.Text = "Summary..." Me.mnuClimaticPrepareSummary.Visible = False ' @@ -2106,7 +2105,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareNewWorksheet.Enabled = False Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet" - Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet" Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..." Me.mnuClimaticPrepareNewWorksheet.Visible = False @@ -2115,7 +2114,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareImportDailyData.Enabled = False Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData" - Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareImportDailyData.Tag = "Import_daily_data" Me.mnuClimaticPrepareImportDailyData.Text = "Import daily Data..." Me.mnuClimaticPrepareImportDailyData.Visible = False @@ -2124,7 +2123,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareMakeFactor.Enabled = False Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor" - Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor" Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..." Me.mnuClimaticPrepareMakeFactor.Visible = False @@ -2133,7 +2132,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareShiftDailyData.Enabled = False Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData" - Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareShiftDailyData.Tag = "Shift_Daily_data" Me.mnuClimaticPrepareShiftDailyData.Text = "Shift Daily Data..." Me.mnuClimaticPrepareShiftDailyData.Visible = False @@ -2142,7 +2141,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareUnstackDailyData.Enabled = False Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData" - Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareUnstackDailyData.Tag = "Unstack_Daily_data" Me.mnuClimaticPrepareUnstackDailyData.Text = "Unstack Daily Data..." Me.mnuClimaticPrepareUnstackDailyData.Visible = False @@ -2151,7 +2150,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareStackDailyData.Enabled = False Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData" - Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareStackDailyData.Tag = "Stack_Daily_data" Me.mnuClimaticPrepareStackDailyData.Text = "Stack Daily data..." Me.mnuClimaticPrepareStackDailyData.Visible = False @@ -2159,362 +2158,362 @@ Partial Class frmMain 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" - Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator30.Size = New System.Drawing.Size(322, 6) ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" - Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDescribe.Text = "Describe" ' 'mnuClimaticDescribeSummarise23Variables ' Me.mnuClimaticDescribeSummarise23Variables.Name = "mnuClimaticDescribeSummarise23Variables" - Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSummarise23Variables.Text = "Summarise 2/3 Variables..." ' 'mnuClimaticDescribeGraph23Variables ' Me.mnuClimaticDescribeGraph23Variables.Name = "mnuClimaticDescribeGraph23Variables" - Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeGraph23Variables.Text = "Graph 2/3 Variables..." ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(318, 6) ' 'mnuClimaticDescribeSPISPEI ' Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI" - Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSPISPEI.Text = "SPI/SPEI..." ' 'mnuClimaticDescribeClimograph ' Me.mnuClimaticDescribeClimograph.Name = "mnuClimaticDescribeClimograph" - Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeClimograph.Text = "Climograph..." ' 'mnuClimaticDescribeTrendGraph ' Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph" - Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..." ' 'mnuClimaticDescribeSeasonalGraph ' Me.mnuClimaticDescribeSeasonalGraph.Enabled = False Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" - Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." ' 'mnuClimaticDescribeIDF ' Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF" - Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeIDF.Text = "IDF..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(318, 6) ' 'mnuClimaticDescribeWindRose ' Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose" - Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeWindPollutionRose ' Me.mnuClimaticDescribeWindPollutionRose.Name = "mnuClimaticDescribeWindPollutionRose" - Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuClimaticDescribeOtherRosePlots ' Me.mnuClimaticDescribeOtherRosePlots.Name = "mnuClimaticDescribeOtherRosePlots" - Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeOtherRosePlots.Text = "Other Rose Plots..." ' '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(212, 22) + Me.mnuClimaticNCMP.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticNCMP.Text = "NCMP" ' 'mnuClimaticNCMPIndices ' Me.mnuClimaticNCMPIndices.Name = "mnuClimaticNCMPIndices" - Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPIndices.Text = "Indices..." ' 'mnuClimaticNCMPVariogram ' Me.mnuClimaticNCMPVariogram.Name = "mnuClimaticNCMPVariogram" - Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPVariogram.Text = "Variogram..." ' 'mnuClimaticNCMPRegionAverage ' Me.mnuClimaticNCMPRegionAverage.Name = "mnuClimaticNCMPRegionAverage" - Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPRegionAverage.Text = "Region Average..." ' 'mnuClimaticNCMPTrendGraphs ' Me.mnuClimaticNCMPTrendGraphs.Name = "mnuClimaticNCMPTrendGraphs" - Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPTrendGraphs.Text = "Trend Graphs..." ' 'mnuClimaticNCMPCountRecords ' Me.mnuClimaticNCMPCountRecords.Name = "mnuClimaticNCMPCountRecords" - Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPCountRecords.Text = "Count Records..." ' 'mnuClimaticNCMPSummary ' Me.mnuClimaticNCMPSummary.Name = "mnuClimaticNCMPSummary" - Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPSummary.Text = "Summary..." ' 'mnuClimaticPICSA ' Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGrap, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" - Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticPICSA.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticPICSA.Text = "PICSA" ' 'mnuClimaticPICSARainfallGraph ' Me.mnuClimaticPICSARainfallGraph.Name = "mnuClimaticPICSARainfallGraph" - Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSARainfallGraph.Text = "Rainfall Graph..." ' 'mnuClimaticPICSATemperatureGraph ' Me.mnuClimaticPICSATemperatureGraph.Name = "mnuClimaticPICSATemperatureGraph" - Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' 'mnuClimaticPICSAGeneralGrap ' Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap" - Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..." ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" - Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6) + Me.ToolStripSeparator73.Size = New System.Drawing.Size(361, 6) ' 'mnuClimaticPICSACumExeedenceGraph ' Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph" - Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSACumExeedenceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticPICSACrops ' Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops" - Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(364, 34) 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(212, 22) + Me.mnuCMSAF.Size = New System.Drawing.Size(325, 34) Me.mnuCMSAF.Text = "CM SAF" ' 'mnuClimaticCMSAFPlotRegion ' Me.mnuClimaticCMSAFPlotRegion.Name = "mnuClimaticCMSAFPlotRegion" - Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(231, 22) + Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(351, 34) Me.mnuClimaticCMSAFPlotRegion.Text = "Plot Region..." ' 'mnuClimaticCMSAFExporttoCMSAFRToolbox ' Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Name = "mnuClimaticCMSAFExporttoCMSAFRToolbox" - Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(231, 22) + Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(351, 34) 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(212, 22) + Me.mnuClimaticCompare.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCompare.Text = "Compare" ' 'mnuClimaticCompareCalculation ' Me.mnuClimaticCompareCalculation.Name = "mnuClimaticCompareCalculation" - Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareCalculation.Text = "Calculation..." ' 'mnuClimaticCompareSummary ' Me.mnuClimaticCompareSummary.Name = "mnuClimaticCompareSummary" - Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareSummary.Text = "Summary..." ' 'ToolStripSeparator66 ' Me.ToolStripSeparator66.Name = "ToolStripSeparator66" - Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6) + Me.ToolStripSeparator66.Size = New System.Drawing.Size(293, 6) ' 'mnuClimaticCompareCorrelations ' Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations" - Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareCorrelations.Text = "Correlations..." ' 'mnuClimaticCompareScatterplot ' Me.mnuClimaticCompareScatterplot.Name = "mnuClimaticCompareScatterplot" - Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareScatterplot.Text = "Scatterplot..." ' 'mnuClimaticCompareTimeSeriesPlot ' Me.mnuClimaticCompareTimeSeriesPlot.Name = "mnuClimaticCompareTimeSeriesPlot" - Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareTimeSeriesPlot.Text = "Time Series Plot..." ' 'mnuClimaticCompareSeasonalPlot ' Me.mnuClimaticCompareSeasonalPlot.Name = "mnuClimaticCompareSeasonalPlot" - Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareSeasonalPlot.Text = "Seasonal Plot..." ' 'mnuClimaticCompareDensityPlot ' Me.mnuClimaticCompareDensityPlot.Name = "mnuClimaticCompareDensityPlot" - Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareDensityPlot.Text = "Density Plot..." ' 'mnuClimaticCompareConditionalQuantiles ' Me.mnuClimaticCompareConditionalQuantiles.Name = "mnuClimaticCompareConditionalQuantiles" - Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareConditionalQuantiles.Text = "Conditional Quantiles..." ' 'mnuClimaticCompareTaylorDiagram ' Me.mnuClimaticCompareTaylorDiagram.Name = "mnuClimaticCompareTaylorDiagram" - Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(296, 34) 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(212, 22) + Me.mnuClimaticMapping.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticMapping.Text = "Mapping" ' 'mnuClimaticMappingMap ' Me.mnuClimaticMappingMap.Name = "mnuClimaticMappingMap" - Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticMappingMap.Text = "Map..." ' 'mnuClimaticMappingCheckStationLocations ' Me.mnuClimaticMappingCheckStationLocations.Name = "mnuClimaticMappingCheckStationLocations" - Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(313, 34) 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(212, 22) + Me.mnuClimaticModel.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticModel.Text = "Model" ' 'mnuClimaticModelsExtremes ' Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" - Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelsExtremes.Text = "Extremes..." ' 'mnuClimaticModelCircular ' Me.mnuClimaticModelCircular.Enabled = False Me.mnuClimaticModelCircular.Name = "mnuClimaticModelCircular" - Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelCircular.Text = "Circular..." Me.mnuClimaticModelCircular.Visible = False ' 'mnuClimaticModelMarkovModelling ' Me.mnuClimaticModelMarkovModelling.Name = "mnuClimaticModelMarkovModelling" - Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelMarkovModelling.Tag = "Markov_Modelling" Me.mnuClimaticModelMarkovModelling.Text = "Markov Modelling..." ' 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(322, 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(212, 22) + Me.mnuClimaticSCF.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticSCF.Text = "Seasonal Forecast Support" ' 'mnuClimaticSCFSupportOpenSST ' Me.mnuClimaticSCFSupportOpenSST.Name = "mnuClimaticSCFSupportOpenSST" - Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportOpenSST.Text = "Open SST..." ' 'mnuClimaticSCFSupportExporttoCPT ' Me.mnuClimaticSCFSupportExporttoCPT.Name = "mnuClimaticSCFSupportExporttoCPT" - Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportExporttoCPT.Tag = "Export_to_CPT" Me.mnuClimaticSCFSupportExporttoCPT.Text = "Export to CPT..." ' 'ToolStripSeparator32 ' Me.ToolStripSeparator32.Name = "ToolStripSeparator32" - Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6) + Me.ToolStripSeparator32.Size = New System.Drawing.Size(361, 6) ' 'mnuClimaticSCFSupportCorrelations ' Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations" - Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCorrelations.Text = "Correlations..." ' 'mnuClimaticSCFSupportPrincipalComponents ' Me.mnuClimaticSCFSupportPrincipalComponents.Name = "mnuClimaticSCFSupportPrincipalComponents" - Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportPrincipalComponents.Text = "Principal Components..." ' 'mnuClimaticSCFSupportCanonicalCorrelations ' Me.mnuClimaticSCFSupportCanonicalCorrelations.Name = "mnuClimaticSCFSupportCanonicalCorrelations" - Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuClimaticSCFSupportCumulativeExceedanceGraph ' Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Name = "mnuClimaticSCFSupportCumulativeExceedanceGraph" - Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(364, 34) 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(212, 22) + Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods" Me.mnuClimaticClimateMethods.Text = "Climate Methods" Me.mnuClimaticClimateMethods.Visible = False @@ -2523,7 +2522,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(199, 22) + Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation" Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation" ' @@ -2531,7 +2530,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain" - Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..." ' @@ -2539,7 +2538,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain" - Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..." ' @@ -2547,7 +2546,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month" Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..." ' @@ -2555,7 +2554,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular" - Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular" Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..." ' @@ -2563,7 +2562,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month" Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..." ' @@ -2571,7 +2570,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily" Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..." ' @@ -2579,7 +2578,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year" Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..." ' @@ -2587,7 +2586,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal" - Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total" Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..." ' @@ -2595,7 +2594,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength" - Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length" Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..." ' @@ -2603,7 +2602,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA" - Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA" Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..." ' @@ -2611,7 +2610,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents" - Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events" Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..." ' @@ -2619,7 +2618,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData" - Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data" Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..." ' @@ -2627,7 +2626,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable" - Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table" Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..." ' @@ -2635,7 +2634,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries" - Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22) + Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(342, 34) Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries" Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..." ' @@ -2643,7 +2642,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD" - Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22) + Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(342, 34) Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT" Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..." ' @@ -2651,7 +2650,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(199, 22) + Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics" Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics" ' @@ -2659,7 +2658,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot" - Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot" Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..." ' @@ -2667,7 +2666,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot" - Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot" Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..." ' @@ -2675,7 +2674,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues" - Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values" Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..." ' @@ -2683,7 +2682,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram" - Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram" Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..." ' @@ -2691,7 +2690,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance" - Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence" Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..." ' @@ -2699,7 +2698,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot" - Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot" Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..." ' @@ -2707,7 +2706,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory" - Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory" Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..." ' @@ -2715,7 +2714,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall" - Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall" Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..." ' @@ -2723,7 +2722,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount" - Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count" Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..." ' @@ -2731,7 +2730,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries" - Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries" Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..." ' @@ -2739,7 +2738,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose" - Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose" Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..." ' @@ -2747,7 +2746,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines" - Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22) + Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(325, 34) Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines" Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..." ' @@ -2755,7 +2754,7 @@ Partial Class frmMain ' Me.mnuClmateMethodThreeSummaries.Enabled = False Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries" - Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22) + Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(325, 34) Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries" Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..." ' @@ -2763,7 +2762,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsModel.Enabled = False Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel" - Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsModel.Tag = "Model" Me.mnuClimaticClimateMethodsModel.Text = "Model..." ' @@ -2771,7 +2770,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(199, 22) + Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional" Me.mnuClimaticClimateMethodsAdditional.Text = "Additional" ' @@ -2779,7 +2778,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT" - Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT" Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..." ' @@ -2787,7 +2786,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics" - Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics" Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..." ' @@ -2795,7 +2794,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..." ' @@ -2803,7 +2802,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..." ' @@ -2811,7 +2810,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance" - Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance" Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..." ' @@ -2819,7 +2818,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsCreateClimateObject.Enabled = False Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject" - Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22) + Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(297, 34) Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' @@ -2827,7 +2826,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(232, 22) + Me.mnuFileSave.Size = New System.Drawing.Size(351, 34) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2835,32 +2834,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(232, 22) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(351, 34) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' 'mnuFileSaveAsDataAs ' Me.mnuFileSaveAsDataAs.Name = "mnuFileSaveAsDataAs" - Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsDataAs.Text = "Save Data As..." ' 'mnuFileSaveAsOutputAs ' Me.mnuFileSaveAsOutputAs.Name = "mnuFileSaveAsOutputAs" - Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsOutputAs.Text = "Save Output As..." ' 'mnuFileSaveAsLogAs ' Me.mnuFileSaveAsLogAs.Name = "mnuFileSaveAsLogAs" - Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsLogAs.Text = "Save Log As..." ' 'mnuFileSaveAsScriptAs ' Me.mnuFileSaveAsScriptAs.Name = "mnuFileSaveAsScriptAs" - Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsScriptAs.Text = "Save Script As..." ' 'mnuFilePrint @@ -2868,7 +2867,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(232, 22) + Me.mnuFilePrint.Size = New System.Drawing.Size(351, 34) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -2877,7 +2876,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(232, 22) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(351, 34) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -2885,12 +2884,12 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(229, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(348, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(232, 22) + Me.mnuFIleExit.Size = New System.Drawing.Size(351, 34) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' @@ -2898,7 +2897,7 @@ Partial Class frmMain ' Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(39, 22) + Me.mnuEdit.Size = New System.Drawing.Size(58, 29) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' @@ -2906,7 +2905,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(167, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(253, 34) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2914,7 +2913,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(167, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(253, 34) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2922,27 +2921,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(253, 34) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(253, 34) Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(253, 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(167, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(253, 34) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -2950,17 +2949,18 @@ Partial Class frmMain ' 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, 460) + Me.stsStrip.Location = New System.Drawing.Point(0, 691) 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(834, 22) + Me.stsStrip.Size = New System.Drawing.Size(1251, 32) Me.stsStrip.TabIndex = 8 Me.stsStrip.Text = "Status" ' 'tstatus ' Me.tstatus.Name = "tstatus" - Me.tstatus.Size = New System.Drawing.Size(119, 17) + Me.tstatus.Size = New System.Drawing.Size(182, 25) Me.tstatus.Text = "No worksheet loaded" ' 'Tool_strip @@ -2969,12 +2969,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, 24) + Me.Tool_strip.Location = New System.Drawing.Point(0, 33) Me.Tool_strip.Name = "Tool_strip" - Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) + Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 3, 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(834, 37) + Me.Tool_strip.Size = New System.Drawing.Size(1251, 39) Me.Tool_strip.TabIndex = 7 Me.Tool_strip.Text = "Tool" ' @@ -2986,7 +2986,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, 34) + Me.mnuTbOpen.Size = New System.Drawing.Size(53, 36) Me.mnuTbOpen.Text = "&Open" Me.mnuTbOpen.ToolTipText = "Import" ' @@ -2997,7 +2997,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, 34) + Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 36) Me.mnuTbOpenFromLibrary.ToolTipText = "Import From Library" ' 'mnuTbSave @@ -3009,40 +3009,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, 34) + Me.mnuTbSave.Size = New System.Drawing.Size(53, 36) Me.mnuTbSave.Text = "&Save" ' 'mnuSaveData ' Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveData.Name = "mnuSaveData" - Me.mnuSaveData.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveData.Size = New System.Drawing.Size(213, 34) 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(139, 22) + Me.mnuSaveOutput.Size = New System.Drawing.Size(213, 34) 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(139, 22) + Me.mnuSaveScript.Size = New System.Drawing.Size(213, 34) Me.mnuSaveScript.Text = "Save Script" ' 'mnuSaveLog ' Me.mnuSaveLog.Name = "mnuSaveLog" - Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveLog.Size = New System.Drawing.Size(213, 34) Me.mnuSaveLog.Text = "Save Log" ' 'toolStripSeparator ' Me.toolStripSeparator.Name = "toolStripSeparator" - Me.toolStripSeparator.Size = New System.Drawing.Size(6, 37) + Me.toolStripSeparator.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLast10Dialogs ' @@ -3058,7 +3058,7 @@ Partial Class frmMain 'separator2 ' Me.separator2.Name = "separator2" - Me.separator2.Size = New System.Drawing.Size(6, 37) + Me.separator2.Size = New System.Drawing.Size(6, 39) ' 'mnuTbDataView ' @@ -3068,7 +3068,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, 34) + Me.mnuTbDataView.Size = New System.Drawing.Size(34, 36) Me.mnuTbDataView.ToolTipText = "Toggle Data view open and closed" ' 'mnuTbOutput @@ -3080,34 +3080,34 @@ 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(53, 34) + Me.mnuTbOutput.Size = New System.Drawing.Size(53, 36) Me.mnuTbOutput.ToolTipText = "Toggle Output window open and closed" ' 'mnuOutputWindow ' Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuOutputWindow.Name = "mnuOutputWindow" - Me.mnuOutputWindow.Size = New System.Drawing.Size(178, 22) + Me.mnuOutputWindow.Size = New System.Drawing.Size(271, 34) 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(178, 22) + Me.mnuShowRCommand.Size = New System.Drawing.Size(271, 34) 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(178, 22) + Me.mnuIncludeComments.Size = New System.Drawing.Size(271, 34) Me.mnuIncludeComments.Text = "Show Comments" ' 'ToolStripSeparator74 ' Me.ToolStripSeparator74.Name = "ToolStripSeparator74" - Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 39) ' 'mnuLastGraph ' @@ -3124,25 +3124,25 @@ Partial Class frmMain 'mnuNormalViewer ' Me.mnuNormalViewer.Name = "mnuNormalViewer" - Me.mnuNormalViewer.Size = New System.Drawing.Size(128, 22) + Me.mnuNormalViewer.Size = New System.Drawing.Size(194, 34) Me.mnuNormalViewer.Text = "Viewer..." ' 'mnuploty ' Me.mnuploty.Name = "mnuploty" - Me.mnuploty.Size = New System.Drawing.Size(128, 22) + Me.mnuploty.Size = New System.Drawing.Size(194, 34) Me.mnuploty.Text = "Plotly..." ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" - Me.mnuRViewer.Size = New System.Drawing.Size(128, 22) + Me.mnuRViewer.Size = New System.Drawing.Size(194, 34) Me.mnuRViewer.Text = "R Viewer..." ' 'ToolStripSeparator75 ' Me.ToolStripSeparator75.Name = "ToolStripSeparator75" - Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLogScript ' @@ -3160,7 +3160,7 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(129, 22) + Me.mnuLogScript.Size = New System.Drawing.Size(196, 34) Me.mnuLogScript.Text = "Log/Script" ' 'mnuMetadata @@ -3179,20 +3179,20 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(202, 22) + Me.mnuColumnMetadat.Size = New System.Drawing.Size(307, 34) 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(202, 22) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(307, 34) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' 'ToolStripSeparator76 ' Me.ToolStripSeparator76.Name = "ToolStripSeparator76" - Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 39) ' 'mnuTbResetLayout ' @@ -3201,13 +3201,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, 34) + Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 36) Me.mnuTbResetLayout.ToolTipText = "Reset to Default Layout" ' 'separator3 ' Me.separator3.Name = "separator3" - Me.separator3.Size = New System.Drawing.Size(6, 37) + Me.separator3.Size = New System.Drawing.Size(6, 39) ' 'mnuTbHelp ' @@ -3216,13 +3216,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, 34) + Me.mnuTbHelp.Size = New System.Drawing.Size(34, 36) Me.mnuTbHelp.Text = "He&lp" ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" - Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLan ' @@ -3231,28 +3231,29 @@ 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, 34) + Me.mnuTbLan.Size = New System.Drawing.Size(34, 36) 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, 37) + Me.separator1.Size = New System.Drawing.Size(6, 39) ' '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.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(834, 24) + Me.mnuBar.Size = New System.Drawing.Size(1251, 33) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' @@ -3260,7 +3261,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(37, 22) + Me.mnuFile.Size = New System.Drawing.Size(54, 29) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3268,7 +3269,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(232, 22) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(351, 34) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3276,33 +3277,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(232, 22) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(351, 34) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(351, 34) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(229, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(348, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(351, 34) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(351, 34) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3310,7 +3311,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(351, 34) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3318,82 +3319,82 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(351, 34) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(351, 34) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(232, 22) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(351, 34) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(232, 22) + Me.mnuFileConvert.Size = New System.Drawing.Size(351, 34) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(229, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(348, 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(232, 22) + Me.mnuFileExport.Size = New System.Drawing.Size(351, 34) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet ' Me.mnuFileExportExportDataSet.Name = "mnuFileExportExportDataSet" - Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportDataSet.Text = "Export Dataset..." ' 'mnuFileExportExportRObjectsToolStripMenuItem ' Me.mnuFileExportExportRObjectsToolStripMenuItem.Name = "mnuFileExportExportRObjectsToolStripMenuItem" - Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportRObjectsToolStripMenuItem.Text = "Export R Objects..." ' 'mnuFileExportExportRWorkspace ' Me.mnuFileExportExportRWorkspace.Name = "mnuFileExportExportRWorkspace" - Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportRWorkspace.Text = "Export R Workspace..." ' 'mnuFileExportExportGraphAsImage ' Me.mnuFileExportExportGraphAsImage.Name = "mnuFileExportExportGraphAsImage" - Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportGraphAsImage.Text = "Export Graph As Image..." ' 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(232, 22) + Me.mnuFileCloseData.Size = New System.Drawing.Size(351, 34) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(229, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(348, 6) ' 'mnuPrepare ' Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.ToolStripSeparator79, 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(59, 22) + Me.mnuPrepare.Size = New System.Drawing.Size(88, 29) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -3401,105 +3402,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.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' 'mnuPrepareDataFrameViewData ' Me.mnuPrepareDataFrameViewData.Name = "mnuPrepareDataFrameViewData" - Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameViewData.Tag = "View_Data..." Me.mnuPrepareDataFrameViewData.Text = "View Data..." ' 'mnuPrepareDataFrameRenameColumn ' Me.mnuPrepareDataFrameRenameColumn.Name = "mnuPrepareDataFrameRenameColumn" - Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameRenameColumn.Tag = "Rename_Column..." Me.mnuPrepareDataFrameRenameColumn.Text = "Rename Columns..." ' 'mnuPrepareDataFrameDuplicateColumn ' Me.mnuPrepareDataFrameDuplicateColumn.Name = "mnuPrepareDataFrameDuplicateColumn" - Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameDuplicateColumn.Text = "Duplicate Column..." ' 'mnuPrepareDataFrameRowNumbersNames ' Me.mnuPrepareDataFrameRowNumbersNames.Name = "mnuPrepareDataFrameRowNumbersNames" - Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameRowNumbersNames.Tag = "Row_Numbers/Names..." Me.mnuPrepareDataFrameRowNumbersNames.Text = "Row Numbers/Names..." ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(298, 6) ' 'mnuPrepareDataFrameSort ' Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort" - Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' 'mnuPrepareDataFrameFilterRows ' Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" - Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" - Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' Me.mnuPrepareDataFrameReplaceValues.Name = "mnuPrepareDataFrameReplaceValues" - Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameReplaceValues.Tag = "Replace_Values..." Me.mnuPrepareDataFrameReplaceValues.Text = "Replace Values..." ' 'mnuPrepareDataFrameConvertColumns ' Me.mnuPrepareDataFrameConvertColumns.Name = "mnuPrepareDataFrameConvertColumns" - Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameConvertColumns.Tag = "Convert_Columns..." Me.mnuPrepareDataFrameConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(298, 6) ' 'mnuPrepareDataFrameReorderColumns ' Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns" - Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameReorderColumns.Tag = "Reorder_Columns..." Me.mnuPrepareDataFrameReorderColumns.Text = "Reorder Columns..." ' 'mnuPrepareDataFrameAddMergeColumns ' Me.mnuPrepareDataFrameAddMergeColumns.Name = "mnuPrepareDataFrameAddMergeColumns" - Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameAddMergeColumns.Text = "Add (Merge) Columns..." ' 'mnuPrepareDataFrameInsertColumnsRows ' Me.mnuPrepareDataFrameInsertColumnsRows.Name = "mnuPrepareDataFrameInsertColumnsRows" - Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameInsertColumnsRows.Tag = "Insert_Columns/Rows..." Me.mnuPrepareDataFrameInsertColumnsRows.Text = "Insert Columns/Rows..." ' 'mnuPrepareDataFrameDeleteColumnsRows ' Me.mnuPrepareDataFrameDeleteColumnsRows.Name = "mnuPrepareDataFrameDeleteColumnsRows" - Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..." Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..." ' @@ -3507,7 +3508,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameProtectColumn.Enabled = False Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn" - Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameProtectColumn.Tag = "..." Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False @@ -3516,7 +3517,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns" - Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..." Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..." Me.mnuPrepareDataFrameFreezeColumns.Visible = False @@ -3524,7 +3525,7 @@ Partial Class frmMain 'mnuPrepareDataframeColourByProperty ' Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty" - Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..." ' 'mnuPrepareCheckData @@ -3532,107 +3533,107 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, 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(180, 22) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData ' Me.mnuPrepareCheckDataVisualiseData.Name = "mnuPrepareCheckDataVisualiseData" - Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..." ' 'mnuPrepareCheckDataPivotTable ' Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable" - Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator50 ' Me.ToolStripSeparator50.Name = "ToolStripSeparator50" - Me.ToolStripSeparator50.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator50.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataDuplicates ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" - Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' Me.mnuPrepareCheckDataCompareColumns.Name = "mnuPrepareCheckDataCompareColumns" - Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataCompareColumns.Text = "Compare Columns..." ' 'mnuPrepareCheckDataNonNumericCases ' Me.mnuPrepareCheckDataNonNumericCases.Name = "mnuPrepareCheckDataNonNumericCases" - Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator49 ' Me.ToolStripSeparator49.Name = "ToolStripSeparator49" - Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator49.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataBoxplot ' Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot" - Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataBoxplot.Text = "Boxplot..." ' 'mnuPrepareCheckDataOneVariableSummarise ' Me.mnuPrepareCheckDataOneVariableSummarise.Name = "mnuPrepareCheckDataOneVariableSummarise" - Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuPrepareCheckDataOneVariableGraph ' Me.mnuPrepareCheckDataOneVariableGraph.Name = "mnuPrepareCheckDataOneVariableGraph" - Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuPrepareCheckDataOneWayFrequencies ' Me.mnuPrepareCheckDataOneWayFrequencies.Name = "mnuPrepareCheckDataOneWayFrequencies" - Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..." ' 'mnuPrepareCheckDataViewDeleteLabels ' Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels" - Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..." ' 'ToolStripSeparator41 ' Me.ToolStripSeparator41.Name = "ToolStripSeparator41" - Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator41.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataExportOpenRefine ' Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine" - Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataExportOpenRefine.Text = "Export To OpenRefine..." ' 'mnuPrepareCheckDataImportOpenRefine ' Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" - Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' Me.ToolStripSeparator40.Name = "ToolStripSeparator40" - Me.ToolStripSeparator40.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator40.Size = New System.Drawing.Size(367, 6) ' 'mnuPreparePrepareToShareJitter ' Me.mnuPreparePrepareToShareJitter.Enabled = False Me.mnuPreparePrepareToShareJitter.Name = "mnuPreparePrepareToShareJitter" - Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22) + Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(370, 34) Me.mnuPreparePrepareToShareJitter.Text = "Jitter..." Me.mnuPreparePrepareToShareJitter.Visible = False ' @@ -3640,90 +3641,95 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage" - Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Text = "Prepare to Share (sdc package)..." Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Visible = False ' 'mnuPrepareCheckDataAnonymiseIDColumn ' Me.mnuPrepareCheckDataAnonymiseIDColumn.Name = "mnuPrepareCheckDataAnonymiseIDColumn" - Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataAnonymiseIDColumn.Text = "Anonymise ID Column..." ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Calculator..." ' + 'ToolStripSeparator79 + ' + Me.ToolStripSeparator79.Name = "ToolStripSeparator79" + Me.ToolStripSeparator79.Size = New System.Drawing.Size(248, 6) + ' 'mnuPrepareColumnCalculate ' 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(180, 22) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' 'mnuPrepareColumnNumericRegularSequence ' Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence" - Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRegularSequence.Tag = "Regular_Sequence..." Me.mnuPrepareColumnNumericRegularSequence.Text = "Regular Sequence..." ' 'mnuPrepareColumnNumericEnter ' Me.mnuPrepareColumnNumericEnter.Name = "mnuPrepareColumnNumericEnter" - Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericEnter.Text = "Enter..." ' 'ToolStripSeparator25 ' Me.ToolStripSeparator25.Name = "ToolStripSeparator25" - Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(301, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRowSummaries.Text = "Row Summaries..." ' 'mnuPrepareColumnNumericTransform ' Me.mnuPrepareColumnNumericTransform.Name = "mnuPrepareColumnNumericTransform" - Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericTransform.Tag = "Rank..." Me.mnuPrepareColumnNumericTransform.Text = "Transform..." ' 'mnuPrepareColumnNumericPolynomials ' Me.mnuPrepareColumnNumericPolynomials.Name = "mnuPrepareColumnNumericPolynomials" - Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericPolynomials.Tag = "Polynomials..." Me.mnuPrepareColumnNumericPolynomials.Text = "Polynomials..." ' 'ToolStripSeparator56 ' Me.ToolStripSeparator56.Name = "ToolStripSeparator56" - Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(301, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRandomSamples.Tag = "Random_Samples..." Me.mnuPrepareColumnNumericRandomSamples.Text = "Random Samples..." ' 'mnuPrepareColumnNumericPermuteRows ' Me.mnuPrepareColumnNumericPermuteRows.Name = "mnuPrepareColumnNumericPermuteRows" - Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' @@ -3731,105 +3737,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(180, 22) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' 'mnuPrepareColumnFactorConvertToFactor ' Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor" - Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor" Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..." ' 'mnuPrepareColumnFactorRecodeNumeric ' Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric" - Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..." Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..." ' 'mnuPrepareColumnFactorCountInFactor ' Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor" - Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorRecodeFactor ' Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor" - Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..." Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..." ' 'mnuPrepareColumnFactorCombineFactors ' Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors" - Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..." Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..." ' 'mnuPrepareColumnFactorDummyVariables ' Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables" - Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..." Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..." ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorLevelsLabels ' Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels" - Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..." Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..." ' 'mnuPrepareColumnFactorReorderLevels ' Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels" - Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..." Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..." ' 'mnuPrepareColumnFactorReferenceLevel ' Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel" - Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..." Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..." ' 'mnuPrepareColumnFactorUnusedLevels ' Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels" - Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..." Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..." ' 'mnuPrepareColumnFactorContrasts ' Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts" - Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..." Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..." ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorFactorDataFrame ' Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame" - Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame" Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..." ' @@ -3837,42 +3843,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(180, 22) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' 'mnuPrepareColumnTextFindReplace ' Me.mnuPrepareColumnTextFindReplace.Name = "mnuPrepareColumnTextFindReplace" - Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextFindReplace.Tag = "Find/Replace..." Me.mnuPrepareColumnTextFindReplace.Text = "Find/Replace..." ' 'mnuPrepareColumnTextSearch ' Me.mnuPrepareColumnTextSearch.Name = "mnuPrepareColumnTextSearch" - Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextSearch.Text = "Search..." Me.mnuPrepareColumnTextSearch.Visible = False ' 'mnuPrepareColumnTextTransform ' Me.mnuPrepareColumnTextTransform.Name = "mnuPrepareColumnTextTransform" - Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextTransform.Tag = "Transform..." Me.mnuPrepareColumnTextTransform.Text = "Transform..." ' 'mnuPrepareColumnTextSplit ' Me.mnuPrepareColumnTextSplit.Name = "mnuPrepareColumnTextSplit" - Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextSplit.Tag = "Split..." Me.mnuPrepareColumnTextSplit.Text = "Split..." ' 'mnuPrepareColumnTextCombine ' Me.mnuPrepareColumnTextCombine.Name = "mnuPrepareColumnTextCombine" - Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextCombine.Tag = "Combine..." Me.mnuPrepareColumnTextCombine.Text = "Combine..." ' @@ -3880,7 +3886,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnTextMatch.Enabled = False Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch" - Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextMatch.Tag = "Match..." Me.mnuPrepareColumnTextMatch.Text = "Match..." Me.mnuPrepareColumnTextMatch.Visible = False @@ -3888,7 +3894,7 @@ Partial Class frmMain 'mnuPrepareColumnTextDistance ' Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance" - Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextDistance.Tag = "Distance..." Me.mnuPrepareColumnTextDistance.Text = "Distance..." ' @@ -3896,38 +3902,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(180, 22) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate ' Me.mnuPrepareColumnDateGenerateDate.Name = "mnuPrepareColumnDateGenerateDate" - Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateGenerateDate.Text = "Generate Dates..." ' 'mnuPrepareColumnDateMakeDate ' Me.mnuPrepareColumnDateMakeDate.Name = "mnuPrepareColumnDateMakeDate" - Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateMakeDate.Text = "Make Date..." ' 'mnuPrepareColumnDateInfillMissingDates ' Me.mnuPrepareColumnDateInfillMissingDates.Name = "mnuPrepareColumnDateInfillMissingDates" - Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuPrepareColumnDateUseDate ' Me.mnuPrepareColumnDateUseDate.Name = "mnuPrepareColumnDateUseDate" - Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateUseDate.Text = "Use Date..." ' 'mnuPrepareColumnDateMakeTime ' Me.mnuPrepareColumnDateMakeTime.Enabled = False Me.mnuPrepareColumnDateMakeTime.Name = "mnuPrepareColumnDateMakeTime" - Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..." Me.mnuPrepareColumnDateMakeTime.Visible = False ' @@ -3935,7 +3941,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDateUseTime.Enabled = False Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" - Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateUseTime.Text = "Use Time..." Me.mnuPrepareColumnDateUseTime.Visible = False ' @@ -3943,169 +3949,169 @@ 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(180, 22) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(263, 34) Me.mnuPrepareColumnDefineConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator55 ' Me.ToolStripSeparator55.Name = "ToolStripSeparator55" - Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(260, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(263, 34) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(248, 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(180, 22) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' 'mnuPrepareColumnReshapeColumnSummaries ' Me.mnuPrepareColumnReshapeColumnSummaries.Name = "mnuPrepareColumnReshapeColumnSummaries" - Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeColumnSummaries.Tag = "Column_Summaries..." Me.mnuPrepareColumnReshapeColumnSummaries.Text = "Column Summaries..." ' 'mnuPrepareColumnReshapeGeneralSummaries ' Me.mnuPrepareColumnReshapeGeneralSummaries.Name = "mnuPrepareColumnReshapeGeneralSummaries" - Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeGeneralSummaries.Text = "General Summaries..." ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(292, 6) ' 'mnuPrepareColumnReshapeStack ' Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack" - Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeStack.Tag = "Stack..." Me.mnuPrepareColumnReshapeStack.Text = "Stack (Pivot Longer)..." ' 'mnuPrepareColumnReshapeUnstack ' Me.mnuPrepareColumnReshapeUnstack.Name = "mnuPrepareColumnReshapeUnstack" - Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeUnstack.Tag = "Unstack..." Me.mnuPrepareColumnReshapeUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuPrepareColumnReshapeMerge ' Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge" - Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..." Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..." ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(292, 6) ' 'mnuPrepareAppendDataFrame ' Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame" - Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareAppendDataFrame.Text = "Append (Bind Rows)..." ' 'mnuPrepareColumnReshapeSubset ' Me.mnuPrepareColumnReshapeSubset.Name = "mnuPrepareColumnReshapeSubset" - Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeSubset.Tag = "Subset..." Me.mnuPrepareColumnReshapeSubset.Text = "Subset..." ' 'mnuPrepareColumnReshapeRandomSubset ' Me.mnuPrepareColumnReshapeRandomSubset.Name = "mnuPrepareColumnReshapeRandomSubset" - Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeRandomSubset.Tag = "Random_Subset..." Me.mnuPrepareColumnReshapeRandomSubset.Text = "Random Subset..." ' 'mnuPrepareColumnReshapeTranspose ' Me.mnuPrepareColumnReshapeTranspose.Name = "mnuPrepareColumnReshapeTranspose" - Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeTranspose.Tag = "Transpose..." Me.mnuPrepareColumnReshapeTranspose.Text = "Transpose..." ' 'mnuPrepareDataReshapeScaleOrDistance ' Me.mnuPrepareDataReshapeScaleOrDistance.Name = "mnuPrepareDataReshapeScaleOrDistance" - Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..." ' 'mnuPrepareDataReshapeRandomSplit ' Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" - Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(248, 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(180, 22) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey ' Me.mnuPrepareKeysAndLinksAddKey.Name = "mnuPrepareKeysAndLinksAddKey" - Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddKey.Text = "Add Key..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKey ' Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Name = "mnuPrepareKeysAndLinksViewAndRemoveKey" - Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Text = "View and Remove Keys..." ' 'mnuPrepareKeysAndLinksAddLink ' Me.mnuPrepareKeysAndLinksAddLink.Name = "mnuPrepareKeysAndLinksAddLink" - Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddLink.Text = "Add Link..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKeys ' Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Name = "mnuPrepareKeysAndLinksViewAndRemoveKeys" - Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Text = "View and Remove Links..." ' 'mnuPrepareKeysAndLinksAddComment ' Me.mnuPrepareKeysAndLinksAddComment.Name = "mnuPrepareKeysAndLinksAddComment" - Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(311, 34) 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(180, 22) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4113,7 +4119,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata" - Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDataFrameMetadata.Tag = "Data_Frame_Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Text = "Data Frame Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Visible = False @@ -4121,46 +4127,46 @@ Partial Class frmMain 'mnuPrepareDataObjectRenameDataFrame ' Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame" - Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectRenameDataFrame.Tag = "ReName_Data_Frame..." Me.mnuPrepareDataObjectRenameDataFrame.Text = "Rename Data Frame..." ' 'mnuPrepareDataObjectReorderDataFrames ' Me.mnuPrepareDataObjectReorderDataFrames.Name = "mnuPrepareDataObjectReorderDataFrames" - Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectReorderDataFrames.Tag = "Reorder_Data_Frames..." Me.mnuPrepareDataObjectReorderDataFrames.Text = "Reorder Data Frames..." ' 'mnuPrepareDataObjectCopyDataFrame ' Me.mnuPrepareDataObjectCopyDataFrame.Name = "mnuPrepareDataObjectCopyDataFrame" - Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectCopyDataFrame.Tag = "Copy_Data_Frame..." Me.mnuPrepareDataObjectCopyDataFrame.Text = "Copy Data Frame..." ' 'mnuPrepareDataObjectDeleteDataFrame ' Me.mnuPrepareDataObjectDeleteDataFrame.Name = "mnuPrepareDataObjectDeleteDataFrame" - Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDeleteDataFrame.Tag = "Delete_Data_Frame..." Me.mnuPrepareDataObjectDeleteDataFrame.Text = "Delete Data Frames..." ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(315, 6) ' 'mnuPrepareDataObjectHideDataframes ' Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes" - Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectHideDataframes.Text = "Hide/Show Data Frames..." ' 'mnuPrepareDataObjectMetadata ' Me.mnuPrepareDataObjectMetadata.Name = "mnuPrepareDataObjectMetadata" - Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..." Me.mnuPrepareDataObjectMetadata.Text = "Metadata..." ' @@ -4168,7 +4174,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectRenameMetadata.Enabled = False Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata" - Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Visible = False @@ -4177,7 +4183,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectReorderMetadata.Enabled = False Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata" - Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Visible = False @@ -4186,7 +4192,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata" - Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Visible = False @@ -4195,35 +4201,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(180, 22) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' 'mnuPrepareRObjectsView ' Me.mnuPrepareRObjectsView.Name = "mnuPrepareRObjectsView" - Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsView.Tag = "View..." Me.mnuPrepareRObjectsView.Text = "View..." ' 'mnuPrepareRObjectsRename ' Me.mnuPrepareRObjectsRename.Name = "mnuPrepareRObjectsRename" - Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsRename.Tag = "Rename..." Me.mnuPrepareRObjectsRename.Text = "Rename..." ' 'mnuPrepareRObjectsReorder ' Me.mnuPrepareRObjectsReorder.Name = "mnuPrepareRObjectsReorder" - Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsReorder.Tag = "Reorder" Me.mnuPrepareRObjectsReorder.Text = "Reorder..." ' 'mnuPrepareRObjectsDelete ' Me.mnuPrepareRObjectsDelete.Name = "mnuPrepareRObjectsDelete" - Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsDelete.Tag = "Delete..." Me.mnuPrepareRObjectsDelete.Text = "Delete..." ' @@ -4231,78 +4237,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(74, 22) + Me.mnuStructured.Size = New System.Drawing.Size(109, 29) 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(186, 22) + Me.mnuStructuredCircular.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredCircular.Text = "Circular" ' 'mnuStructuredCircularDefine ' Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" - Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularDefine.Text = "Define..." ' 'mnuStructuredCircularCalculator ' Me.mnuStructuredCircularCalculator.Name = "mnuStructuredCircularCalculator" - Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularCalculator.Text = "Calculator..." ' 'mnuStructuredCircularSummaries ' Me.mnuStructuredCircularSummaries.Name = "mnuStructuredCircularSummaries" - Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularSummaries.Text = "Summaries..." ' 'ToolStripSeparator46 ' Me.ToolStripSeparator46.Name = "ToolStripSeparator46" - Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator46.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularDensityPlot ' Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot" - Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularDensityPlot.Text = "Circular Plots..." ' 'ToolStripSeparator67 ' Me.ToolStripSeparator67.Name = "ToolStripSeparator67" - Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator67.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularWindRose ' Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose" - Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularWindRose.Text = "Wind Rose..." ' 'mnuStructuredCircularWindPollutionRose ' Me.mnuStructuredCircularWindPollutionRose.Name = "mnuStructuredCircularWindPollutionRose" - Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuStructuredCircularOtherRosePlots ' Me.mnuStructuredCircularOtherRosePlots.Name = "mnuStructuredCircularOtherRosePlots" - Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularOtherRosePlots.Text = "Other Rose Plots..." ' 'ToolStripSeparator68 ' Me.ToolStripSeparator68.Name = "ToolStripSeparator68" - Me.ToolStripSeparator68.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator68.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularCirclize ' Me.mnuStructuredCircularCirclize.Enabled = False Me.mnuStructuredCircularCirclize.Name = "mnuStructuredCircularCirclize" - Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularCirclize.Text = "Circlize..." Me.mnuStructuredCircularCirclize.Visible = False ' @@ -4310,126 +4316,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(186, 22) + Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(281, 34) 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(117, 22) + Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(177, 34) 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(186, 22) + Me.mnuStructuredSurvival.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredSurvival.Text = "Survival" ' 'mnuStructuredSurvivalDefine ' Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" - Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(117, 22) + Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(177, 34) 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(186, 22) + Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredTimeSeries.Text = "Time Series" Me.mnuStructuredTimeSeries.Visible = False ' 'mnuStructuredTimeSeriesDefine ' Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" - Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesDefine.Text = "Define..." ' 'ToolStripSeparator60 ' Me.ToolStripSeparator60.Name = "ToolStripSeparator60" - Me.ToolStripSeparator60.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator60.Size = New System.Drawing.Size(179, 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(119, 22) + Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesDescribe.Text = "Describe" ' 'mnuStructuredTimeSeriesDescribeOneVariable ' Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" - Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesDescribeOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesDescribeGeneral ' Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" - Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesDescribeGeneral.Text = "General..." ' 'ToolStripSeparator61 ' Me.ToolStripSeparator61.Name = "ToolStripSeparator61" - Me.ToolStripSeparator61.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator61.Size = New System.Drawing.Size(179, 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(119, 22) + Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesModel.Text = "Model" ' 'mnuStructuredTimeSeriesModelOneVariable ' Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesModelOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesModelGeneral ' Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesModelGeneral.Text = "General..." ' 'ToolStripSeparator62 ' Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator62.Size = New System.Drawing.Size(179, 6) ' 'ToolStripSeparator63 ' Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6) + Me.ToolStripSeparator63.Size = New System.Drawing.Size(278, 6) ' 'mnuStructuredClimatic ' Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - Me.mnuStructuredClimatic.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredClimatic.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredClimatic.Text = "Climatic..." Me.mnuStructuredClimatic.Visible = False ' 'mnuStructuredProcurement ' Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - Me.mnuStructuredProcurement.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredProcurement.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredProcurement.Text = "Procurement..." Me.mnuStructuredProcurement.Visible = False ' 'mnuStructuredOptionByContext ' Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredOptionByContext.Text = "Options by Context..." Me.mnuStructuredOptionByContext.Visible = False ' 'mnuStructuredSurvey ' Me.mnuStructuredSurvey.Name = "mnuStructuredSurvey" - Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredSurvey.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredSurvey.Text = "Survey" Me.mnuStructuredSurvey.Visible = False ' @@ -4437,424 +4443,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(88, 22) + Me.mnuProcurement.Size = New System.Drawing.Size(129, 29) Me.mnuProcurement.Text = "Procurement" ' 'mnuProcurementOpenFromLibrary ' Me.mnuProcurementOpenFromLibrary.Name = "mnuProcurementOpenFromLibrary" - Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementOpenFromLibrary.Text = "Open From Library..." ' 'mnuProcurementDefineData ' Me.mnuProcurementDefineData.Name = "mnuProcurementDefineData" - Me.mnuProcurementDefineData.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDefineData.Size = New System.Drawing.Size(327, 34) 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(217, 22) + Me.mnuProcurementPrepare.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementPrepare.Text = "Prepare" ' 'mnuProcurementPrepareFilterByCountry ' Me.mnuProcurementPrepareFilterByCountry.Name = "mnuProcurementPrepareFilterByCountry" - Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareFilterByCountry.Text = "Filter by Country (or other)..." ' 'ToolStripSeparator42 ' Me.ToolStripSeparator42.Name = "ToolStripSeparator42" - Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6) + Me.ToolStripSeparator42.Size = New System.Drawing.Size(536, 6) ' 'mnuProcurementPrepareDefineContractValueCategories ' Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories" - Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareDefineContractValueCategories.Text = "Define Contract Value Categories..." ' 'mnuProcurementPrepareRecodeNumericIntoQuantiles ' Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Name = "mnuProcurementPrepareRecodeNumericIntoQuantiles" - Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Text = "Recode Numeric into Quantiles..." ' 'mnuProcurementPrepareSetFactorReferenceLevel ' Me.mnuProcurementPrepareSetFactorReferenceLevel.Name = "mnuProcurementPrepareSetFactorReferenceLevel" - Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSetFactorReferenceLevel.Text = "Set Factor Reference Level..." ' 'mnuProcurementPrepareUseAwardDate ' Me.mnuProcurementPrepareUseAwardDate.Name = "mnuProcurementPrepareUseAwardDate" - Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareUseAwardDate.Text = "Use Award Date (or other)..." ' 'ToolStripSeparator43 ' Me.ToolStripSeparator43.Name = "ToolStripSeparator43" - Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6) + Me.ToolStripSeparator43.Size = New System.Drawing.Size(536, 6) ' 'mnuProcurementPrepareSummariseRedFlagsByCountryorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Text = "Summarise Red Flags by Country (or other)..." ' 'mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Text = "Summarise Red Flags by Country and Year (or other)..." ' 'mnuProcurementPrepareMergeAdditionalData ' Me.mnuProcurementPrepareMergeAdditionalData.Name = "mnuProcurementPrepareMergeAdditionalData" - Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(539, 34) 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(217, 22) + Me.mnuProcurementDescribe.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDescribe.Text = "Describe" ' 'mnuProcurementDescribeOneVariableSummarise ' Me.mnuProcurementDescribeOneVariableSummarise.Name = "mnuProcurementDescribeOneVariableSummarise" - Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuProcurementDescribeOneVariableGraph ' Me.mnuProcurementDescribeOneVariableGraph.Name = "mnuProcurementDescribeOneVariableGraph" - Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeOneVariableGraph.Text = "One Variable Graph..." ' 'ToolStripSeparator44 ' Me.ToolStripSeparator44.Name = "ToolStripSeparator44" - Me.ToolStripSeparator44.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator44.Size = New System.Drawing.Size(316, 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(211, 22) + Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeCategorical.Text = "Categorical" ' 'mnuProcurementDescribeCategoricalOneVarFreq ' Me.mnuProcurementDescribeCategoricalOneVarFreq.Name = "mnuProcurementDescribeCategoricalOneVarFreq" - Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalOneVarFreq.Text = "One Variable Frequencies..." ' 'mnuProcurementDescribeCategoricalTwoVarFreq ' Me.mnuProcurementDescribeCategoricalTwoVarFreq.Name = "mnuProcurementDescribeCategoricalTwoVarFreq" - Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalTwoVarFreq.Text = "Two Variable Frequencies by Sector (or other)..." ' 'ToolStripSeparator52 ' Me.ToolStripSeparator52.Name = "ToolStripSeparator52" - Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6) + Me.ToolStripSeparator52.Size = New System.Drawing.Size(479, 6) ' 'mnuProcurementDescribeCategoricalBarCharts ' Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts" - Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalBarCharts.Text = "Bar Chart..." ' 'mnuProcurementDescribeCategoricalMosaic ' Me.mnuProcurementDescribeCategoricalMosaic.Name = "mnuProcurementDescribeCategoricalMosaic" - Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalMosaic.Text = "Mosaic Plot..." ' 'mnuProcurementDescribeCategoricalTreemap ' Me.mnuProcurementDescribeCategoricalTreemap.Name = "mnuProcurementDescribeCategoricalTreemap" - Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalTreemap.Text = "Treemap..." ' 'DisplayTopNToolStripMenuItem ' Me.DisplayTopNToolStripMenuItem.Name = "DisplayTopNToolStripMenuItem" - Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(319, 22) + Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(482, 34) 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(211, 22) + Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeNumeric.Text = "Numeric" ' 'mnuProcurementDescribeNumericBoxplot ' Me.mnuProcurementDescribeNumericBoxplot.Name = "mnuProcurementDescribeNumericBoxplot" - Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(258, 22) + Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(389, 34) Me.mnuProcurementDescribeNumericBoxplot.Text = "Boxplot..." ' 'HistogramToolStripMenuItem ' Me.HistogramToolStripMenuItem.Name = "HistogramToolStripMenuItem" - Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(258, 22) + Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(389, 34) Me.HistogramToolStripMenuItem.Text = "Histogram..." ' 'ToolStripSeparator53 ' Me.ToolStripSeparator53.Name = "ToolStripSeparator53" - Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6) + Me.ToolStripSeparator53.Size = New System.Drawing.Size(386, 6) ' 'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers ' Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers" - Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(258, 22) + Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(389, 34) 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(217, 22) + Me.mnuProcurementMapping.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementMapping.Text = "Mapping" ' 'mnuProcurementMappingMapCountryValues ' Me.mnuProcurementMappingMapCountryValues.Name = "mnuProcurementMappingMapCountryValues" - Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(189, 22) + Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(285, 34) 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(217, 22) + Me.mnuProcurementModel.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementModel.Text = "Model" ' 'mnuProcurementModelDefineCorruption ' Me.mnuProcurementModelDefineCorruption.Name = "mnuProcurementModelDefineCorruption" - Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(233, 22) + Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(351, 34) Me.mnuProcurementModelDefineCorruption.Text = "Define Corruption Indicators..." ' 'mnuProcurementModelFitModelToolStripMenuItem ' Me.mnuProcurementModelFitModelToolStripMenuItem.Name = "mnuProcurementModelFitModelToolStripMenuItem" - Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(233, 22) + Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(351, 34) Me.mnuProcurementModelFitModelToolStripMenuItem.Text = "Fit Model..." ' 'ToolStripSeparator45 ' Me.ToolStripSeparator45.Name = "ToolStripSeparator45" - Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6) + Me.ToolStripSeparator45.Size = New System.Drawing.Size(324, 6) ' 'mnuProcurementDefineRedFlags ' Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags" - Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(327, 34) 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(217, 22) + Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementUseCRI.Text = "Corruption Risk Index (CRI)" ' 'mnuProcurementCTFVCalculateCRI ' Me.mnuProcurementCTFVCalculateCRI.Name = "mnuProcurementCTFVCalculateCRI" - Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(278, 22) + Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(418, 34) Me.mnuProcurementCTFVCalculateCRI.Text = "Define Corruption Risk Index (CRI)..." ' 'mnuProcurementUseCRISummariseCRIbyCountry ' Me.mnuProcurementUseCRISummariseCRIbyCountry.Name = "mnuProcurementUseCRISummariseCRIbyCountry" - Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(278, 22) + Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(418, 34) 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(84, 22) + Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 29) 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(137, 22) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows ' Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" - Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' Me.mnuOptionsByContextCheckDataCompareColumns.Name = "mnuOptionsByContextCheckDataCompareColumns" - Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataCompareColumns.Text = "Compare Columns..." ' 'ToolStripSeparator47 ' Me.ToolStripSeparator47.Name = "ToolStripSeparator47" - Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator47.Size = New System.Drawing.Size(321, 6) ' 'mnuOptionsByContextCheckDataOneVariableSummarise ' Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise" - Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuOptionsByContextCheckDataOneVariableGraph ' Me.mnuOptionsByContextCheckDataOneVariableGraph.Name = "mnuOptionsByContextCheckDataOneVariableGraph" - Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuOptionsByContextCheckDataOneVariableFrequencies ' Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Name = "mnuOptionsByContextCheckDataOneVariableFrequencies" - Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) 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(137, 22) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation ' Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" - Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(147, 22) + Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(222, 34) Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..." ' 'mnuOptionsByContextDefineOnFarm ' Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm" - Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(147, 22) + Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(222, 34) 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(137, 22) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions ' Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Name = "mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions" - Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Text = "Calculate Difference Between Options..." ' 'ToolStripSeparator48 ' Me.ToolStripSeparator48.Name = "ToolStripSeparator48" - Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6) + Me.ToolStripSeparator48.Size = New System.Drawing.Size(418, 6) ' 'mnuOptionsByContextMergeAdditionalData ' Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData" - Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuOptionsByContextPrepareStack ' Me.mnuOptionsByContextPrepareStack.Name = "mnuOptionsByContextPrepareStack" - Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareStack.Text = "Stack (Pivot Longer)..." ' 'mnuOptionsByContextPrepareUnstack ' Me.mnuOptionsByContextPrepareUnstack.Name = "mnuOptionsByContextPrepareUnstack" - Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(421, 34) 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(137, 22) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments ' Me.mnuOptionsByContextDescribeCompareTwoTreatments.Name = "mnuOptionsByContextDescribeCompareTwoTreatments" - Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeCompareTwoTreatments.Text = "Compare Two Options..." ' 'mnuOptionsByContextDescribeCompareMultipleTreatments ' Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Enabled = False Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Name = "mnuOptionsByContextDescribeCompareMultipleTreatments" - Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Text = "Compare Multiple Options..." ' 'mnuOptionsByContextDescribeBoxplot ' Me.mnuOptionsByContextDescribeBoxplot.Name = "mnuOptionsByContextDescribeBoxplot" - Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(337, 34) 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(137, 22) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel ' Me.mnuOptionsByContextModelFitModel.Name = "mnuOptionsByContextModelFitModel" - Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(265, 34) Me.mnuOptionsByContextModelFitModel.Text = "Fit Model..." ' 'mnuOptionsByContextGeneralFitModel ' Me.mnuOptionsByContextGeneralFitModel.Name = "mnuOptionsByContextGeneralFitModel" - Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(265, 34) 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(137, 22) + Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextCropModel.Text = "Crop Model" ' 'mnuOptionsByContextCropModelApsimxExamples ' Me.mnuOptionsByContextCropModelApsimxExamples.Name = "mnuOptionsByContextCropModelApsimxExamples" - Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(264, 34) 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(46, 22) + Me.mnuTools.Size = New System.Drawing.Size(69, 29) Me.mnuTools.Text = "Tools" ' 'mnuToolsRunRCode ' Me.mnuToolsRunRCode.Enabled = False Me.mnuToolsRunRCode.Name = "mnuToolsRunRCode" - Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRunRCode.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRunRCode.Tag = "Run_R_Code..." Me.mnuToolsRunRCode.Text = "Run R Code..." ' @@ -4862,34 +4868,34 @@ Partial Class frmMain ' Me.mnuToolsRestartR.Enabled = False Me.mnuToolsRestartR.Name = "mnuToolsRestartR" - Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRestartR.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRestartR.Tag = "Restart_R" Me.mnuToolsRestartR.Text = "Restart R" ' 'mnuToolsCheckForUpdates ' Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates" - Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(298, 34) Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates..." Me.mnuToolsCheckForUpdates.Text = "Check for Updates..." ' 'mnuToolsClearOutputWindow ' Me.mnuToolsClearOutputWindow.Name = "mnuToolsClearOutputWindow" - Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(298, 34) Me.mnuToolsClearOutputWindow.Tag = "Clear_Output_Window..." Me.mnuToolsClearOutputWindow.Text = "Clear Output Window..." ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(195, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(295, 6) ' 'mnuToolsSaveCurrentOptions ' Me.mnuToolsSaveCurrentOptions.Enabled = False Me.mnuToolsSaveCurrentOptions.Name = "mnuToolsSaveCurrentOptions" - Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(298, 34) Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' @@ -4897,20 +4903,20 @@ Partial Class frmMain ' Me.mnuToolsLoadOptions.Enabled = False Me.mnuToolsLoadOptions.Name = "mnuToolsLoadOptions" - Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(298, 34) Me.mnuToolsLoadOptions.Tag = "Load_Options..." Me.mnuToolsLoadOptions.Text = "Load Options..." ' 'mnuToolsInstallRPackage ' Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage" - Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(298, 34) Me.mnuToolsInstallRPackage.Text = "Install R Package..." ' 'mnuToolsOptions ' Me.mnuToolsOptions.Name = "mnuToolsOptions" - Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsOptions.Size = New System.Drawing.Size(298, 34) Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' @@ -4924,7 +4930,8 @@ 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, 61) + Me.splOverall.Location = New System.Drawing.Point(0, 72) + Me.splOverall.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -4937,9 +4944,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(834, 399) - Me.splOverall.SplitterDistance = 163 - Me.splOverall.SplitterWidth = 5 + Me.splOverall.Size = New System.Drawing.Size(1251, 619) + Me.splOverall.SplitterDistance = 252 + Me.splOverall.SplitterWidth = 8 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -4947,6 +4954,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.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -4958,9 +4966,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(834, 163) - Me.splExtraWindows.SplitterDistance = 253 - Me.splExtraWindows.SplitterWidth = 5 + Me.splExtraWindows.Size = New System.Drawing.Size(1251, 252) + Me.splExtraWindows.SplitterDistance = 379 + Me.splExtraWindows.SplitterWidth = 8 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -4968,6 +4976,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.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -4978,9 +4987,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(253, 163) - Me.splMetadata.SplitterDistance = 69 - Me.splMetadata.SplitterWidth = 5 + Me.splMetadata.Size = New System.Drawing.Size(379, 252) + Me.splMetadata.SplitterDistance = 103 + Me.splMetadata.SplitterWidth = 8 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -4990,9 +4999,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(4, 5, 4, 5) + Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(69, 163) + Me.ucrColumnMeta.Size = New System.Drawing.Size(103, 252) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5001,9 +5010,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(4, 5, 4, 5) + Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 163) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(268, 252) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5012,9 +5021,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(4, 5, 4, 5) + Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(576, 163) + Me.ucrScriptWindow.Size = New System.Drawing.Size(864, 252) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5024,6 +5033,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.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5035,9 +5045,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(834, 231) - Me.splDataOutput.SplitterDistance = 383 - Me.splDataOutput.SplitterWidth = 5 + Me.splDataOutput.Size = New System.Drawing.Size(1251, 359) + Me.splDataOutput.SplitterDistance = 574 + Me.splDataOutput.SplitterWidth = 8 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5047,9 +5057,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(4, 5, 4, 5) + Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(383, 231) + Me.ucrDataViewer.Size = New System.Drawing.Size(574, 359) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5059,9 +5069,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(4, 5, 4, 5) + Me.ucrOutput.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(446, 231) + Me.ucrOutput.Size = New System.Drawing.Size(669, 359) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5099,16 +5109,11 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'ToolStripSeparator79 - ' - Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(177, 6) - ' 'frmMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(834, 482) + Me.ClientSize = New System.Drawing.Size(1251, 723) Me.Controls.Add(Me.splOverall) Me.Controls.Add(Me.stsStrip) Me.Controls.Add(Me.Tool_strip) @@ -5116,6 +5121,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.Name = "frmMain" Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized diff --git a/instat/frmMain.resx b/instat/frmMain.resx index c73bcdce42b..e679779467e 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S @@ -162,7 +162,7 @@ iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 UExQ92oSqkVXopsuEsymXbRYCkVtgkJtVfpY+Eh1YaWWdiOJWdgWbWmlG000kTxujMnp+cY5ZnLyu7nn NXPPuZkPPpLce+b7nd/3hXtn5p6ZW8VyBIs8vICRhxcw8vACRh5ewMjDCxh5eAEjDy9gGIU3OjrKmpub WXV1NauqqsppSPgHH+GnCbTDe/bsGauvrycnk9OM8PPp06exw+rQCm9kZITV1dWRE8hpR/g6PDwcO60G From d1272922148948cf8bb912542ef95bef2526c56a Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Tue, 14 May 2024 15:49:01 +0200 Subject: [PATCH 91/99] Code Changes --- instat/dlgRestoreBackup.vb | 6 +++--- instat/frmMain.vb | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index f1aa79df431..91f5b78aa02 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -27,9 +27,9 @@ Public Class dlgRestoreBackup Private strLoadDateFilePath As String Private bUserClose As Boolean = True Private clsDummyFunction As New RFunction - Private strAutoSaveDataFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_data_auto_save") - Private strAutoSaveLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_log_auto_save") - Private strAutoSaveInternalLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_debug_log_auto_save") + Public strAutoSaveDataFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_data_auto_save") + Public strAutoSaveLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_log_auto_save") + Public strAutoSaveInternalLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_debug_log_auto_save") Private bReset As Boolean = True Private bFirstload As Boolean = True diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 87a47dcbb2a..87116d9a032 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -479,9 +479,9 @@ Public Class frmMain '--------------------------------------- 'delete the recovery files - If strAutoSavedLogFilePaths.Length > 1 Then + If strAutoSavedLogFilePaths.Length > 0 Then Try - File.Delete(strAutoSavedLogFilePaths(1)) + File.Delete(strAutoSavedLogFilePaths(0)) Catch ex As Exception MsgBox("Could not delete backup log file" & Environment.NewLine, "Error deleting file") End Try @@ -500,13 +500,13 @@ Public Class frmMain End Try End If - 'If strAutoSavedDataFilePaths.Length > 1 Then - ' Try - ' ' File.Delete(strAutoSavedDataFilePaths(1)) - ' Catch ex As Exception - ' MsgBox("Could not delete back data file." & Environment.NewLine & ex.Message, "Error deleting file") - ' End Try - 'End If + If strAutoSavedDataFilePaths.Length > 0 Then + Try + File.Delete(strAutoSavedDataFilePaths(0)) + Catch ex As Exception + MsgBox("Could not delete back data file." & Environment.NewLine & ex.Message, "Error deleting file") + End Try + End If '--------------------------------------- End Sub From c8ee600952308f8c08d8afbd5a23478151378286 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 15 May 2024 11:33:23 +0200 Subject: [PATCH 92/99] Code Improvements --- instat/frmMain.vb | 115 +++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 69 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 87116d9a032..da90ac415f1 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1065,9 +1065,7 @@ Public Class frmMain If clsInstatOptions IsNot Nothing Then SaveInstatOptions(Path.Combine(strAppDataPath, strInstatOptionsFile)) End If - DeleteAutoSaveData() - DeleteAutoSaveLog() - DeleteAutoSaveDebugLog() + DeleteAutoSaveFiles() clsRLink.CloseREngine() End If @@ -1115,83 +1113,62 @@ Public Class frmMain autoTranslate(Me) End Sub - Public Sub DeleteAutoSaveData() + Public Sub DeleteAutoSaveFiles() Try - If Directory.Exists(strAutoSaveDataFolderPath) Then + If Directory.Exists(strAutoSaveDataFolderPath) OrElse Directory.Exists(strAutoSaveLogFolderPath) OrElse Directory.Exists(strAutoSaveInternalLogFolderPath) Then ' Define the retention policy (keep last N autosaves) Dim retentionCount As Integer = 5 ' Example: Keep the last 5 autosaves ' Retrieve autosaved files - Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveDataFolderPath) - Dim files As FileInfo() = autoSaveDirectory.GetFiles("data_*.rds") ' Adjust pattern to match actual filenames - - ' Sort files by last write time in descending order - Dim sortedFiles = files.OrderByDescending(Function(f) f.LastWriteTime) - - ' Determine files to delete based on retention policy - Dim filesToDelete = sortedFiles.Skip(retentionCount) - - ' Delete older autosaved files - For Each file In filesToDelete - file.Delete() - Next - End If - Catch ex As Exception - MsgBox("Could not delete auto save data file at: " & strCurrentAutoSaveDataFilePath & Environment.NewLine & ex.Message) - End Try - End Sub - - Public Sub DeleteAutoSaveLog() - Try - If Directory.Exists(strAutoSaveLogFolderPath) Then - ' Define the retention policy (keep last N autosaves) - Dim retentionCount As Integer = 5 ' Example: Keep the last 5 autosaves - - ' Retrieve autosaved files - Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveLogFolderPath) - Dim files As FileInfo() = autoSaveDirectory.GetFiles("log*.R") ' Adjust pattern to match actual filenames - - ' Sort files by last write time in descending order - Dim sortedFiles = files.OrderByDescending(Function(f) f.LastWriteTime) - - ' Determine files to delete based on retention policy - Dim filesToDelete = sortedFiles.Skip(retentionCount) - - ' Delete older autosaved files - For Each file In filesToDelete - file.Delete() - Next + If Directory.Exists(strAutoSaveDataFolderPath) Then + Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveDataFolderPath) + Dim files As FileInfo() = autoSaveDirectory.GetFiles("data_*.rds") ' Adjust pattern to match actual filenames + + ' Sort files by last write time in descending order + Dim sortedFiles = files.OrderByDescending(Function(f) f.LastWriteTime) + + ' Determine files to delete based on retention policy + Dim filesToDelete = sortedFiles.Skip(retentionCount) + + ' Delete older autosaved files + For Each file In filesToDelete + file.Delete() + Next + ElseIf Directory.Exists(strAutoSaveLogFolderPath) Then + Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveLogFolderPath) + Dim files As FileInfo() = autoSaveDirectory.GetFiles("log*.R") ' Adjust pattern to match actual filenames + + ' Sort files by last write time in descending order + Dim sortedFiles = files.OrderByDescending(Function(f) f.LastWriteTime) + + ' Determine files to delete based on retention policy + Dim filesToDelete = sortedFiles.Skip(retentionCount) + + ' Delete older autosaved files + For Each file In filesToDelete + file.Delete() + Next + ElseIf Directory.Exists(strAutoSaveInternalLogFolderPath) Then + Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveInternalLogFolderPath) + Dim files As FileInfo() = autoSaveDirectory.GetFiles("debug_log*.R") ' Adjust pattern to match actual filenames + + ' Sort files by last write time in descending order + Dim sortedFiles = files.OrderByDescending(Function(f) f.LastWriteTime) + + ' Determine files to delete based on retention policy + Dim filesToDelete = sortedFiles.Skip(retentionCount) + + ' Delete older autosaved files + For Each file In filesToDelete + file.Delete() + Next + End If End If Catch ex As Exception MsgBox("Could not delete auto save data file at: " & strCurrentAutoSaveDataFilePath & Environment.NewLine & ex.Message) End Try End Sub - Public Sub DeleteAutoSaveDebugLog() - Try - If Directory.Exists(strAutoSaveInternalLogFolderPath) Then - ' Define the retention policy (keep last N autosaves) - Dim retentionCount As Integer = 5 ' Example: Keep the last 5 autosaves - - ' Retrieve autosaved files - Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveInternalLogFolderPath) - Dim files As FileInfo() = autoSaveDirectory.GetFiles("debug_log*.R") ' Adjust pattern to match actual filenames - - ' Sort files by last write time in descending order - Dim sortedFiles = files.OrderByDescending(Function(f) f.LastWriteTime) - - ' Determine files to delete based on retention policy - Dim filesToDelete = sortedFiles.Skip(retentionCount) - - ' Delete older autosaved files - For Each file In filesToDelete - file.Delete() - Next - End If - Catch ex As Exception - MsgBox("Could not delete auto save data file at: " & strCurrentAutoSaveDataFilePath & Environment.NewLine & ex.Message) - End Try - End Sub Private Sub mnuOrganiseDataObjectHideDataframes_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataObjectHideDataframes.Click dlgHideDataframes.ShowDialog() From 94500deef7991c0a997184dfa01e35f6fbc496c8 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 15 May 2024 12:44:43 +0300 Subject: [PATCH 93/99] changes --- instat/dlgExportClimaticDefinitions.vb | 54 +++++++++++++++----------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index 1eb0316149d..0c1638dff41 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -213,23 +213,37 @@ Public Class dlgExportClimaticDefinitions End Sub Private Sub TestOkEnabled() - ucrBase.OKEnabled( - Not ucrReceiverData.IsEmpty _ - AndAlso Not ucrReceiverMonth.IsEmpty _ - AndAlso Not ucrReceiverYear.IsEmpty _ - AndAlso Not ucrInputCountry.IsEmpty _ - AndAlso Not ucrInputStationID.IsEmpty _ - AndAlso Not ucrInputTokenPath.IsEmpty _ - AndAlso ( - ((ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked) AndAlso Not ucrReceiverCropData.IsEmpty) _ - OrElse (ucrChkAnnualRainfall.Checked AndAlso Not ucrReceiverRain.IsEmpty) _ - OrElse ((ucrChkAnnualTemp.Checked OrElse ucrChkMonthlyTemp.Checked) AndAlso Not ucrReceiverMinTemp.IsEmpty) _ - OrElse ((ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked) AndAlso Not ucrReceiverDataYear.IsEmpty) _ - OrElse (ucrChkMonthlyTemp.Checked AndAlso Not ucrReceiverDataYearMonth.IsEmpty) _ - OrElse ((ucrChkAnnualTemp.Checked OrElse ucrChkMonthlyTemp.Checked) AndAlso Not ucrReceiverMaxTemp.IsEmpty) - ) -) - + If Not ucrReceiverData.IsEmpty AndAlso + Not ucrReceiverMonth.IsEmpty AndAlso + Not ucrReceiverYear.IsEmpty AndAlso + Not ucrInputCountry.IsEmpty AndAlso + Not ucrInputStationID.IsEmpty AndAlso + Not ucrInputTokenPath.IsEmpty Then + + If (ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked) AndAlso + Not ucrReceiverCropData.IsEmpty Then + ucrBase.OKEnabled(True) + ElseIf ucrChkAnnualRainfall.Checked AndAlso + Not ucrReceiverRain.IsEmpty Then + ucrBase.OKEnabled(True) + ElseIf (ucrChkAnnualTemp.Checked OrElse ucrChkMonthlyTemp.Checked) AndAlso + Not ucrReceiverMinTemp.IsEmpty Then + ucrBase.OKEnabled(True) + ElseIf (ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked) AndAlso + Not ucrReceiverDataYear.IsEmpty Then + ucrBase.OKEnabled(True) + ElseIf ucrChkMonthlyTemp.Checked AndAlso + Not ucrReceiverDataYearMonth.IsEmpty Then + ucrBase.OKEnabled(True) + ElseIf (ucrChkAnnualTemp.Checked OrElse ucrChkMonthlyTemp.Checked) AndAlso + Not ucrReceiverMaxTemp.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + Else + ucrBase.OKEnabled(False) + End If End Sub Private Sub AddRemoveSummary() @@ -367,15 +381,11 @@ Public Class dlgExportClimaticDefinitions Private Sub ucrReceiverData_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverMaxTemp.ControlContentsChanged, ucrReceiverMinTemp.ControlContentsChanged, ucrReceiverCropData.ControlContentsChanged, ucrReceiverDataYearMonth.ControlContentsChanged, ucrReceiverDataYear.ControlContentsChanged, ucrReceiverMonth.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrChkSeasonStartProp.ControlContentsChanged, ucrInputCountry.ControlContentsChanged, ucrInputStationID.ControlContentsChanged, ucrChkIncludeSummaryData.ControlContentsChanged, - ucrChkMonthlyTemp.ControlContentsChanged, ucrChkCropSuccessProp.ControlContentsChanged, ucrChkAnnualTemp.ControlContentsChanged, ucrChkAnnualRainfall.ControlContentsChanged, ucrInputTokenPath.ControlContentsChanged + ucrChkMonthlyTemp.ControlContentsChanged, ucrChkCropSuccessProp.ControlContentsChanged, ucrChkAnnualTemp.ControlContentsChanged, ucrChkAnnualRainfall.ControlContentsChanged, ucrInputTokenPath.ControlContentsChanged, ucrSelectorExportDefinitions.ControlContentsChanged TestOkEnabled() End Sub Private Sub ucrReceiverData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlValueChanged ucrReceiverData.SetMeAsReceiver() End Sub - - Private Sub ucrSelectorExportDefinitions_DataFrameChanged() Handles ucrSelectorExportDefinitions.DataFrameChanged - TestOkEnabled() - End Sub End Class \ No newline at end of file From c19ba38be96fb828ec90ffb6dca1d527b0856cb1 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 15 May 2024 11:56:07 +0200 Subject: [PATCH 94/99] Code Fixes in the Frmmain.designer.vb --- instat/frmMain.Designer.vb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index dd82c6c251a..bc89e9711c3 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -4908,12 +4908,6 @@ Partial Class frmMain Me.mnuToolsRestoreBackup.Tag = "Load_Options..." Me.mnuToolsRestoreBackup.Text = "Restore Backup..." - Me.mnuToolsLoadOptions.Enabled = False - Me.mnuToolsLoadOptions.Name = "mnuToolsLoadOptions" - Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(298, 34) - Me.mnuToolsLoadOptions.Tag = "Load_Options..." - Me.mnuToolsLoadOptions.Text = "Load Options..." - ' 'mnuToolsInstallRPackage ' From 5ddff6a160261efe9d2a66c38ea0ac871678fb61 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 16 May 2024 11:35:48 +0200 Subject: [PATCH 95/99] Code Changes --- instat/dlgRestoreBackup.vb | 6 +++--- instat/frmMain.vb | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 91f5b78aa02..6737206db9a 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -27,9 +27,9 @@ Public Class dlgRestoreBackup Private strLoadDateFilePath As String Private bUserClose As Boolean = True Private clsDummyFunction As New RFunction - Public strAutoSaveDataFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_data_auto_save") - Public strAutoSaveLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_log_auto_save") - Public strAutoSaveInternalLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_debug_log_auto_save") + Public strAutoSaveDataFolderPath = frmMain.strAutoSaveDataFolderPath + Public strAutoSaveLogFolderPath = frmMain.strAutoSaveLogFolderPath + Public strAutoSaveInternalLogFolderPath = frmMain.strAutoSaveInternalLogFolderPath Private bReset As Boolean = True Private bFirstload As Boolean = True diff --git a/instat/frmMain.vb b/instat/frmMain.vb index da90ac415f1..bbca143a6a9 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1125,10 +1125,10 @@ Public Class frmMain Dim files As FileInfo() = autoSaveDirectory.GetFiles("data_*.rds") ' Adjust pattern to match actual filenames ' Sort files by last write time in descending order - Dim sortedFiles = files.OrderByDescending(Function(f) f.LastWriteTime) + Dim sortedFiles As IOrderedEnumerable(Of FileInfo) = files.OrderByDescending(Function(f) f.LastWriteTime) ' Determine files to delete based on retention policy - Dim filesToDelete = sortedFiles.Skip(retentionCount) + Dim filesToDelete As IEnumerable(Of FileInfo) = sortedFiles.Skip(retentionCount) ' Delete older autosaved files For Each file In filesToDelete @@ -1139,10 +1139,10 @@ Public Class frmMain Dim files As FileInfo() = autoSaveDirectory.GetFiles("log*.R") ' Adjust pattern to match actual filenames ' Sort files by last write time in descending order - Dim sortedFiles = files.OrderByDescending(Function(f) f.LastWriteTime) + Dim sortedFiles As IOrderedEnumerable(Of FileInfo) = files.OrderByDescending(Function(f) f.LastWriteTime) ' Determine files to delete based on retention policy - Dim filesToDelete = sortedFiles.Skip(retentionCount) + Dim filesToDelete As IEnumerable(Of FileInfo) = sortedFiles.Skip(retentionCount) ' Delete older autosaved files For Each file In filesToDelete @@ -1153,10 +1153,10 @@ Public Class frmMain Dim files As FileInfo() = autoSaveDirectory.GetFiles("debug_log*.R") ' Adjust pattern to match actual filenames ' Sort files by last write time in descending order - Dim sortedFiles = files.OrderByDescending(Function(f) f.LastWriteTime) + Dim sortedFiles As IOrderedEnumerable(Of FileInfo) = files.OrderByDescending(Function(f) f.LastWriteTime) ' Determine files to delete based on retention policy - Dim filesToDelete = sortedFiles.Skip(retentionCount) + Dim filesToDelete As IEnumerable(Of FileInfo) = sortedFiles.Skip(retentionCount) ' Delete older autosaved files For Each file In filesToDelete From 990096a153146eaf4d92d84363dc27c367edde7c Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Thu, 16 May 2024 18:49:21 +0300 Subject: [PATCH 96/99] changes --- instat/frmMain.Designer.vb | 1447 +++++++++++++++++++----------------- instat/frmMain.resx | 4 +- instat/frmMain.vb | 52 +- 3 files changed, 829 insertions(+), 674 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index bc89e9711c3..6ae0c90e8f3 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -160,14 +160,29 @@ Partial Class frmMain Me.mnuHelpHelpIntroduction = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpFAQ = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpGetingStarted = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuHelpData = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator28 = New System.Windows.Forms.ToolStripSeparator() Me.mnuHelpWindows = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator81 = New System.Windows.Forms.ToolStripSeparator() Me.mnuHelpMenus = New System.Windows.Forms.ToolStripMenuItem() + Me.MenusAndDialogsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator82 = New System.Windows.Forms.ToolStripSeparator() + Me.FileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.EditToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PrepareToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.DescribeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ModelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator83 = New System.Windows.Forms.ToolStripSeparator() + Me.StructuredToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ClimaticToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ProcurementToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ExperimentsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ViewToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpAboutR = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpLearningStatistics = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpRPackages = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpGlossary = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuHelpData = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpLicence = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator29 = New System.Windows.Forms.ToolStripSeparator() Me.mnuHelpPackagesDocumentation = New System.Windows.Forms.ToolStripMenuItem() @@ -708,7 +723,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, 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" ' @@ -716,25 +731,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" @@ -742,26 +757,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" ' @@ -769,26 +784,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" @@ -796,19 +811,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" ' @@ -816,14 +831,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" ' @@ -831,25 +846,25 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneral, Me.ToolStripSeparator38, Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, 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" ' 'mnuDescribeGeneral ' Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeGeneral.Text = "General..." ' 'ToolStripSeparator38 ' Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(309, 6) + Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) ' '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" @@ -857,7 +872,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" @@ -865,7 +880,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" @@ -873,7 +888,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" @@ -881,7 +896,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" @@ -889,12 +904,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" ' @@ -902,7 +917,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 @@ -910,27 +925,27 @@ Partial Class frmMain '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" @@ -938,83 +953,83 @@ Partial Class frmMain '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" ' @@ -1022,168 +1037,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 @@ -1191,14 +1206,15 @@ 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)" + Me.mnuModelOtherOneVariable.Visible = False ' '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..." ' @@ -1206,7 +1222,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..." ' @@ -1214,7 +1230,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..." ' @@ -1222,7 +1238,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..." ' @@ -1231,15 +1247,16 @@ 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)" + Me.mnuModelOtherTwoVariables.Visible = False ' 'mnuModelOtherTwoVariablesTwoSamples ' 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..." ' @@ -1247,21 +1264,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..." ' @@ -1269,14 +1286,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..." ' @@ -1285,29 +1302,30 @@ 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)" + Me.mnuModelOtherThreeVariables.Visible = False ' 'mnuModelOtherThreeVariablesSimpleWithGroups ' 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..." ' @@ -1316,15 +1334,16 @@ 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)" + Me.mnuModelOtherGeneral.Visible = False ' 'mnuModelOtherGeneralANOVAGeneral ' 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..." ' @@ -1332,7 +1351,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..." ' @@ -1340,7 +1359,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..." ' @@ -1348,7 +1367,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 @@ -1357,7 +1376,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 @@ -1366,7 +1385,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 @@ -1375,7 +1394,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..." ' @@ -1383,7 +1402,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..." ' @@ -1391,7 +1410,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 @@ -1400,21 +1419,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 @@ -1423,7 +1442,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.mnuViewSwapDataAndScript}) 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" ' @@ -1431,7 +1450,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(326, 34) + Me.mnuViewDataView.Size = New System.Drawing.Size(213, 22) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1439,21 +1458,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(326, 34) + Me.mnuViewOutput.Size = New System.Drawing.Size(213, 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(326, 34) + Me.mnuViewLogScript.Size = New System.Drawing.Size(213, 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(326, 34) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1461,7 +1480,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1469,19 +1488,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(323, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(210, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1489,7 +1508,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1497,137 +1516,225 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(323, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(210, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(326, 34) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(213, 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(326, 34) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuViewSwapDataAndScript ' Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript" - Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(326, 34) + Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22) Me.mnuViewSwapDataAndScript.Text = "Swap Data and Log/Script" ' '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.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.mnuHelpData, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.ToolStripSeparator81, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, 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" ' + 'mnuHelpData + ' + Me.mnuHelpData.Name = "mnuHelpData" + Me.mnuHelpData.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpData.Text = "Data" + ' '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" ' + 'ToolStripSeparator81 + ' + Me.ToolStripSeparator81.Name = "ToolStripSeparator81" + Me.ToolStripSeparator81.Size = New System.Drawing.Size(206, 6) + ' 'mnuHelpMenus ' + Me.mnuHelpMenus.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenusAndDialogsToolStripMenuItem, Me.ToolStripSeparator82, Me.FileToolStripMenuItem, Me.EditToolStripMenuItem, Me.PrepareToolStripMenuItem, Me.DescribeToolStripMenuItem, Me.ModelToolStripMenuItem, Me.ToolStripSeparator83, Me.StructuredToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.ProcurementToolStripMenuItem, Me.ExperimentsToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.ViewToolStripMenuItem}) 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" ' + 'MenusAndDialogsToolStripMenuItem + ' + Me.MenusAndDialogsToolStripMenuItem.Name = "MenusAndDialogsToolStripMenuItem" + Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.MenusAndDialogsToolStripMenuItem.Text = "Menus and Dialogs" + ' + 'ToolStripSeparator82 + ' + Me.ToolStripSeparator82.Name = "ToolStripSeparator82" + Me.ToolStripSeparator82.Size = New System.Drawing.Size(177, 6) + ' + 'FileToolStripMenuItem + ' + Me.FileToolStripMenuItem.Name = "FileToolStripMenuItem" + Me.FileToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.FileToolStripMenuItem.Text = "File" + ' + 'EditToolStripMenuItem + ' + Me.EditToolStripMenuItem.Name = "EditToolStripMenuItem" + Me.EditToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.EditToolStripMenuItem.Text = "Edit" + ' + 'PrepareToolStripMenuItem + ' + Me.PrepareToolStripMenuItem.Name = "PrepareToolStripMenuItem" + Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PrepareToolStripMenuItem.Text = "Prepare" + ' + 'DescribeToolStripMenuItem + ' + Me.DescribeToolStripMenuItem.Name = "DescribeToolStripMenuItem" + Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.DescribeToolStripMenuItem.Text = "Describe" + ' + 'ModelToolStripMenuItem + ' + Me.ModelToolStripMenuItem.Name = "ModelToolStripMenuItem" + Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ModelToolStripMenuItem.Text = "Model" + ' + 'ToolStripSeparator83 + ' + Me.ToolStripSeparator83.Name = "ToolStripSeparator83" + Me.ToolStripSeparator83.Size = New System.Drawing.Size(177, 6) + ' + 'StructuredToolStripMenuItem + ' + Me.StructuredToolStripMenuItem.Name = "StructuredToolStripMenuItem" + Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.StructuredToolStripMenuItem.Text = "Structured" + ' + 'ClimaticToolStripMenuItem + ' + Me.ClimaticToolStripMenuItem.Name = "ClimaticToolStripMenuItem" + Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ClimaticToolStripMenuItem.Text = "Climatic" + ' + 'ProcurementToolStripMenuItem + ' + Me.ProcurementToolStripMenuItem.Name = "ProcurementToolStripMenuItem" + Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ProcurementToolStripMenuItem.Text = "Procurement" + ' + 'ExperimentsToolStripMenuItem + ' + Me.ExperimentsToolStripMenuItem.Name = "ExperimentsToolStripMenuItem" + Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ExperimentsToolStripMenuItem.Text = "Experiments" + ' + 'ToolsToolStripMenuItem + ' + Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" + Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ToolsToolStripMenuItem.Text = "Tools" + ' + 'ViewToolStripMenuItem + ' + Me.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem" + Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ViewToolStripMenuItem.Text = "View" + ' '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.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.mnuExamineEditData, Me.mnuClimaticTidyandExamine, 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" ' @@ -1635,299 +1742,299 @@ 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.mnuClimaticFileExportToClimpact, Me.mnuClimaticFileExportToGoogleBucketsToolStrip}) 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..." ' 'mnuClimaticFileExportToClimpact ' Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact" - Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..." ' 'mnuClimaticFileExportToGoogleBucketsToolStrip ' Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Name = "mnuClimaticFileExportToGoogleBucketsToolStrip" - Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Text = "Export to Google Buckets..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) ' 'mnuExamineEditData ' Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticExamineEditDataVisualiseData, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator27, Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, 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" ' 'mnuClimaticExamineEditDataVisualiseData ' Me.mnuClimaticExamineEditDataVisualiseData.Name = "mnuClimaticExamineEditDataVisualiseData" - Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(324, 34) + Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(215, 22) Me.mnuClimaticExamineEditDataVisualiseData.Text = "Visualise Data..." ' '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..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(212, 6) ' '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) ' '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..." ' 'mnuClimaticTidyandExamine ' Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineTidyDailyData, Me.ToolStripSeparator71, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.mnuClimaticTidyandExamineNonNumericCases, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText, Me.ToolStripSeparator80, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyDataKey}) 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" ' '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..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(194, 6) ' '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..." ' '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..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator54.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..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator80.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) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' '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,169 +2042,169 @@ 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.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..." ' '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 ' @@ -2105,7 +2212,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 @@ -2114,7 +2221,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 @@ -2123,7 +2230,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 @@ -2132,7 +2239,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 @@ -2141,7 +2248,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 @@ -2150,7 +2257,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 @@ -2158,362 +2265,362 @@ 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.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) 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" ' 'mnuClimaticDescribeSummarise23Variables ' Me.mnuClimaticDescribeSummarise23Variables.Name = "mnuClimaticDescribeSummarise23Variables" - Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSummarise23Variables.Text = "Summarise 2/3 Variables..." ' 'mnuClimaticDescribeGraph23Variables ' Me.mnuClimaticDescribeGraph23Variables.Name = "mnuClimaticDescribeGraph23Variables" - Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeGraph23Variables.Text = "Graph 2/3 Variables..." ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(318, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6) ' 'mnuClimaticDescribeSPISPEI ' Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI" - Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSPISPEI.Text = "SPI/SPEI..." ' 'mnuClimaticDescribeClimograph ' Me.mnuClimaticDescribeClimograph.Name = "mnuClimaticDescribeClimograph" - Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeClimograph.Text = "Climograph..." ' 'mnuClimaticDescribeTrendGraph ' Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph" - Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..." ' 'mnuClimaticDescribeSeasonalGraph ' Me.mnuClimaticDescribeSeasonalGraph.Enabled = False Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" - Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." ' 'mnuClimaticDescribeIDF ' Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF" - Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeIDF.Text = "IDF..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(318, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) ' 'mnuClimaticDescribeWindRose ' Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose" - Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeWindPollutionRose ' Me.mnuClimaticDescribeWindPollutionRose.Name = "mnuClimaticDescribeWindPollutionRose" - Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuClimaticDescribeOtherRosePlots ' Me.mnuClimaticDescribeOtherRosePlots.Name = "mnuClimaticDescribeOtherRosePlots" - Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeOtherRosePlots.Text = "Other Rose Plots..." ' '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.mnuClimaticPICSAGeneralGrap, 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..." ' 'mnuClimaticPICSAGeneralGrap ' Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap" - Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSAGeneralGrap.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 @@ -2522,7 +2629,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" ' @@ -2530,7 +2637,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..." ' @@ -2538,7 +2645,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..." ' @@ -2546,7 +2653,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..." ' @@ -2554,7 +2661,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..." ' @@ -2562,7 +2669,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..." ' @@ -2570,7 +2677,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..." ' @@ -2578,7 +2685,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..." ' @@ -2586,7 +2693,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..." ' @@ -2594,7 +2701,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..." ' @@ -2602,7 +2709,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..." ' @@ -2610,7 +2717,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..." ' @@ -2618,7 +2725,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..." ' @@ -2626,7 +2733,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..." ' @@ -2634,7 +2741,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..." ' @@ -2642,7 +2749,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..." ' @@ -2650,7 +2757,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" ' @@ -2658,7 +2765,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..." ' @@ -2666,7 +2773,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..." ' @@ -2674,7 +2781,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..." ' @@ -2682,7 +2789,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..." ' @@ -2690,7 +2797,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..." ' @@ -2698,7 +2805,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..." ' @@ -2706,7 +2813,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..." ' @@ -2714,7 +2821,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..." ' @@ -2722,7 +2829,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..." ' @@ -2730,7 +2837,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..." ' @@ -2738,7 +2845,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..." ' @@ -2746,7 +2853,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..." ' @@ -2754,7 +2861,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..." ' @@ -2762,7 +2869,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..." ' @@ -2770,7 +2877,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" ' @@ -2778,7 +2885,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..." ' @@ -2786,7 +2893,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..." ' @@ -2794,7 +2901,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..." ' @@ -2802,7 +2909,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..." ' @@ -2810,7 +2917,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..." ' @@ -2818,7 +2925,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..." ' @@ -2826,7 +2933,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..." ' @@ -2834,32 +2941,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 @@ -2867,7 +2974,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 @@ -2876,7 +2983,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 @@ -2884,12 +2991,12 @@ 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" ' @@ -2897,7 +3004,7 @@ Partial Class frmMain ' Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) 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" ' @@ -2905,7 +3012,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(253, 34) + Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2913,7 +3020,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(253, 34) + Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2921,27 +3028,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(253, 34) + Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(253, 34) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(253, 34) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(253, 34) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -2949,18 +3056,17 @@ Partial Class frmMain ' 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 @@ -2969,12 +3075,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" ' @@ -2986,7 +3092,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" ' @@ -2997,7 +3103,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 @@ -3009,40 +3115,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 ' @@ -3058,7 +3164,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 ' @@ -3068,7 +3174,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 @@ -3080,34 +3186,34 @@ 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(53, 36) + Me.mnuTbOutput.Size = New System.Drawing.Size(53, 34) Me.mnuTbOutput.ToolTipText = "Toggle Output window open and closed" ' 'mnuOutputWindow ' Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuOutputWindow.Name = "mnuOutputWindow" - Me.mnuOutputWindow.Size = New System.Drawing.Size(271, 34) + 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(271, 34) + 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(271, 34) + Me.mnuIncludeComments.Size = New System.Drawing.Size(178, 22) Me.mnuIncludeComments.Text = "Show Comments" ' 'ToolStripSeparator74 ' Me.ToolStripSeparator74.Name = "ToolStripSeparator74" - Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 37) ' 'mnuLastGraph ' @@ -3124,25 +3230,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 ' @@ -3160,7 +3266,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 @@ -3179,20 +3285,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 ' @@ -3201,13 +3307,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 ' @@ -3216,13 +3322,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 ' @@ -3231,29 +3337,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(6, 2, 0, 2) + 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" ' @@ -3261,7 +3366,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" ' @@ -3269,7 +3374,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..." ' @@ -3277,33 +3382,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 ' @@ -3311,7 +3416,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 ' @@ -3319,82 +3424,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.ToolStripSeparator79, 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" ' @@ -3402,105 +3507,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.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(169, 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..." ' @@ -3508,7 +3613,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 @@ -3517,7 +3622,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 @@ -3525,7 +3630,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 @@ -3533,107 +3638,107 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, 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(251, 34) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(169, 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..." ' 'mnuPrepareCheckDataPivotTable ' Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable" - Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator50 ' Me.ToolStripSeparator50.Name = "ToolStripSeparator50" - Me.ToolStripSeparator50.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator50.Size = New System.Drawing.Size(242, 6) ' '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 ' @@ -3641,95 +3746,95 @@ 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(248, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Calculator..." ' 'ToolStripSeparator79 ' Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(248, 6) + Me.ToolStripSeparator79.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareColumnCalculate ' 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(251, 34) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(169, 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..." ' @@ -3737,105 +3842,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(251, 34) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(169, 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..." ' @@ -3843,42 +3948,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(251, 34) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(169, 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..." ' @@ -3886,7 +3991,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 @@ -3894,7 +3999,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..." ' @@ -3902,38 +4007,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(251, 34) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(169, 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 ' @@ -3941,7 +4046,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 ' @@ -3949,169 +4054,169 @@ 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(251, 34) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(169, 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(248, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(166, 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(251, 34) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(169, 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.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(248, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(166, 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(251, 34) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(169, 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(251, 34) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4119,7 +4224,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 @@ -4127,46 +4232,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..." ' @@ -4174,7 +4279,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 @@ -4183,7 +4288,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 @@ -4192,7 +4297,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 @@ -4201,35 +4306,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(251, 34) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(169, 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..." ' @@ -4237,78 +4342,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 ' @@ -4316,126 +4421,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 ' @@ -4443,424 +4548,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.mnuToolsRestoreBackup, 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..." ' @@ -4868,57 +4973,54 @@ 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" ' 'mnuToolsCheckForUpdates ' 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..." ' 'mnuToolsRestoreBackup ' - - Me.mnuToolsRestoreBackup.Name = "mnuToolsRestoreBackup" Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRestoreBackup.Tag = "Load_Options..." Me.mnuToolsRestoreBackup.Text = "Restore Backup..." - ' '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..." ' @@ -4932,8 +5034,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.Location = New System.Drawing.Point(0, 61) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -4946,9 +5047,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 = 252 - Me.splOverall.SplitterWidth = 8 + Me.splOverall.Size = New System.Drawing.Size(834, 399) + Me.splOverall.SplitterDistance = 162 + Me.splOverall.SplitterWidth = 5 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -4956,7 +5057,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, 4, 4, 4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -4968,9 +5068,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, 252) - Me.splExtraWindows.SplitterDistance = 379 - Me.splExtraWindows.SplitterWidth = 8 + Me.splExtraWindows.Size = New System.Drawing.Size(834, 162) + Me.splExtraWindows.SplitterDistance = 252 + Me.splExtraWindows.SplitterWidth = 5 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -4978,7 +5078,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, 4, 4, 4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -4989,9 +5088,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(379, 252) - Me.splMetadata.SplitterDistance = 103 - Me.splMetadata.SplitterWidth = 8 + Me.splMetadata.Size = New System.Drawing.Size(252, 162) + Me.splMetadata.SplitterDistance = 68 + Me.splMetadata.SplitterWidth = 5 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -5001,9 +5100,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(103, 252) + Me.ucrColumnMeta.Size = New System.Drawing.Size(68, 162) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5012,9 +5111,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(268, 252) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 162) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5023,9 +5122,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(864, 252) + Me.ucrScriptWindow.Size = New System.Drawing.Size(577, 162) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5035,7 +5134,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, 4, 4, 4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5047,9 +5145,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, 359) - Me.splDataOutput.SplitterDistance = 574 - Me.splDataOutput.SplitterWidth = 8 + Me.splDataOutput.Size = New System.Drawing.Size(834, 232) + Me.splDataOutput.SplitterDistance = 382 + Me.splDataOutput.SplitterWidth = 5 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5059,9 +5157,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(574, 359) + Me.ucrDataViewer.Size = New System.Drawing.Size(382, 232) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5071,9 +5169,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(669, 359) + Me.ucrOutput.Size = New System.Drawing.Size(447, 232) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5113,9 +5211,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) @@ -5123,7 +5221,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, 4, 4, 4) Me.Name = "frmMain" Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized @@ -5814,5 +5911,19 @@ Partial Class frmMain Friend WithEvents mnuClimaticFileExportToGoogleBucketsToolStrip As ToolStripMenuItem Friend WithEvents ToolStripSeparator79 As ToolStripSeparator - + Friend WithEvents MenusAndDialogsToolStripMenuItem As ToolStripMenuItem + Friend WithEvents FileToolStripMenuItem As ToolStripMenuItem + Friend WithEvents EditToolStripMenuItem As ToolStripMenuItem + Friend WithEvents PrepareToolStripMenuItem As ToolStripMenuItem + Friend WithEvents DescribeToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ModelToolStripMenuItem As ToolStripMenuItem + Friend WithEvents StructuredToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ClimaticToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripSeparator81 As ToolStripSeparator + Friend WithEvents ToolStripSeparator82 As ToolStripSeparator + Friend WithEvents ToolStripSeparator83 As ToolStripSeparator + Friend WithEvents ProcurementToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ExperimentsToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolsToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ViewToolStripMenuItem As ToolStripMenuItem End Class 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 bbca143a6a9..c8d4db5f30c 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1341,10 +1341,6 @@ Public Class frmMain Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "133") End Sub - Private Sub mnuHelpMenus_Click(sender As Object, e As EventArgs) Handles mnuHelpMenus.Click - Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "12") - End Sub - Private Sub mnuHelpLicence_Click(sender As Object, e As EventArgs) Handles mnuHelpLicence.Click Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "323") End Sub @@ -2762,4 +2758,52 @@ Public Class frmMain Private Sub mnuClimaticFileExportToGoogleBucketsToolStrip_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileExportToGoogleBucketsToolStrip.Click dlgExportClimaticDefinitions.ShowDialog() End Sub + + Private Sub FileToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FileToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "13") + End Sub + + Private Sub EditToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EditToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "7") + End Sub + + Private Sub PrepareToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PrepareToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "9") + End Sub + + Private Sub DescribeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DescribeToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "18") + End Sub + + Private Sub ModelToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ModelToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "17") + End Sub + + Private Sub StructuredToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles StructuredToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "454") + End Sub + + Private Sub ClimaticToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ClimaticToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "19") + End Sub + + Private Sub ProcurementToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ProcurementToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "498") + End Sub + + Private Sub ExperimentsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExperimentsToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "570") + End Sub + + Private Sub ToolsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ToolsToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "8") + End Sub + + Private Sub ViewToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles ViewToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "21") + End Sub + + Private Sub MenusAndDialogsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MenusAndDialogsToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "12") + End Sub End Class From 8fa87086268724185b0a47bb77e30766e075b797 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Thu, 16 May 2024 19:01:32 +0300 Subject: [PATCH 97/99] translation --- instat/translations/rInstatTranslations.db | Bin 8302592 -> 8306688 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 143a9a22f5a028dc72eed04a4d62704f8d0be805..8cfa1d7f5a378f456f40b0e35f5b088218775663 100644 GIT binary patch delta 1346 zcmciBYfKzf6bJBm?L2m8cIk@(Qwj?LWuPk*D=rHzD238mWRZeTx|Bjo=>qa7+XwE_ z#-lbG#F*Tem^3DoG&EJCvGa9fOtc!zsnJA}hSV=QBw*7R6K$>WEb$95@uSK7?quft zGc)&|JIPyj#bolH_@?QKah$R;n;+(5)6tis{3lUiE+KBx1g0c~E949O;=h*6NLV=v2tSkrV#$~6M#(C#~S88SiA`*$Xh)fis5{v0Ug9GeWCPhqHj&L_3&|u~NfyZ_Im9H}NG{n<@<=}MlLAsm(%(`V=K`62HLD@*&>j?sM0<_xLEsapFg2Ss}~2U6;xJYO^#g5U6xcO6KlL zW<)G25eNiKXF@Xl+5Mxj13d#nv7w2*eJ4hm8X|O1HP;!J%tCX0wXtWsCynX_&X{DD z_}AAP4i8U^x37))?G&Om{Az}Z)`!xsVfyVlon^16I-8AHKiM;>@+ICr*kN7qK+=L_ z*|lUjU!UNoxoYkLr)8-()yry3-KBEMl5$mfLm5;;iXs0XUy@&!kIKz*sp~h_qU#+B zfA0H^Tje|X3g5i%oUg+d^r_yjymQ`T-k|Zbana~DigibSU!T&$y5jlT^R}nmW4N!o z&$}D7KeczYR&iClB<>UL33D50eT(@&_!K`~)+1^^!ftN^S8+yz(#_z>W3z=r{=0UrSj0@eVA0BZs3 z03QVm1J(mJ06qrzIA9~-9>6BRX289GEr9y~_X9owcmS{!@JYZnzzASF;8TDdfCm9P z0lNU727CtaS-|H2p9g#aup96YU=*+i@GxL6;1R$+z<$7^fX4s_0FMI>0-gYj0S*BU z1C9W`2sjEj1~?8l0eBK{5-<*U3h*@G8NjpiICZPZpx-c0t>S#2`TBfr?-$-FZ>@3P zxMmzTw&*wX1^tZPs%LsuJs*39JuRMG_pb2YXEV@a4RnoE%;MSJGd6 zluj{ATo9Bu8ADuMA7sHY-J4c7=i3!b#+vS+}v%9G`O>%QYY=Z?E0Zm(;`b<3r@BF;}v!`bJo zate;LJX86>B~x+(Q@;|1;uFiM;nz@uX%#9#jHKmSs&|2bS8Q?w8fLn9f{Vi{_g+7 zZyu*?iI4C3Q}Zd6<`8A;Lj1#|7UI(nwSeL^kA8084<@xjC1?&(R$a!&C$+K>T^-Q_ zH*}4JWkC>Xg)y!)swb6lQ=@F7pNEIl0%M|4jd(`Mlm<(n6qdp=_!5>w8LWVESP4N` z1tC}s6|e>>p$e)Y3^h;-U%^^f2VcW_*Z>=06MO@8P!A2T85$u1Tc8QPg{`m+nqfQa zfSs@lcEcXn3;Q4nG1w0+& Date: Thu, 16 May 2024 19:21:46 +0300 Subject: [PATCH 98/99] final --- instat/frmMain.Designer.vb | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 6ae0c90e8f3..629c9015bce 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -1555,26 +1555,26 @@ Partial Class frmMain 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpHelpIntroduction.Text = "Introduction" + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpHelpIntroduction.Text = "Introduction..." ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpFAQ.Text = "FAQ" + Me.mnuHelpFAQ.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpFAQ.Text = "FAQ..." ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpGetingStarted.Text = "Getting Started" + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpGetingStarted.Text = "Getting Started..." ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpData.Text = "Data" + Me.mnuHelpData.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpData.Text = "Data..." ' 'ToolStripSeparator28 ' @@ -1584,8 +1584,8 @@ Partial Class frmMain 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpWindows.Text = "Windows" + Me.mnuHelpWindows.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpWindows.Text = "Windows..." ' 'ToolStripSeparator81 ' @@ -1684,35 +1684,35 @@ Partial Class frmMain 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpAboutR.Text = "About R" + Me.mnuHelpAboutR.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpAboutR.Text = "About R..." Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpLearningStatistics.Text = "Learning Statistics" + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpLearningStatistics.Text = "Learning Statistics..." Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpRPackages.Text = "R Packages" + Me.mnuHelpRPackages.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpRPackages.Text = "R Packages..." ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpGlossary.Text = "Glossary" + Me.mnuHelpGlossary.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpGlossary.Text = "Glossary..." ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpLicence.Size = New System.Drawing.Size(218, 22) Me.mnuHelpLicence.Tag = "Licence..." - Me.mnuHelpLicence.Text = "Licence" + Me.mnuHelpLicence.Text = "Licence..." ' 'ToolStripSeparator29 ' @@ -1722,8 +1722,8 @@ Partial Class frmMain 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpPackagesDocumentation.Text = "Packages Documentation" + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpPackagesDocumentation.Text = "Packages Documentation..." ' 'ToolStripSeparator16 ' From f05e0272a643bcb88597460e47d21fe9db9db43a Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Fri, 17 May 2024 12:26:58 +0300 Subject: [PATCH 99/99] changes to the code --- instat/dlgHideDataframes.vb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/instat/dlgHideDataframes.vb b/instat/dlgHideDataframes.vb index 3bcfa18a868..5700bda93e5 100644 --- a/instat/dlgHideDataframes.vb +++ b/instat/dlgHideDataframes.vb @@ -87,7 +87,7 @@ Public Class dlgHideDataframes ucrSelectorForDataFrames.Reset() - clsDummyFunction.AddParameter("checked", "rdoHide", iPosition:=0) + clsDummyFunction.AddParameter("checked", "rdoUnhide", iPosition:=0) clsMappingFunction.SetPackageName("purrr") clsMappingFunction.SetRCommand("map") @@ -143,8 +143,11 @@ Public Class dlgHideDataframes If expTemp IsNot Nothing AndAlso expTemp.Type <> Internals.SymbolicExpressionType.Null Then chrHiddenColumns = expTemp.AsCharacter - For Each strDataFrame As String In chrHiddenColumns - ucrSelectorForDataFrames.lstAvailableVariable.Items.Add(strDataFrame) + For i As Integer = 0 To chrHiddenColumns.Length - 1 + Dim strDataFrame As String = chrHiddenColumns(i) + Dim listItem As New ListViewItem(strDataFrame) + listItem.Tag = "data_names" + ucrSelectorForDataFrames.lstAvailableVariable.Items.Add(listItem) Next End If End Sub