From 2ad0d81f271452b63bc87fdca16e6031095c158d Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Fri, 4 Mar 2022 17:06:36 +0300 Subject: [PATCH 001/100] Added objects in the Random split dialog --- instat/dlgRandomSplit.Designer.vb | 226 +++++++++++++++++++++++++++++- instat/dlgRandomSplit.vb | 38 ++++- 2 files changed, 262 insertions(+), 2 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index a20398e02e8..34142a724ba 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -22,13 +22,219 @@ Partial Class dlgRandomSplit 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Me.rdoSample = New System.Windows.Forms.RadioButton() + Me.rdoTimeSeries = New System.Windows.Forms.RadioButton() + Me.ucrReceiverRandomSplit = New instat.ucrReceiverMultiple() + Me.ucrChkStratifyingFactor = New instat.ucrCheck() + Me.ucrSelectorRandomSplit = New instat.ucrDataFrame() + Me.ucrChkTestingData = New instat.ucrCheck() + Me.ucrChkTrainingData = New instat.ucrCheck() + Me.ucrChkLog = New instat.ucrCheck() + Me.ucrPnlRandomSplit = New instat.UcrPanel() + Me.ucrBase = New instat.ucrButtons() + Me.ucrSaveRandomSplit = New instat.ucrSave() + Me.ucrNudLog = New instat.ucrNud() + Me.ucrNudFraction = New instat.ucrNud() + Me.ucrNudPool = New instat.ucrNud() + Me.lblFraction = New System.Windows.Forms.Label() + Me.lblPool = New System.Windows.Forms.Label() Me.SuspendLayout() ' + 'rdoSample + ' + Me.rdoSample.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoSample.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSample.FlatAppearance.BorderSize = 2 + Me.rdoSample.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSample.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoSample.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoSample.Location = New System.Drawing.Point(98, 23) + Me.rdoSample.Name = "rdoSample" + Me.rdoSample.Size = New System.Drawing.Size(100, 28) + Me.rdoSample.TabIndex = 21 + Me.rdoSample.Text = "Sample" + Me.rdoSample.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSample.UseVisualStyleBackColor = True + ' + 'rdoTimeSeries + ' + Me.rdoTimeSeries.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoTimeSeries.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoTimeSeries.FlatAppearance.BorderSize = 2 + Me.rdoTimeSeries.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoTimeSeries.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoTimeSeries.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoTimeSeries.Location = New System.Drawing.Point(196, 23) + Me.rdoTimeSeries.Name = "rdoTimeSeries" + Me.rdoTimeSeries.Size = New System.Drawing.Size(100, 28) + Me.rdoTimeSeries.TabIndex = 20 + Me.rdoTimeSeries.Text = "Time Series" + Me.rdoTimeSeries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoTimeSeries.UseVisualStyleBackColor = True + ' + 'ucrReceiverRandomSplit + ' + Me.ucrReceiverRandomSplit.AutoSize = True + Me.ucrReceiverRandomSplit.frmParent = Me + Me.ucrReceiverRandomSplit.Location = New System.Drawing.Point(281, 98) + Me.ucrReceiverRandomSplit.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRandomSplit.Name = "ucrReceiverRandomSplit" + Me.ucrReceiverRandomSplit.Selector = Nothing + Me.ucrReceiverRandomSplit.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverRandomSplit.strNcFilePath = "" + Me.ucrReceiverRandomSplit.TabIndex = 18 + Me.ucrReceiverRandomSplit.ucrSelector = Nothing + ' + 'ucrChkStratifyingFactor + ' + Me.ucrChkStratifyingFactor.AutoSize = True + Me.ucrChkStratifyingFactor.Checked = False + Me.ucrChkStratifyingFactor.Location = New System.Drawing.Point(281, 69) + Me.ucrChkStratifyingFactor.Name = "ucrChkStratifyingFactor" + Me.ucrChkStratifyingFactor.Size = New System.Drawing.Size(143, 23) + Me.ucrChkStratifyingFactor.TabIndex = 19 + ' + 'ucrSelectorRandomSplit + ' + Me.ucrSelectorRandomSplit.AutoSize = True + Me.ucrSelectorRandomSplit.bDropUnusedFilterLevels = False + Me.ucrSelectorRandomSplit.bUseCurrentFilter = True + Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(9, 81) + Me.ucrSelectorRandomSplit.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorRandomSplit.Name = "ucrSelectorRandomSplit" + Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(153, 43) + Me.ucrSelectorRandomSplit.TabIndex = 22 + ' + 'ucrChkTestingData + ' + Me.ucrChkTestingData.AutoSize = True + Me.ucrChkTestingData.Checked = False + Me.ucrChkTestingData.Location = New System.Drawing.Point(9, 204) + Me.ucrChkTestingData.Name = "ucrChkTestingData" + Me.ucrChkTestingData.Size = New System.Drawing.Size(143, 23) + Me.ucrChkTestingData.TabIndex = 23 + ' + 'ucrChkTrainingData + ' + Me.ucrChkTrainingData.AutoSize = True + Me.ucrChkTrainingData.Checked = False + Me.ucrChkTrainingData.Location = New System.Drawing.Point(9, 175) + Me.ucrChkTrainingData.Name = "ucrChkTrainingData" + Me.ucrChkTrainingData.Size = New System.Drawing.Size(143, 23) + Me.ucrChkTrainingData.TabIndex = 24 + ' + 'ucrChkLog + ' + Me.ucrChkLog.AutoSize = True + Me.ucrChkLog.Checked = False + Me.ucrChkLog.Location = New System.Drawing.Point(9, 146) + Me.ucrChkLog.Name = "ucrChkLog" + Me.ucrChkLog.Size = New System.Drawing.Size(143, 23) + Me.ucrChkLog.TabIndex = 25 + ' + 'ucrPnlRandomSplit + ' + Me.ucrPnlRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlRandomSplit.Location = New System.Drawing.Point(92, 12) + Me.ucrPnlRandomSplit.Name = "ucrPnlRandomSplit" + Me.ucrPnlRandomSplit.Size = New System.Drawing.Size(212, 44) + Me.ucrPnlRandomSplit.TabIndex = 26 + ' + 'ucrBase + ' + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(9, 341) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 27 + ' + 'ucrSaveRandomSplit + ' + Me.ucrSaveRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveRandomSplit.Location = New System.Drawing.Point(9, 299) + Me.ucrSaveRandomSplit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveRandomSplit.Name = "ucrSaveRandomSplit" + Me.ucrSaveRandomSplit.Size = New System.Drawing.Size(403, 34) + Me.ucrSaveRandomSplit.TabIndex = 28 + ' + 'ucrNudLog + ' + Me.ucrNudLog.AutoSize = True + Me.ucrNudLog.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLog.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLog.Location = New System.Drawing.Point(92, 146) + Me.ucrNudLog.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLog.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLog.Name = "ucrNudLog" + Me.ucrNudLog.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLog.TabIndex = 29 + Me.ucrNudLog.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudFraction + ' + Me.ucrNudFraction.AutoSize = True + Me.ucrNudFraction.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudFraction.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudFraction.Location = New System.Drawing.Point(351, 223) + Me.ucrNudFraction.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudFraction.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudFraction.Name = "ucrNudFraction" + Me.ucrNudFraction.Size = New System.Drawing.Size(50, 20) + Me.ucrNudFraction.TabIndex = 30 + Me.ucrNudFraction.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudPool + ' + Me.ucrNudPool.AutoSize = True + Me.ucrNudPool.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPool.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudPool.Location = New System.Drawing.Point(351, 261) + Me.ucrNudPool.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudPool.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPool.Name = "ucrNudPool" + Me.ucrNudPool.Size = New System.Drawing.Size(50, 20) + Me.ucrNudPool.TabIndex = 31 + Me.ucrNudPool.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblFraction + ' + Me.lblFraction.AutoSize = True + Me.lblFraction.Location = New System.Drawing.Point(278, 223) + Me.lblFraction.Name = "lblFraction" + Me.lblFraction.Size = New System.Drawing.Size(51, 13) + Me.lblFraction.TabIndex = 32 + Me.lblFraction.Text = "Fraction :" + ' + 'lblPool + ' + Me.lblPool.AutoSize = True + Me.lblPool.Location = New System.Drawing.Point(278, 261) + Me.lblPool.Name = "lblPool" + Me.lblPool.Size = New System.Drawing.Size(34, 13) + Me.lblPool.TabIndex = 33 + Me.lblPool.Text = "Pool :" + ' 'dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(386, 319) + Me.ClientSize = New System.Drawing.Size(432, 403) + Me.Controls.Add(Me.lblPool) + Me.Controls.Add(Me.lblFraction) + Me.Controls.Add(Me.ucrNudPool) + Me.Controls.Add(Me.ucrNudFraction) + Me.Controls.Add(Me.ucrNudLog) + Me.Controls.Add(Me.ucrSaveRandomSplit) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.ucrChkLog) + Me.Controls.Add(Me.ucrChkTrainingData) + Me.Controls.Add(Me.ucrChkTestingData) + Me.Controls.Add(Me.ucrSelectorRandomSplit) + Me.Controls.Add(Me.rdoSample) + Me.Controls.Add(Me.rdoTimeSeries) + Me.Controls.Add(Me.ucrReceiverRandomSplit) + Me.Controls.Add(Me.ucrChkStratifyingFactor) + Me.Controls.Add(Me.ucrPnlRandomSplit) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -36,6 +242,24 @@ Partial Class dlgRandomSplit Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Random Split" Me.ResumeLayout(False) + Me.PerformLayout() End Sub + + Friend WithEvents rdoSample As RadioButton + Friend WithEvents rdoTimeSeries As RadioButton + Friend WithEvents ucrReceiverRandomSplit As ucrReceiverMultiple + Friend WithEvents ucrChkStratifyingFactor As ucrCheck + Friend WithEvents ucrSelectorRandomSplit As ucrDataFrame + Friend WithEvents ucrChkLog As ucrCheck + Friend WithEvents ucrChkTrainingData As ucrCheck + Friend WithEvents ucrChkTestingData As ucrCheck + Friend WithEvents ucrNudPool As ucrNud + Friend WithEvents ucrNudFraction As ucrNud + Friend WithEvents ucrNudLog As ucrNud + Friend WithEvents ucrSaveRandomSplit As ucrSave + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrPnlRandomSplit As UcrPanel + Friend WithEvents lblPool As Label + Friend WithEvents lblFraction As Label End Class diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index fa52d73db13..26047605f0c 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -1,5 +1,41 @@ -Public Class dlgRandomSplit +' 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 dlgRandomSplit Private Sub dlgRandomSplit_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 + autoTranslate(Me) + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + ucrPnlRandomSplit.AddRadioButton(rdoSample) + ucrPnlRandomSplit.AddRadioButton(rdoTimeSeries) + ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"scale", "na.omit"}) + ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"dist", "as.matrix"}) End Sub + End Class \ No newline at end of file From a383ce97c6989073234cee256f4fef2b7e6e6228 Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Fri, 4 Mar 2022 21:49:16 +0300 Subject: [PATCH 002/100] Added some few codes on the initialize function --- instat/dlgRandomSplit.vb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 26047605f0c..250e7d804b6 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -36,6 +36,22 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"scale", "na.omit"}) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"dist", "as.matrix"}) + ucrReceiverRandomSplit.SetParameterIsRFunction() + 'ucrReceiverRandomSplit.Selector = ucrSelectorRandomSplit + ucrReceiverRandomSplit.SetMeAsReceiver() + ucrReceiverRandomSplit.SetDataType("numeric") + + ucrChkStratifyingFactor.SetText("Set Seed") + + ucrChkLog.SetText("Log") + + ucrChkTestingData.SetText("Save Testing Data") + + ucrChkTrainingData.SetText("Save Training Data") + End Sub + + Private Sub SetDefaults() + End Sub End Class \ No newline at end of file From cc86eef4ca42984f36511fad7b92ff0487539579 Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Tue, 8 Mar 2022 10:55:03 +0300 Subject: [PATCH 003/100] Added some few codes to the Random split dialog --- instat/dlgRandomSplit.vb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 250e7d804b6..938dd0e4813 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -16,6 +16,10 @@ Imports instat.Translations Public Class dlgRandomSplit + Private bFirstLoad As Boolean = True + Private bReset As Boolean = True + + Private Sub dlgRandomSplit_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -41,17 +45,37 @@ Public Class dlgRandomSplit ucrReceiverRandomSplit.SetMeAsReceiver() ucrReceiverRandomSplit.SetDataType("numeric") + ucrSelectorRandomSplit.SetParameterIsRFunction() + ucrChkStratifyingFactor.SetText("Set Seed") ucrChkLog.SetText("Log") + ucrChkLog.AddToLinkedControls(ucrNudLog, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Default") ucrChkTestingData.SetText("Save Testing Data") ucrChkTrainingData.SetText("Save Training Data") + + ucrNudFraction.SetLinkedDisplayControl(lblFraction) + + ucrNudPool.SetLinkedDisplayControl(lblPool) End Sub Private Sub SetDefaults() End Sub + Private Sub SetRCodeForControls(bReset As Boolean) + + End Sub + + Private Sub TestOkEnabled() + + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOkEnabled() + End Sub End Class \ No newline at end of file From 4db29fe86b5e2645622eb7735ae92a4d48bc0c1d Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Tue, 8 Mar 2022 17:35:58 +0300 Subject: [PATCH 004/100] Setting of R controls. --- instat/dlgRandomSplit.Designer.vb | 250 +++++++++++++++--------------- instat/dlgRandomSplit.vb | 24 ++- 2 files changed, 145 insertions(+), 129 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index 34142a724ba..62b7451fa48 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -24,20 +24,20 @@ Partial Class dlgRandomSplit Private Sub InitializeComponent() Me.rdoSample = New System.Windows.Forms.RadioButton() Me.rdoTimeSeries = New System.Windows.Forms.RadioButton() + Me.lblFraction = New System.Windows.Forms.Label() + Me.lblPool = New System.Windows.Forms.Label() + Me.ucrNudPool = New instat.ucrNud() + Me.ucrNudFraction = New instat.ucrNud() + Me.ucrNudLag = New instat.ucrNud() + Me.ucrSaveRandomSplit = New instat.ucrSave() + Me.ucrBase = New instat.ucrButtons() + Me.ucrChkLag = New instat.ucrCheck() + Me.ucrChkTrainingData = New instat.ucrCheck() + Me.ucrChkTestingData = New instat.ucrCheck() + Me.ucrSelectorRandomSplit = New instat.ucrDataFrame() Me.ucrReceiverRandomSplit = New instat.ucrReceiverMultiple() Me.ucrChkStratifyingFactor = New instat.ucrCheck() - Me.ucrSelectorRandomSplit = New instat.ucrDataFrame() - Me.ucrChkTestingData = New instat.ucrCheck() - Me.ucrChkTrainingData = New instat.ucrCheck() - Me.ucrChkLog = New instat.ucrCheck() Me.ucrPnlRandomSplit = New instat.UcrPanel() - Me.ucrBase = New instat.ucrButtons() - Me.ucrSaveRandomSplit = New instat.ucrSave() - Me.ucrNudLog = New instat.ucrNud() - Me.ucrNudFraction = New instat.ucrNud() - Me.ucrNudPool = New instat.ucrNud() - Me.lblFraction = New System.Windows.Forms.Label() - Me.lblPool = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'rdoSample @@ -72,73 +72,71 @@ Partial Class dlgRandomSplit Me.rdoTimeSeries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoTimeSeries.UseVisualStyleBackColor = True ' - 'ucrReceiverRandomSplit - ' - Me.ucrReceiverRandomSplit.AutoSize = True - Me.ucrReceiverRandomSplit.frmParent = Me - Me.ucrReceiverRandomSplit.Location = New System.Drawing.Point(281, 98) - Me.ucrReceiverRandomSplit.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverRandomSplit.Name = "ucrReceiverRandomSplit" - Me.ucrReceiverRandomSplit.Selector = Nothing - Me.ucrReceiverRandomSplit.Size = New System.Drawing.Size(120, 100) - Me.ucrReceiverRandomSplit.strNcFilePath = "" - Me.ucrReceiverRandomSplit.TabIndex = 18 - Me.ucrReceiverRandomSplit.ucrSelector = Nothing - ' - 'ucrChkStratifyingFactor + 'lblFraction ' - Me.ucrChkStratifyingFactor.AutoSize = True - Me.ucrChkStratifyingFactor.Checked = False - Me.ucrChkStratifyingFactor.Location = New System.Drawing.Point(281, 69) - Me.ucrChkStratifyingFactor.Name = "ucrChkStratifyingFactor" - Me.ucrChkStratifyingFactor.Size = New System.Drawing.Size(143, 23) - Me.ucrChkStratifyingFactor.TabIndex = 19 + Me.lblFraction.AutoSize = True + Me.lblFraction.Location = New System.Drawing.Point(278, 223) + Me.lblFraction.Name = "lblFraction" + Me.lblFraction.Size = New System.Drawing.Size(51, 13) + Me.lblFraction.TabIndex = 32 + Me.lblFraction.Text = "Fraction :" ' - 'ucrSelectorRandomSplit + 'lblPool ' - Me.ucrSelectorRandomSplit.AutoSize = True - Me.ucrSelectorRandomSplit.bDropUnusedFilterLevels = False - Me.ucrSelectorRandomSplit.bUseCurrentFilter = True - Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(9, 81) - Me.ucrSelectorRandomSplit.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorRandomSplit.Name = "ucrSelectorRandomSplit" - Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(153, 43) - Me.ucrSelectorRandomSplit.TabIndex = 22 + Me.lblPool.AutoSize = True + Me.lblPool.Location = New System.Drawing.Point(278, 261) + Me.lblPool.Name = "lblPool" + Me.lblPool.Size = New System.Drawing.Size(34, 13) + Me.lblPool.TabIndex = 33 + Me.lblPool.Text = "Pool :" ' - 'ucrChkTestingData + 'ucrNudPool ' - Me.ucrChkTestingData.AutoSize = True - Me.ucrChkTestingData.Checked = False - Me.ucrChkTestingData.Location = New System.Drawing.Point(9, 204) - Me.ucrChkTestingData.Name = "ucrChkTestingData" - Me.ucrChkTestingData.Size = New System.Drawing.Size(143, 23) - Me.ucrChkTestingData.TabIndex = 23 + Me.ucrNudPool.AutoSize = True + Me.ucrNudPool.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPool.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudPool.Location = New System.Drawing.Point(351, 261) + Me.ucrNudPool.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudPool.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPool.Name = "ucrNudPool" + Me.ucrNudPool.Size = New System.Drawing.Size(50, 20) + Me.ucrNudPool.TabIndex = 31 + Me.ucrNudPool.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'ucrChkTrainingData + 'ucrNudFraction ' - Me.ucrChkTrainingData.AutoSize = True - Me.ucrChkTrainingData.Checked = False - Me.ucrChkTrainingData.Location = New System.Drawing.Point(9, 175) - Me.ucrChkTrainingData.Name = "ucrChkTrainingData" - Me.ucrChkTrainingData.Size = New System.Drawing.Size(143, 23) - Me.ucrChkTrainingData.TabIndex = 24 + Me.ucrNudFraction.AutoSize = True + Me.ucrNudFraction.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudFraction.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudFraction.Location = New System.Drawing.Point(351, 223) + Me.ucrNudFraction.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudFraction.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudFraction.Name = "ucrNudFraction" + Me.ucrNudFraction.Size = New System.Drawing.Size(50, 20) + Me.ucrNudFraction.TabIndex = 30 + Me.ucrNudFraction.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'ucrChkLog + 'ucrNudLag ' - Me.ucrChkLog.AutoSize = True - Me.ucrChkLog.Checked = False - Me.ucrChkLog.Location = New System.Drawing.Point(9, 146) - Me.ucrChkLog.Name = "ucrChkLog" - Me.ucrChkLog.Size = New System.Drawing.Size(143, 23) - Me.ucrChkLog.TabIndex = 25 + Me.ucrNudLag.AutoSize = True + Me.ucrNudLag.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLag.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLag.Location = New System.Drawing.Point(92, 146) + Me.ucrNudLag.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLag.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLag.Name = "ucrNudLag" + Me.ucrNudLag.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLag.TabIndex = 29 + Me.ucrNudLag.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'ucrPnlRandomSplit + 'ucrSaveRandomSplit ' - Me.ucrPnlRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRandomSplit.Location = New System.Drawing.Point(92, 12) - Me.ucrPnlRandomSplit.Name = "ucrPnlRandomSplit" - Me.ucrPnlRandomSplit.Size = New System.Drawing.Size(212, 44) - Me.ucrPnlRandomSplit.TabIndex = 26 + Me.ucrSaveRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveRandomSplit.Location = New System.Drawing.Point(9, 299) + Me.ucrSaveRandomSplit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveRandomSplit.Name = "ucrSaveRandomSplit" + Me.ucrSaveRandomSplit.Size = New System.Drawing.Size(403, 34) + Me.ucrSaveRandomSplit.TabIndex = 28 ' 'ucrBase ' @@ -148,71 +146,73 @@ Partial Class dlgRandomSplit Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 27 ' - 'ucrSaveRandomSplit + 'ucrChkLag ' - Me.ucrSaveRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveRandomSplit.Location = New System.Drawing.Point(9, 299) - Me.ucrSaveRandomSplit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveRandomSplit.Name = "ucrSaveRandomSplit" - Me.ucrSaveRandomSplit.Size = New System.Drawing.Size(403, 34) - Me.ucrSaveRandomSplit.TabIndex = 28 + Me.ucrChkLag.AutoSize = True + Me.ucrChkLag.Checked = False + Me.ucrChkLag.Location = New System.Drawing.Point(9, 146) + Me.ucrChkLag.Name = "ucrChkLag" + Me.ucrChkLag.Size = New System.Drawing.Size(143, 23) + Me.ucrChkLag.TabIndex = 25 ' - 'ucrNudLog + 'ucrChkTrainingData ' - Me.ucrNudLog.AutoSize = True - Me.ucrNudLog.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLog.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLog.Location = New System.Drawing.Point(92, 146) - Me.ucrNudLog.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLog.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLog.Name = "ucrNudLog" - Me.ucrNudLog.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLog.TabIndex = 29 - Me.ucrNudLog.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrChkTrainingData.AutoSize = True + Me.ucrChkTrainingData.Checked = False + Me.ucrChkTrainingData.Location = New System.Drawing.Point(9, 175) + Me.ucrChkTrainingData.Name = "ucrChkTrainingData" + Me.ucrChkTrainingData.Size = New System.Drawing.Size(143, 23) + Me.ucrChkTrainingData.TabIndex = 24 ' - 'ucrNudFraction + 'ucrChkTestingData ' - Me.ucrNudFraction.AutoSize = True - Me.ucrNudFraction.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudFraction.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudFraction.Location = New System.Drawing.Point(351, 223) - Me.ucrNudFraction.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudFraction.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudFraction.Name = "ucrNudFraction" - Me.ucrNudFraction.Size = New System.Drawing.Size(50, 20) - Me.ucrNudFraction.TabIndex = 30 - Me.ucrNudFraction.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrChkTestingData.AutoSize = True + Me.ucrChkTestingData.Checked = False + Me.ucrChkTestingData.Location = New System.Drawing.Point(9, 204) + Me.ucrChkTestingData.Name = "ucrChkTestingData" + Me.ucrChkTestingData.Size = New System.Drawing.Size(143, 23) + Me.ucrChkTestingData.TabIndex = 23 ' - 'ucrNudPool + 'ucrSelectorRandomSplit ' - Me.ucrNudPool.AutoSize = True - Me.ucrNudPool.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudPool.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPool.Location = New System.Drawing.Point(351, 261) - Me.ucrNudPool.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudPool.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudPool.Name = "ucrNudPool" - Me.ucrNudPool.Size = New System.Drawing.Size(50, 20) - Me.ucrNudPool.TabIndex = 31 - Me.ucrNudPool.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrSelectorRandomSplit.AutoSize = True + Me.ucrSelectorRandomSplit.bDropUnusedFilterLevels = False + Me.ucrSelectorRandomSplit.bUseCurrentFilter = True + Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(9, 81) + Me.ucrSelectorRandomSplit.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorRandomSplit.Name = "ucrSelectorRandomSplit" + Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(153, 43) + Me.ucrSelectorRandomSplit.TabIndex = 22 ' - 'lblFraction + 'ucrReceiverRandomSplit ' - Me.lblFraction.AutoSize = True - Me.lblFraction.Location = New System.Drawing.Point(278, 223) - Me.lblFraction.Name = "lblFraction" - Me.lblFraction.Size = New System.Drawing.Size(51, 13) - Me.lblFraction.TabIndex = 32 - Me.lblFraction.Text = "Fraction :" + Me.ucrReceiverRandomSplit.AutoSize = True + Me.ucrReceiverRandomSplit.frmParent = Me + Me.ucrReceiverRandomSplit.Location = New System.Drawing.Point(281, 98) + Me.ucrReceiverRandomSplit.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRandomSplit.Name = "ucrReceiverRandomSplit" + Me.ucrReceiverRandomSplit.Selector = Nothing + Me.ucrReceiverRandomSplit.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverRandomSplit.strNcFilePath = "" + Me.ucrReceiverRandomSplit.TabIndex = 18 + Me.ucrReceiverRandomSplit.ucrSelector = Nothing ' - 'lblPool + 'ucrChkStratifyingFactor ' - Me.lblPool.AutoSize = True - Me.lblPool.Location = New System.Drawing.Point(278, 261) - Me.lblPool.Name = "lblPool" - Me.lblPool.Size = New System.Drawing.Size(34, 13) - Me.lblPool.TabIndex = 33 - Me.lblPool.Text = "Pool :" + Me.ucrChkStratifyingFactor.AutoSize = True + Me.ucrChkStratifyingFactor.Checked = False + Me.ucrChkStratifyingFactor.Location = New System.Drawing.Point(281, 69) + Me.ucrChkStratifyingFactor.Name = "ucrChkStratifyingFactor" + Me.ucrChkStratifyingFactor.Size = New System.Drawing.Size(143, 23) + Me.ucrChkStratifyingFactor.TabIndex = 19 + ' + 'ucrPnlRandomSplit + ' + Me.ucrPnlRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlRandomSplit.Location = New System.Drawing.Point(92, 12) + Me.ucrPnlRandomSplit.Name = "ucrPnlRandomSplit" + Me.ucrPnlRandomSplit.Size = New System.Drawing.Size(212, 44) + Me.ucrPnlRandomSplit.TabIndex = 26 ' 'dlgRandomSplit ' @@ -223,10 +223,10 @@ Partial Class dlgRandomSplit Me.Controls.Add(Me.lblFraction) Me.Controls.Add(Me.ucrNudPool) Me.Controls.Add(Me.ucrNudFraction) - Me.Controls.Add(Me.ucrNudLog) + Me.Controls.Add(Me.ucrNudLag) Me.Controls.Add(Me.ucrSaveRandomSplit) Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.ucrChkLog) + Me.Controls.Add(Me.ucrChkLag) Me.Controls.Add(Me.ucrChkTrainingData) Me.Controls.Add(Me.ucrChkTestingData) Me.Controls.Add(Me.ucrSelectorRandomSplit) @@ -251,12 +251,12 @@ Partial Class dlgRandomSplit Friend WithEvents ucrReceiverRandomSplit As ucrReceiverMultiple Friend WithEvents ucrChkStratifyingFactor As ucrCheck Friend WithEvents ucrSelectorRandomSplit As ucrDataFrame - Friend WithEvents ucrChkLog As ucrCheck + Friend WithEvents ucrChkLag As ucrCheck Friend WithEvents ucrChkTrainingData As ucrCheck Friend WithEvents ucrChkTestingData As ucrCheck Friend WithEvents ucrNudPool As ucrNud Friend WithEvents ucrNudFraction As ucrNud - Friend WithEvents ucrNudLog As ucrNud + Friend WithEvents ucrNudLag As ucrNud Friend WithEvents ucrSaveRandomSplit As ucrSave Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrPnlRandomSplit As UcrPanel diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 938dd0e4813..4148ffd8ea0 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -37,8 +37,12 @@ Public Class dlgRandomSplit Private Sub InitialiseDialog() ucrPnlRandomSplit.AddRadioButton(rdoSample) ucrPnlRandomSplit.AddRadioButton(rdoTimeSeries) - ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"scale", "na.omit"}) - ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"dist", "as.matrix"}) + ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {}) + ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {}) + + ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor, ucrNudPool}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrReceiverRandomSplit.SetParameterIsRFunction() 'ucrReceiverRandomSplit.Selector = ucrSelectorRandomSplit @@ -48,17 +52,29 @@ Public Class dlgRandomSplit ucrSelectorRandomSplit.SetParameterIsRFunction() ucrChkStratifyingFactor.SetText("Set Seed") + ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRandomSplit, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkStratifyingFactor.SetParameter(New RParameter("strata", 2)) + - ucrChkLog.SetText("Log") - ucrChkLog.AddToLinkedControls(ucrNudLog, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Default") + ucrChkLag.SetText("Lag") + ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) ucrChkTestingData.SetText("Save Testing Data") ucrChkTrainingData.SetText("Save Training Data") + 'ucrSaveRandomSplit.set + + ucrNudLag.SetParameter(New RParameter("lag", 3)) + ucrNudLag.SetRDefault("0") + ucrNudFraction.SetLinkedDisplayControl(lblFraction) + ucrNudFraction.SetParameter(New RParameter("prop", 1)) + ucrNudFraction.SetRDefault("3/4") ucrNudPool.SetLinkedDisplayControl(lblPool) + ucrNudPool.SetParameter(New RParameter("pool", 4)) + ucrNudPool.SetRDefault("0.1") End Sub Private Sub SetDefaults() From 8a90bf805a132cec1f4cae1b3eac03cab31a5c41 Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Thu, 10 Mar 2022 17:45:48 +0300 Subject: [PATCH 005/100] Added some code for the defaults and Rcode controls --- instat/dlgRandomSplit.vb | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 4148ffd8ea0..bc59bd4982d 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -18,7 +18,8 @@ Imports instat.Translations Public Class dlgRandomSplit Private bFirstLoad As Boolean = True Private bReset As Boolean = True - + Private clsInitialTimeSplit As RFunction + Private clsInitialSplit As RFunction Private Sub dlgRandomSplit_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -70,19 +71,45 @@ Public Class dlgRandomSplit ucrNudFraction.SetLinkedDisplayControl(lblFraction) ucrNudFraction.SetParameter(New RParameter("prop", 1)) - ucrNudFraction.SetRDefault("3/4") + ucrNudFraction.DecimalPlaces = 2 + ucrNudFraction.Increment = 0.01 + ucrNudFraction.SetRDefault("0.75") ucrNudPool.SetLinkedDisplayControl(lblPool) ucrNudPool.SetParameter(New RParameter("pool", 4)) + ucrNudPool.DecimalPlaces = 2 + ucrNudPool.SetMinMax(0, 1) + ucrNudPool.Increment = 0.1 ucrNudPool.SetRDefault("0.1") End Sub Private Sub SetDefaults() + clsInitialTimeSplit = New RFunction + clsInitialSplit = New RFunction + + clsInitialTimeSplit.SetRCommand("initial_time_split") + clsInitialTimeSplit.SetPackageName("rsample") + + clsInitialSplit.SetRCommand("initial_split") + clsInitialSplit.SetPackageName("rsample") + End Sub Private Sub SetRCodeForControls(bReset As Boolean) - + ucrNudFraction.AddAdditionalCodeParameterPair(clsInitialSplit, New RParameter("prop", 1), iAdditionalPairNo:=1) + 'ucrChkTrainingData.AddAdditionalCodeParameterPair(clsInitialSplit, New RParameter(), iAdditionalPairNo:=1) + 'ucrChkTestingData.AddAdditionalCodeParameterPair(clsInitialSplit, New RParameter(), iAdditionalPairNo:=1) + + ucrSelectorRandomSplit.SetRCode(clsInitialTimeSplit, bReset) + ucrChkTestingData.SetRCode(clsInitialTimeSplit, bReset) + ucrChkTrainingData.SetRCode(clsInitialTimeSplit, bReset) + ucrChkStratifyingFactor.SetRCode(clsInitialTimeSplit, bReset) + ucrNudFraction.SetRCode(clsInitialTimeSplit, bReset) + ucrNudPool.SetRCode(clsInitialTimeSplit, bReset) + ucrSaveRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) + ucrNudLag.SetRCode(clsInitialSplit, bReset) + ucrReceiverRandomSplit.SetRCode(clsInitialSplit, bReset) End Sub Private Sub TestOkEnabled() From d756e8ec1ebaea0293666fafc5390d19ed5aa406 Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Mon, 14 Mar 2022 19:20:12 +0300 Subject: [PATCH 006/100] Minor changes on the random split dialog --- instat/dlgRandomSplit.Designer.vb | 16 -------- instat/dlgRandomSplit.vb | 23 +++++++---- instat/frmMain.Designer.vb | 64 +++++++++++++++++-------------- instat/frmMain.vb | 4 ++ 4 files changed, 55 insertions(+), 52 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index 62b7451fa48..b4fad2ab5ef 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -35,7 +35,6 @@ Partial Class dlgRandomSplit Me.ucrChkTrainingData = New instat.ucrCheck() Me.ucrChkTestingData = New instat.ucrCheck() Me.ucrSelectorRandomSplit = New instat.ucrDataFrame() - Me.ucrReceiverRandomSplit = New instat.ucrReceiverMultiple() Me.ucrChkStratifyingFactor = New instat.ucrCheck() Me.ucrPnlRandomSplit = New instat.UcrPanel() Me.SuspendLayout() @@ -184,19 +183,6 @@ Partial Class dlgRandomSplit Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(153, 43) Me.ucrSelectorRandomSplit.TabIndex = 22 ' - 'ucrReceiverRandomSplit - ' - Me.ucrReceiverRandomSplit.AutoSize = True - Me.ucrReceiverRandomSplit.frmParent = Me - Me.ucrReceiverRandomSplit.Location = New System.Drawing.Point(281, 98) - Me.ucrReceiverRandomSplit.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverRandomSplit.Name = "ucrReceiverRandomSplit" - Me.ucrReceiverRandomSplit.Selector = Nothing - Me.ucrReceiverRandomSplit.Size = New System.Drawing.Size(120, 100) - Me.ucrReceiverRandomSplit.strNcFilePath = "" - Me.ucrReceiverRandomSplit.TabIndex = 18 - Me.ucrReceiverRandomSplit.ucrSelector = Nothing - ' 'ucrChkStratifyingFactor ' Me.ucrChkStratifyingFactor.AutoSize = True @@ -232,7 +218,6 @@ Partial Class dlgRandomSplit Me.Controls.Add(Me.ucrSelectorRandomSplit) Me.Controls.Add(Me.rdoSample) Me.Controls.Add(Me.rdoTimeSeries) - Me.Controls.Add(Me.ucrReceiverRandomSplit) Me.Controls.Add(Me.ucrChkStratifyingFactor) Me.Controls.Add(Me.ucrPnlRandomSplit) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow @@ -248,7 +233,6 @@ Partial Class dlgRandomSplit Friend WithEvents rdoSample As RadioButton Friend WithEvents rdoTimeSeries As RadioButton - Friend WithEvents ucrReceiverRandomSplit As ucrReceiverMultiple Friend WithEvents ucrChkStratifyingFactor As ucrCheck Friend WithEvents ucrSelectorRandomSplit As ucrDataFrame Friend WithEvents ucrChkLag As ucrCheck diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index bc59bd4982d..9fad5161618 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -45,15 +45,15 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrReceiverRandomSplit.SetParameterIsRFunction() + 'ucrReceiverRandomSplit.SetParameterIsRFunction() 'ucrReceiverRandomSplit.Selector = ucrSelectorRandomSplit - ucrReceiverRandomSplit.SetMeAsReceiver() - ucrReceiverRandomSplit.SetDataType("numeric") + 'ucrReceiverRandomSplit.SetMeAsReceiver() + 'ucrReceiverRandomSplit.SetDataType("numeric") ucrSelectorRandomSplit.SetParameterIsRFunction() ucrChkStratifyingFactor.SetText("Set Seed") - ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRandomSplit, {True}, bNewLinkedHideIfParameterMissing:=True) + 'ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRandomSplit, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkStratifyingFactor.SetParameter(New RParameter("strata", 2)) @@ -71,6 +71,8 @@ Public Class dlgRandomSplit ucrNudFraction.SetLinkedDisplayControl(lblFraction) ucrNudFraction.SetParameter(New RParameter("prop", 1)) + ucrNudFraction.Minimum = 0.01 + ucrNudFraction.Maximum = 0.99 ucrNudFraction.DecimalPlaces = 2 ucrNudFraction.Increment = 0.01 ucrNudFraction.SetRDefault("0.75") @@ -78,15 +80,20 @@ Public Class dlgRandomSplit ucrNudPool.SetLinkedDisplayControl(lblPool) ucrNudPool.SetParameter(New RParameter("pool", 4)) ucrNudPool.DecimalPlaces = 2 - ucrNudPool.SetMinMax(0, 1) - ucrNudPool.Increment = 0.1 - ucrNudPool.SetRDefault("0.1") + ucrNudPool.Minimum = 0.00 + ucrNudPool.Maximum = 0.15 + ucrNudPool.Increment = 0.01 + ucrNudPool.SetRDefault("0.10") End Sub Private Sub SetDefaults() clsInitialTimeSplit = New RFunction clsInitialSplit = New RFunction + ucrSelectorRandomSplit.Reset() + ucrSelectorRandomSplit.Focus() + ucrSaveRandomSplit.Reset() + clsInitialTimeSplit.SetRCommand("initial_time_split") clsInitialTimeSplit.SetPackageName("rsample") @@ -109,7 +116,7 @@ Public Class dlgRandomSplit ucrNudPool.SetRCode(clsInitialTimeSplit, bReset) ucrSaveRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) ucrNudLag.SetRCode(clsInitialSplit, bReset) - ucrReceiverRandomSplit.SetRCode(clsInitialSplit, bReset) + 'ucrReceiverRandomSplit.SetRCode(clsInitialSplit, bReset) End Sub Private Sub TestOkEnabled() diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 317a494d249..d78a06cb499 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -634,6 +634,9 @@ Partial Class frmMain Me.mnuOptionsByContextCheckDataOneVariableSummarise = New System.Windows.Forms.ToolStripMenuItem() Me.mnuOptionsByContextCheckDataOneVariableGraph = New System.Windows.Forms.ToolStripMenuItem() Me.mnuOptionsByContextCheckDataOneVariableFrequencies = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuOptionsByContextDefine = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuOptionsByContextDefineOnStation = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuOptionsByContextDefineOnFarm = New System.Windows.Forms.ToolStripMenuItem() Me.mnuOptionsByContextPrepare = New System.Windows.Forms.ToolStripMenuItem() Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator48 = New System.Windows.Forms.ToolStripSeparator() @@ -675,9 +678,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.mnuOptionsByContextDefine = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuOptionsByContextDefineOnStation = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuOptionsByContextDefineOnFarm = New System.Windows.Forms.ToolStripMenuItem() + Me.RandomSplitToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3939,18 +3940,18 @@ Partial Class frmMain 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(180, 22) 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(177, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 @@ -3960,7 +3961,7 @@ Partial Class frmMain ' '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.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.RandomSplitToolStripMenuItem}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataReshape.Tag = "" @@ -4664,7 +4665,7 @@ Partial Class frmMain ' Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicates, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" - Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(180, 22) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(134, 22) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicates @@ -4702,11 +4703,30 @@ Partial Class frmMain 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(134, 22) + Me.mnuOptionsByContextDefine.Text = "Define" + ' + 'mnuOptionsByContextDefineOnStation + ' + Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" + 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(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(180, 22) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(134, 22) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions @@ -4742,7 +4762,7 @@ Partial Class frmMain ' 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(180, 22) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(134, 22) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments @@ -4768,7 +4788,7 @@ Partial Class frmMain ' Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel}) Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel" - Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(180, 22) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(134, 22) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel @@ -5079,24 +5099,11 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - '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(180, 22) - Me.mnuOptionsByContextDefine.Text = "Define" - ' - 'mnuOptionsByContextDefineOnStation - ' - Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" - Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(180, 22) - Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..." + 'RandomSplitToolStripMenuItem ' - 'mnuOptionsByContextDefineOnFarm - ' - Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm" - Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(180, 22) - Me.mnuOptionsByContextDefineOnFarm.Text = "On - Farm..." + Me.RandomSplitToolStripMenuItem.Name = "RandomSplitToolStripMenuItem" + Me.RandomSplitToolStripMenuItem.Size = New System.Drawing.Size(197, 22) + Me.RandomSplitToolStripMenuItem.Text = "Random split..." ' 'frmMain ' @@ -5791,4 +5798,5 @@ Partial Class frmMain Friend WithEvents mnuOptionsByContextDefine As ToolStripMenuItem Friend WithEvents mnuOptionsByContextDefineOnStation As ToolStripMenuItem Friend WithEvents mnuOptionsByContextDefineOnFarm As ToolStripMenuItem + Friend WithEvents RandomSplitToolStripMenuItem As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index bc81ce1a85f..f336b3e6143 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2431,4 +2431,8 @@ Public Class frmMain Private Sub mnuOptionsByContextDefineOnFarm_Click(sender As Object, e As EventArgs) Handles mnuOptionsByContextDefineOnFarm.Click dlgDefineOptionsByContext.ShowDialog() End Sub + + Private Sub RandomSplitToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RandomSplitToolStripMenuItem.Click + dlgRandomSplit.ShowDialog() + End Sub End Class From e779ce2110b4e7a28f7dd6053345f00c996571dc Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Tue, 15 Mar 2022 18:31:14 +0300 Subject: [PATCH 007/100] Minor changes on the dialog --- instat/dlgRandomSplit.Designer.vb | 91 +++++++++++++++++++++++++++---- instat/dlgRandomSplit.vb | 39 ++++++++++--- 2 files changed, 111 insertions(+), 19 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index b4fad2ab5ef..a7cdbd94978 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -26,6 +26,8 @@ Partial Class dlgRandomSplit Me.rdoTimeSeries = New System.Windows.Forms.RadioButton() Me.lblFraction = New System.Windows.Forms.Label() Me.lblPool = New System.Windows.Forms.Label() + Me.lblReceiverRandomSplit = New System.Windows.Forms.Label() + Me.ucrReceiverRandomSplit = New instat.ucrReceiverMultiple() Me.ucrNudPool = New instat.ucrNud() Me.ucrNudFraction = New instat.ucrNud() Me.ucrNudLag = New instat.ucrNud() @@ -37,6 +39,9 @@ Partial Class dlgRandomSplit Me.ucrSelectorRandomSplit = New instat.ucrDataFrame() Me.ucrChkStratifyingFactor = New instat.ucrCheck() Me.ucrPnlRandomSplit = New instat.UcrPanel() + Me.ucrNudBreaks = New instat.ucrNud() + Me.lblBreaks = New System.Windows.Forms.Label() + Me.ucrSelector = New instat.ucrSelectorByDataFrame() Me.SuspendLayout() ' 'rdoSample @@ -83,18 +88,40 @@ Partial Class dlgRandomSplit 'lblPool ' Me.lblPool.AutoSize = True - Me.lblPool.Location = New System.Drawing.Point(278, 261) + Me.lblPool.Location = New System.Drawing.Point(278, 254) Me.lblPool.Name = "lblPool" Me.lblPool.Size = New System.Drawing.Size(34, 13) Me.lblPool.TabIndex = 33 Me.lblPool.Text = "Pool :" ' + 'lblReceiverRandomSplit + ' + Me.lblReceiverRandomSplit.AutoSize = True + Me.lblReceiverRandomSplit.Location = New System.Drawing.Point(279, 95) + Me.lblReceiverRandomSplit.Name = "lblReceiverRandomSplit" + Me.lblReceiverRandomSplit.Size = New System.Drawing.Size(56, 13) + Me.lblReceiverRandomSplit.TabIndex = 35 + Me.lblReceiverRandomSplit.Text = "Variables :" + ' + 'ucrReceiverRandomSplit + ' + Me.ucrReceiverRandomSplit.AutoSize = True + Me.ucrReceiverRandomSplit.frmParent = Me + Me.ucrReceiverRandomSplit.Location = New System.Drawing.Point(281, 112) + Me.ucrReceiverRandomSplit.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRandomSplit.Name = "ucrReceiverRandomSplit" + Me.ucrReceiverRandomSplit.Selector = Nothing + Me.ucrReceiverRandomSplit.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverRandomSplit.strNcFilePath = "" + Me.ucrReceiverRandomSplit.TabIndex = 34 + Me.ucrReceiverRandomSplit.ucrSelector = Nothing + ' 'ucrNudPool ' Me.ucrNudPool.AutoSize = True Me.ucrNudPool.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPool.Location = New System.Drawing.Point(351, 261) + Me.ucrNudPool.Location = New System.Drawing.Point(351, 254) Me.ucrNudPool.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPool.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Name = "ucrNudPool" @@ -120,7 +147,7 @@ Partial Class dlgRandomSplit Me.ucrNudLag.AutoSize = True Me.ucrNudLag.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLag.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLag.Location = New System.Drawing.Point(92, 146) + Me.ucrNudLag.Location = New System.Drawing.Point(92, 230) Me.ucrNudLag.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLag.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLag.Name = "ucrNudLag" @@ -131,7 +158,7 @@ Partial Class dlgRandomSplit 'ucrSaveRandomSplit ' Me.ucrSaveRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveRandomSplit.Location = New System.Drawing.Point(9, 299) + Me.ucrSaveRandomSplit.Location = New System.Drawing.Point(9, 312) Me.ucrSaveRandomSplit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveRandomSplit.Name = "ucrSaveRandomSplit" Me.ucrSaveRandomSplit.Size = New System.Drawing.Size(403, 34) @@ -140,7 +167,7 @@ Partial Class dlgRandomSplit 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 341) + Me.ucrBase.Location = New System.Drawing.Point(9, 354) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 27 @@ -149,7 +176,7 @@ Partial Class dlgRandomSplit ' Me.ucrChkLag.AutoSize = True Me.ucrChkLag.Checked = False - Me.ucrChkLag.Location = New System.Drawing.Point(9, 146) + Me.ucrChkLag.Location = New System.Drawing.Point(9, 230) Me.ucrChkLag.Name = "ucrChkLag" Me.ucrChkLag.Size = New System.Drawing.Size(143, 23) Me.ucrChkLag.TabIndex = 25 @@ -158,7 +185,7 @@ Partial Class dlgRandomSplit ' Me.ucrChkTrainingData.AutoSize = True Me.ucrChkTrainingData.Checked = False - Me.ucrChkTrainingData.Location = New System.Drawing.Point(9, 175) + Me.ucrChkTrainingData.Location = New System.Drawing.Point(9, 259) Me.ucrChkTrainingData.Name = "ucrChkTrainingData" Me.ucrChkTrainingData.Size = New System.Drawing.Size(143, 23) Me.ucrChkTrainingData.TabIndex = 24 @@ -167,7 +194,7 @@ Partial Class dlgRandomSplit ' Me.ucrChkTestingData.AutoSize = True Me.ucrChkTestingData.Checked = False - Me.ucrChkTestingData.Location = New System.Drawing.Point(9, 204) + Me.ucrChkTestingData.Location = New System.Drawing.Point(9, 288) Me.ucrChkTestingData.Name = "ucrChkTestingData" Me.ucrChkTestingData.Size = New System.Drawing.Size(143, 23) Me.ucrChkTestingData.TabIndex = 23 @@ -177,7 +204,7 @@ Partial Class dlgRandomSplit Me.ucrSelectorRandomSplit.AutoSize = True Me.ucrSelectorRandomSplit.bDropUnusedFilterLevels = False Me.ucrSelectorRandomSplit.bUseCurrentFilter = True - Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(9, 81) + Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(9, 75) Me.ucrSelectorRandomSplit.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorRandomSplit.Name = "ucrSelectorRandomSplit" Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(153, 43) @@ -200,11 +227,50 @@ Partial Class dlgRandomSplit Me.ucrPnlRandomSplit.Size = New System.Drawing.Size(212, 44) Me.ucrPnlRandomSplit.TabIndex = 26 ' + 'ucrNudBreaks + ' + Me.ucrNudBreaks.AutoSize = True + Me.ucrNudBreaks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudBreaks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 287) + Me.ucrNudBreaks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudBreaks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudBreaks.Name = "ucrNudBreaks" + Me.ucrNudBreaks.Size = New System.Drawing.Size(50, 20) + Me.ucrNudBreaks.TabIndex = 36 + Me.ucrNudBreaks.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblBreaks + ' + Me.lblBreaks.AutoSize = True + Me.lblBreaks.Location = New System.Drawing.Point(279, 287) + Me.lblBreaks.Name = "lblBreaks" + Me.lblBreaks.Size = New System.Drawing.Size(46, 13) + Me.lblBreaks.TabIndex = 37 + Me.lblBreaks.Text = "Breaks :" + ' + 'ucrSelector + ' + Me.ucrSelector.AutoSize = True + Me.ucrSelector.bDropUnusedFilterLevels = False + Me.ucrSelector.bShowHiddenColumns = False + Me.ucrSelector.bUseCurrentFilter = True + Me.ucrSelector.Location = New System.Drawing.Point(9, 73) + Me.ucrSelector.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelector.Name = "ucrSelector" + Me.ucrSelector.Size = New System.Drawing.Size(151, 180) + Me.ucrSelector.TabIndex = 38 + ' 'dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(432, 403) + Me.ClientSize = New System.Drawing.Size(432, 418) + Me.Controls.Add(Me.ucrSelector) + Me.Controls.Add(Me.lblBreaks) + Me.Controls.Add(Me.ucrNudBreaks) + Me.Controls.Add(Me.lblReceiverRandomSplit) + Me.Controls.Add(Me.ucrReceiverRandomSplit) Me.Controls.Add(Me.lblPool) Me.Controls.Add(Me.lblFraction) Me.Controls.Add(Me.ucrNudPool) @@ -246,4 +312,9 @@ Partial Class dlgRandomSplit Friend WithEvents ucrPnlRandomSplit As UcrPanel Friend WithEvents lblPool As Label Friend WithEvents lblFraction As Label + Friend WithEvents ucrReceiverRandomSplit As ucrReceiverMultiple + Friend WithEvents lblReceiverRandomSplit As Label + Friend WithEvents lblBreaks As Label + Friend WithEvents ucrNudBreaks As ucrNud + Friend WithEvents ucrSelector As ucrSelectorByDataFrame End Class diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 9fad5161618..251a9629181 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -41,19 +41,21 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {}) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {}) - ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor, ucrNudPool}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor, ucrNudPool, ucrNudBreaks}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - 'ucrReceiverRandomSplit.SetParameterIsRFunction() - 'ucrReceiverRandomSplit.Selector = ucrSelectorRandomSplit - 'ucrReceiverRandomSplit.SetMeAsReceiver() - 'ucrReceiverRandomSplit.SetDataType("numeric") + ucrReceiverRandomSplit.SetParameterIsRFunction() + ucrReceiverRandomSplit.Selector = ucrSelector + ucrReceiverRandomSplit.SetMeAsReceiver() + ucrReceiverRandomSplit.SetDataType("numeric") + ucrReceiverRandomSplit.SetLinkedDisplayControl(lblReceiverRandomSplit) ucrSelectorRandomSplit.SetParameterIsRFunction() + ucrSelector.SetParameterIsrfunction() ucrChkStratifyingFactor.SetText("Set Seed") - 'ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRandomSplit, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRandomSplit, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkStratifyingFactor.SetParameter(New RParameter("strata", 2)) @@ -69,6 +71,10 @@ Public Class dlgRandomSplit ucrNudLag.SetParameter(New RParameter("lag", 3)) ucrNudLag.SetRDefault("0") + ucrNudBreaks.SetLinkedDisplayControl(lblBreaks) + ucrNudBreaks.SetParameter(New RParameter("breaks, 4")) + ucrNudBreaks.SetRDefault("4") + ucrNudFraction.SetLinkedDisplayControl(lblFraction) ucrNudFraction.SetParameter(New RParameter("prop", 1)) ucrNudFraction.Minimum = 0.01 @@ -105,27 +111,42 @@ Public Class dlgRandomSplit Private Sub SetRCodeForControls(bReset As Boolean) ucrNudFraction.AddAdditionalCodeParameterPair(clsInitialSplit, New RParameter("prop", 1), iAdditionalPairNo:=1) - 'ucrChkTrainingData.AddAdditionalCodeParameterPair(clsInitialSplit, New RParameter(), iAdditionalPairNo:=1) - 'ucrChkTestingData.AddAdditionalCodeParameterPair(clsInitialSplit, New RParameter(), iAdditionalPairNo:=1) + ucrChkTrainingData.AddAdditionalCodeParameterPair(clsInitialSplit, New RParameter(), iAdditionalPairNo:=1) + ucrChkTestingData.AddAdditionalCodeParameterPair(clsInitialSplit, New RParameter(), iAdditionalPairNo:=1) ucrSelectorRandomSplit.SetRCode(clsInitialTimeSplit, bReset) ucrChkTestingData.SetRCode(clsInitialTimeSplit, bReset) ucrChkTrainingData.SetRCode(clsInitialTimeSplit, bReset) ucrChkStratifyingFactor.SetRCode(clsInitialTimeSplit, bReset) + ucrNudBreaks.SetRCode(clsInitialSplit, bReset) ucrNudFraction.SetRCode(clsInitialTimeSplit, bReset) ucrNudPool.SetRCode(clsInitialTimeSplit, bReset) ucrSaveRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) ucrNudLag.SetRCode(clsInitialSplit, bReset) - 'ucrReceiverRandomSplit.SetRCode(clsInitialSplit, bReset) + ucrReceiverRandomSplit.SetRCode(clsInitialSplit, bReset) End Sub Private Sub TestOkEnabled() End Sub + Private Sub SetBaseFunction() + If rdoSample.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) + + End If + End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeForControls(True) TestOkEnabled() End Sub + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSelectorRandomSplit.ControlContentsChanged, + ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, + ucrSaveRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrChkStratifyingFactor.ControlContentsChanged, + ucrChkTestingData.ControlContentsChanged, ucrChkTrainingData.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, + ucrSelector.ControlContentsChanged + TestOkEnabled() + End Sub + End Class \ No newline at end of file From 569fb9dace5e368af7cbb998af6312817bc19fd2 Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Wed, 16 Mar 2022 12:18:46 +0300 Subject: [PATCH 008/100] Changes --- instat/dlgRandomSplit.vb | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 251a9629181..eaf91cd50a5 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -20,6 +20,8 @@ Public Class dlgRandomSplit Private bReset As Boolean = True Private clsInitialTimeSplit As RFunction Private clsInitialSplit As RFunction + Private clsTraining As RFunction + Private clsTesting As RFunction Private Sub dlgRandomSplit_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -41,10 +43,9 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {}) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {}) - ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor, ucrNudPool, ucrNudBreaks}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor, ucrNudPool, ucrNudBreaks, ucrSelector}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrReceiverRandomSplit.SetParameterIsRFunction() ucrReceiverRandomSplit.Selector = ucrSelector ucrReceiverRandomSplit.SetMeAsReceiver() @@ -56,6 +57,7 @@ Public Class dlgRandomSplit ucrChkStratifyingFactor.SetText("Set Seed") ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRandomSplit, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkStratifyingFactor.AddToLinkedControls(ucrSelector, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkStratifyingFactor.SetParameter(New RParameter("strata", 2)) @@ -63,16 +65,22 @@ Public Class dlgRandomSplit ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) ucrChkTestingData.SetText("Save Testing Data") + ucrChkTestingData.SetParameter(New RParameter("x", 0)) + ucrChkTrainingData.SetText("Save Training Data") + ucrChkTrainingData.SetParameter(New RParameter("x", 0)) 'ucrSaveRandomSplit.set + ucrSaveRandomSplit.SetLabelText("Save sample to:") + ucrSaveRandomSplit.SetSaveTypeAsDataFrame() + ucrSaveRandomSplit.SetDataFrameSelector(ucrSelector.ucrAvailableDataFrames) ucrNudLag.SetParameter(New RParameter("lag", 3)) ucrNudLag.SetRDefault("0") ucrNudBreaks.SetLinkedDisplayControl(lblBreaks) - ucrNudBreaks.SetParameter(New RParameter("breaks, 4")) + ucrNudBreaks.SetParameter(New RParameter("breaks", 4)) ucrNudBreaks.SetRDefault("4") ucrNudFraction.SetLinkedDisplayControl(lblFraction) @@ -95,6 +103,9 @@ Public Class dlgRandomSplit Private Sub SetDefaults() clsInitialTimeSplit = New RFunction clsInitialSplit = New RFunction + clsTesting = New RFunction + clsTraining = New RFunction + ucrSelectorRandomSplit.Reset() ucrSelectorRandomSplit.Focus() @@ -106,7 +117,15 @@ Public Class dlgRandomSplit clsInitialSplit.SetRCommand("initial_split") clsInitialSplit.SetPackageName("rsample") + clsTraining.SetPackageName("rsample") + clsTraining.SetRCommand("training") + clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit, iPosition:=0) + clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit, iPosition:=0) + clsTesting.SetPackageName("rsample") + clsTesting.SetRCommand("testing") + clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit, iPosition:=0) + clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit, iPosition:=0) End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -134,6 +153,9 @@ Public Class dlgRandomSplit ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) End If + If rdoTimeSeries.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsInitialTimeSplit) + End If End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -148,5 +170,4 @@ Public Class dlgRandomSplit ucrSelector.ControlContentsChanged TestOkEnabled() End Sub - End Class \ No newline at end of file From e10096c20fff7333850a653d18fa71f0021ba985 Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:47:11 +0300 Subject: [PATCH 009/100] minor changes --- instat/dlgRandomSplit.vb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index eaf91cd50a5..c8729d1a3eb 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -151,7 +151,11 @@ Public Class dlgRandomSplit Private Sub SetBaseFunction() If rdoSample.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) - + If ucrChkTrainingData.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) + Else + ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) + End If End If If rdoTimeSeries.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsInitialTimeSplit) From 2266979b042741cd4896e78d939665feb6989f6a Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Fri, 25 Mar 2022 15:41:55 +0300 Subject: [PATCH 010/100] minor changes --- instat/dlgRandomSplit.Designer.vb | 8 ++++---- instat/dlgRandomSplit.vb | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index a7cdbd94978..cfcff77e5fa 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -41,7 +41,7 @@ Partial Class dlgRandomSplit Me.ucrPnlRandomSplit = New instat.UcrPanel() Me.ucrNudBreaks = New instat.ucrNud() Me.lblBreaks = New System.Windows.Forms.Label() - Me.ucrSelector = New instat.ucrSelectorByDataFrame() + Me.ucrSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.SuspendLayout() ' 'rdoSample @@ -255,10 +255,10 @@ Partial Class dlgRandomSplit Me.ucrSelector.bDropUnusedFilterLevels = False Me.ucrSelector.bShowHiddenColumns = False Me.ucrSelector.bUseCurrentFilter = True - Me.ucrSelector.Location = New System.Drawing.Point(9, 73) + Me.ucrSelector.Location = New System.Drawing.Point(9, 75) Me.ucrSelector.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelector.Name = "ucrSelector" - Me.ucrSelector.Size = New System.Drawing.Size(151, 180) + Me.ucrSelector.Size = New System.Drawing.Size(213, 183) Me.ucrSelector.TabIndex = 38 ' 'dlgRandomSplit @@ -316,5 +316,5 @@ Partial Class dlgRandomSplit Friend WithEvents lblReceiverRandomSplit As Label Friend WithEvents lblBreaks As Label Friend WithEvents ucrNudBreaks As ucrNud - Friend WithEvents ucrSelector As ucrSelectorByDataFrame + Friend WithEvents ucrSelector As ucrSelectorByDataFrameAddRemove End Class diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index c8729d1a3eb..0ea0b877c93 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -126,6 +126,7 @@ Public Class dlgRandomSplit clsTesting.SetRCommand("testing") clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit, iPosition:=0) clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit, iPosition:=0) + ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -151,11 +152,6 @@ Public Class dlgRandomSplit Private Sub SetBaseFunction() If rdoSample.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) - If ucrChkTrainingData.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) - Else - ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) - End If End If If rdoTimeSeries.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsInitialTimeSplit) @@ -170,8 +166,12 @@ Public Class dlgRandomSplit Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSelectorRandomSplit.ControlContentsChanged, ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrSaveRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrChkStratifyingFactor.ControlContentsChanged, - ucrChkTestingData.ControlContentsChanged, ucrChkTrainingData.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, - ucrSelector.ControlContentsChanged + ucrChkTestingData.ControlContentsChanged, ucrChkTrainingData.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged TestOkEnabled() End Sub + + Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged + SetBaseFunction() + + End Sub End Class \ No newline at end of file From ff994d0b2b89c326ebe511ea7d1ec6f4189b21a9 Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Mon, 28 Mar 2022 18:39:22 +0300 Subject: [PATCH 011/100] Changes to the random split dialog --- instat/dlgRandomSplit.Designer.vb | 112 +++++++++++++----------------- instat/dlgRandomSplit.vb | 105 ++++++++++++++++------------ 2 files changed, 108 insertions(+), 109 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index cfcff77e5fa..4ee6553132a 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -27,6 +27,8 @@ Partial Class dlgRandomSplit Me.lblFraction = New System.Windows.Forms.Label() Me.lblPool = New System.Windows.Forms.Label() Me.lblReceiverRandomSplit = New System.Windows.Forms.Label() + Me.lblBreaks = New System.Windows.Forms.Label() + Me.ucrNudBreaks = New instat.ucrNud() Me.ucrReceiverRandomSplit = New instat.ucrReceiverMultiple() Me.ucrNudPool = New instat.ucrNud() Me.ucrNudFraction = New instat.ucrNud() @@ -36,12 +38,9 @@ Partial Class dlgRandomSplit Me.ucrChkLag = New instat.ucrCheck() Me.ucrChkTrainingData = New instat.ucrCheck() Me.ucrChkTestingData = New instat.ucrCheck() - Me.ucrSelectorRandomSplit = New instat.ucrDataFrame() Me.ucrChkStratifyingFactor = New instat.ucrCheck() Me.ucrPnlRandomSplit = New instat.UcrPanel() - Me.ucrNudBreaks = New instat.ucrNud() - Me.lblBreaks = New System.Windows.Forms.Label() - Me.ucrSelector = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrSelectorRandomSplit = New instat.ucrSelectorByDataFrameAddRemove() Me.SuspendLayout() ' 'rdoSample @@ -52,7 +51,7 @@ Partial Class dlgRandomSplit Me.rdoSample.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSample.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSample.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSample.Location = New System.Drawing.Point(98, 23) + Me.rdoSample.Location = New System.Drawing.Point(110, 20) Me.rdoSample.Name = "rdoSample" Me.rdoSample.Size = New System.Drawing.Size(100, 28) Me.rdoSample.TabIndex = 21 @@ -68,7 +67,7 @@ Partial Class dlgRandomSplit Me.rdoTimeSeries.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoTimeSeries.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTimeSeries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoTimeSeries.Location = New System.Drawing.Point(196, 23) + Me.rdoTimeSeries.Location = New System.Drawing.Point(208, 20) Me.rdoTimeSeries.Name = "rdoTimeSeries" Me.rdoTimeSeries.Size = New System.Drawing.Size(100, 28) Me.rdoTimeSeries.TabIndex = 20 @@ -79,7 +78,7 @@ Partial Class dlgRandomSplit 'lblFraction ' Me.lblFraction.AutoSize = True - Me.lblFraction.Location = New System.Drawing.Point(278, 223) + Me.lblFraction.Location = New System.Drawing.Point(281, 223) Me.lblFraction.Name = "lblFraction" Me.lblFraction.Size = New System.Drawing.Size(51, 13) Me.lblFraction.TabIndex = 32 @@ -88,7 +87,7 @@ Partial Class dlgRandomSplit 'lblPool ' Me.lblPool.AutoSize = True - Me.lblPool.Location = New System.Drawing.Point(278, 254) + Me.lblPool.Location = New System.Drawing.Point(281, 254) Me.lblPool.Name = "lblPool" Me.lblPool.Size = New System.Drawing.Size(34, 13) Me.lblPool.TabIndex = 33 @@ -103,6 +102,28 @@ Partial Class dlgRandomSplit Me.lblReceiverRandomSplit.TabIndex = 35 Me.lblReceiverRandomSplit.Text = "Variables :" ' + 'lblBreaks + ' + Me.lblBreaks.AutoSize = True + Me.lblBreaks.Location = New System.Drawing.Point(281, 287) + Me.lblBreaks.Name = "lblBreaks" + Me.lblBreaks.Size = New System.Drawing.Size(46, 13) + Me.lblBreaks.TabIndex = 37 + Me.lblBreaks.Text = "Breaks :" + ' + 'ucrNudBreaks + ' + Me.ucrNudBreaks.AutoSize = True + Me.ucrNudBreaks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudBreaks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 287) + Me.ucrNudBreaks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudBreaks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudBreaks.Name = "ucrNudBreaks" + Me.ucrNudBreaks.Size = New System.Drawing.Size(50, 20) + Me.ucrNudBreaks.TabIndex = 36 + Me.ucrNudBreaks.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'ucrReceiverRandomSplit ' Me.ucrReceiverRandomSplit.AutoSize = True @@ -147,7 +168,7 @@ Partial Class dlgRandomSplit Me.ucrNudLag.AutoSize = True Me.ucrNudLag.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLag.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLag.Location = New System.Drawing.Point(92, 230) + Me.ucrNudLag.Location = New System.Drawing.Point(92, 249) Me.ucrNudLag.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLag.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLag.Name = "ucrNudLag" @@ -158,16 +179,16 @@ Partial Class dlgRandomSplit 'ucrSaveRandomSplit ' Me.ucrSaveRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveRandomSplit.Location = New System.Drawing.Point(9, 312) + Me.ucrSaveRandomSplit.Location = New System.Drawing.Point(9, 331) Me.ucrSaveRandomSplit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveRandomSplit.Name = "ucrSaveRandomSplit" - Me.ucrSaveRandomSplit.Size = New System.Drawing.Size(403, 34) + Me.ucrSaveRandomSplit.Size = New System.Drawing.Size(403, 23) Me.ucrSaveRandomSplit.TabIndex = 28 ' 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 354) + Me.ucrBase.Location = New System.Drawing.Point(9, 358) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 27 @@ -176,7 +197,7 @@ Partial Class dlgRandomSplit ' Me.ucrChkLag.AutoSize = True Me.ucrChkLag.Checked = False - Me.ucrChkLag.Location = New System.Drawing.Point(9, 230) + Me.ucrChkLag.Location = New System.Drawing.Point(9, 249) Me.ucrChkLag.Name = "ucrChkLag" Me.ucrChkLag.Size = New System.Drawing.Size(143, 23) Me.ucrChkLag.TabIndex = 25 @@ -185,7 +206,7 @@ Partial Class dlgRandomSplit ' Me.ucrChkTrainingData.AutoSize = True Me.ucrChkTrainingData.Checked = False - Me.ucrChkTrainingData.Location = New System.Drawing.Point(9, 259) + Me.ucrChkTrainingData.Location = New System.Drawing.Point(9, 278) Me.ucrChkTrainingData.Name = "ucrChkTrainingData" Me.ucrChkTrainingData.Size = New System.Drawing.Size(143, 23) Me.ucrChkTrainingData.TabIndex = 24 @@ -194,22 +215,11 @@ Partial Class dlgRandomSplit ' Me.ucrChkTestingData.AutoSize = True Me.ucrChkTestingData.Checked = False - Me.ucrChkTestingData.Location = New System.Drawing.Point(9, 288) + Me.ucrChkTestingData.Location = New System.Drawing.Point(9, 307) Me.ucrChkTestingData.Name = "ucrChkTestingData" Me.ucrChkTestingData.Size = New System.Drawing.Size(143, 23) Me.ucrChkTestingData.TabIndex = 23 ' - 'ucrSelectorRandomSplit - ' - Me.ucrSelectorRandomSplit.AutoSize = True - Me.ucrSelectorRandomSplit.bDropUnusedFilterLevels = False - Me.ucrSelectorRandomSplit.bUseCurrentFilter = True - Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(9, 75) - Me.ucrSelectorRandomSplit.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorRandomSplit.Name = "ucrSelectorRandomSplit" - Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(153, 43) - Me.ucrSelectorRandomSplit.TabIndex = 22 - ' 'ucrChkStratifyingFactor ' Me.ucrChkStratifyingFactor.AutoSize = True @@ -222,51 +232,28 @@ Partial Class dlgRandomSplit 'ucrPnlRandomSplit ' Me.ucrPnlRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRandomSplit.Location = New System.Drawing.Point(92, 12) + Me.ucrPnlRandomSplit.Location = New System.Drawing.Point(104, 12) Me.ucrPnlRandomSplit.Name = "ucrPnlRandomSplit" Me.ucrPnlRandomSplit.Size = New System.Drawing.Size(212, 44) Me.ucrPnlRandomSplit.TabIndex = 26 ' - 'ucrNudBreaks - ' - Me.ucrNudBreaks.AutoSize = True - Me.ucrNudBreaks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudBreaks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 287) - Me.ucrNudBreaks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudBreaks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudBreaks.Name = "ucrNudBreaks" - Me.ucrNudBreaks.Size = New System.Drawing.Size(50, 20) - Me.ucrNudBreaks.TabIndex = 36 - Me.ucrNudBreaks.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'lblBreaks - ' - Me.lblBreaks.AutoSize = True - Me.lblBreaks.Location = New System.Drawing.Point(279, 287) - Me.lblBreaks.Name = "lblBreaks" - Me.lblBreaks.Size = New System.Drawing.Size(46, 13) - Me.lblBreaks.TabIndex = 37 - Me.lblBreaks.Text = "Breaks :" - ' - 'ucrSelector + 'ucrSelectorRandomSplit ' - Me.ucrSelector.AutoSize = True - Me.ucrSelector.bDropUnusedFilterLevels = False - Me.ucrSelector.bShowHiddenColumns = False - Me.ucrSelector.bUseCurrentFilter = True - Me.ucrSelector.Location = New System.Drawing.Point(9, 75) - Me.ucrSelector.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelector.Name = "ucrSelector" - Me.ucrSelector.Size = New System.Drawing.Size(213, 183) - Me.ucrSelector.TabIndex = 38 + Me.ucrSelectorRandomSplit.AutoSize = True + Me.ucrSelectorRandomSplit.bDropUnusedFilterLevels = False + Me.ucrSelectorRandomSplit.bShowHiddenColumns = False + Me.ucrSelectorRandomSplit.bUseCurrentFilter = True + Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(9, 63) + Me.ucrSelectorRandomSplit.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorRandomSplit.Name = "ucrSelectorRandomSplit" + Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorRandomSplit.TabIndex = 38 ' 'dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(432, 418) - Me.Controls.Add(Me.ucrSelector) Me.Controls.Add(Me.lblBreaks) Me.Controls.Add(Me.ucrNudBreaks) Me.Controls.Add(Me.lblReceiverRandomSplit) @@ -281,11 +268,11 @@ Partial Class dlgRandomSplit Me.Controls.Add(Me.ucrChkLag) Me.Controls.Add(Me.ucrChkTrainingData) Me.Controls.Add(Me.ucrChkTestingData) - Me.Controls.Add(Me.ucrSelectorRandomSplit) Me.Controls.Add(Me.rdoSample) Me.Controls.Add(Me.rdoTimeSeries) Me.Controls.Add(Me.ucrChkStratifyingFactor) Me.Controls.Add(Me.ucrPnlRandomSplit) + Me.Controls.Add(Me.ucrSelectorRandomSplit) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -300,7 +287,6 @@ Partial Class dlgRandomSplit Friend WithEvents rdoSample As RadioButton Friend WithEvents rdoTimeSeries As RadioButton Friend WithEvents ucrChkStratifyingFactor As ucrCheck - Friend WithEvents ucrSelectorRandomSplit As ucrDataFrame Friend WithEvents ucrChkLag As ucrCheck Friend WithEvents ucrChkTrainingData As ucrCheck Friend WithEvents ucrChkTestingData As ucrCheck @@ -316,5 +302,5 @@ Partial Class dlgRandomSplit Friend WithEvents lblReceiverRandomSplit As Label Friend WithEvents lblBreaks As Label Friend WithEvents ucrNudBreaks As ucrNud - Friend WithEvents ucrSelector As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrSelectorRandomSplit As ucrSelectorByDataFrameAddRemove End Class diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 0ea0b877c93..bea4f932a88 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -38,31 +38,21 @@ Public Class dlgRandomSplit End Sub Private Sub InitialiseDialog() - ucrPnlRandomSplit.AddRadioButton(rdoSample) - ucrPnlRandomSplit.AddRadioButton(rdoTimeSeries) - ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {}) - ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {}) - ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor, ucrNudPool, ucrNudBreaks, ucrSelector}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - - ucrReceiverRandomSplit.SetParameterIsRFunction() - ucrReceiverRandomSplit.Selector = ucrSelector + ucrReceiverRandomSplit.Selector = ucrSelectorRandomSplit ucrReceiverRandomSplit.SetMeAsReceiver() ucrReceiverRandomSplit.SetDataType("numeric") ucrReceiverRandomSplit.SetLinkedDisplayControl(lblReceiverRandomSplit) - ucrSelectorRandomSplit.SetParameterIsRFunction() - ucrSelector.SetParameterIsrfunction() + ucrSelectorRandomSplit.SetParameter(New RParameter("data", 0)) + ucrSelectorRandomSplit.SetParameterIsString() ucrChkStratifyingFactor.SetText("Set Seed") - ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRandomSplit, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkStratifyingFactor.AddToLinkedControls(ucrSelector, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkStratifyingFactor.SetParameter(New RParameter("strata", 2)) - + ucrChkStratifyingFactor.SetValueIfUnchecked("NULL") ucrChkLag.SetText("Lag") - ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) + ucrChkLag.SetParameter(New RParameter("lag"), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrChkTestingData.SetText("Save Testing Data") ucrChkTestingData.SetParameter(New RParameter("x", 0)) @@ -71,17 +61,14 @@ Public Class dlgRandomSplit ucrChkTrainingData.SetText("Save Training Data") ucrChkTrainingData.SetParameter(New RParameter("x", 0)) - 'ucrSaveRandomSplit.set ucrSaveRandomSplit.SetLabelText("Save sample to:") ucrSaveRandomSplit.SetSaveTypeAsDataFrame() - ucrSaveRandomSplit.SetDataFrameSelector(ucrSelector.ucrAvailableDataFrames) + ucrSaveRandomSplit.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) ucrNudLag.SetParameter(New RParameter("lag", 3)) - ucrNudLag.SetRDefault("0") ucrNudBreaks.SetLinkedDisplayControl(lblBreaks) ucrNudBreaks.SetParameter(New RParameter("breaks", 4)) - ucrNudBreaks.SetRDefault("4") ucrNudFraction.SetLinkedDisplayControl(lblFraction) ucrNudFraction.SetParameter(New RParameter("prop", 1)) @@ -89,15 +76,22 @@ Public Class dlgRandomSplit ucrNudFraction.Maximum = 0.99 ucrNudFraction.DecimalPlaces = 2 ucrNudFraction.Increment = 0.01 - ucrNudFraction.SetRDefault("0.75") ucrNudPool.SetLinkedDisplayControl(lblPool) - ucrNudPool.SetParameter(New RParameter("pool", 4)) + ucrNudPool.SetParameter(New RParameter("pool", 5)) ucrNudPool.DecimalPlaces = 2 ucrNudPool.Minimum = 0.00 ucrNudPool.Maximum = 0.15 ucrNudPool.Increment = 0.01 - ucrNudPool.SetRDefault("0.10") + + ucrPnlRandomSplit.AddRadioButton(rdoSample) + ucrPnlRandomSplit.AddRadioButton(rdoTimeSeries) + ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"initial_split", "training", "testing"}) + ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"initial_time_split", "training", "testing"}) + ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor, ucrNudPool, ucrNudBreaks}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) + End Sub Private Sub SetDefaults() @@ -111,39 +105,45 @@ Public Class dlgRandomSplit ucrSelectorRandomSplit.Focus() ucrSaveRandomSplit.Reset() - clsInitialTimeSplit.SetRCommand("initial_time_split") clsInitialTimeSplit.SetPackageName("rsample") + clsInitialTimeSplit.SetRCommand("initial_time_split") + clsInitialTimeSplit.AddParameter("prop", "0.75", iPosition:=1) + clsInitialTimeSplit.AddParameter("lag", "0", iPosition:=2) - clsInitialSplit.SetRCommand("initial_split") clsInitialSplit.SetPackageName("rsample") + clsInitialSplit.SetRCommand("initial_split") + clsInitialSplit.AddParameter("prop", "0.75", iPosition:=1) + clsInitialSplit.AddParameter("strata", "NULL", iPosition:=2) + clsInitialSplit.AddParameter("lag", "0", iPosition:=3) + clsInitialSplit.AddParameter("breaks", "4", iPosition:=4) + clsInitialSplit.AddParameter("pool", "0.1", iPosition:=5) + clsTraining.SetPackageName("rsample") clsTraining.SetRCommand("training") - clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit, iPosition:=0) - clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit, iPosition:=0) clsTesting.SetPackageName("rsample") clsTesting.SetRCommand("testing") - clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit, iPosition:=0) - clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit, iPosition:=0) ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrNudFraction.AddAdditionalCodeParameterPair(clsInitialSplit, New RParameter("prop", 1), iAdditionalPairNo:=1) - ucrChkTrainingData.AddAdditionalCodeParameterPair(clsInitialSplit, New RParameter(), iAdditionalPairNo:=1) - ucrChkTestingData.AddAdditionalCodeParameterPair(clsInitialSplit, New RParameter(), iAdditionalPairNo:=1) - - ucrSelectorRandomSplit.SetRCode(clsInitialTimeSplit, bReset) - ucrChkTestingData.SetRCode(clsInitialTimeSplit, bReset) - ucrChkTrainingData.SetRCode(clsInitialTimeSplit, bReset) - ucrChkStratifyingFactor.SetRCode(clsInitialTimeSplit, bReset) + ucrSelectorRandomSplit.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("data", 0), iAdditionalPairNo:=1) + ucrNudFraction.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("prop", 1), iAdditionalPairNo:=1) + ucrNudLag.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("lag", 3), iAdditionalPairNo:=1) + ucrSaveRandomSplit.AddAdditionalRCode(clsTesting, iAdditionalPairNo:=1) + + ucrSelectorRandomSplit.SetRCode(clsInitialSplit, bReset) + ucrChkTestingData.SetRCode(clsTesting, bReset) + ucrChkTrainingData.SetRCode(clsTraining, bReset) + ucrChkStratifyingFactor.SetRCode(clsInitialSplit, bReset) ucrNudBreaks.SetRCode(clsInitialSplit, bReset) - ucrNudFraction.SetRCode(clsInitialTimeSplit, bReset) - ucrNudPool.SetRCode(clsInitialTimeSplit, bReset) - ucrSaveRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) + ucrNudFraction.SetRCode(clsInitialSplit, bReset) + ucrNudPool.SetRCode(clsInitialSplit, bReset) + ucrSaveRandomSplit.SetRCode(clsTraining, bReset) ucrNudLag.SetRCode(clsInitialSplit, bReset) ucrReceiverRandomSplit.SetRCode(clsInitialSplit, bReset) + ucrPnlRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) End Sub Private Sub TestOkEnabled() @@ -151,10 +151,25 @@ Public Class dlgRandomSplit End Sub Private Sub SetBaseFunction() If rdoSample.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) + If ucrChkTestingData.Checked Then + clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) + ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) + ElseIf ucrChkTrainingData.Checked Then + clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) + ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) + Else + ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) End If - If rdoTimeSeries.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsInitialTimeSplit) + Else + If ucrChkTrainingData.Checked Then + clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) + ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) + ElseIf ucrChkTrainingData.Checked Then + clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) + ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) + Else + ucrBase.clsRsyntax.SetBaseRFunction(clsInitialTimeSplit) + End If End If End Sub @@ -163,15 +178,13 @@ Public Class dlgRandomSplit SetRCodeForControls(True) TestOkEnabled() End Sub - Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSelectorRandomSplit.ControlContentsChanged, - ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrSaveRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrChkStratifyingFactor.ControlContentsChanged, ucrChkTestingData.ControlContentsChanged, ucrChkTrainingData.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged TestOkEnabled() End Sub - Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged + Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrChkTestingData.ControlValueChanged, ucrChkTrainingData.ControlValueChanged SetBaseFunction() - End Sub End Class \ No newline at end of file From b5c205e72020a4f7e2574d26f3503276727c24ba Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Wed, 30 Mar 2022 18:23:19 +0300 Subject: [PATCH 012/100] Minor changes --- instat/dlgRandomSplit.vb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index bea4f932a88..eb48a09460f 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -41,7 +41,7 @@ Public Class dlgRandomSplit ucrReceiverRandomSplit.Selector = ucrSelectorRandomSplit ucrReceiverRandomSplit.SetMeAsReceiver() - ucrReceiverRandomSplit.SetDataType("numeric") + 'ucrReceiverRandomSplit.SetDataType("factor") ucrReceiverRandomSplit.SetLinkedDisplayControl(lblReceiverRandomSplit) ucrSelectorRandomSplit.SetParameter(New RParameter("data", 0)) @@ -158,6 +158,9 @@ Public Class dlgRandomSplit clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) Else + If ucrChkStratifyingFactor.Checked Then + + End If ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) End If Else From 5afadf044fba73bcab53bf6bcc8c0534f3e2dcd8 Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Wed, 30 Mar 2022 21:39:17 +0300 Subject: [PATCH 013/100] minor changes --- instat/dlgRandomSplit.vb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index eb48a09460f..7516d0c92b2 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -66,6 +66,7 @@ Public Class dlgRandomSplit ucrSaveRandomSplit.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) ucrNudLag.SetParameter(New RParameter("lag", 3)) + ucrNudLag.SetMinMax(-100, 100) ucrNudBreaks.SetLinkedDisplayControl(lblBreaks) ucrNudBreaks.SetParameter(New RParameter("breaks", 4)) @@ -158,9 +159,6 @@ Public Class dlgRandomSplit clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) Else - If ucrChkStratifyingFactor.Checked Then - - End If ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) End If Else From a12328fcc88ce677e65ff325003ddbd09e6c09af Mon Sep 17 00:00:00 2001 From: mmulahvictor <60970331+mmulahvictor@users.noreply.github.com> Date: Thu, 31 Mar 2022 16:31:31 +0300 Subject: [PATCH 014/100] Changes on the random split dialog --- instat/dlgRandomSplit.vb | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 7516d0c92b2..94870cb6e5b 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -45,25 +45,28 @@ Public Class dlgRandomSplit ucrReceiverRandomSplit.SetLinkedDisplayControl(lblReceiverRandomSplit) ucrSelectorRandomSplit.SetParameter(New RParameter("data", 0)) - ucrSelectorRandomSplit.SetParameterIsString() + ucrSelectorRandomSplit.SetParameterIsrfunction() ucrChkStratifyingFactor.SetText("Set Seed") ucrChkStratifyingFactor.SetParameter(New RParameter("strata", 2)) ucrChkStratifyingFactor.SetValueIfUnchecked("NULL") ucrChkLag.SetText("Lag") - ucrChkLag.SetParameter(New RParameter("lag"), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + ucrChkLag.SetParameter(New RParameter("lag", 2)) ucrChkTestingData.SetText("Save Testing Data") - ucrChkTestingData.SetParameter(New RParameter("x", 0)) - + 'ucrChkTestingData.SetParameter(New RParameter("x", 0)) + 'ucrChkTestingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkTrainingData.SetText("Save Training Data") - ucrChkTrainingData.SetParameter(New RParameter("x", 0)) + 'ucrChkTrainingData.SetParameter(New RParameter("x", 0)) + 'ucrChkTrainingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrSaveRandomSplit.SetLabelText("Save sample to:") ucrSaveRandomSplit.SetSaveTypeAsDataFrame() ucrSaveRandomSplit.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) + ucrSaveRandomSplit.SetPrefix("training") + ucrSaveRandomSplit.SetIsComboBox() ucrNudLag.SetParameter(New RParameter("lag", 3)) ucrNudLag.SetMinMax(-100, 100) @@ -122,9 +125,11 @@ Public Class dlgRandomSplit clsTraining.SetPackageName("rsample") clsTraining.SetRCommand("training") + clsTraining.SetAssignTo("last_training", strTempDataframe:=ucrSelectorRandomSplit.strCurrentDataFrame, strDataFrameNames:="last_training") clsTesting.SetPackageName("rsample") clsTesting.SetRCommand("testing") + clsTesting.SetAssignTo("last_testing", strTempDataframe:=ucrSelectorRandomSplit.strCurrentDataFrame, strDataFrameNames:="last_testing") ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) End Sub @@ -152,6 +157,7 @@ Public Class dlgRandomSplit End Sub Private Sub SetBaseFunction() If rdoSample.Checked Then + ' ucrBase.clsRsyntax.iCallType = 2 If ucrChkTestingData.Checked Then clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) @@ -160,7 +166,7 @@ Public Class dlgRandomSplit ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) Else ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) - End If + End If Else If ucrChkTrainingData.Checked Then clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) @@ -188,4 +194,12 @@ Public Class dlgRandomSplit Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrChkTestingData.ControlValueChanged, ucrChkTrainingData.ControlValueChanged SetBaseFunction() End Sub + + 'Private Sub ucrChkStratifyingFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkStratifyingFactor.ControlValueChanged + ' If ucrChkStratifyingFactor.Checked Then + ' ucrNudPool.Visible = True + ' Else + ' ucrNudPool.Visible = False + ' End If + 'End Sub End Class \ No newline at end of file From 5140fecc1e8162c0bd2ecb8cb7fe4b4c4d4cd5e5 Mon Sep 17 00:00:00 2001 From: VictorM Date: Mon, 4 Apr 2022 17:08:50 +0300 Subject: [PATCH 015/100] Removing form main changes --- instat/frmMain.Designer.vb | 16 ++++------------ instat/frmMain.vb | 4 ---- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index d78a06cb499..ed33c843f6d 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -678,7 +678,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.RandomSplitToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3940,18 +3939,18 @@ Partial Class frmMain 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(180, 22) + 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(177, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 @@ -3961,7 +3960,7 @@ Partial Class frmMain ' '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.RandomSplitToolStripMenuItem}) + 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.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataReshape.Tag = "" @@ -5099,12 +5098,6 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'RandomSplitToolStripMenuItem - ' - Me.RandomSplitToolStripMenuItem.Name = "RandomSplitToolStripMenuItem" - Me.RandomSplitToolStripMenuItem.Size = New System.Drawing.Size(197, 22) - Me.RandomSplitToolStripMenuItem.Text = "Random split..." - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5798,5 +5791,4 @@ Partial Class frmMain Friend WithEvents mnuOptionsByContextDefine As ToolStripMenuItem Friend WithEvents mnuOptionsByContextDefineOnStation As ToolStripMenuItem Friend WithEvents mnuOptionsByContextDefineOnFarm As ToolStripMenuItem - Friend WithEvents RandomSplitToolStripMenuItem As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index f336b3e6143..bc81ce1a85f 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2431,8 +2431,4 @@ Public Class frmMain Private Sub mnuOptionsByContextDefineOnFarm_Click(sender As Object, e As EventArgs) Handles mnuOptionsByContextDefineOnFarm.Click dlgDefineOptionsByContext.ShowDialog() End Sub - - Private Sub RandomSplitToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RandomSplitToolStripMenuItem.Click - dlgRandomSplit.ShowDialog() - End Sub End Class From 8b5e6133695eaa7bd0351970fb537c0a1c4e67f5 Mon Sep 17 00:00:00 2001 From: VictorM Date: Tue, 5 Apr 2022 18:16:12 +0300 Subject: [PATCH 016/100] Minor changes for the time series radio button --- instat/dlgRandomSplit.vb | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 94870cb6e5b..52bfbf96f01 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -50,17 +50,15 @@ Public Class dlgRandomSplit ucrChkStratifyingFactor.SetText("Set Seed") ucrChkStratifyingFactor.SetParameter(New RParameter("strata", 2)) ucrChkStratifyingFactor.SetValueIfUnchecked("NULL") + ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRandomSplit, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkLag.SetText("Lag") - ucrChkLag.SetParameter(New RParameter("lag", 2)) - + ucrNudLag.SetParameter(New RParameter("lag", 3)) + ucrNudLag.SetMinMax(-100, 100) + ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) ucrChkTestingData.SetText("Save Testing Data") - 'ucrChkTestingData.SetParameter(New RParameter("x", 0)) - 'ucrChkTestingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkTrainingData.SetText("Save Training Data") - 'ucrChkTrainingData.SetParameter(New RParameter("x", 0)) - 'ucrChkTrainingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrSaveRandomSplit.SetLabelText("Save sample to:") ucrSaveRandomSplit.SetSaveTypeAsDataFrame() @@ -68,8 +66,6 @@ Public Class dlgRandomSplit ucrSaveRandomSplit.SetPrefix("training") ucrSaveRandomSplit.SetIsComboBox() - ucrNudLag.SetParameter(New RParameter("lag", 3)) - ucrNudLag.SetMinMax(-100, 100) ucrNudBreaks.SetLinkedDisplayControl(lblBreaks) ucrNudBreaks.SetParameter(New RParameter("breaks", 4)) @@ -94,7 +90,7 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"initial_time_split", "training", "testing"}) ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor, ucrNudPool, ucrNudBreaks}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) + 'ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) End Sub @@ -196,10 +192,6 @@ Public Class dlgRandomSplit End Sub 'Private Sub ucrChkStratifyingFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkStratifyingFactor.ControlValueChanged - ' If ucrChkStratifyingFactor.Checked Then - ' ucrNudPool.Visible = True - ' Else - ' ucrNudPool.Visible = False - ' End If + 'End Sub End Class \ No newline at end of file From 849d4956f5ea8467c2c6201d4572b396f29b1e98 Mon Sep 17 00:00:00 2001 From: VictorM Date: Wed, 6 Apr 2022 19:14:50 +0300 Subject: [PATCH 017/100] Minor changes --- instat/dlgRandomSplit.vb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 52bfbf96f01..8026167574e 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -130,7 +130,7 @@ Public Class dlgRandomSplit End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrSelectorRandomSplit.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("data", 0), iAdditionalPairNo:=1) + ucrSelectorRandomSplit.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("data", ucrSelectorRandomSplit.ucrAvailableDataFrames.clsCurrDataFrame, 0), iAdditionalPairNo:=1) ucrNudFraction.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("prop", 1), iAdditionalPairNo:=1) ucrNudLag.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("lag", 3), iAdditionalPairNo:=1) ucrSaveRandomSplit.AddAdditionalRCode(clsTesting, iAdditionalPairNo:=1) @@ -153,7 +153,6 @@ Public Class dlgRandomSplit End Sub Private Sub SetBaseFunction() If rdoSample.Checked Then - ' ucrBase.clsRsyntax.iCallType = 2 If ucrChkTestingData.Checked Then clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) @@ -163,8 +162,8 @@ Public Class dlgRandomSplit Else ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) End If - Else - If ucrChkTrainingData.Checked Then + ElseIf rdoTimeSeries.Checked Then + If ucrChkTestingData.Checked Then clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) ElseIf ucrChkTrainingData.Checked Then @@ -190,8 +189,4 @@ Public Class dlgRandomSplit Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrChkTestingData.ControlValueChanged, ucrChkTrainingData.ControlValueChanged SetBaseFunction() End Sub - - 'Private Sub ucrChkStratifyingFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkStratifyingFactor.ControlValueChanged - - 'End Sub End Class \ No newline at end of file From 599644af1aa08ca9f6a01c38079a8e2fe5c42abf Mon Sep 17 00:00:00 2001 From: VictorM Date: Thu, 7 Apr 2022 16:07:15 +0300 Subject: [PATCH 018/100] Adding the icalltype to show output in the output window --- instat/dlgRandomSplit.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 8026167574e..3069eda3d69 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -161,6 +161,7 @@ Public Class dlgRandomSplit ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) Else ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) + ucrBase.clsRsyntax.iCallType = 2 End If ElseIf rdoTimeSeries.Checked Then If ucrChkTestingData.Checked Then @@ -171,6 +172,7 @@ Public Class dlgRandomSplit ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) Else ucrBase.clsRsyntax.SetBaseRFunction(clsInitialTimeSplit) + ucrBase.clsRsyntax.iCallType = 2 End If End If End Sub From bb8fc433c1c4efc144a9017e8a047678f6137cc1 Mon Sep 17 00:00:00 2001 From: VictorM Date: Fri, 22 Apr 2022 15:09:38 +0300 Subject: [PATCH 019/100] Doing some major changes on the designer and the code. --- instat/dlgRandomSplit.Designer.vb | 44 ++++++++++++------------ instat/dlgRandomSplit.vb | 57 ++++++++++++++++++++++++------- 2 files changed, 66 insertions(+), 35 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index 4ee6553132a..0d6651e8fa4 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -29,7 +29,6 @@ Partial Class dlgRandomSplit Me.lblReceiverRandomSplit = New System.Windows.Forms.Label() Me.lblBreaks = New System.Windows.Forms.Label() Me.ucrNudBreaks = New instat.ucrNud() - Me.ucrReceiverRandomSplit = New instat.ucrReceiverMultiple() Me.ucrNudPool = New instat.ucrNud() Me.ucrNudFraction = New instat.ucrNud() Me.ucrNudLag = New instat.ucrNud() @@ -41,6 +40,7 @@ Partial Class dlgRandomSplit Me.ucrChkStratifyingFactor = New instat.ucrCheck() Me.ucrPnlRandomSplit = New instat.UcrPanel() Me.ucrSelectorRandomSplit = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrReceiverRanSplit = New instat.ucrReceiverSingle() Me.SuspendLayout() ' 'rdoSample @@ -78,7 +78,7 @@ Partial Class dlgRandomSplit 'lblFraction ' Me.lblFraction.AutoSize = True - Me.lblFraction.Location = New System.Drawing.Point(281, 223) + Me.lblFraction.Location = New System.Drawing.Point(281, 152) Me.lblFraction.Name = "lblFraction" Me.lblFraction.Size = New System.Drawing.Size(51, 13) Me.lblFraction.TabIndex = 32 @@ -87,7 +87,7 @@ Partial Class dlgRandomSplit 'lblPool ' Me.lblPool.AutoSize = True - Me.lblPool.Location = New System.Drawing.Point(281, 254) + Me.lblPool.Location = New System.Drawing.Point(281, 183) Me.lblPool.Name = "lblPool" Me.lblPool.Size = New System.Drawing.Size(34, 13) Me.lblPool.TabIndex = 33 @@ -105,7 +105,7 @@ Partial Class dlgRandomSplit 'lblBreaks ' Me.lblBreaks.AutoSize = True - Me.lblBreaks.Location = New System.Drawing.Point(281, 287) + Me.lblBreaks.Location = New System.Drawing.Point(281, 216) Me.lblBreaks.Name = "lblBreaks" Me.lblBreaks.Size = New System.Drawing.Size(46, 13) Me.lblBreaks.TabIndex = 37 @@ -116,7 +116,7 @@ Partial Class dlgRandomSplit Me.ucrNudBreaks.AutoSize = True Me.ucrNudBreaks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 287) + Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 216) Me.ucrNudBreaks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudBreaks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Name = "ucrNudBreaks" @@ -124,25 +124,12 @@ Partial Class dlgRandomSplit Me.ucrNudBreaks.TabIndex = 36 Me.ucrNudBreaks.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'ucrReceiverRandomSplit - ' - Me.ucrReceiverRandomSplit.AutoSize = True - Me.ucrReceiverRandomSplit.frmParent = Me - Me.ucrReceiverRandomSplit.Location = New System.Drawing.Point(281, 112) - Me.ucrReceiverRandomSplit.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverRandomSplit.Name = "ucrReceiverRandomSplit" - Me.ucrReceiverRandomSplit.Selector = Nothing - Me.ucrReceiverRandomSplit.Size = New System.Drawing.Size(120, 100) - Me.ucrReceiverRandomSplit.strNcFilePath = "" - Me.ucrReceiverRandomSplit.TabIndex = 34 - Me.ucrReceiverRandomSplit.ucrSelector = Nothing - ' 'ucrNudPool ' Me.ucrNudPool.AutoSize = True Me.ucrNudPool.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPool.Location = New System.Drawing.Point(351, 254) + Me.ucrNudPool.Location = New System.Drawing.Point(351, 183) Me.ucrNudPool.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPool.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Name = "ucrNudPool" @@ -155,7 +142,7 @@ Partial Class dlgRandomSplit Me.ucrNudFraction.AutoSize = True Me.ucrNudFraction.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFraction.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudFraction.Location = New System.Drawing.Point(351, 223) + Me.ucrNudFraction.Location = New System.Drawing.Point(351, 152) Me.ucrNudFraction.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudFraction.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFraction.Name = "ucrNudFraction" @@ -249,15 +236,28 @@ Partial Class dlgRandomSplit Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorRandomSplit.TabIndex = 38 ' + 'ucrReceiverRanSplit + ' + Me.ucrReceiverRanSplit.AutoSize = True + Me.ucrReceiverRanSplit.frmParent = Me + Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(281, 108) + Me.ucrReceiverRanSplit.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRanSplit.Name = "ucrReceiverRanSplit" + Me.ucrReceiverRanSplit.Selector = Nothing + Me.ucrReceiverRanSplit.Size = New System.Drawing.Size(120, 21) + Me.ucrReceiverRanSplit.strNcFilePath = "" + Me.ucrReceiverRanSplit.TabIndex = 39 + Me.ucrReceiverRanSplit.ucrSelector = Nothing + ' 'dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(432, 418) + Me.Controls.Add(Me.ucrReceiverRanSplit) Me.Controls.Add(Me.lblBreaks) Me.Controls.Add(Me.ucrNudBreaks) Me.Controls.Add(Me.lblReceiverRandomSplit) - Me.Controls.Add(Me.ucrReceiverRandomSplit) Me.Controls.Add(Me.lblPool) Me.Controls.Add(Me.lblFraction) Me.Controls.Add(Me.ucrNudPool) @@ -298,9 +298,9 @@ Partial Class dlgRandomSplit Friend WithEvents ucrPnlRandomSplit As UcrPanel Friend WithEvents lblPool As Label Friend WithEvents lblFraction As Label - Friend WithEvents ucrReceiverRandomSplit As ucrReceiverMultiple Friend WithEvents lblReceiverRandomSplit As Label Friend WithEvents lblBreaks As Label Friend WithEvents ucrNudBreaks As ucrNud Friend WithEvents ucrSelectorRandomSplit As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrReceiverRanSplit As ucrReceiverSingle End Class diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 3069eda3d69..f0264e2b29b 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -19,8 +19,9 @@ Public Class dlgRandomSplit Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsInitialTimeSplit As RFunction - Private clsInitialSplit As RFunction + Private clsInitialSplit As New RFunction Private clsTraining As RFunction + Private clsDummyFunction As RFunction Private clsTesting As RFunction Private Sub dlgRandomSplit_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -39,26 +40,35 @@ Public Class dlgRandomSplit Private Sub InitialiseDialog() - ucrReceiverRandomSplit.Selector = ucrSelectorRandomSplit - ucrReceiverRandomSplit.SetMeAsReceiver() - 'ucrReceiverRandomSplit.SetDataType("factor") - ucrReceiverRandomSplit.SetLinkedDisplayControl(lblReceiverRandomSplit) + ucrReceiverRanSplit.SetParameter(New RParameter("strata", 2)) + ucrReceiverRanSplit.Selector = ucrSelectorRandomSplit + ucrReceiverRanSplit.SetMeAsReceiver() + ucrReceiverRanSplit.SetDataType("factor") + ucrReceiverRanSplit.SetLinkedDisplayControl(lblReceiverRandomSplit) + ucrReceiverRanSplit.SetParameterIsString() ucrSelectorRandomSplit.SetParameter(New RParameter("data", 0)) ucrSelectorRandomSplit.SetParameterIsrfunction() ucrChkStratifyingFactor.SetText("Set Seed") - ucrChkStratifyingFactor.SetParameter(New RParameter("strata", 2)) - ucrChkStratifyingFactor.SetValueIfUnchecked("NULL") - ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRandomSplit, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkStratifyingFactor.SetParameter(New RParameter("check")) + ucrChkStratifyingFactor.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRanSplit, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkLag.SetText("Lag") ucrNudLag.SetParameter(New RParameter("lag", 3)) ucrNudLag.SetMinMax(-100, 100) ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) + ucrChkTestingData.SetText("Save Testing Data") + ucrChkTestingData.SetParameter(New RParameter("testing", 0)) + ucrChkTestingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkTrainingData.SetText("Save Training Data") + ucrChkTrainingData.SetParameter(New RParameter("training", 0)) + ucrChkTrainingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrSaveRandomSplit.SetLabelText("Save sample to:") ucrSaveRandomSplit.SetSaveTypeAsDataFrame() @@ -88,6 +98,7 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddRadioButton(rdoTimeSeries) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"initial_split", "training", "testing"}) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"initial_time_split", "training", "testing"}) + ucrPnlRandomSplit.AddToLinkedControls(ucrChkStratifyingFactor, {rdoSample}, bNewLinkedHideIfParameterMissing:=True) ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor, ucrNudPool, ucrNudBreaks}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) 'ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) @@ -99,6 +110,7 @@ Public Class dlgRandomSplit clsInitialSplit = New RFunction clsTesting = New RFunction clsTraining = New RFunction + clsDummyFunction = New RFunction ucrSelectorRandomSplit.Reset() @@ -136,15 +148,15 @@ Public Class dlgRandomSplit ucrSaveRandomSplit.AddAdditionalRCode(clsTesting, iAdditionalPairNo:=1) ucrSelectorRandomSplit.SetRCode(clsInitialSplit, bReset) - ucrChkTestingData.SetRCode(clsTesting, bReset) - ucrChkTrainingData.SetRCode(clsTraining, bReset) - ucrChkStratifyingFactor.SetRCode(clsInitialSplit, bReset) + ucrChkTestingData.SetRCode(clsDummyFunction, bReset) + ucrChkTrainingData.SetRCode(clsDummyFunction, bReset) + ucrChkStratifyingFactor.SetRCode(clsDummyFunction, bReset) ucrNudBreaks.SetRCode(clsInitialSplit, bReset) ucrNudFraction.SetRCode(clsInitialSplit, bReset) ucrNudPool.SetRCode(clsInitialSplit, bReset) ucrSaveRandomSplit.SetRCode(clsTraining, bReset) ucrNudLag.SetRCode(clsInitialSplit, bReset) - ucrReceiverRandomSplit.SetRCode(clsInitialSplit, bReset) + ucrReceiverRanSplit.SetRCode(clsInitialSplit, bReset) ucrPnlRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) End Sub @@ -156,6 +168,7 @@ Public Class dlgRandomSplit If ucrChkTestingData.Checked Then clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) + ucrBase.clsRsyntax.iCallType = 0 ElseIf ucrChkTrainingData.Checked Then clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) @@ -188,7 +201,25 @@ Public Class dlgRandomSplit TestOkEnabled() End Sub - Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrChkTestingData.ControlValueChanged, ucrChkTrainingData.ControlValueChanged + Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged '', ucrChkTestingData.ControlValueChanged, ucrChkTrainingData.ControlValueChanged + SetBaseFunction() + End Sub + + 'Private Sub ucrChkStratifyingFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkStratifyingFactor.ControlValueChanged + ' If ucrChkStratifyingFactor.Checked Then + ' ucrReceiverRanSplit.SetDataType("factor") + ' End If + 'End Sub + Private Sub SetDataFramePrefix() + If ucrChkTestingData.Checked Then + ucrSaveRandomSplit.SetPrefix("testing") + ElseIf ucrChkTrainingData.Checked Then + ucrSaveRandomSplit.SetPrefix("training") + End If + End Sub + + Private Sub ucrChkTestingData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkTestingData.ControlValueChanged, ucrChkTrainingData.ControlValueChanged + SetDataFramePrefix() SetBaseFunction() End Sub End Class \ No newline at end of file From 227178f4ec589c325200e4d259065634e9991cc2 Mon Sep 17 00:00:00 2001 From: VictorM Date: Fri, 22 Apr 2022 16:56:36 +0300 Subject: [PATCH 020/100] Removing error appearing on the ucr panel --- instat/dlgRandomSplit.vb | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index f0264e2b29b..910c20aaeba 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -39,7 +39,6 @@ Public Class dlgRandomSplit End Sub Private Sub InitialiseDialog() - ucrReceiverRanSplit.SetParameter(New RParameter("strata", 2)) ucrReceiverRanSplit.Selector = ucrSelectorRandomSplit ucrReceiverRanSplit.SetMeAsReceiver() @@ -64,19 +63,16 @@ Public Class dlgRandomSplit ucrChkTestingData.SetParameter(New RParameter("testing", 0)) ucrChkTestingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - ucrChkTrainingData.SetText("Save Training Data") ucrChkTrainingData.SetParameter(New RParameter("training", 0)) ucrChkTrainingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - ucrSaveRandomSplit.SetLabelText("Save sample to:") ucrSaveRandomSplit.SetSaveTypeAsDataFrame() ucrSaveRandomSplit.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) ucrSaveRandomSplit.SetPrefix("training") ucrSaveRandomSplit.SetIsComboBox() - ucrNudBreaks.SetLinkedDisplayControl(lblBreaks) ucrNudBreaks.SetParameter(New RParameter("breaks", 4)) @@ -101,8 +97,6 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddToLinkedControls(ucrChkStratifyingFactor, {rdoSample}, bNewLinkedHideIfParameterMissing:=True) ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor, ucrNudPool, ucrNudBreaks}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - 'ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) - End Sub Private Sub SetDefaults() @@ -112,7 +106,6 @@ Public Class dlgRandomSplit clsTraining = New RFunction clsDummyFunction = New RFunction - ucrSelectorRandomSplit.Reset() ucrSelectorRandomSplit.Focus() ucrSaveRandomSplit.Reset() @@ -130,7 +123,6 @@ Public Class dlgRandomSplit clsInitialSplit.AddParameter("breaks", "4", iPosition:=4) clsInitialSplit.AddParameter("pool", "0.1", iPosition:=5) - clsTraining.SetPackageName("rsample") clsTraining.SetRCommand("training") clsTraining.SetAssignTo("last_training", strTempDataframe:=ucrSelectorRandomSplit.strCurrentDataFrame, strDataFrameNames:="last_training") @@ -157,7 +149,9 @@ Public Class dlgRandomSplit ucrSaveRandomSplit.SetRCode(clsTraining, bReset) ucrNudLag.SetRCode(clsInitialSplit, bReset) ucrReceiverRanSplit.SetRCode(clsInitialSplit, bReset) - ucrPnlRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) + If bReset Then + ucrPnlRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) + End If End Sub Private Sub TestOkEnabled() @@ -169,12 +163,16 @@ Public Class dlgRandomSplit clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) ucrBase.clsRsyntax.iCallType = 0 + ucrChkTrainingData.Checked = False ElseIf ucrChkTrainingData.Checked Then clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) + ucrChkTestingData.Checked = False Else ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) ucrBase.clsRsyntax.iCallType = 2 + ucrChkTestingData.Checked = False + ucrChkTrainingData.Checked = False End If ElseIf rdoTimeSeries.Checked Then If ucrChkTestingData.Checked Then @@ -205,11 +203,6 @@ Public Class dlgRandomSplit SetBaseFunction() End Sub - 'Private Sub ucrChkStratifyingFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkStratifyingFactor.ControlValueChanged - ' If ucrChkStratifyingFactor.Checked Then - ' ucrReceiverRanSplit.SetDataType("factor") - ' End If - 'End Sub Private Sub SetDataFramePrefix() If ucrChkTestingData.Checked Then ucrSaveRandomSplit.SetPrefix("testing") From 2f7081a0bcbaea9f239ee4257e4b729c28848b6e Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 2 Jun 2022 13:20:08 +0200 Subject: [PATCH 021/100] Changes to Random Split Dialogue --- instat/dlgCopySheet.Designer.vb | 2 +- instat/dlgRandomSplit.Designer.vb | 34 +++++++++++++++---------------- instat/dlgRandomSplit.vb | 11 +++++----- instat/frmMain.Designer.vb | 9 ++++---- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/instat/dlgCopySheet.Designer.vb b/instat/dlgCopySheet.Designer.vb index 79bd1502d9c..28ccd10419b 100644 --- a/instat/dlgCopySheet.Designer.vb +++ b/instat/dlgCopySheet.Designer.vb @@ -21,7 +21,7 @@ Imports System ''' ''' A strongly-typed resource class, for looking up localized strings, etc. ''' - _ Friend Class dlgCopySheet diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index 0d6651e8fa4..b3decaf9e44 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -32,7 +32,6 @@ Partial Class dlgRandomSplit Me.ucrNudPool = New instat.ucrNud() Me.ucrNudFraction = New instat.ucrNud() Me.ucrNudLag = New instat.ucrNud() - Me.ucrSaveRandomSplit = New instat.ucrSave() Me.ucrBase = New instat.ucrButtons() Me.ucrChkLag = New instat.ucrCheck() Me.ucrChkTrainingData = New instat.ucrCheck() @@ -41,6 +40,7 @@ Partial Class dlgRandomSplit Me.ucrPnlRandomSplit = New instat.UcrPanel() Me.ucrSelectorRandomSplit = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverRanSplit = New instat.ucrReceiverSingle() + Me.ucrSaveRandomSplit = New instat.ucrSave() Me.SuspendLayout() ' 'rdoSample @@ -80,27 +80,27 @@ Partial Class dlgRandomSplit Me.lblFraction.AutoSize = True Me.lblFraction.Location = New System.Drawing.Point(281, 152) Me.lblFraction.Name = "lblFraction" - Me.lblFraction.Size = New System.Drawing.Size(51, 13) + Me.lblFraction.Size = New System.Drawing.Size(48, 13) Me.lblFraction.TabIndex = 32 - Me.lblFraction.Text = "Fraction :" + Me.lblFraction.Text = "Fraction:" ' 'lblPool ' Me.lblPool.AutoSize = True Me.lblPool.Location = New System.Drawing.Point(281, 183) Me.lblPool.Name = "lblPool" - Me.lblPool.Size = New System.Drawing.Size(34, 13) + Me.lblPool.Size = New System.Drawing.Size(31, 13) Me.lblPool.TabIndex = 33 - Me.lblPool.Text = "Pool :" + Me.lblPool.Text = "Pool:" ' 'lblReceiverRandomSplit ' Me.lblReceiverRandomSplit.AutoSize = True Me.lblReceiverRandomSplit.Location = New System.Drawing.Point(279, 95) Me.lblReceiverRandomSplit.Name = "lblReceiverRandomSplit" - Me.lblReceiverRandomSplit.Size = New System.Drawing.Size(56, 13) + Me.lblReceiverRandomSplit.Size = New System.Drawing.Size(53, 13) Me.lblReceiverRandomSplit.TabIndex = 35 - Me.lblReceiverRandomSplit.Text = "Variables :" + Me.lblReceiverRandomSplit.Text = "Variables:" ' 'lblBreaks ' @@ -163,15 +163,6 @@ Partial Class dlgRandomSplit Me.ucrNudLag.TabIndex = 29 Me.ucrNudLag.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'ucrSaveRandomSplit - ' - Me.ucrSaveRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveRandomSplit.Location = New System.Drawing.Point(9, 331) - Me.ucrSaveRandomSplit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveRandomSplit.Name = "ucrSaveRandomSplit" - Me.ucrSaveRandomSplit.Size = New System.Drawing.Size(403, 23) - Me.ucrSaveRandomSplit.TabIndex = 28 - ' 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -249,6 +240,15 @@ Partial Class dlgRandomSplit Me.ucrReceiverRanSplit.TabIndex = 39 Me.ucrReceiverRanSplit.ucrSelector = Nothing ' + 'ucrSaveRandomSplit + ' + Me.ucrSaveRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveRandomSplit.Location = New System.Drawing.Point(9, 331) + Me.ucrSaveRandomSplit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveRandomSplit.Name = "ucrSaveRandomSplit" + Me.ucrSaveRandomSplit.Size = New System.Drawing.Size(403, 23) + Me.ucrSaveRandomSplit.TabIndex = 28 + ' 'dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -293,7 +293,6 @@ Partial Class dlgRandomSplit Friend WithEvents ucrNudPool As ucrNud Friend WithEvents ucrNudFraction As ucrNud Friend WithEvents ucrNudLag As ucrNud - Friend WithEvents ucrSaveRandomSplit As ucrSave Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrPnlRandomSplit As UcrPanel Friend WithEvents lblPool As Label @@ -303,4 +302,5 @@ Partial Class dlgRandomSplit Friend WithEvents ucrNudBreaks As ucrNud Friend WithEvents ucrSelectorRandomSplit As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrReceiverRanSplit As ucrReceiverSingle + Friend WithEvents ucrSaveRandomSplit As ucrSave End Class diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 910c20aaeba..b639349ed14 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -49,11 +49,13 @@ Public Class dlgRandomSplit ucrSelectorRandomSplit.SetParameter(New RParameter("data", 0)) ucrSelectorRandomSplit.SetParameterIsrfunction() - ucrChkStratifyingFactor.SetText("Set Seed") + ucrChkStratifyingFactor.SetText("Stratifying Factor") ucrChkStratifyingFactor.SetParameter(New RParameter("check")) ucrChkStratifyingFactor.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkStratifyingFactor.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRanSplit, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkLag.SetText("Lag") ucrNudLag.SetParameter(New RParameter("lag", 3)) ucrNudLag.SetMinMax(-100, 100) @@ -95,7 +97,7 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"initial_split", "training", "testing"}) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"initial_time_split", "training", "testing"}) ucrPnlRandomSplit.AddToLinkedControls(ucrChkStratifyingFactor, {rdoSample}, bNewLinkedHideIfParameterMissing:=True) - ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor, ucrNudPool, ucrNudBreaks}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor, ucrNudBreaks}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) End Sub @@ -193,9 +195,8 @@ Public Class dlgRandomSplit SetRCodeForControls(True) TestOkEnabled() End Sub - Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, - ucrSaveRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrChkStratifyingFactor.ControlContentsChanged, - ucrChkTestingData.ControlContentsChanged, ucrChkTrainingData.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrChkStratifyingFactor.ControlContentsChanged, + ucrChkTestingData.ControlContentsChanged, ucrChkTrainingData.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrSaveRandomSplit.ControlContentsChanged TestOkEnabled() End Sub diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 807c7e5c1ea..612a0cb3462 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -1217,7 +1217,7 @@ Partial Class frmMain 'mnuModelOtherOneVariableExactResults ' Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults" - Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(180, 22) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1225,7 +1225,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(180, 22) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1233,7 +1233,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(180, 22) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1241,7 +1241,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(180, 22) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -4022,7 +4022,6 @@ Partial Class frmMain ' 'mnuPrepareDataReshapeRandomSplit ' - Me.mnuPrepareDataReshapeRandomSplit.Enabled = False Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." From 111ec61a599f6b189454bbe4527707fa2bd782ba Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 6 Jul 2022 13:00:58 +0200 Subject: [PATCH 022/100] changes --- instat/dlgRandomSplit.vb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index b639349ed14..111b327520f 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -53,7 +53,7 @@ Public Class dlgRandomSplit ucrChkStratifyingFactor.SetParameter(New RParameter("check")) ucrChkStratifyingFactor.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkStratifyingFactor.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRanSplit, {True}, bNewLinkedHideIfParameterMissing:=True) + 'ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRanSplit, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkLag.SetText("Lag") @@ -80,16 +80,14 @@ Public Class dlgRandomSplit ucrNudFraction.SetLinkedDisplayControl(lblFraction) ucrNudFraction.SetParameter(New RParameter("prop", 1)) - ucrNudFraction.Minimum = 0.01 - ucrNudFraction.Maximum = 0.99 + ucrNudFraction.SetMinMax(0.01, 0.99) ucrNudFraction.DecimalPlaces = 2 ucrNudFraction.Increment = 0.01 ucrNudPool.SetLinkedDisplayControl(lblPool) ucrNudPool.SetParameter(New RParameter("pool", 5)) ucrNudPool.DecimalPlaces = 2 - ucrNudPool.Minimum = 0.00 - ucrNudPool.Maximum = 0.15 + ucrNudPool.SetMinMax(0.00, 0.15) ucrNudPool.Increment = 0.01 ucrPnlRandomSplit.AddRadioButton(rdoSample) @@ -195,6 +193,7 @@ Public Class dlgRandomSplit SetRCodeForControls(True) TestOkEnabled() End Sub + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrChkStratifyingFactor.ControlContentsChanged, ucrChkTestingData.ControlContentsChanged, ucrChkTrainingData.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrSaveRandomSplit.ControlContentsChanged TestOkEnabled() From 1d8810b0a8a1e2723ab5d313631147775eddd785 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 7 Oct 2022 12:54:21 +0200 Subject: [PATCH 023/100] Implementing TestOk --- instat/dlgRandomSplit.Designer.vb | 14 +------------- instat/dlgRandomSplit.vb | 9 +++++++-- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index b3decaf9e44..71d4b971ab0 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -26,7 +26,6 @@ Partial Class dlgRandomSplit Me.rdoTimeSeries = New System.Windows.Forms.RadioButton() Me.lblFraction = New System.Windows.Forms.Label() Me.lblPool = New System.Windows.Forms.Label() - Me.lblReceiverRandomSplit = New System.Windows.Forms.Label() Me.lblBreaks = New System.Windows.Forms.Label() Me.ucrNudBreaks = New instat.ucrNud() Me.ucrNudPool = New instat.ucrNud() @@ -93,15 +92,6 @@ Partial Class dlgRandomSplit Me.lblPool.TabIndex = 33 Me.lblPool.Text = "Pool:" ' - 'lblReceiverRandomSplit - ' - Me.lblReceiverRandomSplit.AutoSize = True - Me.lblReceiverRandomSplit.Location = New System.Drawing.Point(279, 95) - Me.lblReceiverRandomSplit.Name = "lblReceiverRandomSplit" - Me.lblReceiverRandomSplit.Size = New System.Drawing.Size(53, 13) - Me.lblReceiverRandomSplit.TabIndex = 35 - Me.lblReceiverRandomSplit.Text = "Variables:" - ' 'lblBreaks ' Me.lblBreaks.AutoSize = True @@ -202,7 +192,7 @@ Partial Class dlgRandomSplit ' Me.ucrChkStratifyingFactor.AutoSize = True Me.ucrChkStratifyingFactor.Checked = False - Me.ucrChkStratifyingFactor.Location = New System.Drawing.Point(281, 69) + Me.ucrChkStratifyingFactor.Location = New System.Drawing.Point(281, 82) Me.ucrChkStratifyingFactor.Name = "ucrChkStratifyingFactor" Me.ucrChkStratifyingFactor.Size = New System.Drawing.Size(143, 23) Me.ucrChkStratifyingFactor.TabIndex = 19 @@ -257,7 +247,6 @@ Partial Class dlgRandomSplit Me.Controls.Add(Me.ucrReceiverRanSplit) Me.Controls.Add(Me.lblBreaks) Me.Controls.Add(Me.ucrNudBreaks) - Me.Controls.Add(Me.lblReceiverRandomSplit) Me.Controls.Add(Me.lblPool) Me.Controls.Add(Me.lblFraction) Me.Controls.Add(Me.ucrNudPool) @@ -297,7 +286,6 @@ Partial Class dlgRandomSplit Friend WithEvents ucrPnlRandomSplit As UcrPanel Friend WithEvents lblPool As Label Friend WithEvents lblFraction As Label - Friend WithEvents lblReceiverRandomSplit As Label Friend WithEvents lblBreaks As Label Friend WithEvents ucrNudBreaks As ucrNud Friend WithEvents ucrSelectorRandomSplit As ucrSelectorByDataFrameAddRemove diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 111b327520f..118e688dd4d 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -43,7 +43,6 @@ Public Class dlgRandomSplit ucrReceiverRanSplit.Selector = ucrSelectorRandomSplit ucrReceiverRanSplit.SetMeAsReceiver() ucrReceiverRanSplit.SetDataType("factor") - ucrReceiverRanSplit.SetLinkedDisplayControl(lblReceiverRandomSplit) ucrReceiverRanSplit.SetParameterIsString() ucrSelectorRandomSplit.SetParameter(New RParameter("data", 0)) @@ -155,7 +154,13 @@ Public Class dlgRandomSplit End Sub Private Sub TestOkEnabled() - + If rdoSample.Checked Then + ucrBase.OKEnabled(Not ucrReceiverRanSplit.IsEmpty) + ElseIf rdoTimeSeries.Checked Then + ucrBase.OKEnabled(Not ucrReceiverRanSplit.IsEmpty) + Else + ucrBase.OKEnabled(False) + End If End Sub Private Sub SetBaseFunction() If rdoSample.Checked Then From 185a3be30c3c78d10de0ea8994477f18e26835e1 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 20 Oct 2022 12:18:40 +0200 Subject: [PATCH 024/100] Changes to Controls --- instat/dlgRandomSplit.vb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 118e688dd4d..f400bee5bb2 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -86,8 +86,8 @@ Public Class dlgRandomSplit ucrNudPool.SetLinkedDisplayControl(lblPool) ucrNudPool.SetParameter(New RParameter("pool", 5)) ucrNudPool.DecimalPlaces = 2 - ucrNudPool.SetMinMax(0.00, 0.15) - ucrNudPool.Increment = 0.01 + ucrNudPool.SetMinMax(0.01, 1.0) + ucrNudPool.Increment = 0.1 ucrPnlRandomSplit.AddRadioButton(rdoSample) ucrPnlRandomSplit.AddRadioButton(rdoTimeSeries) @@ -120,7 +120,7 @@ Public Class dlgRandomSplit clsInitialSplit.AddParameter("strata", "NULL", iPosition:=2) clsInitialSplit.AddParameter("lag", "0", iPosition:=3) clsInitialSplit.AddParameter("breaks", "4", iPosition:=4) - clsInitialSplit.AddParameter("pool", "0.1", iPosition:=5) + clsInitialSplit.AddParameter("pool", "0.10", iPosition:=5) clsTraining.SetPackageName("rsample") clsTraining.SetRCommand("training") @@ -154,10 +154,8 @@ Public Class dlgRandomSplit End Sub Private Sub TestOkEnabled() - If rdoSample.Checked Then - ucrBase.OKEnabled(Not ucrReceiverRanSplit.IsEmpty) - ElseIf rdoTimeSeries.Checked Then - ucrBase.OKEnabled(Not ucrReceiverRanSplit.IsEmpty) + If rdoSample.Checked Or rdoTimeSeries.Checked Then + ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) End If From c7007b2b72fb055d7af4b4b2cb6bb1a8d04d62cc Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:33:08 +0200 Subject: [PATCH 025/100] Assingning rsample --- instat/dlgRandomSplit.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index f400bee5bb2..ad1d13e1639 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -113,6 +113,7 @@ Public Class dlgRandomSplit clsInitialTimeSplit.SetRCommand("initial_time_split") clsInitialTimeSplit.AddParameter("prop", "0.75", iPosition:=1) clsInitialTimeSplit.AddParameter("lag", "0", iPosition:=2) + clsInitialTimeSplit.SetAssignTo("rsample") clsInitialSplit.SetPackageName("rsample") clsInitialSplit.SetRCommand("initial_split") @@ -121,6 +122,7 @@ Public Class dlgRandomSplit clsInitialSplit.AddParameter("lag", "0", iPosition:=3) clsInitialSplit.AddParameter("breaks", "4", iPosition:=4) clsInitialSplit.AddParameter("pool", "0.10", iPosition:=5) + clsInitialSplit.SetAssignTo("rsample") clsTraining.SetPackageName("rsample") clsTraining.SetRCommand("training") From 7f9e1754a300111a22b255e49e75b84b695c8331 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 28 Oct 2022 15:21:11 +0200 Subject: [PATCH 026/100] Implementing RFunction --- instat/dlgRandomSplit.Designer.vb | 56 +++++++++------------ instat/dlgRandomSplit.vb | 81 +++++++++++++++++-------------- 2 files changed, 66 insertions(+), 71 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index 71d4b971ab0..e1e8b6604fc 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -33,13 +33,12 @@ Partial Class dlgRandomSplit Me.ucrNudLag = New instat.ucrNud() Me.ucrBase = New instat.ucrButtons() Me.ucrChkLag = New instat.ucrCheck() - Me.ucrChkTrainingData = New instat.ucrCheck() - Me.ucrChkTestingData = New instat.ucrCheck() Me.ucrChkStratifyingFactor = New instat.ucrCheck() Me.ucrPnlRandomSplit = New instat.UcrPanel() Me.ucrSelectorRandomSplit = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverRanSplit = New instat.ucrReceiverSingle() - Me.ucrSaveRandomSplit = New instat.ucrSave() + Me.ucrSaveTrainingData = New instat.ucrSave() + Me.ucrSaveTestingData = New instat.ucrSave() Me.SuspendLayout() ' 'rdoSample @@ -170,24 +169,6 @@ Partial Class dlgRandomSplit Me.ucrChkLag.Size = New System.Drawing.Size(143, 23) Me.ucrChkLag.TabIndex = 25 ' - 'ucrChkTrainingData - ' - Me.ucrChkTrainingData.AutoSize = True - Me.ucrChkTrainingData.Checked = False - Me.ucrChkTrainingData.Location = New System.Drawing.Point(9, 278) - Me.ucrChkTrainingData.Name = "ucrChkTrainingData" - Me.ucrChkTrainingData.Size = New System.Drawing.Size(143, 23) - Me.ucrChkTrainingData.TabIndex = 24 - ' - 'ucrChkTestingData - ' - Me.ucrChkTestingData.AutoSize = True - Me.ucrChkTestingData.Checked = False - Me.ucrChkTestingData.Location = New System.Drawing.Point(9, 307) - Me.ucrChkTestingData.Name = "ucrChkTestingData" - Me.ucrChkTestingData.Size = New System.Drawing.Size(143, 23) - Me.ucrChkTestingData.TabIndex = 23 - ' 'ucrChkStratifyingFactor ' Me.ucrChkStratifyingFactor.AutoSize = True @@ -230,20 +211,30 @@ Partial Class dlgRandomSplit Me.ucrReceiverRanSplit.TabIndex = 39 Me.ucrReceiverRanSplit.ucrSelector = Nothing ' - 'ucrSaveRandomSplit + 'ucrSaveTrainingData + ' + Me.ucrSaveTrainingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 331) + Me.ucrSaveTrainingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTrainingData.Name = "ucrSaveTrainingData" + Me.ucrSaveTrainingData.Size = New System.Drawing.Size(403, 23) + Me.ucrSaveTrainingData.TabIndex = 28 + ' + 'ucrSaveTestingData ' - Me.ucrSaveRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveRandomSplit.Location = New System.Drawing.Point(9, 331) - Me.ucrSaveRandomSplit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveRandomSplit.Name = "ucrSaveRandomSplit" - Me.ucrSaveRandomSplit.Size = New System.Drawing.Size(403, 23) - Me.ucrSaveRandomSplit.TabIndex = 28 + Me.ucrSaveTestingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveTestingData.Location = New System.Drawing.Point(9, 300) + Me.ucrSaveTestingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTestingData.Name = "ucrSaveTestingData" + Me.ucrSaveTestingData.Size = New System.Drawing.Size(403, 23) + Me.ucrSaveTestingData.TabIndex = 40 ' 'dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(432, 418) + Me.Controls.Add(Me.ucrSaveTestingData) Me.Controls.Add(Me.ucrReceiverRanSplit) Me.Controls.Add(Me.lblBreaks) Me.Controls.Add(Me.ucrNudBreaks) @@ -252,11 +243,9 @@ Partial Class dlgRandomSplit Me.Controls.Add(Me.ucrNudPool) Me.Controls.Add(Me.ucrNudFraction) Me.Controls.Add(Me.ucrNudLag) - Me.Controls.Add(Me.ucrSaveRandomSplit) + Me.Controls.Add(Me.ucrSaveTrainingData) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrChkLag) - Me.Controls.Add(Me.ucrChkTrainingData) - Me.Controls.Add(Me.ucrChkTestingData) Me.Controls.Add(Me.rdoSample) Me.Controls.Add(Me.rdoTimeSeries) Me.Controls.Add(Me.ucrChkStratifyingFactor) @@ -277,8 +266,6 @@ Partial Class dlgRandomSplit Friend WithEvents rdoTimeSeries As RadioButton Friend WithEvents ucrChkStratifyingFactor As ucrCheck Friend WithEvents ucrChkLag As ucrCheck - Friend WithEvents ucrChkTrainingData As ucrCheck - Friend WithEvents ucrChkTestingData As ucrCheck Friend WithEvents ucrNudPool As ucrNud Friend WithEvents ucrNudFraction As ucrNud Friend WithEvents ucrNudLag As ucrNud @@ -290,5 +277,6 @@ Partial Class dlgRandomSplit Friend WithEvents ucrNudBreaks As ucrNud Friend WithEvents ucrSelectorRandomSplit As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrReceiverRanSplit As ucrReceiverSingle - Friend WithEvents ucrSaveRandomSplit As ucrSave + Friend WithEvents ucrSaveTrainingData As ucrSave + Friend WithEvents ucrSaveTestingData As ucrSave End Class diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index ad1d13e1639..f1512cea286 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -60,19 +60,25 @@ Public Class dlgRandomSplit ucrNudLag.SetMinMax(-100, 100) ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) - ucrChkTestingData.SetText("Save Testing Data") - ucrChkTestingData.SetParameter(New RParameter("testing", 0)) - ucrChkTestingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - - ucrChkTrainingData.SetText("Save Training Data") - ucrChkTrainingData.SetParameter(New RParameter("training", 0)) - ucrChkTrainingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - - ucrSaveRandomSplit.SetLabelText("Save sample to:") - ucrSaveRandomSplit.SetSaveTypeAsDataFrame() - ucrSaveRandomSplit.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) - ucrSaveRandomSplit.SetPrefix("training") - ucrSaveRandomSplit.SetIsComboBox() + 'ucrChkTestingData.SetText("Save Testing Data") + 'ucrChkTestingData.SetParameter(New RParameter("testing", 0)) + 'ucrChkTestingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + + 'ucrChkTrainingData.SetText("Save Training Data") + 'ucrChkTrainingData.SetParameter(New RParameter("training", 0)) + 'ucrChkTrainingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + + ucrSaveTrainingData.SetLabelText("Save sample to:") + ucrSaveTrainingData.SetSaveTypeAsDataFrame() + ucrSaveTrainingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) + ucrSaveTrainingData.SetPrefix("training") + ucrSaveTrainingData.SetIsComboBox() + + ucrSaveTestingData.SetLabelText("Save sample to:") + ucrSaveTestingData.SetSaveTypeAsDataFrame() + ucrSaveTestingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) + ucrSaveTestingData.SetPrefix("testing") + ucrSaveTestingData.SetIsComboBox() ucrNudBreaks.SetLinkedDisplayControl(lblBreaks) ucrNudBreaks.SetParameter(New RParameter("breaks", 4)) @@ -107,7 +113,8 @@ Public Class dlgRandomSplit ucrSelectorRandomSplit.Reset() ucrSelectorRandomSplit.Focus() - ucrSaveRandomSplit.Reset() + ucrSaveTrainingData.Reset() + ucrSaveTestingData.Reset() clsInitialTimeSplit.SetPackageName("rsample") clsInitialTimeSplit.SetRCommand("initial_time_split") @@ -126,11 +133,11 @@ Public Class dlgRandomSplit clsTraining.SetPackageName("rsample") clsTraining.SetRCommand("training") - clsTraining.SetAssignTo("last_training", strTempDataframe:=ucrSelectorRandomSplit.strCurrentDataFrame, strDataFrameNames:="last_training") + clsTraining.SetAssignTo("training", strTempDataframe:=ucrSelectorRandomSplit.strCurrentDataFrame, strDataFrameNames:="last_training") clsTesting.SetPackageName("rsample") clsTesting.SetRCommand("testing") - clsTesting.SetAssignTo("last_testing", strTempDataframe:=ucrSelectorRandomSplit.strCurrentDataFrame, strDataFrameNames:="last_testing") + clsTesting.SetAssignTo("testing", strTempDataframe:=ucrSelectorRandomSplit.strCurrentDataFrame, strDataFrameNames:="last_testing") ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) End Sub @@ -138,16 +145,15 @@ Public Class dlgRandomSplit ucrSelectorRandomSplit.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("data", ucrSelectorRandomSplit.ucrAvailableDataFrames.clsCurrDataFrame, 0), iAdditionalPairNo:=1) ucrNudFraction.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("prop", 1), iAdditionalPairNo:=1) ucrNudLag.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("lag", 3), iAdditionalPairNo:=1) - ucrSaveRandomSplit.AddAdditionalRCode(clsTesting, iAdditionalPairNo:=1) + 'ucrSaveTrainingData.AddAdditionalRCode(clsTesting, iAdditionalPairNo:=1) ucrSelectorRandomSplit.SetRCode(clsInitialSplit, bReset) - ucrChkTestingData.SetRCode(clsDummyFunction, bReset) - ucrChkTrainingData.SetRCode(clsDummyFunction, bReset) ucrChkStratifyingFactor.SetRCode(clsDummyFunction, bReset) ucrNudBreaks.SetRCode(clsInitialSplit, bReset) ucrNudFraction.SetRCode(clsInitialSplit, bReset) ucrNudPool.SetRCode(clsInitialSplit, bReset) - ucrSaveRandomSplit.SetRCode(clsTraining, bReset) + ucrSaveTrainingData.SetRCode(clsTraining, bReset) + ucrSaveTestingData.SetRCode(clsTesting, bReset) ucrNudLag.SetRCode(clsInitialSplit, bReset) ucrReceiverRanSplit.SetRCode(clsInitialSplit, bReset) If bReset Then @@ -164,26 +170,22 @@ Public Class dlgRandomSplit End Sub Private Sub SetBaseFunction() If rdoSample.Checked Then - If ucrChkTestingData.Checked Then + If ucrSaveTestingData.IsComplete Then clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) - ucrBase.clsRsyntax.iCallType = 0 - ucrChkTrainingData.Checked = False - ElseIf ucrChkTrainingData.Checked Then + 'ucrBase.clsRsyntax.iCallType = 0 + ElseIf ucrSaveTrainingData.IsComplete Then clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) - ucrChkTestingData.Checked = False Else ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) ucrBase.clsRsyntax.iCallType = 2 - ucrChkTestingData.Checked = False - ucrChkTrainingData.Checked = False End If - ElseIf rdoTimeSeries.Checked Then - If ucrChkTestingData.Checked Then + Else + If ucrSaveTestingData.IsComplete Then clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) - ElseIf ucrChkTrainingData.Checked Then + ElseIf ucrSaveTrainingData.IsComplete Then clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) Else @@ -199,8 +201,7 @@ Public Class dlgRandomSplit TestOkEnabled() End Sub - Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrChkStratifyingFactor.ControlContentsChanged, - ucrChkTestingData.ControlContentsChanged, ucrChkTrainingData.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrSaveRandomSplit.ControlContentsChanged + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrChkStratifyingFactor.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged TestOkEnabled() End Sub @@ -209,14 +210,20 @@ Public Class dlgRandomSplit End Sub Private Sub SetDataFramePrefix() - If ucrChkTestingData.Checked Then - ucrSaveRandomSplit.SetPrefix("testing") - ElseIf ucrChkTrainingData.Checked Then - ucrSaveRandomSplit.SetPrefix("training") + Dim strDataframeName As String = ucrSelectorRandomSplit.ucrAvailableDataFrames.cboAvailableDataFrames.Text + If ucrSelectorRandomSplit.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso (Not ucrSaveTestingData.bUserTyped) AndAlso (Not ucrSaveTrainingData.bUserTyped) Then + If rdoSample.Checked Then + ucrSaveTestingData.SetPrefix(strDataframeName & "testing") + ucrSaveTrainingData.SetPrefix(strDataframeName & "training") + End If + If rdoTimeSeries.Checked Then + ucrSaveTestingData.SetPrefix(strDataframeName & "testing") + ucrSaveTrainingData.SetPrefix(strDataframeName & "training") + End If End If End Sub - Private Sub ucrChkTestingData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkTestingData.ControlValueChanged, ucrChkTrainingData.ControlValueChanged + Private Sub ucrChkTestingData_ControlValueChanged(ucrChangedControl As ucrCore) SetDataFramePrefix() SetBaseFunction() End Sub From 8b9ff504e9181bc56d0c4d0952fb7eeac97fc746 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 31 Oct 2022 08:24:06 +0100 Subject: [PATCH 027/100] Adding ucrSaves --- instat/dlgRandomSplit.vb | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index f1512cea286..582f19fcec2 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -52,22 +52,12 @@ Public Class dlgRandomSplit ucrChkStratifyingFactor.SetParameter(New RParameter("check")) ucrChkStratifyingFactor.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkStratifyingFactor.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedHideIfParameterMissing:=True) - 'ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRanSplit, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkLag.SetText("Lag") ucrNudLag.SetParameter(New RParameter("lag", 3)) ucrNudLag.SetMinMax(-100, 100) ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) - 'ucrChkTestingData.SetText("Save Testing Data") - 'ucrChkTestingData.SetParameter(New RParameter("testing", 0)) - 'ucrChkTestingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - - 'ucrChkTrainingData.SetText("Save Training Data") - 'ucrChkTrainingData.SetParameter(New RParameter("training", 0)) - 'ucrChkTrainingData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - ucrSaveTrainingData.SetLabelText("Save sample to:") ucrSaveTrainingData.SetSaveTypeAsDataFrame() ucrSaveTrainingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) @@ -145,7 +135,6 @@ Public Class dlgRandomSplit ucrSelectorRandomSplit.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("data", ucrSelectorRandomSplit.ucrAvailableDataFrames.clsCurrDataFrame, 0), iAdditionalPairNo:=1) ucrNudFraction.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("prop", 1), iAdditionalPairNo:=1) ucrNudLag.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("lag", 3), iAdditionalPairNo:=1) - 'ucrSaveTrainingData.AddAdditionalRCode(clsTesting, iAdditionalPairNo:=1) ucrSelectorRandomSplit.SetRCode(clsInitialSplit, bReset) ucrChkStratifyingFactor.SetRCode(clsDummyFunction, bReset) @@ -162,7 +151,7 @@ Public Class dlgRandomSplit End Sub Private Sub TestOkEnabled() - If rdoSample.Checked Or rdoTimeSeries.Checked Then + If ucrSaveTestingData.IsComplete Or ucrSaveTrainingData.IsComplete Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -173,24 +162,20 @@ Public Class dlgRandomSplit If ucrSaveTestingData.IsComplete Then clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) - 'ucrBase.clsRsyntax.iCallType = 0 - ElseIf ucrSaveTrainingData.IsComplete Then + End If + If ucrSaveTrainingData.IsComplete Then clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) - ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) - Else - ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) - ucrBase.clsRsyntax.iCallType = 2 + ucrBase.clsRsyntax.AddToAfterCodes(clsTraining) End If Else If ucrSaveTestingData.IsComplete Then clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) - ElseIf ucrSaveTrainingData.IsComplete Then + End If + If ucrSaveTrainingData.IsComplete Then clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) - ucrBase.clsRsyntax.SetBaseRFunction(clsTraining) - Else - ucrBase.clsRsyntax.SetBaseRFunction(clsInitialTimeSplit) - ucrBase.clsRsyntax.iCallType = 2 + ucrBase.clsRsyntax.AddToAfterCodes(clsTraining) + End If End If End Sub @@ -222,9 +207,4 @@ Public Class dlgRandomSplit End If End If End Sub - - Private Sub ucrChkTestingData_ControlValueChanged(ucrChangedControl As ucrCore) - SetDataFramePrefix() - SetBaseFunction() - End Sub End Class \ No newline at end of file From 724cce4d2a13598feb42a5b53cc874abdc1768f8 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 31 Oct 2022 13:05:39 +0100 Subject: [PATCH 028/100] Layout Changes --- instat/dlgRandomSplit.Designer.vb | 8 ++++---- instat/dlgRandomSplit.vb | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index e1e8b6604fc..d03db813ffc 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -155,7 +155,7 @@ Partial Class dlgRandomSplit 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 358) + Me.ucrBase.Location = New System.Drawing.Point(9, 342) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 27 @@ -214,7 +214,7 @@ Partial Class dlgRandomSplit 'ucrSaveTrainingData ' Me.ucrSaveTrainingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 331) + Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 315) Me.ucrSaveTrainingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTrainingData.Name = "ucrSaveTrainingData" Me.ucrSaveTrainingData.Size = New System.Drawing.Size(403, 23) @@ -223,7 +223,7 @@ Partial Class dlgRandomSplit 'ucrSaveTestingData ' Me.ucrSaveTestingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTestingData.Location = New System.Drawing.Point(9, 300) + Me.ucrSaveTestingData.Location = New System.Drawing.Point(9, 284) Me.ucrSaveTestingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTestingData.Name = "ucrSaveTestingData" Me.ucrSaveTestingData.Size = New System.Drawing.Size(403, 23) @@ -233,7 +233,7 @@ Partial Class dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(432, 418) + Me.ClientSize = New System.Drawing.Size(432, 399) Me.Controls.Add(Me.ucrSaveTestingData) Me.Controls.Add(Me.ucrReceiverRanSplit) Me.Controls.Add(Me.lblBreaks) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 582f19fcec2..ca5ef541140 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -55,8 +55,9 @@ Public Class dlgRandomSplit ucrChkLag.SetText("Lag") ucrNudLag.SetParameter(New RParameter("lag", 3)) - ucrNudLag.SetMinMax(-100, 100) + ucrNudLag.SetMinMax(0, 100) ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) + ucrNudLag.Increment = 0.5 ucrSaveTrainingData.SetLabelText("Save sample to:") ucrSaveTrainingData.SetSaveTypeAsDataFrame() @@ -190,7 +191,7 @@ Public Class dlgRandomSplit TestOkEnabled() End Sub - Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged '', ucrChkTestingData.ControlValueChanged, ucrChkTrainingData.ControlValueChanged + Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged SetBaseFunction() End Sub @@ -198,12 +199,11 @@ Public Class dlgRandomSplit Dim strDataframeName As String = ucrSelectorRandomSplit.ucrAvailableDataFrames.cboAvailableDataFrames.Text If ucrSelectorRandomSplit.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso (Not ucrSaveTestingData.bUserTyped) AndAlso (Not ucrSaveTrainingData.bUserTyped) Then If rdoSample.Checked Then - ucrSaveTestingData.SetPrefix(strDataframeName & "testing") - ucrSaveTrainingData.SetPrefix(strDataframeName & "training") - End If - If rdoTimeSeries.Checked Then - ucrSaveTestingData.SetPrefix(strDataframeName & "testing") - ucrSaveTrainingData.SetPrefix(strDataframeName & "training") + ucrSaveTestingData.SetPrefix(strDataframeName & "testing_data") + ucrSaveTrainingData.SetPrefix(strDataframeName & "training_data") + Else + ucrSaveTestingData.SetPrefix(strDataframeName & "testing_data") + ucrSaveTrainingData.SetPrefix(strDataframeName & "training_data") End If End If End Sub From 2434456f4439364d28ec6754f822ed33b4c8f98d Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 31 Oct 2022 13:25:58 +0100 Subject: [PATCH 029/100] Setting up controls --- instat/dlgRandomSplit.Designer.vb | 2 +- instat/dlgRandomSplit.vb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index d03db813ffc..845c608847b 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -202,7 +202,7 @@ Partial Class dlgRandomSplit ' Me.ucrReceiverRanSplit.AutoSize = True Me.ucrReceiverRanSplit.frmParent = Me - Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(281, 108) + Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(281, 111) Me.ucrReceiverRanSplit.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRanSplit.Name = "ucrReceiverRanSplit" Me.ucrReceiverRanSplit.Selector = Nothing diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index ca5ef541140..ad5a9532d1c 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -52,6 +52,7 @@ Public Class dlgRandomSplit ucrChkStratifyingFactor.SetParameter(New RParameter("check")) ucrChkStratifyingFactor.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkStratifyingFactor.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRanSplit, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkLag.SetText("Lag") ucrNudLag.SetParameter(New RParameter("lag", 3)) From c492d5ddc397cf862bfbb00c79b17c93fd068a5f Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 31 Oct 2022 13:48:57 +0100 Subject: [PATCH 030/100] Changes --- instat/dlgRandomSplit.vb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index ad5a9532d1c..0ab35c6b964 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -21,7 +21,6 @@ Public Class dlgRandomSplit Private clsInitialTimeSplit As RFunction Private clsInitialSplit As New RFunction Private clsTraining As RFunction - Private clsDummyFunction As RFunction Private clsTesting As RFunction Private Sub dlgRandomSplit_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -101,7 +100,6 @@ Public Class dlgRandomSplit clsInitialSplit = New RFunction clsTesting = New RFunction clsTraining = New RFunction - clsDummyFunction = New RFunction ucrSelectorRandomSplit.Reset() ucrSelectorRandomSplit.Focus() @@ -139,7 +137,6 @@ Public Class dlgRandomSplit ucrNudLag.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("lag", 3), iAdditionalPairNo:=1) ucrSelectorRandomSplit.SetRCode(clsInitialSplit, bReset) - ucrChkStratifyingFactor.SetRCode(clsDummyFunction, bReset) ucrNudBreaks.SetRCode(clsInitialSplit, bReset) ucrNudFraction.SetRCode(clsInitialSplit, bReset) ucrNudPool.SetRCode(clsInitialSplit, bReset) @@ -177,7 +174,6 @@ Public Class dlgRandomSplit If ucrSaveTrainingData.IsComplete Then clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) ucrBase.clsRsyntax.AddToAfterCodes(clsTraining) - End If End If End Sub From 56d045d21d12ee04b1db96ca9ce46b7a16c1eb4f Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Tue, 1 Nov 2022 12:20:58 +0100 Subject: [PATCH 031/100] layout changes --- instat/dlgRandomSplit.Designer.vb | 8 ++++---- instat/dlgRandomSplit.vb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index 845c608847b..26ea832e2a9 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -85,7 +85,7 @@ Partial Class dlgRandomSplit 'lblPool ' Me.lblPool.AutoSize = True - Me.lblPool.Location = New System.Drawing.Point(281, 183) + Me.lblPool.Location = New System.Drawing.Point(281, 215) Me.lblPool.Name = "lblPool" Me.lblPool.Size = New System.Drawing.Size(31, 13) Me.lblPool.TabIndex = 33 @@ -94,7 +94,7 @@ Partial Class dlgRandomSplit 'lblBreaks ' Me.lblBreaks.AutoSize = True - Me.lblBreaks.Location = New System.Drawing.Point(281, 216) + Me.lblBreaks.Location = New System.Drawing.Point(281, 184) Me.lblBreaks.Name = "lblBreaks" Me.lblBreaks.Size = New System.Drawing.Size(46, 13) Me.lblBreaks.TabIndex = 37 @@ -105,7 +105,7 @@ Partial Class dlgRandomSplit Me.ucrNudBreaks.AutoSize = True Me.ucrNudBreaks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 216) + Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 184) Me.ucrNudBreaks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudBreaks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Name = "ucrNudBreaks" @@ -118,7 +118,7 @@ Partial Class dlgRandomSplit Me.ucrNudPool.AutoSize = True Me.ucrNudPool.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPool.Location = New System.Drawing.Point(351, 183) + Me.ucrNudPool.Location = New System.Drawing.Point(351, 215) Me.ucrNudPool.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPool.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Name = "ucrNudPool" diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 0ab35c6b964..2165a2e6a59 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -62,13 +62,13 @@ Public Class dlgRandomSplit ucrSaveTrainingData.SetLabelText("Save sample to:") ucrSaveTrainingData.SetSaveTypeAsDataFrame() ucrSaveTrainingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) - ucrSaveTrainingData.SetPrefix("training") + ucrSaveTrainingData.SetPrefix("training_data") ucrSaveTrainingData.SetIsComboBox() ucrSaveTestingData.SetLabelText("Save sample to:") ucrSaveTestingData.SetSaveTypeAsDataFrame() ucrSaveTestingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) - ucrSaveTestingData.SetPrefix("testing") + ucrSaveTestingData.SetPrefix("testing_data") ucrSaveTestingData.SetIsComboBox() ucrNudBreaks.SetLinkedDisplayControl(lblBreaks) From 6aabac52ccf0c477b1de2fc35b4a496d1bef9e44 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 3 Nov 2022 09:39:33 +0100 Subject: [PATCH 032/100] Changes --- instat/dlgRandomSplit.Designer.vb | 70 +++++++++++++++---------------- instat/dlgRandomSplit.vb | 22 +++++----- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index 26ea832e2a9..40a01c5eee8 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -49,10 +49,10 @@ Partial Class dlgRandomSplit Me.rdoSample.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSample.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSample.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSample.Location = New System.Drawing.Point(110, 20) + Me.rdoSample.Location = New System.Drawing.Point(111, 15) Me.rdoSample.Name = "rdoSample" Me.rdoSample.Size = New System.Drawing.Size(100, 28) - Me.rdoSample.TabIndex = 21 + Me.rdoSample.TabIndex = 1 Me.rdoSample.Text = "Sample" Me.rdoSample.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoSample.UseVisualStyleBackColor = True @@ -65,10 +65,10 @@ Partial Class dlgRandomSplit Me.rdoTimeSeries.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoTimeSeries.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTimeSeries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoTimeSeries.Location = New System.Drawing.Point(208, 20) + Me.rdoTimeSeries.Location = New System.Drawing.Point(209, 15) Me.rdoTimeSeries.Name = "rdoTimeSeries" Me.rdoTimeSeries.Size = New System.Drawing.Size(100, 28) - Me.rdoTimeSeries.TabIndex = 20 + Me.rdoTimeSeries.TabIndex = 2 Me.rdoTimeSeries.Text = "Time Series" Me.rdoTimeSeries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoTimeSeries.UseVisualStyleBackColor = True @@ -76,28 +76,28 @@ Partial Class dlgRandomSplit 'lblFraction ' Me.lblFraction.AutoSize = True - Me.lblFraction.Location = New System.Drawing.Point(281, 152) + Me.lblFraction.Location = New System.Drawing.Point(281, 136) Me.lblFraction.Name = "lblFraction" Me.lblFraction.Size = New System.Drawing.Size(48, 13) - Me.lblFraction.TabIndex = 32 + Me.lblFraction.TabIndex = 6 Me.lblFraction.Text = "Fraction:" ' 'lblPool ' Me.lblPool.AutoSize = True - Me.lblPool.Location = New System.Drawing.Point(281, 215) + Me.lblPool.Location = New System.Drawing.Point(281, 199) Me.lblPool.Name = "lblPool" Me.lblPool.Size = New System.Drawing.Size(31, 13) - Me.lblPool.TabIndex = 33 + Me.lblPool.TabIndex = 10 Me.lblPool.Text = "Pool:" ' 'lblBreaks ' Me.lblBreaks.AutoSize = True - Me.lblBreaks.Location = New System.Drawing.Point(281, 184) + Me.lblBreaks.Location = New System.Drawing.Point(281, 168) Me.lblBreaks.Name = "lblBreaks" Me.lblBreaks.Size = New System.Drawing.Size(46, 13) - Me.lblBreaks.TabIndex = 37 + Me.lblBreaks.TabIndex = 8 Me.lblBreaks.Text = "Breaks :" ' 'ucrNudBreaks @@ -105,12 +105,12 @@ Partial Class dlgRandomSplit Me.ucrNudBreaks.AutoSize = True Me.ucrNudBreaks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 184) + Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 166) Me.ucrNudBreaks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudBreaks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Name = "ucrNudBreaks" Me.ucrNudBreaks.Size = New System.Drawing.Size(50, 20) - Me.ucrNudBreaks.TabIndex = 36 + Me.ucrNudBreaks.TabIndex = 9 Me.ucrNudBreaks.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrNudPool @@ -118,12 +118,12 @@ Partial Class dlgRandomSplit Me.ucrNudPool.AutoSize = True Me.ucrNudPool.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPool.Location = New System.Drawing.Point(351, 215) + Me.ucrNudPool.Location = New System.Drawing.Point(351, 198) Me.ucrNudPool.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPool.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Name = "ucrNudPool" Me.ucrNudPool.Size = New System.Drawing.Size(50, 20) - Me.ucrNudPool.TabIndex = 31 + Me.ucrNudPool.TabIndex = 11 Me.ucrNudPool.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrNudFraction @@ -131,12 +131,12 @@ Partial Class dlgRandomSplit Me.ucrNudFraction.AutoSize = True Me.ucrNudFraction.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFraction.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudFraction.Location = New System.Drawing.Point(351, 152) + Me.ucrNudFraction.Location = New System.Drawing.Point(351, 133) Me.ucrNudFraction.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudFraction.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFraction.Name = "ucrNudFraction" Me.ucrNudFraction.Size = New System.Drawing.Size(50, 20) - Me.ucrNudFraction.TabIndex = 30 + Me.ucrNudFraction.TabIndex = 7 Me.ucrNudFraction.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrNudLag @@ -144,47 +144,47 @@ Partial Class dlgRandomSplit Me.ucrNudLag.AutoSize = True Me.ucrNudLag.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLag.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLag.Location = New System.Drawing.Point(92, 249) + Me.ucrNudLag.Location = New System.Drawing.Point(135, 242) Me.ucrNudLag.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLag.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLag.Name = "ucrNudLag" Me.ucrNudLag.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLag.TabIndex = 29 + Me.ucrNudLag.TabIndex = 13 Me.ucrNudLag.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 342) + Me.ucrBase.Location = New System.Drawing.Point(9, 332) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) - Me.ucrBase.TabIndex = 27 + Me.ucrBase.TabIndex = 16 ' 'ucrChkLag ' Me.ucrChkLag.AutoSize = True Me.ucrChkLag.Checked = False - Me.ucrChkLag.Location = New System.Drawing.Point(9, 249) + Me.ucrChkLag.Location = New System.Drawing.Point(9, 243) Me.ucrChkLag.Name = "ucrChkLag" Me.ucrChkLag.Size = New System.Drawing.Size(143, 23) - Me.ucrChkLag.TabIndex = 25 + Me.ucrChkLag.TabIndex = 12 ' 'ucrChkStratifyingFactor ' Me.ucrChkStratifyingFactor.AutoSize = True Me.ucrChkStratifyingFactor.Checked = False - Me.ucrChkStratifyingFactor.Location = New System.Drawing.Point(281, 82) + Me.ucrChkStratifyingFactor.Location = New System.Drawing.Point(281, 72) Me.ucrChkStratifyingFactor.Name = "ucrChkStratifyingFactor" Me.ucrChkStratifyingFactor.Size = New System.Drawing.Size(143, 23) - Me.ucrChkStratifyingFactor.TabIndex = 19 + Me.ucrChkStratifyingFactor.TabIndex = 4 ' 'ucrPnlRandomSplit ' Me.ucrPnlRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRandomSplit.Location = New System.Drawing.Point(104, 12) + Me.ucrPnlRandomSplit.Location = New System.Drawing.Point(105, 7) Me.ucrPnlRandomSplit.Name = "ucrPnlRandomSplit" Me.ucrPnlRandomSplit.Size = New System.Drawing.Size(212, 44) - Me.ucrPnlRandomSplit.TabIndex = 26 + Me.ucrPnlRandomSplit.TabIndex = 0 ' 'ucrSelectorRandomSplit ' @@ -192,48 +192,48 @@ Partial Class dlgRandomSplit Me.ucrSelectorRandomSplit.bDropUnusedFilterLevels = False Me.ucrSelectorRandomSplit.bShowHiddenColumns = False Me.ucrSelectorRandomSplit.bUseCurrentFilter = True - Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(9, 63) + Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(9, 53) Me.ucrSelectorRandomSplit.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorRandomSplit.Name = "ucrSelectorRandomSplit" Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorRandomSplit.TabIndex = 38 + Me.ucrSelectorRandomSplit.TabIndex = 3 ' 'ucrReceiverRanSplit ' Me.ucrReceiverRanSplit.AutoSize = True Me.ucrReceiverRanSplit.frmParent = Me - Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(281, 111) + Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(281, 101) Me.ucrReceiverRanSplit.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRanSplit.Name = "ucrReceiverRanSplit" Me.ucrReceiverRanSplit.Selector = Nothing Me.ucrReceiverRanSplit.Size = New System.Drawing.Size(120, 21) Me.ucrReceiverRanSplit.strNcFilePath = "" - Me.ucrReceiverRanSplit.TabIndex = 39 + Me.ucrReceiverRanSplit.TabIndex = 5 Me.ucrReceiverRanSplit.ucrSelector = Nothing ' 'ucrSaveTrainingData ' Me.ucrSaveTrainingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 315) + Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 305) Me.ucrSaveTrainingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTrainingData.Name = "ucrSaveTrainingData" Me.ucrSaveTrainingData.Size = New System.Drawing.Size(403, 23) - Me.ucrSaveTrainingData.TabIndex = 28 + Me.ucrSaveTrainingData.TabIndex = 15 ' 'ucrSaveTestingData ' Me.ucrSaveTestingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTestingData.Location = New System.Drawing.Point(9, 284) + Me.ucrSaveTestingData.Location = New System.Drawing.Point(9, 274) Me.ucrSaveTestingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTestingData.Name = "ucrSaveTestingData" Me.ucrSaveTestingData.Size = New System.Drawing.Size(403, 23) - Me.ucrSaveTestingData.TabIndex = 40 + Me.ucrSaveTestingData.TabIndex = 14 ' 'dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(432, 399) + Me.ClientSize = New System.Drawing.Size(432, 389) Me.Controls.Add(Me.ucrSaveTestingData) Me.Controls.Add(Me.ucrReceiverRanSplit) Me.Controls.Add(Me.lblBreaks) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 2165a2e6a59..6d8fd9d7d8a 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -47,11 +47,16 @@ Public Class dlgRandomSplit ucrSelectorRandomSplit.SetParameter(New RParameter("data", 0)) ucrSelectorRandomSplit.SetParameterIsrfunction() + ucrNudPool.SetLinkedDisplayControl(lblPool) + ucrNudPool.SetParameter(New RParameter("pool", 5)) + ucrNudPool.DecimalPlaces = 2 + ucrNudPool.SetMinMax(0.01, 1.0) + ucrNudPool.Increment = 0.1 + ucrChkStratifyingFactor.SetText("Stratifying Factor") - ucrChkStratifyingFactor.SetParameter(New RParameter("check")) - ucrChkStratifyingFactor.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - ucrChkStratifyingFactor.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRanSplit, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkStratifyingFactor.SetParameter(ucrNudPool.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + ucrChkStratifyingFactor.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRanSplit, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkLag.SetText("Lag") ucrNudLag.SetParameter(New RParameter("lag", 3)) @@ -80,12 +85,6 @@ Public Class dlgRandomSplit ucrNudFraction.DecimalPlaces = 2 ucrNudFraction.Increment = 0.01 - ucrNudPool.SetLinkedDisplayControl(lblPool) - ucrNudPool.SetParameter(New RParameter("pool", 5)) - ucrNudPool.DecimalPlaces = 2 - ucrNudPool.SetMinMax(0.01, 1.0) - ucrNudPool.Increment = 0.1 - ucrPnlRandomSplit.AddRadioButton(rdoSample) ucrPnlRandomSplit.AddRadioButton(rdoTimeSeries) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"initial_split", "training", "testing"}) @@ -118,7 +117,7 @@ Public Class dlgRandomSplit clsInitialSplit.AddParameter("strata", "NULL", iPosition:=2) clsInitialSplit.AddParameter("lag", "0", iPosition:=3) clsInitialSplit.AddParameter("breaks", "4", iPosition:=4) - clsInitialSplit.AddParameter("pool", "0.10", iPosition:=5) + clsInitialSplit.AddParameter("pool", "0.01", iPosition:=5) clsInitialSplit.SetAssignTo("rsample") clsTraining.SetPackageName("rsample") @@ -144,6 +143,7 @@ Public Class dlgRandomSplit ucrSaveTestingData.SetRCode(clsTesting, bReset) ucrNudLag.SetRCode(clsInitialSplit, bReset) ucrReceiverRanSplit.SetRCode(clsInitialSplit, bReset) + ucrChkStratifyingFactor.SetRCode(clsInitialSplit, bReset) If bReset Then ucrPnlRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) End If From dfb4b4fd181c4eaa678210e9843f10db440c1305 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 3 Nov 2022 12:23:00 +0100 Subject: [PATCH 033/100] Code Changes --- instat/dlgRandomSplit.vb | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 6d8fd9d7d8a..307487fbd50 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -18,10 +18,10 @@ Imports instat.Translations Public Class dlgRandomSplit Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsInitialTimeSplit As RFunction + Private clsInitialTimeSplit As New RFunction Private clsInitialSplit As New RFunction - Private clsTraining As RFunction - Private clsTesting As RFunction + Private clsTraining As New RFunction + Private clsTesting As New RFunction Private Sub dlgRandomSplit_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -55,14 +55,14 @@ Public Class dlgRandomSplit ucrChkStratifyingFactor.SetText("Stratifying Factor") ucrChkStratifyingFactor.SetParameter(ucrNudPool.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) - ucrChkStratifyingFactor.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkStratifyingFactor.AddToLinkedControls(ucrReceiverRanSplit, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkStratifyingFactor.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedUpdateFunction:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.01) - ucrChkLag.SetText("Lag") ucrNudLag.SetParameter(New RParameter("lag", 3)) ucrNudLag.SetMinMax(0, 100) - ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) ucrNudLag.Increment = 0.5 + ucrChkLag.SetText("Lag") + ucrChkLag.SetParameter(ucrNudLag.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) ucrSaveTrainingData.SetLabelText("Save sample to:") ucrSaveTrainingData.SetSaveTypeAsDataFrame() @@ -90,7 +90,7 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"initial_split", "training", "testing"}) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"initial_time_split", "training", "testing"}) ucrPnlRandomSplit.AddToLinkedControls(ucrChkStratifyingFactor, {rdoSample}, bNewLinkedHideIfParameterMissing:=True) - ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor, ucrNudBreaks}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlRandomSplit.AddToLinkedControls(ucrNudBreaks, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=4) ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) End Sub @@ -115,25 +115,26 @@ Public Class dlgRandomSplit clsInitialSplit.SetRCommand("initial_split") clsInitialSplit.AddParameter("prop", "0.75", iPosition:=1) clsInitialSplit.AddParameter("strata", "NULL", iPosition:=2) - clsInitialSplit.AddParameter("lag", "0", iPosition:=3) clsInitialSplit.AddParameter("breaks", "4", iPosition:=4) - clsInitialSplit.AddParameter("pool", "0.01", iPosition:=5) clsInitialSplit.SetAssignTo("rsample") clsTraining.SetPackageName("rsample") clsTraining.SetRCommand("training") - clsTraining.SetAssignTo("training", strTempDataframe:=ucrSelectorRandomSplit.strCurrentDataFrame, strDataFrameNames:="last_training") + clsTraining.SetAssignTo("training_data", strTempDataframe:=ucrSelectorRandomSplit.strCurrentDataFrame, strDataFrameNames:="last_training") clsTesting.SetPackageName("rsample") clsTesting.SetRCommand("testing") - clsTesting.SetAssignTo("testing", strTempDataframe:=ucrSelectorRandomSplit.strCurrentDataFrame, strDataFrameNames:="last_testing") + clsTesting.SetAssignTo("testing_data", strTempDataframe:=ucrSelectorRandomSplit.strCurrentDataFrame, strDataFrameNames:="last_testing") ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) + ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) + ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1) End Sub Private Sub SetRCodeForControls(bReset As Boolean) + ucrPnlRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) ucrSelectorRandomSplit.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("data", ucrSelectorRandomSplit.ucrAvailableDataFrames.clsCurrDataFrame, 0), iAdditionalPairNo:=1) ucrNudFraction.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("prop", 1), iAdditionalPairNo:=1) - ucrNudLag.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("lag", 3), iAdditionalPairNo:=1) + ucrNudLag.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("lag", 2), iAdditionalPairNo:=1) ucrSelectorRandomSplit.SetRCode(clsInitialSplit, bReset) ucrNudBreaks.SetRCode(clsInitialSplit, bReset) @@ -141,12 +142,9 @@ Public Class dlgRandomSplit ucrNudPool.SetRCode(clsInitialSplit, bReset) ucrSaveTrainingData.SetRCode(clsTraining, bReset) ucrSaveTestingData.SetRCode(clsTesting, bReset) - ucrNudLag.SetRCode(clsInitialSplit, bReset) + ucrNudLag.SetRCode(clsTesting, bReset) ucrReceiverRanSplit.SetRCode(clsInitialSplit, bReset) ucrChkStratifyingFactor.SetRCode(clsInitialSplit, bReset) - If bReset Then - ucrPnlRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) - End If End Sub Private Sub TestOkEnabled() @@ -156,26 +154,28 @@ Public Class dlgRandomSplit ucrBase.OKEnabled(False) End If End Sub + Private Sub SetBaseFunction() + ucrBase.clsRsyntax.ClearCodes() If rdoSample.Checked Then If ucrSaveTestingData.IsComplete Then clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) - ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) End If If ucrSaveTrainingData.IsComplete Then clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) - ucrBase.clsRsyntax.AddToAfterCodes(clsTraining) End If + ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) Else If ucrSaveTestingData.IsComplete Then clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) - ucrBase.clsRsyntax.SetBaseRFunction(clsTesting) End If If ucrSaveTrainingData.IsComplete Then clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) - ucrBase.clsRsyntax.AddToAfterCodes(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 @@ -188,7 +188,7 @@ Public Class dlgRandomSplit TestOkEnabled() End Sub - Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged + Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrChkStratifyingFactor.ControlValueChanged, ucrReceiverRanSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged SetBaseFunction() End Sub From 098b1608e1f16afaead446f1c2ce9415e2e08b3f Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 4 Nov 2022 08:03:24 +0100 Subject: [PATCH 034/100] Removing SetDataFramePrefix --- instat/dlgRandomSplit.vb | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 307487fbd50..78e0b58ea22 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -60,6 +60,7 @@ Public Class dlgRandomSplit ucrNudLag.SetParameter(New RParameter("lag", 3)) ucrNudLag.SetMinMax(0, 100) ucrNudLag.Increment = 0.5 + ucrNudLag.DecimalPlaces = 2 ucrChkLag.SetText("Lag") ucrChkLag.SetParameter(ucrNudLag.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) @@ -134,7 +135,6 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) ucrSelectorRandomSplit.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("data", ucrSelectorRandomSplit.ucrAvailableDataFrames.clsCurrDataFrame, 0), iAdditionalPairNo:=1) ucrNudFraction.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("prop", 1), iAdditionalPairNo:=1) - ucrNudLag.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("lag", 2), iAdditionalPairNo:=1) ucrSelectorRandomSplit.SetRCode(clsInitialSplit, bReset) ucrNudBreaks.SetRCode(clsInitialSplit, bReset) @@ -142,7 +142,7 @@ Public Class dlgRandomSplit ucrNudPool.SetRCode(clsInitialSplit, bReset) ucrSaveTrainingData.SetRCode(clsTraining, bReset) ucrSaveTestingData.SetRCode(clsTesting, bReset) - ucrNudLag.SetRCode(clsTesting, bReset) + ucrNudLag.SetRCode(clsInitialTimeSplit, bReset) ucrReceiverRanSplit.SetRCode(clsInitialSplit, bReset) ucrChkStratifyingFactor.SetRCode(clsInitialSplit, bReset) End Sub @@ -192,16 +192,4 @@ Public Class dlgRandomSplit SetBaseFunction() End Sub - Private Sub SetDataFramePrefix() - Dim strDataframeName As String = ucrSelectorRandomSplit.ucrAvailableDataFrames.cboAvailableDataFrames.Text - If ucrSelectorRandomSplit.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso (Not ucrSaveTestingData.bUserTyped) AndAlso (Not ucrSaveTrainingData.bUserTyped) Then - If rdoSample.Checked Then - ucrSaveTestingData.SetPrefix(strDataframeName & "testing_data") - ucrSaveTrainingData.SetPrefix(strDataframeName & "training_data") - Else - ucrSaveTestingData.SetPrefix(strDataframeName & "testing_data") - ucrSaveTrainingData.SetPrefix(strDataframeName & "training_data") - End If - End If - End Sub End Class \ No newline at end of file From 456bd9f7a55c49f0c2335027a4d0028ee8ade14f Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 9 Nov 2022 10:38:57 +0100 Subject: [PATCH 035/100] Minor Changes --- instat/dlgRandomSplit.Designer.vb | 36 +++++++++++++++---------------- instat/dlgRandomSplit.vb | 22 +++++++++---------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index 40a01c5eee8..d19416a137e 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -33,12 +33,12 @@ Partial Class dlgRandomSplit Me.ucrNudLag = New instat.ucrNud() Me.ucrBase = New instat.ucrButtons() Me.ucrChkLag = New instat.ucrCheck() - Me.ucrChkStratifyingFactor = New instat.ucrCheck() Me.ucrPnlRandomSplit = New instat.UcrPanel() Me.ucrSelectorRandomSplit = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverRanSplit = New instat.ucrReceiverSingle() Me.ucrSaveTrainingData = New instat.ucrSave() Me.ucrSaveTestingData = New instat.ucrSave() + Me.Label1 = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'rdoSample @@ -76,7 +76,7 @@ Partial Class dlgRandomSplit 'lblFraction ' Me.lblFraction.AutoSize = True - Me.lblFraction.Location = New System.Drawing.Point(281, 136) + Me.lblFraction.Location = New System.Drawing.Point(281, 141) Me.lblFraction.Name = "lblFraction" Me.lblFraction.Size = New System.Drawing.Size(48, 13) Me.lblFraction.TabIndex = 6 @@ -85,7 +85,7 @@ Partial Class dlgRandomSplit 'lblPool ' Me.lblPool.AutoSize = True - Me.lblPool.Location = New System.Drawing.Point(281, 199) + Me.lblPool.Location = New System.Drawing.Point(281, 197) Me.lblPool.Name = "lblPool" Me.lblPool.Size = New System.Drawing.Size(31, 13) Me.lblPool.TabIndex = 10 @@ -94,7 +94,7 @@ Partial Class dlgRandomSplit 'lblBreaks ' Me.lblBreaks.AutoSize = True - Me.lblBreaks.Location = New System.Drawing.Point(281, 168) + Me.lblBreaks.Location = New System.Drawing.Point(281, 169) Me.lblBreaks.Name = "lblBreaks" Me.lblBreaks.Size = New System.Drawing.Size(46, 13) Me.lblBreaks.TabIndex = 8 @@ -105,7 +105,7 @@ Partial Class dlgRandomSplit Me.ucrNudBreaks.AutoSize = True Me.ucrNudBreaks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 166) + Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 165) Me.ucrNudBreaks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudBreaks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Name = "ucrNudBreaks" @@ -118,7 +118,7 @@ Partial Class dlgRandomSplit Me.ucrNudPool.AutoSize = True Me.ucrNudPool.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPool.Location = New System.Drawing.Point(351, 198) + Me.ucrNudPool.Location = New System.Drawing.Point(351, 197) Me.ucrNudPool.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPool.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Name = "ucrNudPool" @@ -169,15 +169,6 @@ Partial Class dlgRandomSplit Me.ucrChkLag.Size = New System.Drawing.Size(143, 23) Me.ucrChkLag.TabIndex = 12 ' - 'ucrChkStratifyingFactor - ' - Me.ucrChkStratifyingFactor.AutoSize = True - Me.ucrChkStratifyingFactor.Checked = False - Me.ucrChkStratifyingFactor.Location = New System.Drawing.Point(281, 72) - Me.ucrChkStratifyingFactor.Name = "ucrChkStratifyingFactor" - Me.ucrChkStratifyingFactor.Size = New System.Drawing.Size(143, 23) - Me.ucrChkStratifyingFactor.TabIndex = 4 - ' 'ucrPnlRandomSplit ' Me.ucrPnlRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -202,7 +193,7 @@ Partial Class dlgRandomSplit ' Me.ucrReceiverRanSplit.AutoSize = True Me.ucrReceiverRanSplit.frmParent = Me - Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(281, 101) + Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(281, 105) Me.ucrReceiverRanSplit.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRanSplit.Name = "ucrReceiverRanSplit" Me.ucrReceiverRanSplit.Selector = Nothing @@ -229,11 +220,21 @@ Partial Class dlgRandomSplit Me.ucrSaveTestingData.Size = New System.Drawing.Size(403, 23) Me.ucrSaveTestingData.TabIndex = 14 ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(278, 84) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(144, 13) + Me.Label1.TabIndex = 17 + Me.Label1.Text = "Stratifying variable (Optional):" + ' 'dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(432, 389) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ucrSaveTestingData) Me.Controls.Add(Me.ucrReceiverRanSplit) Me.Controls.Add(Me.lblBreaks) @@ -248,7 +249,6 @@ Partial Class dlgRandomSplit Me.Controls.Add(Me.ucrChkLag) Me.Controls.Add(Me.rdoSample) Me.Controls.Add(Me.rdoTimeSeries) - Me.Controls.Add(Me.ucrChkStratifyingFactor) Me.Controls.Add(Me.ucrPnlRandomSplit) Me.Controls.Add(Me.ucrSelectorRandomSplit) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow @@ -264,7 +264,6 @@ Partial Class dlgRandomSplit Friend WithEvents rdoSample As RadioButton Friend WithEvents rdoTimeSeries As RadioButton - Friend WithEvents ucrChkStratifyingFactor As ucrCheck Friend WithEvents ucrChkLag As ucrCheck Friend WithEvents ucrNudPool As ucrNud Friend WithEvents ucrNudFraction As ucrNud @@ -279,4 +278,5 @@ Partial Class dlgRandomSplit Friend WithEvents ucrReceiverRanSplit As ucrReceiverSingle Friend WithEvents ucrSaveTrainingData As ucrSave Friend WithEvents ucrSaveTestingData As ucrSave + Friend WithEvents Label1 As Label End Class diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 78e0b58ea22..478b84746b3 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -49,14 +49,10 @@ Public Class dlgRandomSplit ucrNudPool.SetLinkedDisplayControl(lblPool) ucrNudPool.SetParameter(New RParameter("pool", 5)) - ucrNudPool.DecimalPlaces = 2 - ucrNudPool.SetMinMax(0.01, 1.0) + ucrNudPool.DecimalPlaces = 1 + ucrNudPool.SetMinMax(0.1, 1.0) ucrNudPool.Increment = 0.1 - ucrChkStratifyingFactor.SetText("Stratifying Factor") - ucrChkStratifyingFactor.SetParameter(ucrNudPool.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) - ucrChkStratifyingFactor.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedUpdateFunction:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.01) - ucrNudLag.SetParameter(New RParameter("lag", 3)) ucrNudLag.SetMinMax(0, 100) ucrNudLag.Increment = 0.5 @@ -90,8 +86,7 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddRadioButton(rdoTimeSeries) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"initial_split", "training", "testing"}) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"initial_time_split", "training", "testing"}) - ucrPnlRandomSplit.AddToLinkedControls(ucrChkStratifyingFactor, {rdoSample}, bNewLinkedHideIfParameterMissing:=True) - ucrPnlRandomSplit.AddToLinkedControls(ucrNudBreaks, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=4) + ucrPnlRandomSplit.AddToLinkedControls({ucrNudBreaks, ucrNudPool}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) End Sub @@ -116,7 +111,8 @@ Public Class dlgRandomSplit clsInitialSplit.SetRCommand("initial_split") clsInitialSplit.AddParameter("prop", "0.75", iPosition:=1) clsInitialSplit.AddParameter("strata", "NULL", iPosition:=2) - clsInitialSplit.AddParameter("breaks", "4", iPosition:=4) + clsInitialSplit.AddParameter("breaks", "4", iPosition:=3) + clsInitialSplit.AddParameter("pool", "0.1", iPosition:=4) clsInitialSplit.SetAssignTo("rsample") clsTraining.SetPackageName("rsample") @@ -144,7 +140,6 @@ Public Class dlgRandomSplit ucrSaveTestingData.SetRCode(clsTesting, bReset) ucrNudLag.SetRCode(clsInitialTimeSplit, bReset) ucrReceiverRanSplit.SetRCode(clsInitialSplit, bReset) - ucrChkStratifyingFactor.SetRCode(clsInitialSplit, bReset) End Sub Private Sub TestOkEnabled() @@ -184,12 +179,15 @@ Public Class dlgRandomSplit TestOkEnabled() End Sub - Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrChkStratifyingFactor.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged TestOkEnabled() End Sub - Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrChkStratifyingFactor.ControlValueChanged, ucrReceiverRanSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged + Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrReceiverRanSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged SetBaseFunction() End Sub + Private Sub ucrSelectorRandomSplit_Load(sender As Object, e As EventArgs) Handles ucrSelectorRandomSplit.Load + + End Sub End Class \ No newline at end of file From 3fd433f400f682958983d2b18d3f101bf36029c7 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Wed, 9 Nov 2022 15:18:17 +0000 Subject: [PATCH 036/100] Update dlgRandomSplit.Designer.vb --- instat/dlgRandomSplit.Designer.vb | 96 ++++++++++++++++++------------- 1 file changed, 55 insertions(+), 41 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index d19416a137e..ff63537da21 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -1,4 +1,4 @@ - _ + _ Partial Class dlgRandomSplit Inherits System.Windows.Forms.Form @@ -49,9 +49,10 @@ Partial Class dlgRandomSplit Me.rdoSample.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSample.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSample.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSample.Location = New System.Drawing.Point(111, 15) + Me.rdoSample.Location = New System.Drawing.Point(166, 23) + Me.rdoSample.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.rdoSample.Name = "rdoSample" - Me.rdoSample.Size = New System.Drawing.Size(100, 28) + Me.rdoSample.Size = New System.Drawing.Size(150, 43) Me.rdoSample.TabIndex = 1 Me.rdoSample.Text = "Sample" Me.rdoSample.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -65,9 +66,10 @@ Partial Class dlgRandomSplit Me.rdoTimeSeries.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoTimeSeries.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTimeSeries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoTimeSeries.Location = New System.Drawing.Point(209, 15) + Me.rdoTimeSeries.Location = New System.Drawing.Point(314, 23) + Me.rdoTimeSeries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.rdoTimeSeries.Name = "rdoTimeSeries" - Me.rdoTimeSeries.Size = New System.Drawing.Size(100, 28) + Me.rdoTimeSeries.Size = New System.Drawing.Size(150, 43) Me.rdoTimeSeries.TabIndex = 2 Me.rdoTimeSeries.Text = "Time Series" Me.rdoTimeSeries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -76,40 +78,44 @@ Partial Class dlgRandomSplit 'lblFraction ' Me.lblFraction.AutoSize = True - Me.lblFraction.Location = New System.Drawing.Point(281, 141) + Me.lblFraction.Location = New System.Drawing.Point(422, 207) + Me.lblFraction.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFraction.Name = "lblFraction" - Me.lblFraction.Size = New System.Drawing.Size(48, 13) + Me.lblFraction.Size = New System.Drawing.Size(71, 20) Me.lblFraction.TabIndex = 6 Me.lblFraction.Text = "Fraction:" ' 'lblPool ' Me.lblPool.AutoSize = True - Me.lblPool.Location = New System.Drawing.Point(281, 197) + Me.lblPool.Location = New System.Drawing.Point(422, 294) + Me.lblPool.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblPool.Name = "lblPool" - Me.lblPool.Size = New System.Drawing.Size(31, 13) + Me.lblPool.Size = New System.Drawing.Size(44, 20) Me.lblPool.TabIndex = 10 Me.lblPool.Text = "Pool:" ' 'lblBreaks ' Me.lblBreaks.AutoSize = True - Me.lblBreaks.Location = New System.Drawing.Point(281, 169) + Me.lblBreaks.Location = New System.Drawing.Point(422, 251) + Me.lblBreaks.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblBreaks.Name = "lblBreaks" - Me.lblBreaks.Size = New System.Drawing.Size(46, 13) + Me.lblBreaks.Size = New System.Drawing.Size(63, 20) Me.lblBreaks.TabIndex = 8 - Me.lblBreaks.Text = "Breaks :" + Me.lblBreaks.Text = "Breaks:" ' 'ucrNudBreaks ' Me.ucrNudBreaks.AutoSize = True Me.ucrNudBreaks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 165) + Me.ucrNudBreaks.Location = New System.Drawing.Point(526, 249) + Me.ucrNudBreaks.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrNudBreaks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudBreaks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Name = "ucrNudBreaks" - Me.ucrNudBreaks.Size = New System.Drawing.Size(50, 20) + Me.ucrNudBreaks.Size = New System.Drawing.Size(75, 31) Me.ucrNudBreaks.TabIndex = 9 Me.ucrNudBreaks.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -118,11 +124,12 @@ Partial Class dlgRandomSplit Me.ucrNudPool.AutoSize = True Me.ucrNudPool.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPool.Location = New System.Drawing.Point(351, 197) + Me.ucrNudPool.Location = New System.Drawing.Point(526, 292) + Me.ucrNudPool.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrNudPool.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPool.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Name = "ucrNudPool" - Me.ucrNudPool.Size = New System.Drawing.Size(50, 20) + Me.ucrNudPool.Size = New System.Drawing.Size(75, 31) Me.ucrNudPool.TabIndex = 11 Me.ucrNudPool.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -131,11 +138,12 @@ Partial Class dlgRandomSplit Me.ucrNudFraction.AutoSize = True Me.ucrNudFraction.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFraction.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudFraction.Location = New System.Drawing.Point(351, 133) + Me.ucrNudFraction.Location = New System.Drawing.Point(527, 203) + Me.ucrNudFraction.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrNudFraction.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudFraction.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFraction.Name = "ucrNudFraction" - Me.ucrNudFraction.Size = New System.Drawing.Size(50, 20) + Me.ucrNudFraction.Size = New System.Drawing.Size(75, 31) Me.ucrNudFraction.TabIndex = 7 Me.ucrNudFraction.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -144,37 +152,41 @@ Partial Class dlgRandomSplit Me.ucrNudLag.AutoSize = True Me.ucrNudLag.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLag.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLag.Location = New System.Drawing.Point(135, 242) + Me.ucrNudLag.Location = New System.Drawing.Point(157, 368) + Me.ucrNudLag.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrNudLag.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLag.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLag.Name = "ucrNudLag" - Me.ucrNudLag.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLag.Size = New System.Drawing.Size(75, 31) Me.ucrNudLag.TabIndex = 13 Me.ucrNudLag.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 332) + Me.ucrBase.Location = New System.Drawing.Point(14, 511) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.Size = New System.Drawing.Size(615, 80) Me.ucrBase.TabIndex = 16 ' 'ucrChkLag ' Me.ucrChkLag.AutoSize = True Me.ucrChkLag.Checked = False - Me.ucrChkLag.Location = New System.Drawing.Point(9, 243) + Me.ucrChkLag.Location = New System.Drawing.Point(14, 368) + Me.ucrChkLag.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkLag.Name = "ucrChkLag" - Me.ucrChkLag.Size = New System.Drawing.Size(143, 23) + Me.ucrChkLag.Size = New System.Drawing.Size(214, 35) Me.ucrChkLag.TabIndex = 12 ' 'ucrPnlRandomSplit ' Me.ucrPnlRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRandomSplit.Location = New System.Drawing.Point(105, 7) + Me.ucrPnlRandomSplit.Location = New System.Drawing.Point(158, 11) + Me.ucrPnlRandomSplit.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrPnlRandomSplit.Name = "ucrPnlRandomSplit" - Me.ucrPnlRandomSplit.Size = New System.Drawing.Size(212, 44) + Me.ucrPnlRandomSplit.Size = New System.Drawing.Size(318, 68) Me.ucrPnlRandomSplit.TabIndex = 0 ' 'ucrSelectorRandomSplit @@ -183,21 +195,21 @@ Partial Class dlgRandomSplit Me.ucrSelectorRandomSplit.bDropUnusedFilterLevels = False Me.ucrSelectorRandomSplit.bShowHiddenColumns = False Me.ucrSelectorRandomSplit.bUseCurrentFilter = True - Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(9, 53) + Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(14, 82) Me.ucrSelectorRandomSplit.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorRandomSplit.Name = "ucrSelectorRandomSplit" - Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(320, 282) Me.ucrSelectorRandomSplit.TabIndex = 3 ' 'ucrReceiverRanSplit ' Me.ucrReceiverRanSplit.AutoSize = True Me.ucrReceiverRanSplit.frmParent = Me - Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(281, 105) + Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(422, 157) Me.ucrReceiverRanSplit.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRanSplit.Name = "ucrReceiverRanSplit" Me.ucrReceiverRanSplit.Selector = Nothing - Me.ucrReceiverRanSplit.Size = New System.Drawing.Size(120, 21) + Me.ucrReceiverRanSplit.Size = New System.Drawing.Size(180, 32) Me.ucrReceiverRanSplit.strNcFilePath = "" Me.ucrReceiverRanSplit.TabIndex = 5 Me.ucrReceiverRanSplit.ucrSelector = Nothing @@ -205,35 +217,36 @@ Partial Class dlgRandomSplit 'ucrSaveTrainingData ' Me.ucrSaveTrainingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 305) - Me.ucrSaveTrainingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTrainingData.Location = New System.Drawing.Point(14, 462) + Me.ucrSaveTrainingData.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveTrainingData.Name = "ucrSaveTrainingData" - Me.ucrSaveTrainingData.Size = New System.Drawing.Size(403, 23) + Me.ucrSaveTrainingData.Size = New System.Drawing.Size(450, 35) Me.ucrSaveTrainingData.TabIndex = 15 ' 'ucrSaveTestingData ' Me.ucrSaveTestingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTestingData.Location = New System.Drawing.Point(9, 274) - Me.ucrSaveTestingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTestingData.Location = New System.Drawing.Point(14, 416) + Me.ucrSaveTestingData.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveTestingData.Name = "ucrSaveTestingData" - Me.ucrSaveTestingData.Size = New System.Drawing.Size(403, 23) + Me.ucrSaveTestingData.Size = New System.Drawing.Size(450, 35) Me.ucrSaveTestingData.TabIndex = 14 ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(278, 84) + Me.Label1.Location = New System.Drawing.Point(418, 138) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(144, 13) + Me.Label1.Size = New System.Drawing.Size(216, 20) Me.Label1.TabIndex = 17 - Me.Label1.Text = "Stratifying variable (Optional):" + Me.Label1.Text = "Stratifying Variable (optional):" ' 'dlgRandomSplit ' - 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.ClientSize = New System.Drawing.Size(432, 389) + Me.ClientSize = New System.Drawing.Size(648, 598) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ucrSaveTestingData) Me.Controls.Add(Me.ucrReceiverRanSplit) @@ -252,6 +265,7 @@ Partial Class dlgRandomSplit Me.Controls.Add(Me.ucrPnlRandomSplit) Me.Controls.Add(Me.ucrSelectorRandomSplit) 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 = "dlgRandomSplit" From 85a0d277dee05641d8e2f066f6c73a8e18d61fbd Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Tue, 22 Nov 2022 12:41:39 +0100 Subject: [PATCH 037/100] code changes --- instat/dlgRandomSplit.Designer.vb | 48 +++++++++++++++---------------- instat/dlgRandomSplit.vb | 35 +++++++++++++--------- 2 files changed, 45 insertions(+), 38 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index d19416a137e..14f992b8d6c 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -25,8 +25,6 @@ Partial Class dlgRandomSplit Me.rdoSample = New System.Windows.Forms.RadioButton() Me.rdoTimeSeries = New System.Windows.Forms.RadioButton() Me.lblFraction = New System.Windows.Forms.Label() - Me.lblPool = New System.Windows.Forms.Label() - Me.lblBreaks = New System.Windows.Forms.Label() Me.ucrNudBreaks = New instat.ucrNud() Me.ucrNudPool = New instat.ucrNud() Me.ucrNudFraction = New instat.ucrNud() @@ -39,6 +37,8 @@ Partial Class dlgRandomSplit Me.ucrSaveTrainingData = New instat.ucrSave() Me.ucrSaveTestingData = New instat.ucrSave() Me.Label1 = New System.Windows.Forms.Label() + Me.ucrChkbreaks = New instat.ucrCheck() + Me.ucrChkPool = New instat.ucrCheck() Me.SuspendLayout() ' 'rdoSample @@ -82,24 +82,6 @@ Partial Class dlgRandomSplit Me.lblFraction.TabIndex = 6 Me.lblFraction.Text = "Fraction:" ' - 'lblPool - ' - Me.lblPool.AutoSize = True - Me.lblPool.Location = New System.Drawing.Point(281, 197) - Me.lblPool.Name = "lblPool" - Me.lblPool.Size = New System.Drawing.Size(31, 13) - Me.lblPool.TabIndex = 10 - Me.lblPool.Text = "Pool:" - ' - 'lblBreaks - ' - Me.lblBreaks.AutoSize = True - Me.lblBreaks.Location = New System.Drawing.Point(281, 169) - Me.lblBreaks.Name = "lblBreaks" - Me.lblBreaks.Size = New System.Drawing.Size(46, 13) - Me.lblBreaks.TabIndex = 8 - Me.lblBreaks.Text = "Breaks :" - ' 'ucrNudBreaks ' Me.ucrNudBreaks.AutoSize = True @@ -229,6 +211,24 @@ Partial Class dlgRandomSplit Me.Label1.TabIndex = 17 Me.Label1.Text = "Stratifying variable (Optional):" ' + 'ucrChkbreaks + ' + Me.ucrChkbreaks.AutoSize = True + Me.ucrChkbreaks.Checked = False + Me.ucrChkbreaks.Location = New System.Drawing.Point(264, 165) + Me.ucrChkbreaks.Name = "ucrChkbreaks" + Me.ucrChkbreaks.Size = New System.Drawing.Size(143, 23) + Me.ucrChkbreaks.TabIndex = 18 + ' + 'ucrChkPool + ' + Me.ucrChkPool.AutoSize = True + Me.ucrChkPool.Checked = False + Me.ucrChkPool.Location = New System.Drawing.Point(265, 197) + Me.ucrChkPool.Name = "ucrChkPool" + Me.ucrChkPool.Size = New System.Drawing.Size(143, 23) + Me.ucrChkPool.TabIndex = 19 + ' 'dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -237,9 +237,7 @@ Partial Class dlgRandomSplit Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ucrSaveTestingData) Me.Controls.Add(Me.ucrReceiverRanSplit) - Me.Controls.Add(Me.lblBreaks) Me.Controls.Add(Me.ucrNudBreaks) - Me.Controls.Add(Me.lblPool) Me.Controls.Add(Me.lblFraction) Me.Controls.Add(Me.ucrNudPool) Me.Controls.Add(Me.ucrNudFraction) @@ -251,6 +249,8 @@ Partial Class dlgRandomSplit Me.Controls.Add(Me.rdoTimeSeries) Me.Controls.Add(Me.ucrPnlRandomSplit) Me.Controls.Add(Me.ucrSelectorRandomSplit) + Me.Controls.Add(Me.ucrChkPool) + Me.Controls.Add(Me.ucrChkbreaks) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -270,13 +270,13 @@ Partial Class dlgRandomSplit Friend WithEvents ucrNudLag As ucrNud Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrPnlRandomSplit As UcrPanel - Friend WithEvents lblPool As Label Friend WithEvents lblFraction As Label - Friend WithEvents lblBreaks As Label Friend WithEvents ucrNudBreaks As ucrNud Friend WithEvents ucrSelectorRandomSplit As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrReceiverRanSplit As ucrReceiverSingle Friend WithEvents ucrSaveTrainingData As ucrSave Friend WithEvents ucrSaveTestingData As ucrSave Friend WithEvents Label1 As Label + Friend WithEvents ucrChkPool As ucrCheck + Friend WithEvents ucrChkbreaks As ucrCheck End Class diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 478b84746b3..07a4af976e0 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -41,17 +41,19 @@ Public Class dlgRandomSplit ucrReceiverRanSplit.SetParameter(New RParameter("strata", 2)) ucrReceiverRanSplit.Selector = ucrSelectorRandomSplit ucrReceiverRanSplit.SetMeAsReceiver() - ucrReceiverRanSplit.SetDataType("factor") + ucrReceiverRanSplit.SetParameter(New RParameter("data", 0)) ucrReceiverRanSplit.SetParameterIsString() ucrSelectorRandomSplit.SetParameter(New RParameter("data", 0)) ucrSelectorRandomSplit.SetParameterIsrfunction() - ucrNudPool.SetLinkedDisplayControl(lblPool) ucrNudPool.SetParameter(New RParameter("pool", 5)) ucrNudPool.DecimalPlaces = 1 - ucrNudPool.SetMinMax(0.1, 1.0) - ucrNudPool.Increment = 0.1 + ucrNudPool.SetMinMax(0.01, 1.0) + ucrNudPool.Increment = 0.01 + ucrChkPool.SetText("Pool") + ucrChkPool.SetParameter(ucrNudPool.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + ucrChkPool.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) ucrNudLag.SetParameter(New RParameter("lag", 3)) ucrNudLag.SetMinMax(0, 100) @@ -61,20 +63,24 @@ Public Class dlgRandomSplit ucrChkLag.SetParameter(ucrNudLag.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) - ucrSaveTrainingData.SetLabelText("Save sample to:") + ucrSaveTrainingData.SetLabelText("Save Train to:") ucrSaveTrainingData.SetSaveTypeAsDataFrame() ucrSaveTrainingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) ucrSaveTrainingData.SetPrefix("training_data") ucrSaveTrainingData.SetIsComboBox() - ucrSaveTestingData.SetLabelText("Save sample to:") + ucrSaveTestingData.SetLabelText("Save Test to:") ucrSaveTestingData.SetSaveTypeAsDataFrame() ucrSaveTestingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) ucrSaveTestingData.SetPrefix("testing_data") ucrSaveTestingData.SetIsComboBox() - ucrNudBreaks.SetLinkedDisplayControl(lblBreaks) - ucrNudBreaks.SetParameter(New RParameter("breaks", 4)) + ucrNudBreaks.SetParameter(New RParameter("breaks", 2)) + ucrChkbreaks.SetText("breaks") + ucrChkbreaks.SetParameter(ucrNudBreaks.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + ucrChkbreaks.AddToLinkedControls(ucrNudBreaks, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) + + ucrNudFraction.SetLinkedDisplayControl(lblFraction) ucrNudFraction.SetParameter(New RParameter("prop", 1)) @@ -86,7 +92,7 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddRadioButton(rdoTimeSeries) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"initial_split", "training", "testing"}) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"initial_time_split", "training", "testing"}) - ucrPnlRandomSplit.AddToLinkedControls({ucrNudBreaks, ucrNudPool}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlRandomSplit.AddToLinkedControls({ucrChkbreaks, ucrChkPool}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) End Sub @@ -110,9 +116,9 @@ Public Class dlgRandomSplit clsInitialSplit.SetPackageName("rsample") clsInitialSplit.SetRCommand("initial_split") clsInitialSplit.AddParameter("prop", "0.75", iPosition:=1) - clsInitialSplit.AddParameter("strata", "NULL", iPosition:=2) - clsInitialSplit.AddParameter("breaks", "4", iPosition:=3) - clsInitialSplit.AddParameter("pool", "0.1", iPosition:=4) + 'clsInitialSplit.AddParameter("strata", "NULL", iPosition:=2) + 'clsInitialSplit.AddParameter("breaks", "4", iPosition:=3) + 'clsInitialSplit.AddParameter("pool", "0.1", iPosition:=4) clsInitialSplit.SetAssignTo("rsample") clsTraining.SetPackageName("rsample") @@ -179,11 +185,12 @@ Public Class dlgRandomSplit TestOkEnabled() End Sub - Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, + ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged, ucrChkPool.ControlContentsChanged, ucrChkbreaks.ControlContentsChanged TestOkEnabled() End Sub - Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrReceiverRanSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged + Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrReceiverRanSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged, ucrChkbreaks.ControlValueChanged, ucrChkPool.ControlValueChanged SetBaseFunction() End Sub From aa82620e7420d4e1f210e030fa3cb10582a7aee1 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Tue, 22 Nov 2022 13:08:59 +0100 Subject: [PATCH 038/100] Changes --- instat/dlgRandomSplit.Designer.vb | 115 ++++++++++++------------------ instat/dlgRandomSplit.vb | 9 ++- 2 files changed, 51 insertions(+), 73 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index d33633eaf35..8ed86010593 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -49,10 +49,9 @@ Partial Class dlgRandomSplit Me.rdoSample.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSample.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSample.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSample.Location = New System.Drawing.Point(166, 23) - Me.rdoSample.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.rdoSample.Location = New System.Drawing.Point(111, 15) Me.rdoSample.Name = "rdoSample" - Me.rdoSample.Size = New System.Drawing.Size(150, 43) + Me.rdoSample.Size = New System.Drawing.Size(100, 28) Me.rdoSample.TabIndex = 1 Me.rdoSample.Text = "Sample" Me.rdoSample.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -66,10 +65,9 @@ Partial Class dlgRandomSplit Me.rdoTimeSeries.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoTimeSeries.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTimeSeries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoTimeSeries.Location = New System.Drawing.Point(314, 23) - Me.rdoTimeSeries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.rdoTimeSeries.Location = New System.Drawing.Point(209, 15) Me.rdoTimeSeries.Name = "rdoTimeSeries" - Me.rdoTimeSeries.Size = New System.Drawing.Size(150, 43) + Me.rdoTimeSeries.Size = New System.Drawing.Size(100, 28) Me.rdoTimeSeries.TabIndex = 2 Me.rdoTimeSeries.Text = "Time Series" Me.rdoTimeSeries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -78,42 +76,23 @@ Partial Class dlgRandomSplit 'lblFraction ' Me.lblFraction.AutoSize = True - Me.lblFraction.Location = New System.Drawing.Point(422, 207) - Me.lblFraction.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFraction.Location = New System.Drawing.Point(281, 135) Me.lblFraction.Name = "lblFraction" - Me.lblFraction.Size = New System.Drawing.Size(71, 20) + Me.lblFraction.Size = New System.Drawing.Size(48, 13) Me.lblFraction.TabIndex = 6 Me.lblFraction.Text = "Fraction:" ' - 'lblPool - ' - Me.lblPool.AutoSize = True - Me.lblPool.Location = New System.Drawing.Point(281, 197) - Me.lblPool.Name = "lblPool" - Me.lblPool.Size = New System.Drawing.Size(31, 13) - Me.lblPool.TabIndex = 10 - Me.lblPool.Text = "Pool:" - ' - 'lblBreaks - ' - Me.lblBreaks.AutoSize = True - Me.lblBreaks.Location = New System.Drawing.Point(281, 169) - Me.lblBreaks.Name = "lblBreaks" - Me.lblBreaks.Size = New System.Drawing.Size(46, 13) - Me.lblBreaks.TabIndex = 8 - Me.lblBreaks.Text = "Breaks :" - ' 'ucrNudBreaks ' Me.ucrNudBreaks.AutoSize = True Me.ucrNudBreaks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudBreaks.Location = New System.Drawing.Point(526, 249) - Me.ucrNudBreaks.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 162) + Me.ucrNudBreaks.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudBreaks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudBreaks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Name = "ucrNudBreaks" - Me.ucrNudBreaks.Size = New System.Drawing.Size(75, 31) + Me.ucrNudBreaks.Size = New System.Drawing.Size(50, 20) Me.ucrNudBreaks.TabIndex = 9 Me.ucrNudBreaks.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -122,12 +101,12 @@ Partial Class dlgRandomSplit Me.ucrNudPool.AutoSize = True Me.ucrNudPool.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPool.Location = New System.Drawing.Point(526, 292) - Me.ucrNudPool.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrNudPool.Location = New System.Drawing.Point(351, 190) + Me.ucrNudPool.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudPool.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPool.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Name = "ucrNudPool" - Me.ucrNudPool.Size = New System.Drawing.Size(75, 31) + Me.ucrNudPool.Size = New System.Drawing.Size(50, 20) Me.ucrNudPool.TabIndex = 11 Me.ucrNudPool.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -136,12 +115,12 @@ Partial Class dlgRandomSplit Me.ucrNudFraction.AutoSize = True Me.ucrNudFraction.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFraction.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudFraction.Location = New System.Drawing.Point(527, 203) - Me.ucrNudFraction.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrNudFraction.Location = New System.Drawing.Point(351, 132) + Me.ucrNudFraction.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudFraction.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudFraction.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFraction.Name = "ucrNudFraction" - Me.ucrNudFraction.Size = New System.Drawing.Size(75, 31) + Me.ucrNudFraction.Size = New System.Drawing.Size(50, 20) Me.ucrNudFraction.TabIndex = 7 Me.ucrNudFraction.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -150,41 +129,41 @@ Partial Class dlgRandomSplit Me.ucrNudLag.AutoSize = True Me.ucrNudLag.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLag.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLag.Location = New System.Drawing.Point(157, 368) - Me.ucrNudLag.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrNudLag.Location = New System.Drawing.Point(105, 239) + Me.ucrNudLag.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudLag.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLag.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLag.Name = "ucrNudLag" - Me.ucrNudLag.Size = New System.Drawing.Size(75, 31) + Me.ucrNudLag.Size = New System.Drawing.Size(50, 20) Me.ucrNudLag.TabIndex = 13 Me.ucrNudLag.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(14, 511) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrBase.Location = New System.Drawing.Point(9, 332) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(615, 80) + Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 16 ' 'ucrChkLag ' Me.ucrChkLag.AutoSize = True Me.ucrChkLag.Checked = False - Me.ucrChkLag.Location = New System.Drawing.Point(14, 368) - Me.ucrChkLag.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkLag.Location = New System.Drawing.Point(9, 239) + Me.ucrChkLag.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkLag.Name = "ucrChkLag" - Me.ucrChkLag.Size = New System.Drawing.Size(214, 35) + Me.ucrChkLag.Size = New System.Drawing.Size(143, 23) Me.ucrChkLag.TabIndex = 12 ' 'ucrPnlRandomSplit ' Me.ucrPnlRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRandomSplit.Location = New System.Drawing.Point(158, 11) - Me.ucrPnlRandomSplit.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrPnlRandomSplit.Location = New System.Drawing.Point(105, 7) + Me.ucrPnlRandomSplit.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrPnlRandomSplit.Name = "ucrPnlRandomSplit" - Me.ucrPnlRandomSplit.Size = New System.Drawing.Size(318, 68) + Me.ucrPnlRandomSplit.Size = New System.Drawing.Size(212, 44) Me.ucrPnlRandomSplit.TabIndex = 0 ' 'ucrSelectorRandomSplit @@ -193,21 +172,21 @@ Partial Class dlgRandomSplit Me.ucrSelectorRandomSplit.bDropUnusedFilterLevels = False Me.ucrSelectorRandomSplit.bShowHiddenColumns = False Me.ucrSelectorRandomSplit.bUseCurrentFilter = True - Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(14, 82) + Me.ucrSelectorRandomSplit.Location = New System.Drawing.Point(9, 53) Me.ucrSelectorRandomSplit.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorRandomSplit.Name = "ucrSelectorRandomSplit" - Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(320, 282) + Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorRandomSplit.TabIndex = 3 ' 'ucrReceiverRanSplit ' Me.ucrReceiverRanSplit.AutoSize = True Me.ucrReceiverRanSplit.frmParent = Me - Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(422, 157) + Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(281, 102) Me.ucrReceiverRanSplit.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRanSplit.Name = "ucrReceiverRanSplit" Me.ucrReceiverRanSplit.Selector = Nothing - Me.ucrReceiverRanSplit.Size = New System.Drawing.Size(180, 32) + Me.ucrReceiverRanSplit.Size = New System.Drawing.Size(120, 21) Me.ucrReceiverRanSplit.strNcFilePath = "" Me.ucrReceiverRanSplit.TabIndex = 5 Me.ucrReceiverRanSplit.ucrSelector = Nothing @@ -215,28 +194,27 @@ Partial Class dlgRandomSplit 'ucrSaveTrainingData ' Me.ucrSaveTrainingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTrainingData.Location = New System.Drawing.Point(14, 462) - Me.ucrSaveTrainingData.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 300) + Me.ucrSaveTrainingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTrainingData.Name = "ucrSaveTrainingData" - Me.ucrSaveTrainingData.Size = New System.Drawing.Size(450, 35) + Me.ucrSaveTrainingData.Size = New System.Drawing.Size(300, 23) Me.ucrSaveTrainingData.TabIndex = 15 ' 'ucrSaveTestingData ' Me.ucrSaveTestingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTestingData.Location = New System.Drawing.Point(14, 416) - Me.ucrSaveTestingData.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSaveTestingData.Location = New System.Drawing.Point(9, 270) + Me.ucrSaveTestingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTestingData.Name = "ucrSaveTestingData" - Me.ucrSaveTestingData.Size = New System.Drawing.Size(450, 35) + Me.ucrSaveTestingData.Size = New System.Drawing.Size(300, 23) Me.ucrSaveTestingData.TabIndex = 14 ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(418, 138) - Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label1.Location = New System.Drawing.Point(279, 84) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(216, 20) + Me.Label1.Size = New System.Drawing.Size(143, 13) Me.Label1.TabIndex = 17 Me.Label1.Text = "Stratifying Variable (optional):" ' @@ -244,25 +222,27 @@ Partial Class dlgRandomSplit ' Me.ucrChkbreaks.AutoSize = True Me.ucrChkbreaks.Checked = False - Me.ucrChkbreaks.Location = New System.Drawing.Point(264, 165) + Me.ucrChkbreaks.Location = New System.Drawing.Point(264, 159) + Me.ucrChkbreaks.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.ucrChkbreaks.Name = "ucrChkbreaks" - Me.ucrChkbreaks.Size = New System.Drawing.Size(143, 23) + Me.ucrChkbreaks.Size = New System.Drawing.Size(130, 23) Me.ucrChkbreaks.TabIndex = 18 ' 'ucrChkPool ' Me.ucrChkPool.AutoSize = True Me.ucrChkPool.Checked = False - Me.ucrChkPool.Location = New System.Drawing.Point(265, 197) + Me.ucrChkPool.Location = New System.Drawing.Point(264, 190) + Me.ucrChkPool.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.ucrChkPool.Name = "ucrChkPool" - Me.ucrChkPool.Size = New System.Drawing.Size(143, 23) + Me.ucrChkPool.Size = New System.Drawing.Size(130, 23) Me.ucrChkPool.TabIndex = 19 ' 'dlgRandomSplit ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(648, 598) + Me.ClientSize = New System.Drawing.Size(432, 389) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ucrSaveTestingData) Me.Controls.Add(Me.ucrReceiverRanSplit) @@ -281,7 +261,6 @@ Partial Class dlgRandomSplit Me.Controls.Add(Me.ucrChkPool) Me.Controls.Add(Me.ucrChkbreaks) 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 = "dlgRandomSplit" diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 07a4af976e0..20599f3b39f 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -51,6 +51,7 @@ Public Class dlgRandomSplit ucrNudPool.DecimalPlaces = 1 ucrNudPool.SetMinMax(0.01, 1.0) ucrNudPool.Increment = 0.01 + ucrNudPool.DecimalPlaces = 2 ucrChkPool.SetText("Pool") ucrChkPool.SetParameter(ucrNudPool.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrChkPool.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) @@ -76,12 +77,13 @@ Public Class dlgRandomSplit ucrSaveTestingData.SetIsComboBox() ucrNudBreaks.SetParameter(New RParameter("breaks", 2)) + ucrNudBreaks.SetMinMax(0.01, 1.0) + ucrNudBreaks.DecimalPlaces = 1 + ucrNudBreaks.Increment = 0.01 ucrChkbreaks.SetText("breaks") ucrChkbreaks.SetParameter(ucrNudBreaks.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrChkbreaks.AddToLinkedControls(ucrNudBreaks, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) - - ucrNudFraction.SetLinkedDisplayControl(lblFraction) ucrNudFraction.SetParameter(New RParameter("prop", 1)) ucrNudFraction.SetMinMax(0.01, 0.99) @@ -116,9 +118,6 @@ Public Class dlgRandomSplit clsInitialSplit.SetPackageName("rsample") clsInitialSplit.SetRCommand("initial_split") clsInitialSplit.AddParameter("prop", "0.75", iPosition:=1) - 'clsInitialSplit.AddParameter("strata", "NULL", iPosition:=2) - 'clsInitialSplit.AddParameter("breaks", "4", iPosition:=3) - 'clsInitialSplit.AddParameter("pool", "0.1", iPosition:=4) clsInitialSplit.SetAssignTo("rsample") clsTraining.SetPackageName("rsample") From a92d0291493806a3a0210ce05a849b07a1cd2c24 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 30 Nov 2022 14:28:20 +0100 Subject: [PATCH 039/100] code Changes --- instat/dlgRandomSplit.Designer.vb | 171 +++++++++++++++--------------- instat/dlgRandomSplit.vb | 40 +++---- 2 files changed, 108 insertions(+), 103 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index 8ed86010593..5e2ce1d7baa 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -24,21 +24,21 @@ Partial Class dlgRandomSplit Private Sub InitializeComponent() Me.rdoSample = New System.Windows.Forms.RadioButton() Me.rdoTimeSeries = New System.Windows.Forms.RadioButton() - Me.lblFraction = New System.Windows.Forms.Label() + Me.ucrChkStratifyingvariable = New instat.ucrCheck() + Me.ucrSaveTestingData = New instat.ucrSave() + Me.ucrReceiverRanSplit = New instat.ucrReceiverSingle() Me.ucrNudBreaks = New instat.ucrNud() Me.ucrNudPool = New instat.ucrNud() Me.ucrNudFraction = New instat.ucrNud() Me.ucrNudLag = New instat.ucrNud() + Me.ucrSaveTrainingData = New instat.ucrSave() Me.ucrBase = New instat.ucrButtons() Me.ucrChkLag = New instat.ucrCheck() Me.ucrPnlRandomSplit = New instat.UcrPanel() Me.ucrSelectorRandomSplit = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrReceiverRanSplit = New instat.ucrReceiverSingle() - Me.ucrSaveTrainingData = New instat.ucrSave() - Me.ucrSaveTestingData = New instat.ucrSave() - Me.Label1 = New System.Windows.Forms.Label() - Me.ucrChkbreaks = New instat.ucrCheck() - Me.ucrChkPool = New instat.ucrCheck() + Me.lblFraction = New System.Windows.Forms.Label() + Me.lblBreaks = New System.Windows.Forms.Label() + Me.lblPool = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'rdoSample @@ -73,14 +73,37 @@ Partial Class dlgRandomSplit Me.rdoTimeSeries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoTimeSeries.UseVisualStyleBackColor = True ' - 'lblFraction + 'ucrChkStratifyingvariable ' - Me.lblFraction.AutoSize = True - Me.lblFraction.Location = New System.Drawing.Point(281, 135) - Me.lblFraction.Name = "lblFraction" - Me.lblFraction.Size = New System.Drawing.Size(48, 13) - Me.lblFraction.TabIndex = 6 - Me.lblFraction.Text = "Fraction:" + Me.ucrChkStratifyingvariable.AutoSize = True + Me.ucrChkStratifyingvariable.Checked = False + Me.ucrChkStratifyingvariable.Location = New System.Drawing.Point(280, 77) + Me.ucrChkStratifyingvariable.Margin = New System.Windows.Forms.Padding(2) + Me.ucrChkStratifyingvariable.Name = "ucrChkStratifyingvariable" + Me.ucrChkStratifyingvariable.Size = New System.Drawing.Size(148, 23) + Me.ucrChkStratifyingvariable.TabIndex = 20 + ' + 'ucrSaveTestingData + ' + Me.ucrSaveTestingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveTestingData.Location = New System.Drawing.Point(9, 300) + Me.ucrSaveTestingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTestingData.Name = "ucrSaveTestingData" + Me.ucrSaveTestingData.Size = New System.Drawing.Size(300, 23) + Me.ucrSaveTestingData.TabIndex = 14 + ' + 'ucrReceiverRanSplit + ' + Me.ucrReceiverRanSplit.AutoSize = True + Me.ucrReceiverRanSplit.frmParent = Me + Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(281, 102) + Me.ucrReceiverRanSplit.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRanSplit.Name = "ucrReceiverRanSplit" + Me.ucrReceiverRanSplit.Selector = Nothing + Me.ucrReceiverRanSplit.Size = New System.Drawing.Size(120, 21) + Me.ucrReceiverRanSplit.strNcFilePath = "" + Me.ucrReceiverRanSplit.TabIndex = 5 + Me.ucrReceiverRanSplit.ucrSelector = Nothing ' 'ucrNudBreaks ' @@ -88,7 +111,7 @@ Partial Class dlgRandomSplit Me.ucrNudBreaks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 162) - Me.ucrNudBreaks.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudBreaks.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudBreaks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudBreaks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Name = "ucrNudBreaks" @@ -102,7 +125,7 @@ Partial Class dlgRandomSplit Me.ucrNudPool.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudPool.Location = New System.Drawing.Point(351, 190) - Me.ucrNudPool.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudPool.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudPool.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPool.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Name = "ucrNudPool" @@ -116,7 +139,7 @@ Partial Class dlgRandomSplit Me.ucrNudFraction.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFraction.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudFraction.Location = New System.Drawing.Point(351, 132) - Me.ucrNudFraction.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudFraction.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudFraction.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudFraction.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudFraction.Name = "ucrNudFraction" @@ -130,7 +153,7 @@ Partial Class dlgRandomSplit Me.ucrNudLag.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLag.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudLag.Location = New System.Drawing.Point(105, 239) - Me.ucrNudLag.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudLag.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudLag.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLag.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLag.Name = "ucrNudLag" @@ -138,11 +161,20 @@ Partial Class dlgRandomSplit Me.ucrNudLag.TabIndex = 13 Me.ucrNudLag.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' + 'ucrSaveTrainingData + ' + Me.ucrSaveTrainingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 269) + Me.ucrSaveTrainingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTrainingData.Name = "ucrSaveTrainingData" + Me.ucrSaveTrainingData.Size = New System.Drawing.Size(300, 23) + Me.ucrSaveTrainingData.TabIndex = 15 + ' 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(9, 332) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 16 @@ -152,7 +184,7 @@ Partial Class dlgRandomSplit Me.ucrChkLag.AutoSize = True Me.ucrChkLag.Checked = False Me.ucrChkLag.Location = New System.Drawing.Point(9, 239) - Me.ucrChkLag.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkLag.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkLag.Name = "ucrChkLag" Me.ucrChkLag.Size = New System.Drawing.Size(143, 23) Me.ucrChkLag.TabIndex = 12 @@ -161,7 +193,7 @@ Partial Class dlgRandomSplit ' Me.ucrPnlRandomSplit.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlRandomSplit.Location = New System.Drawing.Point(105, 7) - Me.ucrPnlRandomSplit.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlRandomSplit.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlRandomSplit.Name = "ucrPnlRandomSplit" Me.ucrPnlRandomSplit.Size = New System.Drawing.Size(212, 44) Me.ucrPnlRandomSplit.TabIndex = 0 @@ -178,76 +210,51 @@ Partial Class dlgRandomSplit Me.ucrSelectorRandomSplit.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorRandomSplit.TabIndex = 3 ' - 'ucrReceiverRanSplit - ' - Me.ucrReceiverRanSplit.AutoSize = True - Me.ucrReceiverRanSplit.frmParent = Me - Me.ucrReceiverRanSplit.Location = New System.Drawing.Point(281, 102) - Me.ucrReceiverRanSplit.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverRanSplit.Name = "ucrReceiverRanSplit" - Me.ucrReceiverRanSplit.Selector = Nothing - Me.ucrReceiverRanSplit.Size = New System.Drawing.Size(120, 21) - Me.ucrReceiverRanSplit.strNcFilePath = "" - Me.ucrReceiverRanSplit.TabIndex = 5 - Me.ucrReceiverRanSplit.ucrSelector = Nothing - ' - 'ucrSaveTrainingData - ' - Me.ucrSaveTrainingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 300) - Me.ucrSaveTrainingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveTrainingData.Name = "ucrSaveTrainingData" - Me.ucrSaveTrainingData.Size = New System.Drawing.Size(300, 23) - Me.ucrSaveTrainingData.TabIndex = 15 - ' - 'ucrSaveTestingData - ' - Me.ucrSaveTestingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTestingData.Location = New System.Drawing.Point(9, 270) - Me.ucrSaveTestingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveTestingData.Name = "ucrSaveTestingData" - Me.ucrSaveTestingData.Size = New System.Drawing.Size(300, 23) - Me.ucrSaveTestingData.TabIndex = 14 - ' - 'Label1 + 'lblFraction ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(279, 84) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(143, 13) - Me.Label1.TabIndex = 17 - Me.Label1.Text = "Stratifying Variable (optional):" + Me.lblFraction.AutoSize = True + Me.lblFraction.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFraction.Location = New System.Drawing.Point(289, 136) + Me.lblFraction.Name = "lblFraction" + Me.lblFraction.Size = New System.Drawing.Size(48, 13) + Me.lblFraction.TabIndex = 21 + Me.lblFraction.Tag = "" + Me.lblFraction.Text = "Fraction:" ' - 'ucrChkbreaks + 'lblBreaks ' - Me.ucrChkbreaks.AutoSize = True - Me.ucrChkbreaks.Checked = False - Me.ucrChkbreaks.Location = New System.Drawing.Point(264, 159) - Me.ucrChkbreaks.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) - Me.ucrChkbreaks.Name = "ucrChkbreaks" - Me.ucrChkbreaks.Size = New System.Drawing.Size(130, 23) - Me.ucrChkbreaks.TabIndex = 18 + Me.lblBreaks.AutoSize = True + Me.lblBreaks.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblBreaks.Location = New System.Drawing.Point(289, 166) + Me.lblBreaks.Name = "lblBreaks" + Me.lblBreaks.Size = New System.Drawing.Size(43, 13) + Me.lblBreaks.TabIndex = 22 + Me.lblBreaks.Tag = "" + Me.lblBreaks.Text = "Breaks:" ' - 'ucrChkPool + 'lblPool ' - Me.ucrChkPool.AutoSize = True - Me.ucrChkPool.Checked = False - Me.ucrChkPool.Location = New System.Drawing.Point(264, 190) - Me.ucrChkPool.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) - Me.ucrChkPool.Name = "ucrChkPool" - Me.ucrChkPool.Size = New System.Drawing.Size(130, 23) - Me.ucrChkPool.TabIndex = 19 + Me.lblPool.AutoSize = True + Me.lblPool.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblPool.Location = New System.Drawing.Point(289, 194) + Me.lblPool.Name = "lblPool" + Me.lblPool.Size = New System.Drawing.Size(31, 13) + Me.lblPool.TabIndex = 23 + Me.lblPool.Tag = "" + Me.lblPool.Text = "Pool:" ' 'dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(432, 389) - Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.lblPool) + Me.Controls.Add(Me.lblBreaks) + Me.Controls.Add(Me.lblFraction) + Me.Controls.Add(Me.ucrChkStratifyingvariable) Me.Controls.Add(Me.ucrSaveTestingData) Me.Controls.Add(Me.ucrReceiverRanSplit) Me.Controls.Add(Me.ucrNudBreaks) - Me.Controls.Add(Me.lblFraction) Me.Controls.Add(Me.ucrNudPool) Me.Controls.Add(Me.ucrNudFraction) Me.Controls.Add(Me.ucrNudLag) @@ -258,8 +265,6 @@ Partial Class dlgRandomSplit Me.Controls.Add(Me.rdoTimeSeries) Me.Controls.Add(Me.ucrPnlRandomSplit) Me.Controls.Add(Me.ucrSelectorRandomSplit) - Me.Controls.Add(Me.ucrChkPool) - Me.Controls.Add(Me.ucrChkbreaks) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -279,13 +284,13 @@ Partial Class dlgRandomSplit Friend WithEvents ucrNudLag As ucrNud Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrPnlRandomSplit As UcrPanel - Friend WithEvents lblFraction As Label Friend WithEvents ucrNudBreaks As ucrNud Friend WithEvents ucrSelectorRandomSplit As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrReceiverRanSplit As ucrReceiverSingle Friend WithEvents ucrSaveTrainingData As ucrSave Friend WithEvents ucrSaveTestingData As ucrSave - Friend WithEvents Label1 As Label - Friend WithEvents ucrChkPool As ucrCheck - Friend WithEvents ucrChkbreaks As ucrCheck + Friend WithEvents ucrChkStratifyingvariable As ucrCheck + Friend WithEvents lblPool As Label + Friend WithEvents lblBreaks As Label + Friend WithEvents lblFraction As Label End Class diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 20599f3b39f..c0076418d41 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -47,14 +47,16 @@ Public Class dlgRandomSplit ucrSelectorRandomSplit.SetParameter(New RParameter("data", 0)) ucrSelectorRandomSplit.SetParameterIsrfunction() + ucrChkStratifyingvariable.SetText("Stratifying Variable (optional):") + ucrChkStratifyingvariable.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True) + ucrChkStratifyingvariable.AddToLinkedControls(ucrNudBreaks, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True) + ucrNudPool.SetParameter(New RParameter("pool", 5)) ucrNudPool.DecimalPlaces = 1 ucrNudPool.SetMinMax(0.01, 1.0) ucrNudPool.Increment = 0.01 ucrNudPool.DecimalPlaces = 2 - ucrChkPool.SetText("Pool") - ucrChkPool.SetParameter(ucrNudPool.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) - ucrChkPool.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) + ucrNudPool.SetLinkedDisplayControl(lblPool) ucrNudLag.SetParameter(New RParameter("lag", 3)) ucrNudLag.SetMinMax(0, 100) @@ -62,15 +64,15 @@ Public Class dlgRandomSplit ucrNudLag.DecimalPlaces = 2 ucrChkLag.SetText("Lag") ucrChkLag.SetParameter(ucrNudLag.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) - ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) + ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True) - ucrSaveTrainingData.SetLabelText("Save Train to:") + ucrSaveTrainingData.SetLabelText("Save Train:") ucrSaveTrainingData.SetSaveTypeAsDataFrame() ucrSaveTrainingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) ucrSaveTrainingData.SetPrefix("training_data") ucrSaveTrainingData.SetIsComboBox() - ucrSaveTestingData.SetLabelText("Save Test to:") + ucrSaveTestingData.SetLabelText("Save Test:") ucrSaveTestingData.SetSaveTypeAsDataFrame() ucrSaveTestingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) ucrSaveTestingData.SetPrefix("testing_data") @@ -78,11 +80,9 @@ Public Class dlgRandomSplit ucrNudBreaks.SetParameter(New RParameter("breaks", 2)) ucrNudBreaks.SetMinMax(0.01, 1.0) - ucrNudBreaks.DecimalPlaces = 1 + ucrNudBreaks.DecimalPlaces = 2 ucrNudBreaks.Increment = 0.01 - ucrChkbreaks.SetText("breaks") - ucrChkbreaks.SetParameter(ucrNudBreaks.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) - ucrChkbreaks.AddToLinkedControls(ucrNudBreaks, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) + ucrNudBreaks.SetLinkedDisplayControl(lblBreaks) ucrNudFraction.SetLinkedDisplayControl(lblFraction) ucrNudFraction.SetParameter(New RParameter("prop", 1)) @@ -94,15 +94,15 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddRadioButton(rdoTimeSeries) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"initial_split", "training", "testing"}) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"initial_time_split", "training", "testing"}) - ucrPnlRandomSplit.AddToLinkedControls({ucrChkbreaks, ucrChkPool}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) End Sub Private Sub SetDefaults() clsInitialTimeSplit = New RFunction clsInitialSplit = New RFunction - clsTesting = New RFunction clsTraining = New RFunction + clsTesting = New RFunction + ucrSelectorRandomSplit.Reset() ucrSelectorRandomSplit.Focus() @@ -158,20 +158,20 @@ Public Class dlgRandomSplit Private Sub SetBaseFunction() ucrBase.clsRsyntax.ClearCodes() If rdoSample.Checked Then - If ucrSaveTestingData.IsComplete Then - clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) - End If If ucrSaveTrainingData.IsComplete Then clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) End If - ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) - Else If ucrSaveTestingData.IsComplete Then - clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) + clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) End If + ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) + Else If ucrSaveTrainingData.IsComplete Then clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) End If + If ucrSaveTestingData.IsComplete Then + clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) + End If ucrBase.clsRsyntax.SetBaseRFunction(clsInitialTimeSplit) End If ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) @@ -185,11 +185,11 @@ Public Class dlgRandomSplit End Sub Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, - ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged, ucrChkPool.ControlContentsChanged, ucrChkbreaks.ControlContentsChanged + ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged TestOkEnabled() End Sub - Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrReceiverRanSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged, ucrChkbreaks.ControlValueChanged, ucrChkPool.ControlValueChanged + Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrReceiverRanSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged SetBaseFunction() End Sub From 6dbcea635386c2a5812c120b87b219070c647301 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:29:42 +0100 Subject: [PATCH 040/100] Code Changes --- instat/dlgRandomSplit.Designer.vb | 35 ++++++++++++------ instat/dlgRandomSplit.vb | 61 ++++++++++++++++--------------- 2 files changed, 56 insertions(+), 40 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index 5e2ce1d7baa..cc0d36ec301 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -24,7 +24,7 @@ Partial Class dlgRandomSplit Private Sub InitializeComponent() Me.rdoSample = New System.Windows.Forms.RadioButton() Me.rdoTimeSeries = New System.Windows.Forms.RadioButton() - Me.ucrChkStratifyingvariable = New instat.ucrCheck() + Me.ucrChkStratifyingFactor = New instat.ucrCheck() Me.ucrSaveTestingData = New instat.ucrSave() Me.ucrReceiverRanSplit = New instat.ucrReceiverSingle() Me.ucrNudBreaks = New instat.ucrNud() @@ -39,6 +39,7 @@ Partial Class dlgRandomSplit Me.lblFraction = New System.Windows.Forms.Label() Me.lblBreaks = New System.Windows.Forms.Label() Me.lblPool = New System.Windows.Forms.Label() + Me.ucrChkTest = New instat.ucrCheck() Me.SuspendLayout() ' 'rdoSample @@ -73,15 +74,15 @@ Partial Class dlgRandomSplit Me.rdoTimeSeries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoTimeSeries.UseVisualStyleBackColor = True ' - 'ucrChkStratifyingvariable + 'ucrChkStratifyingFactor ' - Me.ucrChkStratifyingvariable.AutoSize = True - Me.ucrChkStratifyingvariable.Checked = False - Me.ucrChkStratifyingvariable.Location = New System.Drawing.Point(280, 77) - Me.ucrChkStratifyingvariable.Margin = New System.Windows.Forms.Padding(2) - Me.ucrChkStratifyingvariable.Name = "ucrChkStratifyingvariable" - Me.ucrChkStratifyingvariable.Size = New System.Drawing.Size(148, 23) - Me.ucrChkStratifyingvariable.TabIndex = 20 + Me.ucrChkStratifyingFactor.AutoSize = True + Me.ucrChkStratifyingFactor.Checked = False + Me.ucrChkStratifyingFactor.Location = New System.Drawing.Point(280, 77) + Me.ucrChkStratifyingFactor.Margin = New System.Windows.Forms.Padding(2) + Me.ucrChkStratifyingFactor.Name = "ucrChkStratifyingFactor" + Me.ucrChkStratifyingFactor.Size = New System.Drawing.Size(148, 23) + Me.ucrChkStratifyingFactor.TabIndex = 20 ' 'ucrSaveTestingData ' @@ -243,15 +244,26 @@ Partial Class dlgRandomSplit Me.lblPool.Tag = "" Me.lblPool.Text = "Pool:" ' + 'ucrChkTest + ' + Me.ucrChkTest.AutoSize = True + Me.ucrChkTest.Checked = False + Me.ucrChkTest.Location = New System.Drawing.Point(189, 239) + Me.ucrChkTest.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkTest.Name = "ucrChkTest" + Me.ucrChkTest.Size = New System.Drawing.Size(143, 23) + Me.ucrChkTest.TabIndex = 24 + ' 'dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(432, 389) + Me.Controls.Add(Me.ucrChkTest) Me.Controls.Add(Me.lblPool) Me.Controls.Add(Me.lblBreaks) Me.Controls.Add(Me.lblFraction) - Me.Controls.Add(Me.ucrChkStratifyingvariable) + Me.Controls.Add(Me.ucrChkStratifyingFactor) Me.Controls.Add(Me.ucrSaveTestingData) Me.Controls.Add(Me.ucrReceiverRanSplit) Me.Controls.Add(Me.ucrNudBreaks) @@ -289,8 +301,9 @@ Partial Class dlgRandomSplit Friend WithEvents ucrReceiverRanSplit As ucrReceiverSingle Friend WithEvents ucrSaveTrainingData As ucrSave Friend WithEvents ucrSaveTestingData As ucrSave - Friend WithEvents ucrChkStratifyingvariable As ucrCheck + Friend WithEvents ucrChkStratifyingFactor As ucrCheck Friend WithEvents lblPool As Label Friend WithEvents lblBreaks As Label Friend WithEvents lblFraction As Label + Friend WithEvents ucrChkTest As ucrCheck End Class diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index c0076418d41..a8895bd9b0e 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -41,22 +41,22 @@ Public Class dlgRandomSplit ucrReceiverRanSplit.SetParameter(New RParameter("strata", 2)) ucrReceiverRanSplit.Selector = ucrSelectorRandomSplit ucrReceiverRanSplit.SetMeAsReceiver() - ucrReceiverRanSplit.SetParameter(New RParameter("data", 0)) + ucrReceiverRanSplit.SetDataType("factor") ucrReceiverRanSplit.SetParameterIsString() ucrSelectorRandomSplit.SetParameter(New RParameter("data", 0)) ucrSelectorRandomSplit.SetParameterIsrfunction() - ucrChkStratifyingvariable.SetText("Stratifying Variable (optional):") - ucrChkStratifyingvariable.AddToLinkedControls(ucrNudPool, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True) - ucrChkStratifyingvariable.AddToLinkedControls(ucrNudBreaks, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True) - + ucrNudPool.SetLinkedDisplayControl(lblPool) ucrNudPool.SetParameter(New RParameter("pool", 5)) - ucrNudPool.DecimalPlaces = 1 + ucrNudPool.DecimalPlaces = 2 ucrNudPool.SetMinMax(0.01, 1.0) ucrNudPool.Increment = 0.01 - ucrNudPool.DecimalPlaces = 2 - ucrNudPool.SetLinkedDisplayControl(lblPool) + + ucrChkStratifyingFactor.SetText("Stratifying Variable") + ucrChkStratifyingFactor.AddToLinkedControls(ucrNudBreaks, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=4) + ucrChkStratifyingFactor.SetParameter(ucrNudPool.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + ucrChkStratifyingFactor.AddToLinkedControls({ucrNudPool, ucrReceiverRanSplit}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedUpdateFunction:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.1) ucrNudLag.SetParameter(New RParameter("lag", 3)) ucrNudLag.SetMinMax(0, 100) @@ -64,25 +64,28 @@ Public Class dlgRandomSplit ucrNudLag.DecimalPlaces = 2 ucrChkLag.SetText("Lag") ucrChkLag.SetParameter(ucrNudLag.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) - ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True) + ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) + + ucrChkTest.SetText("Save Test") + ucrChkTest.AddToLinkedControls(ucrSaveTestingData, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrSaveTrainingData.SetLabelText("Save Train:") + ucrSaveTrainingData.SetLabelText("Save Train to:") ucrSaveTrainingData.SetSaveTypeAsDataFrame() ucrSaveTrainingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) ucrSaveTrainingData.SetPrefix("training_data") ucrSaveTrainingData.SetIsComboBox() - ucrSaveTestingData.SetLabelText("Save Test:") + ucrSaveTestingData.SetLabelText("Save Test to:") ucrSaveTestingData.SetSaveTypeAsDataFrame() ucrSaveTestingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) ucrSaveTestingData.SetPrefix("testing_data") ucrSaveTestingData.SetIsComboBox() - ucrNudBreaks.SetParameter(New RParameter("breaks", 2)) - ucrNudBreaks.SetMinMax(0.01, 1.0) - ucrNudBreaks.DecimalPlaces = 2 - ucrNudBreaks.Increment = 0.01 ucrNudBreaks.SetLinkedDisplayControl(lblBreaks) + ucrNudBreaks.SetParameter(New RParameter("breaks", 4)) + ucrNudFraction.SetMinMax(0.1, 10.0) + ucrNudFraction.DecimalPlaces = 2 + ucrNudFraction.Increment = 0.1 ucrNudFraction.SetLinkedDisplayControl(lblFraction) ucrNudFraction.SetParameter(New RParameter("prop", 1)) @@ -95,14 +98,14 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"initial_split", "training", "testing"}) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"initial_time_split", "training", "testing"}) ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) End Sub Private Sub SetDefaults() clsInitialTimeSplit = New RFunction clsInitialSplit = New RFunction - clsTraining = New RFunction clsTesting = New RFunction - + clsTraining = New RFunction ucrSelectorRandomSplit.Reset() ucrSelectorRandomSplit.Focus() @@ -118,6 +121,8 @@ Public Class dlgRandomSplit clsInitialSplit.SetPackageName("rsample") clsInitialSplit.SetRCommand("initial_split") clsInitialSplit.AddParameter("prop", "0.75", iPosition:=1) + clsInitialSplit.AddParameter("strata", "NULL", iPosition:=2) + clsInitialSplit.AddParameter("breaks", "4", iPosition:=4) clsInitialSplit.SetAssignTo("rsample") clsTraining.SetPackageName("rsample") @@ -134,6 +139,7 @@ Public Class dlgRandomSplit Private Sub SetRCodeForControls(bReset As Boolean) ucrPnlRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) + ucrChkTest.SetRCode(clsInitialSplit, bReset) ucrSelectorRandomSplit.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("data", ucrSelectorRandomSplit.ucrAvailableDataFrames.clsCurrDataFrame, 0), iAdditionalPairNo:=1) ucrNudFraction.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("prop", 1), iAdditionalPairNo:=1) @@ -145,6 +151,7 @@ Public Class dlgRandomSplit ucrSaveTestingData.SetRCode(clsTesting, bReset) ucrNudLag.SetRCode(clsInitialTimeSplit, bReset) ucrReceiverRanSplit.SetRCode(clsInitialSplit, bReset) + ucrChkStratifyingFactor.SetRCode(clsInitialSplit, bReset) End Sub Private Sub TestOkEnabled() @@ -158,20 +165,20 @@ Public Class dlgRandomSplit Private Sub SetBaseFunction() ucrBase.clsRsyntax.ClearCodes() If rdoSample.Checked Then - If ucrSaveTrainingData.IsComplete Then - clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) - End If If ucrSaveTestingData.IsComplete Then clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) End If - ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) - Else If ucrSaveTrainingData.IsComplete Then - clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) + clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) End If + ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) + Else If ucrSaveTestingData.IsComplete Then clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) End If + If ucrSaveTrainingData.IsComplete Then + clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) + End If ucrBase.clsRsyntax.SetBaseRFunction(clsInitialTimeSplit) End If ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) @@ -184,16 +191,12 @@ Public Class dlgRandomSplit TestOkEnabled() End Sub - Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, - ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrChkStratifyingFactor.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged, ucrChkTest.ControlContentsChanged TestOkEnabled() End Sub - Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrReceiverRanSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged + Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrChkStratifyingFactor.ControlValueChanged, ucrReceiverRanSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged, ucrChkTest.ControlValueChanged SetBaseFunction() End Sub - Private Sub ucrSelectorRandomSplit_Load(sender As Object, e As EventArgs) Handles ucrSelectorRandomSplit.Load - - End Sub End Class \ No newline at end of file From 52a52ac5150d8d134e89597916f61ff4dab329c2 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 5 Dec 2022 15:22:40 +0100 Subject: [PATCH 041/100] implemented checkbox for save test data --- instat/dlgRandomSplit.vb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index a8895bd9b0e..2f73176d0c7 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -66,7 +66,7 @@ Public Class dlgRandomSplit ucrChkLag.SetParameter(ucrNudLag.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) - ucrChkTest.SetText("Save Test") + ucrChkTest.SetText("Save Test Variable:") ucrChkTest.AddToLinkedControls(ucrSaveTestingData, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrSaveTrainingData.SetLabelText("Save Train to:") @@ -139,7 +139,7 @@ Public Class dlgRandomSplit Private Sub SetRCodeForControls(bReset As Boolean) ucrPnlRandomSplit.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) - ucrChkTest.SetRCode(clsInitialSplit, bReset) + ucrSelectorRandomSplit.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("data", ucrSelectorRandomSplit.ucrAvailableDataFrames.clsCurrDataFrame, 0), iAdditionalPairNo:=1) ucrNudFraction.AddAdditionalCodeParameterPair(clsInitialTimeSplit, New RParameter("prop", 1), iAdditionalPairNo:=1) @@ -152,6 +152,10 @@ Public Class dlgRandomSplit ucrNudLag.SetRCode(clsInitialTimeSplit, bReset) ucrReceiverRanSplit.SetRCode(clsInitialSplit, bReset) ucrChkStratifyingFactor.SetRCode(clsInitialSplit, bReset) + + If bReset Then + ucrChkTest.SetRCode(clsInitialSplit, bReset) + End If End Sub Private Sub TestOkEnabled() From af9af1b27b0380e525115e6ad046c76e9b619ce5 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 16 Jan 2023 07:00:57 +0100 Subject: [PATCH 042/100] layout Changes --- instat/dlgRandomSplit.Designer.vb | 12 ++++++------ instat/dlgRandomSplit.vb | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index cc0d36ec301..4253b0aa1de 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -111,7 +111,7 @@ Partial Class dlgRandomSplit Me.ucrNudBreaks.AutoSize = True Me.ucrNudBreaks.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudBreaks.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 162) + Me.ucrNudBreaks.Location = New System.Drawing.Point(351, 160) Me.ucrNudBreaks.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudBreaks.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudBreaks.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -125,7 +125,7 @@ Partial Class dlgRandomSplit Me.ucrNudPool.AutoSize = True Me.ucrNudPool.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPool.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPool.Location = New System.Drawing.Point(351, 190) + Me.ucrNudPool.Location = New System.Drawing.Point(351, 188) Me.ucrNudPool.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudPool.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPool.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -153,7 +153,7 @@ Partial Class dlgRandomSplit Me.ucrNudLag.AutoSize = True Me.ucrNudLag.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLag.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLag.Location = New System.Drawing.Point(105, 239) + Me.ucrNudLag.Location = New System.Drawing.Point(351, 159) Me.ucrNudLag.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudLag.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLag.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -165,7 +165,7 @@ Partial Class dlgRandomSplit 'ucrSaveTrainingData ' Me.ucrSaveTrainingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 269) + Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 270) Me.ucrSaveTrainingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTrainingData.Name = "ucrSaveTrainingData" Me.ucrSaveTrainingData.Size = New System.Drawing.Size(300, 23) @@ -184,7 +184,7 @@ Partial Class dlgRandomSplit ' Me.ucrChkLag.AutoSize = True Me.ucrChkLag.Checked = False - Me.ucrChkLag.Location = New System.Drawing.Point(9, 239) + Me.ucrChkLag.Location = New System.Drawing.Point(272, 159) Me.ucrChkLag.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkLag.Name = "ucrChkLag" Me.ucrChkLag.Size = New System.Drawing.Size(143, 23) @@ -248,7 +248,7 @@ Partial Class dlgRandomSplit ' Me.ucrChkTest.AutoSize = True Me.ucrChkTest.Checked = False - Me.ucrChkTest.Location = New System.Drawing.Point(189, 239) + Me.ucrChkTest.Location = New System.Drawing.Point(9, 240) Me.ucrChkTest.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkTest.Name = "ucrChkTest" Me.ucrChkTest.Size = New System.Drawing.Size(143, 23) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 2f73176d0c7..d958454744b 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -62,11 +62,11 @@ Public Class dlgRandomSplit ucrNudLag.SetMinMax(0, 100) ucrNudLag.Increment = 0.5 ucrNudLag.DecimalPlaces = 2 - ucrChkLag.SetText("Lag") + ucrChkLag.SetText("Lag:") ucrChkLag.SetParameter(ucrNudLag.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) - ucrChkTest.SetText("Save Test Variable:") + ucrChkTest.SetText("Save Test Data:") ucrChkTest.AddToLinkedControls(ucrSaveTestingData, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrSaveTrainingData.SetLabelText("Save Train to:") From a55ae74c7a83c63619ecda7c3fe7dcd39cb54c69 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 23 Jan 2023 18:21:43 +0100 Subject: [PATCH 043/100] Code Changes --- instat/dlgRandomSplit.Designer.vb | 12 ++++++------ instat/dlgRandomSplit.vb | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/instat/dlgRandomSplit.Designer.vb b/instat/dlgRandomSplit.Designer.vb index 4253b0aa1de..33ee631c577 100644 --- a/instat/dlgRandomSplit.Designer.vb +++ b/instat/dlgRandomSplit.Designer.vb @@ -87,7 +87,7 @@ Partial Class dlgRandomSplit 'ucrSaveTestingData ' Me.ucrSaveTestingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTestingData.Location = New System.Drawing.Point(9, 300) + Me.ucrSaveTestingData.Location = New System.Drawing.Point(9, 274) Me.ucrSaveTestingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTestingData.Name = "ucrSaveTestingData" Me.ucrSaveTestingData.Size = New System.Drawing.Size(300, 23) @@ -165,7 +165,7 @@ Partial Class dlgRandomSplit 'ucrSaveTrainingData ' Me.ucrSaveTrainingData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 270) + Me.ucrSaveTrainingData.Location = New System.Drawing.Point(9, 244) Me.ucrSaveTrainingData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTrainingData.Name = "ucrSaveTrainingData" Me.ucrSaveTrainingData.Size = New System.Drawing.Size(300, 23) @@ -174,7 +174,7 @@ Partial Class dlgRandomSplit 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 332) + Me.ucrBase.Location = New System.Drawing.Point(9, 303) Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) @@ -184,7 +184,7 @@ Partial Class dlgRandomSplit ' Me.ucrChkLag.AutoSize = True Me.ucrChkLag.Checked = False - Me.ucrChkLag.Location = New System.Drawing.Point(272, 159) + Me.ucrChkLag.Location = New System.Drawing.Point(291, 160) Me.ucrChkLag.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkLag.Name = "ucrChkLag" Me.ucrChkLag.Size = New System.Drawing.Size(143, 23) @@ -248,7 +248,7 @@ Partial Class dlgRandomSplit ' Me.ucrChkTest.AutoSize = True Me.ucrChkTest.Checked = False - Me.ucrChkTest.Location = New System.Drawing.Point(9, 240) + Me.ucrChkTest.Location = New System.Drawing.Point(9, 274) Me.ucrChkTest.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkTest.Name = "ucrChkTest" Me.ucrChkTest.Size = New System.Drawing.Size(143, 23) @@ -258,7 +258,7 @@ Partial Class dlgRandomSplit ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(432, 389) + Me.ClientSize = New System.Drawing.Size(432, 363) Me.Controls.Add(Me.ucrChkTest) Me.Controls.Add(Me.lblPool) Me.Controls.Add(Me.lblBreaks) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index d958454744b..b63cea721d5 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -62,11 +62,11 @@ Public Class dlgRandomSplit ucrNudLag.SetMinMax(0, 100) ucrNudLag.Increment = 0.5 ucrNudLag.DecimalPlaces = 2 - ucrChkLag.SetText("Lag:") + ucrChkLag.SetText("Lag") ucrChkLag.SetParameter(ucrNudLag.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) - ucrChkTest.SetText("Save Test Data:") + ucrChkTest.SetText("Save Test to") ucrChkTest.AddToLinkedControls(ucrSaveTestingData, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrSaveTrainingData.SetLabelText("Save Train to:") From 0536833caa5232a8e3bb7304ba08e54ef8c40dc5 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 13 Mar 2023 10:57:45 +0100 Subject: [PATCH 044/100] code changes on lag checkbox and Dataframe name changes --- instat/dlgRandomSplit.vb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index b63cea721d5..be9f1f2b938 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -62,6 +62,7 @@ Public Class dlgRandomSplit ucrNudLag.SetMinMax(0, 100) ucrNudLag.Increment = 0.5 ucrNudLag.DecimalPlaces = 2 + ucrChkLag.SetText("Lag") ucrChkLag.SetParameter(ucrNudLag.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) @@ -83,9 +84,9 @@ Public Class dlgRandomSplit ucrNudBreaks.SetLinkedDisplayControl(lblBreaks) ucrNudBreaks.SetParameter(New RParameter("breaks", 4)) - ucrNudFraction.SetMinMax(0.1, 10.0) - ucrNudFraction.DecimalPlaces = 2 - ucrNudFraction.Increment = 0.1 + ucrNudBreaks.SetMinMax(0.1, 10.0) + ucrNudBreaks.DecimalPlaces = 2 + ucrNudBreaks.Increment = 0.1 ucrNudFraction.SetLinkedDisplayControl(lblFraction) ucrNudFraction.SetParameter(New RParameter("prop", 1)) @@ -97,7 +98,7 @@ Public Class dlgRandomSplit ucrPnlRandomSplit.AddRadioButton(rdoTimeSeries) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoSample, {"initial_split", "training", "testing"}) ucrPnlRandomSplit.AddFunctionNamesCondition(rdoTimeSeries, {"initial_time_split", "training", "testing"}) - ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlRandomSplit.AddToLinkedControls({ucrChkLag}, {rdoTimeSeries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) ucrPnlRandomSplit.AddToLinkedControls({ucrChkStratifyingFactor}, {rdoSample}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) End Sub @@ -107,6 +108,8 @@ Public Class dlgRandomSplit clsTesting = New RFunction clsTraining = New RFunction + NewDefaultName() + ucrSelectorRandomSplit.Reset() ucrSelectorRandomSplit.Focus() ucrSaveTrainingData.Reset() @@ -195,12 +198,20 @@ Public Class dlgRandomSplit TestOkEnabled() End Sub + Private Sub NewDefaultName() + If ucrSelectorRandomSplit.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso (Not ucrSaveTrainingData.bUserTyped) Then + ucrSaveTestingData.SetPrefix(ucrSelectorRandomSplit.ucrAvailableDataFrames.cboAvailableDataFrames.Text & "_testing_data") + ucrSaveTrainingData.SetPrefix(ucrSelectorRandomSplit.ucrAvailableDataFrames.cboAvailableDataFrames.Text & "_training_data") + End If + End Sub + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrChkStratifyingFactor.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged, ucrChkTest.ControlContentsChanged TestOkEnabled() End Sub Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrChkStratifyingFactor.ControlValueChanged, ucrReceiverRanSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged, ucrChkTest.ControlValueChanged SetBaseFunction() + NewDefaultName() End Sub End Class \ No newline at end of file From 21e87cafa6b7de8aa78f4cad3feedbef8e9efa36 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Tue, 14 Mar 2023 08:37:44 +0100 Subject: [PATCH 045/100] code changes --- instat/dlgRandomSplit.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index be9f1f2b938..6e6292b465a 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -162,7 +162,7 @@ Public Class dlgRandomSplit End Sub Private Sub TestOkEnabled() - If ucrSaveTestingData.IsComplete Or ucrSaveTrainingData.IsComplete Then + If ucrSaveTrainingData.IsComplete Or ucrSaveTestingData.IsComplete Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -205,11 +205,11 @@ Public Class dlgRandomSplit End If End Sub - Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrChkStratifyingFactor.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged, ucrChkTest.ControlContentsChanged + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged, ucrChkTest.ControlContentsChanged TestOkEnabled() End Sub - Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrChkStratifyingFactor.ControlValueChanged, ucrReceiverRanSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged, ucrChkTest.ControlValueChanged + Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged SetBaseFunction() NewDefaultName() End Sub From 97b4fc431e984824bcacfbee0e0e5f408016896b Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 17 Mar 2023 09:27:58 +0100 Subject: [PATCH 046/100] Modifications to the TestOK --- instat/dlgRandomSplit.vb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 6e6292b465a..a59e712c5b6 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -130,11 +130,9 @@ Public Class dlgRandomSplit clsTraining.SetPackageName("rsample") clsTraining.SetRCommand("training") - clsTraining.SetAssignTo("training_data", strTempDataframe:=ucrSelectorRandomSplit.strCurrentDataFrame, strDataFrameNames:="last_training") clsTesting.SetPackageName("rsample") clsTesting.SetRCommand("testing") - clsTesting.SetAssignTo("testing_data", strTempDataframe:=ucrSelectorRandomSplit.strCurrentDataFrame, strDataFrameNames:="last_testing") ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1) @@ -162,7 +160,7 @@ Public Class dlgRandomSplit End Sub Private Sub TestOkEnabled() - If ucrSaveTrainingData.IsComplete Or ucrSaveTestingData.IsComplete Then + If (rdoSample.Checked AndAlso ucrChkStratifyingFactor.Checked AndAlso Not ucrReceiverRanSplit.IsEmpty) OrElse (rdoTimeSeries.Checked AndAlso ucrChkLag.Checked) Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -205,13 +203,12 @@ Public Class dlgRandomSplit End If End Sub - Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, ucrNudPool.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged, ucrChkTest.ControlContentsChanged + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkStratifyingFactor.ControlContentsChanged, ucrReceiverRanSplit.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged TestOkEnabled() End Sub Private Sub ucrPnlRandomSplit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRandomSplit.ControlValueChanged, ucrChkLag.ControlValueChanged, ucrNudBreaks.ControlValueChanged, ucrNudFraction.ControlValueChanged, ucrNudPool.ControlValueChanged SetBaseFunction() - NewDefaultName() End Sub End Class \ No newline at end of file From 2ad632a10cb9eeb2b54ac987e65c3ac38e6e16ac Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Tue, 21 Mar 2023 11:09:03 +0100 Subject: [PATCH 047/100] minor code changes --- instat/dlgRandomSplit.vb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index a59e712c5b6..7a6d59b2b50 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -161,7 +161,11 @@ Public Class dlgRandomSplit Private Sub TestOkEnabled() If (rdoSample.Checked AndAlso ucrChkStratifyingFactor.Checked AndAlso Not ucrReceiverRanSplit.IsEmpty) OrElse (rdoTimeSeries.Checked AndAlso ucrChkLag.Checked) Then - ucrBase.OKEnabled(True) + If ucrSaveTrainingData.IsComplete AndAlso ucrSaveTestingData.IsComplete Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If Else ucrBase.OKEnabled(False) End If From 2fcf27ccfba02611a99b23588c6c55a7f4c3e0d7 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Tue, 21 Mar 2023 12:44:03 +0100 Subject: [PATCH 048/100] code changes --- instat/dlgRandomSplit.vb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 7a6d59b2b50..ad616f81028 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -160,7 +160,8 @@ Public Class dlgRandomSplit End Sub Private Sub TestOkEnabled() - If (rdoSample.Checked AndAlso ucrChkStratifyingFactor.Checked AndAlso Not ucrReceiverRanSplit.IsEmpty) OrElse (rdoTimeSeries.Checked AndAlso ucrChkLag.Checked) Then + If (rdoSample.Checked AndAlso ucrChkStratifyingFactor.Checked AndAlso Not ucrReceiverRanSplit.IsEmpty AndAlso Not ucrNudFraction.IsEmpty AndAlso Not ucrNudBreaks.IsEmpty AndAlso Not ucrNudPool.IsEmpty) OrElse + (rdoTimeSeries.Checked AndAlso ucrChkLag.Checked AndAlso Not ucrNudFraction.IsEmpty AndAlso Not ucrNudLag.IsEmpty) Then If ucrSaveTrainingData.IsComplete AndAlso ucrSaveTestingData.IsComplete Then ucrBase.OKEnabled(True) Else @@ -207,7 +208,9 @@ Public Class dlgRandomSplit End If End Sub - Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkStratifyingFactor.ControlContentsChanged, ucrReceiverRanSplit.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, ucrChkLag.ControlContentsChanged, ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged + Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkStratifyingFactor.ControlContentsChanged, ucrReceiverRanSplit.ControlContentsChanged, ucrPnlRandomSplit.ControlContentsChanged, + ucrChkLag.ControlContentsChanged, ucrSaveTrainingData.ControlContentsChanged, ucrSaveTestingData.ControlContentsChanged, ucrNudBreaks.ControlContentsChanged, ucrNudFraction.ControlContentsChanged, ucrNudLag.ControlContentsChanged, + ucrNudPool.ControlContentsChanged TestOkEnabled() End Sub From 8cb7bee0c214540c95e5e99cf17019c301fc0a71 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 23 Mar 2023 13:02:58 +0100 Subject: [PATCH 049/100] Minor Code changes --- instat/dlgRandomSplit.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index ad616f81028..9b5c7791247 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -59,7 +59,7 @@ Public Class dlgRandomSplit ucrChkStratifyingFactor.AddToLinkedControls({ucrNudPool, ucrReceiverRanSplit}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedUpdateFunction:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.1) ucrNudLag.SetParameter(New RParameter("lag", 3)) - ucrNudLag.SetMinMax(0, 100) + ucrNudLag.SetMinMax(Integer.MinValue, Integer.MaxValue) ucrNudLag.Increment = 0.5 ucrNudLag.DecimalPlaces = 2 From 8e15ce7c1e5cba65d80a4bdd3ae15277e28dd86b Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 23 Mar 2023 13:25:55 +0100 Subject: [PATCH 050/100] code changes --- instat/dlgRandomSplit.vb | 2 -- 1 file changed, 2 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 9b5c7791247..ed5599884ab 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -60,8 +60,6 @@ Public Class dlgRandomSplit ucrNudLag.SetParameter(New RParameter("lag", 3)) ucrNudLag.SetMinMax(Integer.MinValue, Integer.MaxValue) - ucrNudLag.Increment = 0.5 - ucrNudLag.DecimalPlaces = 2 ucrChkLag.SetText("Lag") ucrChkLag.SetParameter(ucrNudLag.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) From c96d79fa4f187869f3e44b4b140cc06c4186272c Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 23 Mar 2023 13:54:44 +0100 Subject: [PATCH 051/100] Code changes --- instat/dlgRandomSplit.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index ed5599884ab..227f9b13939 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -158,9 +158,9 @@ Public Class dlgRandomSplit End Sub Private Sub TestOkEnabled() - If (rdoSample.Checked AndAlso ucrChkStratifyingFactor.Checked AndAlso Not ucrReceiverRanSplit.IsEmpty AndAlso Not ucrNudFraction.IsEmpty AndAlso Not ucrNudBreaks.IsEmpty AndAlso Not ucrNudPool.IsEmpty) OrElse - (rdoTimeSeries.Checked AndAlso ucrChkLag.Checked AndAlso Not ucrNudFraction.IsEmpty AndAlso Not ucrNudLag.IsEmpty) Then - If ucrSaveTrainingData.IsComplete AndAlso ucrSaveTestingData.IsComplete Then + If (rdoSample.Checked AndAlso ucrChkStratifyingFactor.Checked AndAlso Not ucrReceiverRanSplit.IsEmpty AndAlso Not ucrNudBreaks.IsEmpty AndAlso Not ucrNudPool.IsEmpty) OrElse + (rdoTimeSeries.Checked AndAlso ucrChkLag.Checked AndAlso Not ucrNudLag.IsEmpty) Then + If ucrSaveTrainingData.IsComplete AndAlso ucrSaveTestingData.IsComplete AndAlso Not ucrNudFraction.IsEmpty Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) From 794a93837113061113702fe57931193bdad13760 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 24 Mar 2023 09:43:09 +0100 Subject: [PATCH 052/100] Modifications to TeskOK --- instat/dlgRandomSplit.vb | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 227f9b13939..b720b1ac5d8 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -158,15 +158,36 @@ Public Class dlgRandomSplit End Sub Private Sub TestOkEnabled() - If (rdoSample.Checked AndAlso ucrChkStratifyingFactor.Checked AndAlso Not ucrReceiverRanSplit.IsEmpty AndAlso Not ucrNudBreaks.IsEmpty AndAlso Not ucrNudPool.IsEmpty) OrElse - (rdoTimeSeries.Checked AndAlso ucrChkLag.Checked AndAlso Not ucrNudLag.IsEmpty) Then - If ucrSaveTrainingData.IsComplete AndAlso ucrSaveTestingData.IsComplete AndAlso Not ucrNudFraction.IsEmpty Then - ucrBase.OKEnabled(True) + If rdoSample.Checked Then + If ucrChkStratifyingFactor.Checked Then + If Not ucrReceiverRanSplit.IsEmpty AndAlso Not ucrNudBreaks.IsEmpty AndAlso Not ucrNudPool.IsEmpty Then + If ucrSaveTrainingData.IsComplete AndAlso ucrSaveTestingData.IsComplete AndAlso Not ucrNudFraction.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + Else + ucrBase.OKEnabled(False) + End If Else ucrBase.OKEnabled(False) End If Else - ucrBase.OKEnabled(False) + If rdoTimeSeries.Checked Then + If ucrChkLag.Checked Then + If Not ucrNudLag.IsEmpty Then + If ucrSaveTrainingData.IsComplete AndAlso ucrSaveTestingData.IsComplete AndAlso Not ucrNudFraction.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + Else + ucrBase.OKEnabled(False) + End If + Else + ucrBase.OKEnabled(False) + End If + End If End If End Sub From f141340657344049ffd08cd5b90079ab05bb9203 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 29 Mar 2023 12:31:32 +0200 Subject: [PATCH 053/100] TestOK Modifications --- instat/dlgRandomSplit.vb | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index b720b1ac5d8..0dfcf8652f1 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -158,37 +158,33 @@ Public Class dlgRandomSplit End Sub Private Sub TestOkEnabled() - If rdoSample.Checked Then - If ucrChkStratifyingFactor.Checked Then - If Not ucrReceiverRanSplit.IsEmpty AndAlso Not ucrNudBreaks.IsEmpty AndAlso Not ucrNudPool.IsEmpty Then - If ucrSaveTrainingData.IsComplete AndAlso ucrSaveTestingData.IsComplete AndAlso Not ucrNudFraction.IsEmpty Then + If Not ucrSaveTrainingData.IsComplete Or Not ucrSaveTestingData.IsComplete Or ucrNudFraction.IsEmpty Then + ucrBase.OKEnabled(False) + Else + If rdoSample.Checked Then + If ucrChkStratifyingFactor.Checked Then + If Not ucrReceiverRanSplit.IsEmpty AndAlso Not ucrNudBreaks.IsEmpty AndAlso Not ucrNudPool.IsEmpty Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) End If Else - ucrBase.OKEnabled(False) + ucrBase.OKEnabled(True) End If Else - ucrBase.OKEnabled(False) - End If - Else - If rdoTimeSeries.Checked Then + If rdoTimeSeries.Checked Then If ucrChkLag.Checked Then - If Not ucrNudLag.IsEmpty Then - If ucrSaveTrainingData.IsComplete AndAlso ucrSaveTestingData.IsComplete AndAlso Not ucrNudFraction.IsEmpty Then + If Not ucrNudLag.IsEmpty Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) End If Else - ucrBase.OKEnabled(False) + ucrBase.OKEnabled(True) End If - Else - ucrBase.OKEnabled(False) - End If End If End If + End If End Sub Private Sub SetBaseFunction() From 655dc7b3f9166d9ddb9e5fe57f0884affec4cd99 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 29 Mar 2023 12:33:20 +0200 Subject: [PATCH 054/100] Minor changes --- instat/dlgRandomSplit.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 0dfcf8652f1..f1ac9f2254d 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -173,7 +173,7 @@ Public Class dlgRandomSplit End If Else If rdoTimeSeries.Checked Then - If ucrChkLag.Checked Then + If ucrChkLag.Checked Then If Not ucrNudLag.IsEmpty Then ucrBase.OKEnabled(True) Else @@ -182,9 +182,9 @@ Public Class dlgRandomSplit Else ucrBase.OKEnabled(True) End If + End If End If End If - End If End Sub Private Sub SetBaseFunction() From 17ed371fe5b6304ffe201dacff05846ef06403dc Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Tue, 11 Apr 2023 09:39:19 +0200 Subject: [PATCH 055/100] minor changes to TestOK --- instat/dlgRandomSplit.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index f1ac9f2254d..7af7a1f3610 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -158,7 +158,7 @@ Public Class dlgRandomSplit End Sub Private Sub TestOkEnabled() - If Not ucrSaveTrainingData.IsComplete Or Not ucrSaveTestingData.IsComplete Or ucrNudFraction.IsEmpty Then + If Not ucrSaveTrainingData.IsComplete OrElse Not ucrSaveTestingData.IsComplete OrElse ucrNudFraction.IsEmpty Then ucrBase.OKEnabled(False) Else If rdoSample.Checked Then From 937182cb1be20beed16a9d81e27d08c6ab3a934a Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Tue, 25 Jul 2023 12:35:38 +0300 Subject: [PATCH 056/100] General_mnu --- instat/frmMain.Designer.vb | 1362 ++++++++++++++++++------------------ instat/frmMain.resx | 4 +- instat/frmMain.vb | 21 +- 3 files changed, 693 insertions(+), 694 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 7d0d94628c1..6161a829c81 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -66,17 +66,13 @@ Partial Class frmMain Me.ToolStripSeparator26 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeSpecificMapPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificDotPlot = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator27 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeSpecificMosaic = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificCummulativeDistribution = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificParallelCoordinatePlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTables = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeGeneralColumnSummaries = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeGeneralTabulation = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeGeneralGraphics = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuDescribeGeneralUseSummaries = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeMultivariate = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeMultivariateCorrelations = New System.Windows.Forms.ToolStripMenuItem() @@ -681,6 +677,10 @@ 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.mnuDescribeGraphGraphics = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeGeneralTables = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeGeneralPivotTable = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator27 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -706,7 +706,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, Me.mnuDescribeGeneral, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseTable, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" - Me.mnuDescribe.Size = New System.Drawing.Size(96, 29) + Me.mnuDescribe.Size = New System.Drawing.Size(64, 22) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -714,25 +714,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(180, 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(180, 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(177, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..." Me.mnuDescribeOneVariableSummarise.Text = "Summarise..." Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised" @@ -740,26 +740,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(180, 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(177, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(180, 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(180, 22) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -767,26 +767,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(180, 22) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoThreeVariablesPivotTable ' Me.mnuDescribeTwoThreeVariablesPivotTable.Name = "mnuDescribeTwoThreeVariablesPivotTable" - Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator36 ' Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(305, 6) + Me.ToolStripSeparator36.Size = New System.Drawing.Size(203, 6) ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables" @@ -794,19 +794,19 @@ Partial Class frmMain 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(305, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' @@ -814,29 +814,29 @@ 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" ' 'mnuDescribeSpecificTablesGraphs ' - Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.ToolStripSeparator27, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) + Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot, Me.mnuDescribeGraphGraphics}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' 'mnuDescribeSpecificBarPieChart ' Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart" - Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificBarPieChart.Tag = "Bar_Chart" Me.mnuDescribeSpecificBarPieChart.Text = "Bar Chart..." Me.mnuDescribeSpecificBarPieChart.ToolTipText = "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds" @@ -844,7 +844,7 @@ Partial Class frmMain 'mnuDescribeSpecificBoxplotJitterViolinPlot ' Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot" - Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Tag = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Text = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.ToolTipText = "Boxplot (including Tufte), Jitter and Violin Plots" @@ -852,7 +852,7 @@ Partial Class frmMain 'mnuDescribeSpecificHistogramDensityFrequencyPlot ' Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot" - Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Tag = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Text = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.ToolTipText = "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons" @@ -860,7 +860,7 @@ Partial Class frmMain 'mnuDescribeSpecificPointPlot ' Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot" - Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..." Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..." Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot" @@ -868,7 +868,7 @@ Partial Class frmMain 'mnuDescribeSpecificLineSmoothPlot ' Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot" - Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificLineSmoothPlot.Tag = "Line_Plot..." Me.mnuDescribeSpecificLineSmoothPlot.Text = "Line Plot..." Me.mnuDescribeSpecificLineSmoothPlot.ToolTipText = "Line Plots, Smoothed Plots, Dumbbell and Slope Plots" @@ -876,12 +876,12 @@ Partial Class frmMain 'ToolStripSeparator26 ' Me.ToolStripSeparator26.Name = "ToolStripSeparator26" - Me.ToolStripSeparator26.Size = New System.Drawing.Size(309, 6) + Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6) ' 'mnuDescribeSpecificMapPlot ' Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot" - Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..." Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map" ' @@ -889,64 +889,52 @@ 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 ' - 'ToolStripSeparator27 - ' - Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(309, 6) - ' 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" - Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificMosaic.Text = "Mosaic Plot..." Me.mnuDescribeSpecificMosaic.ToolTipText = "Mosaic Plot" ' 'mnuDescribeSpecificCummulativeDistribution ' Me.mnuDescribeSpecificCummulativeDistribution.Name = "mnuDescribeSpecificCummulativeDistribution" - Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificCummulativeDistribution.Text = "Cumulative Distribution..." Me.mnuDescribeSpecificCummulativeDistribution.ToolTipText = "Cumulative Graph and Exceedance Graph" ' 'mnuDescribeSpecificParallelCoordinatePlot ' Me.mnuDescribeSpecificParallelCoordinatePlot.Name = "mnuDescribeSpecificParallelCoordinatePlot" - Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" ' 'mnuDescribeGeneral ' - Me.mnuDescribeGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneralColumnSummaries, Me.mnuDescribeGeneralTabulation, Me.mnuDescribeGeneralGraphics, Me.ToolStripSeparator38, Me.mnuDescribeGeneralUseSummaries}) + Me.mnuDescribeGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneralPivotTable, Me.ToolStripSeparator27, Me.mnuDescribeGeneralTabulation, Me.mnuDescribeGeneralGraphics, Me.mnuDescribeGeneralTables}) Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneral.Tag = "General" Me.mnuDescribeGeneral.Text = "General" ' - 'mnuDescribeGeneralColumnSummaries - ' - Me.mnuDescribeGeneralColumnSummaries.Name = "mnuDescribeGeneralColumnSummaries" - Me.mnuDescribeGeneralColumnSummaries.Size = New System.Drawing.Size(281, 34) - Me.mnuDescribeGeneralColumnSummaries.Tag = "Column_Summaries..." - Me.mnuDescribeGeneralColumnSummaries.Text = "Column Summaries..." - ' 'mnuDescribeGeneralTabulation ' Me.mnuDescribeGeneralTabulation.Enabled = False Me.mnuDescribeGeneralTabulation.Name = "mnuDescribeGeneralTabulation" - Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(281, 34) + Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneralTabulation.Tag = "Tabulation..." Me.mnuDescribeGeneralTabulation.Text = "Tabulation..." Me.mnuDescribeGeneralTabulation.Visible = False @@ -954,101 +942,90 @@ Partial Class frmMain 'mnuDescribeGeneralGraphics ' Me.mnuDescribeGeneralGraphics.Name = "mnuDescribeGeneralGraphics" - Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(281, 34) + Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeGeneralGraphics.Tag = "Graphics..." Me.mnuDescribeGeneralGraphics.Text = "Graphics..." ' - 'ToolStripSeparator38 - ' - Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(278, 6) - ' - 'mnuDescribeGeneralUseSummaries - ' - Me.mnuDescribeGeneralUseSummaries.Name = "mnuDescribeGeneralUseSummaries" - Me.mnuDescribeGeneralUseSummaries.Size = New System.Drawing.Size(281, 34) - Me.mnuDescribeGeneralUseSummaries.Text = "Use Summaries..." - ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(268, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(180, 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(177, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel ' Me.mnuModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributions, Me.ToolStripSeparator3, Me.mnuModelFitModel, Me.mnuModelCompareModels, Me.mnuModelUseModel, Me.mnuModelOtherOneVariable, Me.mnuModelOtherTwoVariables, Me.mnuModelOtherThreeVariables, Me.mnuModelOtherGeneral}) Me.mnuModel.Name = "mnuModel" - Me.mnuModel.Size = New System.Drawing.Size(79, 29) + Me.mnuModel.Size = New System.Drawing.Size(53, 22) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1056,168 +1033,168 @@ Partial Class frmMain ' Me.mnuModelProbabilityDistributions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributionsShowModel, Me.mnuModelProbabilityDistributionsCompareModels, Me.mnuModelProbabilityDistributionsRandomSamplesUseModel}) Me.mnuModelProbabilityDistributions.Name = "mnuModelProbabilityDistributions" - Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(305, 34) + Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(201, 22) Me.mnuModelProbabilityDistributions.Tag = "Probability_Distributions" Me.mnuModelProbabilityDistributions.Text = "Probability Distributions" ' 'mnuModelProbabilityDistributionsShowModel ' Me.mnuModelProbabilityDistributionsShowModel.Name = "mnuModelProbabilityDistributionsShowModel" - Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsShowModel.Text = "Show Model..." ' 'mnuModelProbabilityDistributionsCompareModels ' Me.mnuModelProbabilityDistributionsCompareModels.Enabled = False Me.mnuModelProbabilityDistributionsCompareModels.Name = "mnuModelProbabilityDistributionsCompareModels" - Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsCompareModels.Tag = "Show_Models..." Me.mnuModelProbabilityDistributionsCompareModels.Text = "Compare Models..." ' 'mnuModelProbabilityDistributionsRandomSamplesUseModel ' Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Name = "mnuModelProbabilityDistributionsRandomSamplesUseModel" - Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..." Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples ..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(302, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(198, 6) ' 'mnuModelFitModel ' Me.mnuModelFitModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelFitModelOneVariable, Me.mnuModelFitModelTwoVariables, Me.mnuModelFitModelThreeVariables, Me.mnuModelFitModelFourVariables, Me.ToolStripSeparator24, Me.mnuModelFitModelGeneral, Me.mnuModelFitModelMachineLearning, Me.ToolStripSeparator57, Me.mnuModelFitModelHypothesisTestsKeyboard, Me.mnuModelFitModelModelKeyboard}) Me.mnuModelFitModel.Name = "mnuModelFitModel" - Me.mnuModelFitModel.Size = New System.Drawing.Size(305, 34) + Me.mnuModelFitModel.Size = New System.Drawing.Size(201, 22) Me.mnuModelFitModel.Tag = "Fit_Model..." Me.mnuModelFitModel.Text = "Fit Model" ' 'mnuModelFitModelOneVariable ' Me.mnuModelFitModelOneVariable.Name = "mnuModelFitModelOneVariable" - Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelOneVariable.Text = "One Variable..." ' 'mnuModelFitModelTwoVariables ' Me.mnuModelFitModelTwoVariables.Name = "mnuModelFitModelTwoVariables" - Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelTwoVariables.Text = "Two Variables..." ' 'mnuModelFitModelThreeVariables ' Me.mnuModelFitModelThreeVariables.Name = "mnuModelFitModelThreeVariables" - Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelThreeVariables.Text = "Three Variables..." ' 'mnuModelFitModelFourVariables ' Me.mnuModelFitModelFourVariables.Name = "mnuModelFitModelFourVariables" - Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelFourVariables.Text = "Four Variables..." ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(344, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelGeneral ' Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral" - Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelGeneral.Text = "General..." ' 'mnuModelFitModelMachineLearning ' Me.mnuModelFitModelMachineLearning.Enabled = False Me.mnuModelFitModelMachineLearning.Name = "mnuModelFitModelMachineLearning" - Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelMachineLearning.Text = "Machine Learning (Caret)..." Me.mnuModelFitModelMachineLearning.Visible = False ' 'ToolStripSeparator57 ' Me.ToolStripSeparator57.Name = "ToolStripSeparator57" - Me.ToolStripSeparator57.Size = New System.Drawing.Size(344, 6) + Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelHypothesisTestsKeyboard ' Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard" - Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelHypothesisTestsKeyboard.Text = "Hypothesis Tests Keyboards..." ' 'mnuModelFitModelModelKeyboard ' Me.mnuModelFitModelModelKeyboard.Name = "mnuModelFitModelModelKeyboard" - Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelModelKeyboard.Text = "Fit Model Keyboards..." ' 'mnuModelCompareModels ' Me.mnuModelCompareModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelCompareModelsOneVariable}) Me.mnuModelCompareModels.Name = "mnuModelCompareModels" - Me.mnuModelCompareModels.Size = New System.Drawing.Size(305, 34) + Me.mnuModelCompareModels.Size = New System.Drawing.Size(201, 22) Me.mnuModelCompareModels.Text = "Compare Models" ' 'mnuModelCompareModelsOneVariable ' Me.mnuModelCompareModelsOneVariable.Name = "mnuModelCompareModelsOneVariable" - Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuModelCompareModelsOneVariable.Text = "One Variable..." ' 'mnuModelUseModel ' Me.mnuModelUseModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelUseModelOneVariable, Me.mnuModelUseModelTwoVariables, Me.ToolStripSeparator59, Me.mnuModelUseModelGlance, Me.mnuModelUseModelTidy, Me.mnuModelUseModelAugment, Me.ToolStripSeparator58, Me.mnuModelUseModelUseModelKeyboard}) Me.mnuModelUseModel.Name = "mnuModelUseModel" - Me.mnuModelUseModel.Size = New System.Drawing.Size(305, 34) + Me.mnuModelUseModel.Size = New System.Drawing.Size(201, 22) Me.mnuModelUseModel.Text = "Use Model" ' 'mnuModelUseModelOneVariable ' Me.mnuModelUseModelOneVariable.Name = "mnuModelUseModelOneVariable" - Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelOneVariable.Text = "One Variable..." ' 'mnuModelUseModelTwoVariables ' Me.mnuModelUseModelTwoVariables.Name = "mnuModelUseModelTwoVariables" - Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelTwoVariables.Text = "Two Variables..." ' 'ToolStripSeparator59 ' Me.ToolStripSeparator59.Name = "ToolStripSeparator59" - Me.ToolStripSeparator59.Size = New System.Drawing.Size(297, 6) + Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelGlance ' Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance" - Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelGlance.Text = "Glance..." ' 'mnuModelUseModelTidy ' Me.mnuModelUseModelTidy.Name = "mnuModelUseModelTidy" - Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelTidy.Text = "Tidy..." ' 'mnuModelUseModelAugment ' Me.mnuModelUseModelAugment.Name = "mnuModelUseModelAugment" - Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelAugment.Text = "Augment..." ' 'ToolStripSeparator58 ' Me.ToolStripSeparator58.Name = "ToolStripSeparator58" - Me.ToolStripSeparator58.Size = New System.Drawing.Size(297, 6) + Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelUseModelKeyboard ' Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard" - Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..." ' 'mnuModelOtherOneVariable @@ -1225,14 +1202,14 @@ Partial Class frmMain Me.mnuModelOtherOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherOneVariableExactResults, Me.mnuModelOtherOneVariableSampleSummaryData, Me.mnuModelOtherOneVariableNonParametric, Me.mnuModelOtherOneVariableGoodnessofFit}) Me.mnuModelOtherOneVariable.Enabled = False Me.mnuModelOtherOneVariable.Name = "mnuModelOtherOneVariable" - Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)" Me.mnuModelOtherOneVariable.Text = "Other (One Variable)" ' 'mnuModelOtherOneVariableExactResults ' Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults" - Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1240,7 +1217,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1248,7 +1225,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1256,7 +1233,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -1265,7 +1242,7 @@ Partial Class frmMain Me.mnuModelOtherTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherTwoVariablesTwoSamples, Me.mnuModelOtherTwoVariablesSummaryData, Me.mnuModelOtherTwoVariablesSimpleRegression, Me.mnuModelOtherTwoVariablesOneWayANOVA, Me.mnuModelOtherTwoVariablesNonParametricTwoSamples, Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA}) Me.mnuModelOtherTwoVariables.Enabled = False Me.mnuModelOtherTwoVariables.Name = "mnuModelOtherTwoVariables" - Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" ' @@ -1273,7 +1250,7 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples" - Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..." Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..." ' @@ -1281,21 +1258,21 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData" - Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherTwoVariablesSummaryData.Text = "Summary Data..." ' 'mnuModelOtherTwoVariablesSimpleRegression ' Me.mnuModelOtherTwoVariablesSimpleRegression.Name = "mnuModelOtherTwoVariablesSimpleRegression" - Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesSimpleRegression.Tag = "Simple_Regression..." Me.mnuModelOtherTwoVariablesSimpleRegression.Text = "Simple Regression..." ' 'mnuModelOtherTwoVariablesOneWayANOVA ' Me.mnuModelOtherTwoVariablesOneWayANOVA.Name = "mnuModelOtherTwoVariablesOneWayANOVA" - Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..." ' @@ -1303,14 +1280,14 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples" - Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Tag = "Non_Parameteric_Two_Samples..." Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Text = "Non Parametric Two Samples..." ' 'mnuModelOtherTwoVariablesNonParametricOneWayANOVA ' Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Name = "mnuModelOtherTwoVariablesNonParametricOneWayANOVA" - Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Tag = "Non_Parameteric_One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Text = "Non Parameteric One Way ANOVA..." ' @@ -1319,7 +1296,7 @@ Partial Class frmMain Me.mnuModelOtherThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherThreeVariablesSimpleWithGroups, Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA, Me.mnuModelOtherThreeVariablesChisquareTest}) Me.mnuModelOtherThreeVariables.Enabled = False Me.mnuModelOtherThreeVariables.Name = "mnuModelOtherThreeVariables" - Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" ' @@ -1327,21 +1304,21 @@ Partial Class frmMain ' Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups" - Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesSimpleWithGroups.Tag = "Simple_with_groups..." Me.mnuModelOtherThreeVariablesSimpleWithGroups.Text = "Simple With Groups..." ' 'mnuModelOtherThreeVariablesNonParametricTwoWayANOVA ' Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Name = "mnuModelOtherThreeVariablesNonParametricTwoWayANOVA" - Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Tag = "Non_Parametric_Two_Way_ANOVA..." Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Text = "Non Parametric Two Way ANOVA..." ' 'mnuModelOtherThreeVariablesChisquareTest ' Me.mnuModelOtherThreeVariablesChisquareTest.Name = "mnuModelOtherThreeVariablesChisquareTest" - Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test" Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..." ' @@ -1350,7 +1327,7 @@ Partial Class frmMain Me.mnuModelOtherGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherGeneralANOVAGeneral, Me.mnuModelOtherGeneralRegression, Me.mnuModelOtherGeneralLogLinear}) Me.mnuModelOtherGeneral.Enabled = False Me.mnuModelOtherGeneral.Name = "mnuModelOtherGeneral" - Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" ' @@ -1358,7 +1335,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral" - Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..." Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..." ' @@ -1366,7 +1343,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralRegression.Enabled = False Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression" - Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralRegression.Tag = "Regression..." Me.mnuModelOtherGeneralRegression.Text = "Regression..." ' @@ -1374,7 +1351,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralLogLinear.Enabled = False Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear" - Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' @@ -1382,7 +1359,7 @@ Partial Class frmMain ' Me.mnuClimaticExamine.Enabled = False Me.mnuClimaticExamine.Name = "mnuClimaticExamine" - Me.mnuClimaticExamine.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticExamine.Tag = "Examine" Me.mnuClimaticExamine.Text = "Examine..." Me.mnuClimaticExamine.Visible = False @@ -1391,7 +1368,7 @@ Partial Class frmMain ' Me.mnuClimaticProcess.Enabled = False Me.mnuClimaticProcess.Name = "mnuClimaticProcess" - Me.mnuClimaticProcess.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticProcess.Tag = "Process" Me.mnuClimaticProcess.Text = "Process..." Me.mnuClimaticProcess.Visible = False @@ -1400,7 +1377,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticEvaporationSite, Me.mnuClimaticEvaporationPenman}) Me.mnuClimaticEvaporation.Name = "mnuClimaticEvaporation" - Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticEvaporation.Tag = "Evaporation" Me.mnuClimaticEvaporation.Text = "Evaporation" Me.mnuClimaticEvaporation.Visible = False @@ -1409,7 +1386,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationSite.Enabled = False Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite" - Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(189, 34) + Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationSite.Tag = "Site" Me.mnuClimaticEvaporationSite.Text = "Site..." ' @@ -1417,7 +1394,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationPenman.Enabled = False Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman" - Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(189, 34) + Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationPenman.Tag = "Penman" Me.mnuClimaticEvaporationPenman.Text = "Penman..." ' @@ -1425,7 +1402,7 @@ Partial Class frmMain ' Me.mnuClimaticCrop.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCropCropCoefficients, Me.mnuClimaticCropWaterSatisfactionIndex}) Me.mnuClimaticCrop.Name = "mnuClimaticCrop" - Me.mnuClimaticCrop.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCrop.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCrop.Tag = "Crop" Me.mnuClimaticCrop.Text = "Crop" Me.mnuClimaticCrop.Visible = False @@ -1434,21 +1411,21 @@ Partial Class frmMain ' Me.mnuClimaticCropCropCoefficients.Enabled = False Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients" - Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCropCropCoefficients.Text = "Crop Coefficients..." ' 'mnuClimaticCropWaterSatisfactionIndex ' Me.mnuClimaticCropWaterSatisfactionIndex.Enabled = False Me.mnuClimaticCropWaterSatisfactionIndex.Name = "mnuClimaticCropWaterSatisfactionIndex" - Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCropWaterSatisfactionIndex.Text = "Water Satisfaction Index..." ' 'mnuClimaticHeatSum ' Me.mnuClimaticHeatSum.Enabled = False Me.mnuClimaticHeatSum.Name = "mnuClimaticHeatSum" - Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticHeatSum.Tag = "Heat_Sum" Me.mnuClimaticHeatSum.Text = "Heat Sum..." Me.mnuClimaticHeatSum.Visible = False @@ -1457,7 +1434,7 @@ Partial Class frmMain ' Me.mnuView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuViewDataView, Me.mnuViewOutput, Me.mnuViewLogScript, Me.mnuViewColumnMetadata, Me.mnuViewDataFrameMetadata, Me.mnuViewStructuredMenu, Me.ToolStripSeparator22, Me.mnuViewClimaticMenu, Me.mnuViewProcurementMenu, Me.mnuViewOptionsByContextMenu, Me.ToolStripSeparator39, Me.mnuViewResetToDefaultLayout, Me.mnuViewSwapDataAndMetadata}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(65, 29) + Me.mnuView.Size = New System.Drawing.Size(44, 22) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1465,7 +1442,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(314, 34) + Me.mnuViewDataView.Size = New System.Drawing.Size(205, 22) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1473,21 +1450,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(314, 34) + Me.mnuViewOutput.Size = New System.Drawing.Size(205, 22) Me.mnuViewOutput.Text = "Output" ' 'mnuViewLogScript ' Me.mnuViewLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewLogScript.Name = "mnuViewLogScript" - Me.mnuViewLogScript.Size = New System.Drawing.Size(314, 34) + Me.mnuViewLogScript.Size = New System.Drawing.Size(205, 22) Me.mnuViewLogScript.Text = "Log/Script" ' 'mnuViewColumnMetadata ' Me.mnuViewColumnMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewColumnMetadata.Name = "mnuViewColumnMetadata" - Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(314, 34) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(205, 22) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1495,7 +1472,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(314, 34) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(205, 22) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1503,19 +1480,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(314, 34) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(205, 22) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(311, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(202, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(314, 34) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(205, 22) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1523,7 +1500,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(314, 34) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(205, 22) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1531,131 +1508,131 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(314, 34) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(205, 22) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(311, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(202, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(314, 34) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(205, 22) Me.mnuViewResetToDefaultLayout.Text = "Reset to Default Layout" ' 'mnuViewSwapDataAndMetadata ' Me.mnuViewSwapDataAndMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndMetadata.Name = "mnuViewSwapDataAndMetadata" - Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(314, 34) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(205, 22) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuHelp ' Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpData, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(65, 29) + Me.mnuHelp.Size = New System.Drawing.Size(44, 22) Me.mnuHelp.Tag = "Help" Me.mnuHelp.Text = "Help" ' 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(209, 22) Me.mnuHelpHelpIntroduction.Text = "Introduction" ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpFAQ.Size = New System.Drawing.Size(209, 22) Me.mnuHelpFAQ.Text = "FAQ" ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(209, 22) Me.mnuHelpGetingStarted.Text = "Getting Started" ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(311, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(206, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpWindows.Size = New System.Drawing.Size(209, 22) Me.mnuHelpWindows.Text = "Windows" ' 'mnuHelpMenus ' Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpMenus.Size = New System.Drawing.Size(209, 22) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(209, 22) Me.mnuHelpAboutR.Text = "About R" Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(209, 22) Me.mnuHelpLearningStatistics.Text = "Learning Statistics" Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpRPackages.Size = New System.Drawing.Size(209, 22) Me.mnuHelpRPackages.Text = "R Packages" ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpGlossary.Size = New System.Drawing.Size(209, 22) Me.mnuHelpGlossary.Text = "Glossary" ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpData.Size = New System.Drawing.Size(209, 22) Me.mnuHelpData.Text = "Data" ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpLicence.Size = New System.Drawing.Size(209, 22) Me.mnuHelpLicence.Tag = "Licence..." Me.mnuHelpLicence.Text = "Licence" ' 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(311, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(206, 6) ' 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(209, 22) Me.mnuHelpPackagesDocumentation.Text = "Packages Documentation" ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(209, 6) ' 'mnuClimatic ' Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuClimaticTidyandExamine, Me.mnuExamineEditData, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods}) Me.mnuClimatic.Name = "mnuClimatic" - Me.mnuClimatic.Size = New System.Drawing.Size(90, 29) + Me.mnuClimatic.Size = New System.Drawing.Size(63, 22) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' @@ -1663,271 +1640,271 @@ Partial Class frmMain ' Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.ToolStripSeparator20, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimateFileImportfromClimSoftWizard, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip}) Me.mnuClimaticFile.Name = "mnuClimaticFile" - Me.mnuClimaticFile.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticFile.Text = "File" ' 'mnuClimaticFileImportSST ' Me.mnuClimaticFileImportSST.Name = "mnuClimaticFileImportSST" - Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportSST.Text = "Import SST..." ' 'mnuClimaticFileImportfromIRIDataLibrary ' Me.mnuClimaticFileImportfromIRIDataLibrary.Name = "mnuClimaticFileImportfromIRIDataLibrary" - Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromIRIDataLibrary.Text = "Import from IRI Data Library..." ' 'mnuClimaticFileImportfromClimateDataStore ' Me.mnuClimaticFileImportfromClimateDataStore.Name = "mnuClimaticFileImportfromClimateDataStore" - Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromClimateDataStore.Text = "Import from CDS (Climate Data Store)..." ' 'mnuClimaticFileImportandTidyNetCDF ' Me.mnuClimaticFileImportandTidyNetCDF.Name = "mnuClimaticFileImportandTidyNetCDF" - Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportandTidyNetCDF.Text = "Import and Tidy NetCDF..." ' 'mnuClimaticFileImportandTidyShapefile ' Me.mnuClimaticFileImportandTidyShapefile.Name = "mnuClimaticFileImportandTidyShapefile" - Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportandTidyShapefile.Text = "Import and Tidy Shapefile..." ' 'ToolStripSeparator20 ' Me.ToolStripSeparator20.Name = "ToolStripSeparator20" - Me.ToolStripSeparator20.Size = New System.Drawing.Size(423, 6) + Me.ToolStripSeparator20.Size = New System.Drawing.Size(279, 6) ' 'mnuClimateFileImportfromClimSoft ' Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft" - Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(426, 34) + Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(282, 22) Me.mnuClimateFileImportfromClimSoft.Text = "Import from Climsoft..." ' 'mnuClimateFileImportfromClimSoftWizard ' Me.mnuClimateFileImportfromClimSoftWizard.Name = "mnuClimateFileImportfromClimSoftWizard" - Me.mnuClimateFileImportfromClimSoftWizard.Size = New System.Drawing.Size(426, 34) + Me.mnuClimateFileImportfromClimSoftWizard.Size = New System.Drawing.Size(282, 22) Me.mnuClimateFileImportfromClimSoftWizard.Text = "Import from Climsoft Wizard..." ' 'mnuClimaticFileImportfromCliData ' Me.mnuClimaticFileImportfromCliData.Enabled = False Me.mnuClimaticFileImportfromCliData.Name = "mnuClimaticFileImportfromCliData" - Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..." Me.mnuClimaticFileImportfromCliData.Visible = False ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(423, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" - Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToClimsoft.Text = "Export to Climsoft..." ' 'mnuClimaticFileExportToCPT ' Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" - Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." ' 'mnuExportToWWRToolStrip ' Me.mnuExportToWWRToolStrip.Name = "mnuExportToWWRToolStrip" - Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(426, 34) + Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticTidyandExamine ' Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineVisualiseData, Me.mnuClimaticTidyandExamineTidyDailyData, Me.mnuClimaticTidyandExamineNonNumericCases, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" - Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticTidyandExamine.Text = "Tidy Data" ' 'mnuClimaticTidyandExamineVisualiseData ' Me.mnuClimaticTidyandExamineVisualiseData.Name = "mnuClimaticTidyandExamineVisualiseData" - Me.mnuClimaticTidyandExamineVisualiseData.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineVisualiseData.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineVisualiseData.Text = "Visualise Data..." ' 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineMerge.Text = "Merge..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'mnuExamineEditData ' Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator79, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns}) Me.mnuExamineEditData.Name = "mnuExamineEditData" - Me.mnuExamineEditData.Size = New System.Drawing.Size(325, 34) + Me.mnuExamineEditData.Size = New System.Drawing.Size(212, 22) Me.mnuExamineEditData.Text = "Examine/Edit Data" ' 'mnuExamineEditDataOneVariableSummarise ' Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" - Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuExamineEditDataOneVariableGraph ' Me.mnuExamineEditDataOneVariableGraph.Name = "mnuExamineEditDataOneVariableGraph" - Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuExamineEditDataOneVariableFrequencies ' Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies" - Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'ToolStripSeparator78 ' Me.ToolStripSeparator78.Name = "ToolStripSeparator78" - Me.ToolStripSeparator78.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6) ' 'mnuExamineEditDataPivotTable ' Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" - Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator79 ' Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator79.Size = New System.Drawing.Size(212, 6) ' 'mnuExamineEditDataSetupForDataEditing ' Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" - Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataSetupForDataEditing.Text = "Setup for Data Editing..." ' 'mnuExamineEditDataDailyDataEditing ' Me.mnuExamineEditDataDailyDataEditing.Name = "mnuExamineEditDataDailyDataEditing" - Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..." ' 'mnuExamineEditDataCompareColumns ' Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns" - Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." ' 'mnuClimaticDates ' Me.mnuClimaticDates.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDatesGenerateDates, Me.mnuClimaticDatesMakeDate, Me.mnuClimaticDatesInfillMissingDates, Me.mnuClimaticDatesUseDate, Me.mnuClimaticDatesMakeTime, Me.mnuClimaticDatesUseTime}) Me.mnuClimaticDates.Name = "mnuClimaticDates" - Me.mnuClimaticDates.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDates.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDates.Text = "Dates" ' 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -1935,175 +1912,175 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' 'mnuClimaticDefineClimaticData ' Me.mnuClimaticDefineClimaticData.Name = "mnuClimaticDefineClimaticData" - Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDefineClimaticData.Text = "Define Climatic Data..." ' 'mnuClimaticCheckData ' Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations}) Me.mnuClimaticCheckData.Name = "mnuClimaticCheckData" - Me.mnuClimaticCheckData.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCheckData.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCheckData.Text = "Check Data" ' 'mnuClimaticCheckDataInventory ' Me.mnuClimaticCheckDataInventory.Name = "mnuClimaticCheckDataInventory" - Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataInventory.Text = "Inventory..." ' 'mnuClimaticCheckDataDisplayDaily ' Me.mnuClimaticCheckDataDisplayDaily.Name = "mnuClimaticCheckDataDisplayDaily" - Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataDisplayDaily.Text = "Display Daily..." ' 'ToolStripSeparator65 ' Me.ToolStripSeparator65.Name = "ToolStripSeparator65" - Me.ToolStripSeparator65.Size = New System.Drawing.Size(310, 6) + Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataFillMissingValues ' Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues" - Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataFillMissingValues.Text = "Fill Missing Values..." ' 'mnuClimaticCheckDataBoxplot ' Me.mnuClimaticCheckDataBoxplot.Name = "mnuClimaticCheckDataBoxplot" - Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataBoxplot.Text = "Boxplot..." ' 'mnuClimaticCheckDataQCTemperatures ' Me.mnuClimaticCheckDataQCTemperatures.Name = "mnuClimaticCheckDataQCTemperatures" - Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataQCTemperatures.Text = "QC Temperatures..." ' 'mnuClimaticCheckDataQCRainfall ' Me.mnuClimaticCheckDataQCRainfall.Name = "mnuClimaticCheckDataQCRainfall" - Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataQCRainfall.Text = "QC Rainfall..." ' 'ToolStripSeparator70 ' Me.ToolStripSeparator70.Name = "ToolStripSeparator70" - Me.ToolStripSeparator70.Size = New System.Drawing.Size(310, 6) + Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataHomogenization ' Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization" - Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataHomogenization.Text = "Homogenization..." ' 'mnuClimaticCheckDataCheckStationLocations ' Me.mnuClimaticCheckDataCheckStationLocations.Name = "mnuClimaticCheckDataCheckStationLocations" - Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticPrepare ' Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareClimdex, Me.mnuClimaticPrepareSPI, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) Me.mnuClimaticPrepare.Name = "mnuClimaticPrepare" - Me.mnuClimaticPrepare.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticPrepare.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPrepare.Tag = "Prepare" Me.mnuClimaticPrepare.Text = "Prepare" ' 'mnuCimaticPrepareTransform ' Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" - Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(281, 34) + Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) Me.mnuCimaticPrepareTransform.Text = "Transform..." ' 'mnuClimaticPrepareConversions ' Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions" - Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareConversions.Text = "Conversions..." ' 'ToolStripSeparator37 ' Me.ToolStripSeparator37.Name = "ToolStripSeparator37" - Me.ToolStripSeparator37.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimaticSummaries ' Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." ' 'mnuClimaticPrepareStartoftheRains ' Me.mnuClimaticPrepareStartoftheRains.Name = "mnuClimaticPrepareStartoftheRains" - Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareStartoftheRains.Text = "Start of the Rains..." ' 'mnuClimaticPrepareEndOfRains ' Me.mnuClimaticPrepareEndOfRains.Name = "mnuClimaticPrepareEndOfRains" - Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareEndOfRains.Text = "End of Rains..." ' 'mnuClimaticPrepareLengthOfSeason ' Me.mnuClimaticPrepareLengthOfSeason.Name = "mnuClimaticPrepareLengthOfSeason" - Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareLengthOfSeason.Text = "Length of Season..." ' 'mnuClimaticPrepareSpells ' Me.mnuClimaticPrepareSpells.Name = "mnuClimaticPrepareSpells" - Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSpells.Text = "Spells..." ' 'mnuClimaticPrepareExtremes ' Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" - Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareExtremes.Text = "Extremes..." ' 'ToolStripSeparator64 ' Me.ToolStripSeparator64.Name = "ToolStripSeparator64" - Me.ToolStripSeparator64.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimdex ' Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex" - Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareClimdex.Text = "Climdex..." ' 'mnuClimaticPrepareSPI ' Me.mnuClimaticPrepareSPI.Name = "mnuClimaticPrepareSPI" - Me.mnuClimaticPrepareSPI.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSPI.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSPI.Text = "SPI/SPEI..." ' 'ToolStripSeparator51 ' Me.ToolStripSeparator51.Name = "ToolStripSeparator51" - Me.ToolStripSeparator51.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareEvapotranspiration ' Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration" - Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareEvapotranspiration.Text = "Evapotranspiration..." ' 'mnuClimaticPrepareSummary ' Me.mnuClimaticPrepareSummary.Enabled = False Me.mnuClimaticPrepareSummary.Name = "mnuClimaticPrepareSummary" - Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSummary.Text = "Summary..." Me.mnuClimaticPrepareSummary.Visible = False ' @@ -2111,7 +2088,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareNewWorksheet.Enabled = False Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet" - Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet" Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..." Me.mnuClimaticPrepareNewWorksheet.Visible = False @@ -2120,7 +2097,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareImportDailyData.Enabled = False Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData" - Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareImportDailyData.Tag = "Import_daily_data" Me.mnuClimaticPrepareImportDailyData.Text = "Import daily Data..." Me.mnuClimaticPrepareImportDailyData.Visible = False @@ -2129,7 +2106,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareMakeFactor.Enabled = False Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor" - Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor" Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..." Me.mnuClimaticPrepareMakeFactor.Visible = False @@ -2138,7 +2115,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareShiftDailyData.Enabled = False Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData" - Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareShiftDailyData.Tag = "Shift_Daily_data" Me.mnuClimaticPrepareShiftDailyData.Text = "Shift Daily Data..." Me.mnuClimaticPrepareShiftDailyData.Visible = False @@ -2147,7 +2124,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareUnstackDailyData.Enabled = False Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData" - Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareUnstackDailyData.Tag = "Unstack_Daily_data" Me.mnuClimaticPrepareUnstackDailyData.Text = "Unstack Daily Data..." Me.mnuClimaticPrepareUnstackDailyData.Visible = False @@ -2156,7 +2133,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareStackDailyData.Enabled = False Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData" - Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareStackDailyData.Tag = "Stack_Daily_data" Me.mnuClimaticPrepareStackDailyData.Text = "Stack Daily data..." Me.mnuClimaticPrepareStackDailyData.Visible = False @@ -2164,342 +2141,342 @@ Partial Class frmMain 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" - Me.ToolStripSeparator30.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeRainfall, Me.mnuClimaticDescribeTemperatures, Me.mnuClimaticDescribeWindSpeedDirection, Me.mnuClimaticDescribeSunshineRadiation, Me.ToolStripSeparator17, Me.mnuClimaticDescribeGeneral, Me.ToolStripSeparator31}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" - Me.mnuClimaticDescribe.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDescribe.Text = "Describe" ' 'mnuClimaticDescribeRainfall ' Me.mnuClimaticDescribeRainfall.Enabled = False Me.mnuClimaticDescribeRainfall.Name = "mnuClimaticDescribeRainfall" - Me.mnuClimaticDescribeRainfall.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticDescribeRainfall.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticDescribeRainfall.Text = "Rainfall..." ' 'mnuClimaticDescribeTemperatures ' Me.mnuClimaticDescribeTemperatures.Enabled = False Me.mnuClimaticDescribeTemperatures.Name = "mnuClimaticDescribeTemperatures" - Me.mnuClimaticDescribeTemperatures.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticDescribeTemperatures.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticDescribeTemperatures.Text = "Temperature..." ' 'mnuClimaticDescribeWindSpeedDirection ' Me.mnuClimaticDescribeWindSpeedDirection.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeWindSpeedDirectionWindRose}) Me.mnuClimaticDescribeWindSpeedDirection.Name = "mnuClimaticDescribeWindSpeedDirection" - Me.mnuClimaticDescribeWindSpeedDirection.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticDescribeWindSpeedDirection.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticDescribeWindSpeedDirection.Text = "Wind Speed/Direction..." ' 'mnuClimaticDescribeWindSpeedDirectionWindRose ' Me.mnuClimaticDescribeWindSpeedDirectionWindRose.Name = "mnuClimaticDescribeWindSpeedDirectionWindRose" - Me.mnuClimaticDescribeWindSpeedDirectionWindRose.Size = New System.Drawing.Size(211, 34) + Me.mnuClimaticDescribeWindSpeedDirectionWindRose.Size = New System.Drawing.Size(139, 22) Me.mnuClimaticDescribeWindSpeedDirectionWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeSunshineRadiation ' Me.mnuClimaticDescribeSunshineRadiation.Enabled = False Me.mnuClimaticDescribeSunshineRadiation.Name = "mnuClimaticDescribeSunshineRadiation" - Me.mnuClimaticDescribeSunshineRadiation.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticDescribeSunshineRadiation.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticDescribeSunshineRadiation.Text = "Sunshine/Radiation..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(196, 6) ' 'mnuClimaticDescribeGeneral ' Me.mnuClimaticDescribeGeneral.Enabled = False Me.mnuClimaticDescribeGeneral.Name = "mnuClimaticDescribeGeneral" - Me.mnuClimaticDescribeGeneral.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticDescribeGeneral.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticDescribeGeneral.Text = "General" ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(196, 6) ' 'mnuClimaticNCMP ' Me.mnuClimaticNCMP.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticNCMPIndices, Me.mnuClimaticNCMPVariogram, Me.mnuClimaticNCMPRegionAverage, Me.mnuClimaticNCMPTrendGraphs, Me.mnuClimaticNCMPCountRecords, Me.mnuClimaticNCMPSummary}) Me.mnuClimaticNCMP.Name = "mnuClimaticNCMP" - Me.mnuClimaticNCMP.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticNCMP.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticNCMP.Text = "NCMP" ' 'mnuClimaticNCMPIndices ' Me.mnuClimaticNCMPIndices.Name = "mnuClimaticNCMPIndices" - Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPIndices.Text = "Indices..." ' 'mnuClimaticNCMPVariogram ' Me.mnuClimaticNCMPVariogram.Name = "mnuClimaticNCMPVariogram" - Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPVariogram.Text = "Variogram..." ' 'mnuClimaticNCMPRegionAverage ' Me.mnuClimaticNCMPRegionAverage.Name = "mnuClimaticNCMPRegionAverage" - Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPRegionAverage.Text = "Region Average..." ' 'mnuClimaticNCMPTrendGraphs ' Me.mnuClimaticNCMPTrendGraphs.Name = "mnuClimaticNCMPTrendGraphs" - Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPTrendGraphs.Text = "Trend Graphs..." ' 'mnuClimaticNCMPCountRecords ' Me.mnuClimaticNCMPCountRecords.Name = "mnuClimaticNCMPCountRecords" - Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPCountRecords.Text = "Count Records..." ' 'mnuClimaticNCMPSummary ' Me.mnuClimaticNCMPSummary.Name = "mnuClimaticNCMPSummary" - Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPSummary.Text = "Summary..." ' 'mnuClimaticPICSA ' Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGraph, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" - Me.mnuClimaticPICSA.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPICSA.Text = "PICSA" ' 'mnuClimaticPICSARainfallGraph ' Me.mnuClimaticPICSARainfallGraph.Name = "mnuClimaticPICSARainfallGraph" - Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSARainfallGraph.Text = "Rainfall Graph..." ' 'mnuClimaticPICSATemperatureGraph ' Me.mnuClimaticPICSATemperatureGraph.Name = "mnuClimaticPICSATemperatureGraph" - Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' 'mnuClimaticPICSAGeneralGraph ' Me.mnuClimaticPICSAGeneralGraph.Name = "mnuClimaticPICSAGeneralGraph" - Me.mnuClimaticPICSAGeneralGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSAGeneralGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSAGeneralGraph.Text = "General Graph..." ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" - Me.ToolStripSeparator73.Size = New System.Drawing.Size(361, 6) + Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticPICSACumExeedenceGraph ' Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph" - Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSACumExeedenceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticPICSACrops ' Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops" - Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSACrops.Text = "Crops..." ' 'mnuCMSAF ' Me.mnuCMSAF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCMSAFPlotRegion, Me.mnuClimaticCMSAFExporttoCMSAFRToolbox}) Me.mnuCMSAF.Name = "mnuCMSAF" - Me.mnuCMSAF.Size = New System.Drawing.Size(325, 34) + Me.mnuCMSAF.Size = New System.Drawing.Size(212, 22) Me.mnuCMSAF.Text = "CM SAF" ' 'mnuClimaticCMSAFPlotRegion ' Me.mnuClimaticCMSAFPlotRegion.Name = "mnuClimaticCMSAFPlotRegion" - Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(351, 34) + Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(231, 22) Me.mnuClimaticCMSAFPlotRegion.Text = "Plot Region..." ' 'mnuClimaticCMSAFExporttoCMSAFRToolbox ' Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Name = "mnuClimaticCMSAFExporttoCMSAFRToolbox" - Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(351, 34) + Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(231, 22) Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Text = "Export to CM SAF R Toolbox..." ' 'mnuClimaticCompare ' Me.mnuClimaticCompare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCompareCalculation, Me.mnuClimaticCompareSummary, Me.ToolStripSeparator66, Me.mnuClimaticCompareCorrelations, Me.mnuClimaticCompareScatterplot, Me.mnuClimaticCompareTimeSeriesPlot, Me.mnuClimaticCompareSeasonalPlot, Me.mnuClimaticCompareDensityPlot, Me.mnuClimaticCompareConditionalQuantiles, Me.mnuClimaticCompareTaylorDiagram}) Me.mnuClimaticCompare.Name = "mnuClimaticCompare" - Me.mnuClimaticCompare.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCompare.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCompare.Text = "Compare" ' 'mnuClimaticCompareCalculation ' Me.mnuClimaticCompareCalculation.Name = "mnuClimaticCompareCalculation" - Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareCalculation.Text = "Calculation..." ' 'mnuClimaticCompareSummary ' Me.mnuClimaticCompareSummary.Name = "mnuClimaticCompareSummary" - Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareSummary.Text = "Summary..." ' 'ToolStripSeparator66 ' Me.ToolStripSeparator66.Name = "ToolStripSeparator66" - Me.ToolStripSeparator66.Size = New System.Drawing.Size(293, 6) + Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6) ' 'mnuClimaticCompareCorrelations ' Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations" - Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareCorrelations.Text = "Correlations..." ' 'mnuClimaticCompareScatterplot ' Me.mnuClimaticCompareScatterplot.Name = "mnuClimaticCompareScatterplot" - Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareScatterplot.Text = "Scatterplot..." ' 'mnuClimaticCompareTimeSeriesPlot ' Me.mnuClimaticCompareTimeSeriesPlot.Name = "mnuClimaticCompareTimeSeriesPlot" - Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareTimeSeriesPlot.Text = "Time Series Plot..." ' 'mnuClimaticCompareSeasonalPlot ' Me.mnuClimaticCompareSeasonalPlot.Name = "mnuClimaticCompareSeasonalPlot" - Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareSeasonalPlot.Text = "Seasonal Plot..." ' 'mnuClimaticCompareDensityPlot ' Me.mnuClimaticCompareDensityPlot.Name = "mnuClimaticCompareDensityPlot" - Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareDensityPlot.Text = "Density Plot..." ' 'mnuClimaticCompareConditionalQuantiles ' Me.mnuClimaticCompareConditionalQuantiles.Name = "mnuClimaticCompareConditionalQuantiles" - Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareConditionalQuantiles.Text = "Conditional Quantiles..." ' 'mnuClimaticCompareTaylorDiagram ' Me.mnuClimaticCompareTaylorDiagram.Name = "mnuClimaticCompareTaylorDiagram" - Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareTaylorDiagram.Text = "Taylor Diagram..." ' 'mnuClimaticMapping ' Me.mnuClimaticMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticMappingMap, Me.mnuClimaticMappingCheckStationLocations}) Me.mnuClimaticMapping.Name = "mnuClimaticMapping" - Me.mnuClimaticMapping.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticMapping.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticMapping.Text = "Mapping" ' 'mnuClimaticMappingMap ' Me.mnuClimaticMappingMap.Name = "mnuClimaticMappingMap" - Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticMappingMap.Text = "Map..." ' 'mnuClimaticMappingCheckStationLocations ' Me.mnuClimaticMappingCheckStationLocations.Name = "mnuClimaticMappingCheckStationLocations" - Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticMappingCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticModel ' Me.mnuClimaticModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelCircular, Me.mnuClimaticModelMarkovModelling}) Me.mnuClimaticModel.Name = "mnuClimaticModel" - Me.mnuClimaticModel.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticModel.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticModel.Text = "Model" ' 'mnuClimaticModelsExtremes ' Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" - Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelsExtremes.Text = "Extremes..." ' 'mnuClimaticModelCircular ' Me.mnuClimaticModelCircular.Enabled = False Me.mnuClimaticModelCircular.Name = "mnuClimaticModelCircular" - Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelCircular.Text = "Circular..." Me.mnuClimaticModelCircular.Visible = False ' 'mnuClimaticModelMarkovModelling ' Me.mnuClimaticModelMarkovModelling.Name = "mnuClimaticModelMarkovModelling" - Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelMarkovModelling.Tag = "Markov_Modelling" Me.mnuClimaticModelMarkovModelling.Text = "Markov Modelling..." ' 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticSCF ' Me.mnuClimaticSCF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticSCFSupportOpenSST, Me.mnuClimaticSCFSupportExporttoCPT, Me.ToolStripSeparator32, Me.mnuClimaticSCFSupportCorrelations, Me.mnuClimaticSCFSupportPrincipalComponents, Me.mnuClimaticSCFSupportCanonicalCorrelations, Me.mnuClimaticSCFSupportCumulativeExceedanceGraph}) Me.mnuClimaticSCF.Name = "mnuClimaticSCF" - Me.mnuClimaticSCF.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticSCF.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticSCF.Text = "Seasonal Forecast Support" ' 'mnuClimaticSCFSupportOpenSST ' Me.mnuClimaticSCFSupportOpenSST.Name = "mnuClimaticSCFSupportOpenSST" - Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportOpenSST.Text = "Open SST..." ' 'mnuClimaticSCFSupportExporttoCPT ' Me.mnuClimaticSCFSupportExporttoCPT.Name = "mnuClimaticSCFSupportExporttoCPT" - Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportExporttoCPT.Tag = "Export_to_CPT" Me.mnuClimaticSCFSupportExporttoCPT.Text = "Export to CPT..." ' 'ToolStripSeparator32 ' Me.ToolStripSeparator32.Name = "ToolStripSeparator32" - Me.ToolStripSeparator32.Size = New System.Drawing.Size(361, 6) + Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticSCFSupportCorrelations ' Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations" - Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCorrelations.Text = "Correlations..." ' 'mnuClimaticSCFSupportPrincipalComponents ' Me.mnuClimaticSCFSupportPrincipalComponents.Name = "mnuClimaticSCFSupportPrincipalComponents" - Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportPrincipalComponents.Text = "Principal Components..." ' 'mnuClimaticSCFSupportCanonicalCorrelations ' Me.mnuClimaticSCFSupportCanonicalCorrelations.Name = "mnuClimaticSCFSupportCanonicalCorrelations" - Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuClimaticSCFSupportCumulativeExceedanceGraph ' Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Name = "mnuClimaticSCFSupportCumulativeExceedanceGraph" - Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticClimateMethods ' Me.mnuClimaticClimateMethods.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulation, Me.mnuClimaticClimateMethodsGraphics, Me.mnuClimaticClimateMethodsModel, Me.mnuClimaticClimateMethodsAdditional, Me.mnuClimateMethodsCreateClimateObject}) Me.mnuClimaticClimateMethods.Name = "mnuClimaticClimateMethods" - Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods" Me.mnuClimaticClimateMethods.Text = "Climate Methods" Me.mnuClimaticClimateMethods.Visible = False @@ -2508,7 +2485,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulationStartOfRain, Me.mnuClimaticClimateMethodsDataManipulationEndOfRain, Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth, Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular, Me.mnuClimaticClimateMethodsDataManipulationDayMonth, Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily, Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear, Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal, Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength, Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA, Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents, Me.mnuClimaticClimateMethodsDataManipulationMissingData, Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable, Me.mnuClimateMethodsDataManipulationMonthlySummaries, Me.mnuClimateMethodsDataManipulationOutputForCD}) Me.mnuClimaticClimateMethodsDataManipulation.Name = "mnuClimaticClimateMethodsDataManipulation" - Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation" Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation" ' @@ -2516,7 +2493,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain" - Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..." ' @@ -2524,7 +2501,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain" - Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..." ' @@ -2532,7 +2509,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month" Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..." ' @@ -2540,7 +2517,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular" - Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular" Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..." ' @@ -2548,7 +2525,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month" Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..." ' @@ -2556,7 +2533,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily" Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..." ' @@ -2564,7 +2541,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year" Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..." ' @@ -2572,7 +2549,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal" - Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total" Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..." ' @@ -2580,7 +2557,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength" - Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length" Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..." ' @@ -2588,7 +2565,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA" - Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA" Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..." ' @@ -2596,7 +2573,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents" - Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events" Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..." ' @@ -2604,7 +2581,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData" - Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data" Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..." ' @@ -2612,7 +2589,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable" - Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table" Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..." ' @@ -2620,7 +2597,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries" - Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(342, 34) + Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries" Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..." ' @@ -2628,7 +2605,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD" - Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(342, 34) + Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT" Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..." ' @@ -2636,7 +2613,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphics.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot, Me.mnuClimaticClimateMethodsGraphicsCliplot, Me.mnuClimaticClimateMethodsGraphicsMissingValues, Me.mnuClimaticClimateMethodsGraphicsHistogram, Me.mnuClimaticClimateMethodsGraphicsCumExceedance, Me.mnuClimaticClimateMethodsGraphicsBoxplot, Me.mnuClimaticClimateMethodsGraphicsInventory, Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall, Me.mnuClimaticClimateMethodsGraphicsRainCount, Me.mnuClimaticClimateMethodsGraphicsTimeseries, Me.mnuClimaticClimateMethodsGraphicsWindrose, Me.mnuClimateMethodsGraphicsMultipleLines, Me.mnuClmateMethodThreeSummaries}) Me.mnuClimaticClimateMethodsGraphics.Name = "mnuClimaticClimateMethodsGraphics" - Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics" Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics" ' @@ -2644,7 +2621,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot" - Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot" Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..." ' @@ -2652,7 +2629,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot" - Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot" Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..." ' @@ -2660,7 +2637,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues" - Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values" Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..." ' @@ -2668,7 +2645,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram" - Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram" Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..." ' @@ -2676,7 +2653,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance" - Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence" Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..." ' @@ -2684,7 +2661,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot" - Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot" Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..." ' @@ -2692,7 +2669,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory" - Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory" Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..." ' @@ -2700,7 +2677,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall" - Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall" Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..." ' @@ -2708,7 +2685,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount" - Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count" Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..." ' @@ -2716,7 +2693,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries" - Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries" Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..." ' @@ -2724,7 +2701,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose" - Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose" Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..." ' @@ -2732,7 +2709,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines" - Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(325, 34) + Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22) Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines" Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..." ' @@ -2740,7 +2717,7 @@ Partial Class frmMain ' Me.mnuClmateMethodThreeSummaries.Enabled = False Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries" - Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(325, 34) + Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22) Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries" Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..." ' @@ -2748,7 +2725,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsModel.Enabled = False Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel" - Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsModel.Tag = "Model" Me.mnuClimaticClimateMethodsModel.Text = "Model..." ' @@ -2756,7 +2733,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditional.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsAdditionalOutputForCPT, Me.mnuClimaticClimateMethodsAdditionalRainsStatistics, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain, Me.mnuClimaticClimateMethodsAdditionalWaterBalance}) Me.mnuClimaticClimateMethodsAdditional.Name = "mnuClimaticClimateMethodsAdditional" - Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional" Me.mnuClimaticClimateMethodsAdditional.Text = "Additional" ' @@ -2764,7 +2741,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT" - Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT" Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..." ' @@ -2772,7 +2749,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics" - Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics" Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..." ' @@ -2780,7 +2757,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..." ' @@ -2788,7 +2765,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..." ' @@ -2796,7 +2773,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance" - Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance" Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..." ' @@ -2804,7 +2781,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsCreateClimateObject.Enabled = False Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject" - Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(297, 34) + Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22) Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' @@ -2812,7 +2789,7 @@ Partial Class frmMain ' Me.mnuFileSave.Name = "mnuFileSave" Me.mnuFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys) - Me.mnuFileSave.Size = New System.Drawing.Size(351, 34) + Me.mnuFileSave.Size = New System.Drawing.Size(232, 22) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2820,32 +2797,32 @@ Partial Class frmMain ' Me.mnuFileSaveAs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileSaveAsDataAs, Me.mnuFileSaveAsOutputAs, Me.mnuFileSaveAsLogAs, Me.mnuFileSaveAsScriptAs}) Me.mnuFileSaveAs.Name = "mnuFileSaveAs" - Me.mnuFileSaveAs.Size = New System.Drawing.Size(351, 34) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(232, 22) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' 'mnuFileSaveAsDataAs ' Me.mnuFileSaveAsDataAs.Name = "mnuFileSaveAsDataAs" - Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsDataAs.Text = "Save Data As..." ' 'mnuFileSaveAsOutputAs ' Me.mnuFileSaveAsOutputAs.Name = "mnuFileSaveAsOutputAs" - Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsOutputAs.Text = "Save Output As..." ' 'mnuFileSaveAsLogAs ' Me.mnuFileSaveAsLogAs.Name = "mnuFileSaveAsLogAs" - Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsLogAs.Text = "Save Log As..." ' 'mnuFileSaveAsScriptAs ' Me.mnuFileSaveAsScriptAs.Name = "mnuFileSaveAsScriptAs" - Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsScriptAs.Text = "Save Script As..." ' 'mnuFilePrint @@ -2853,7 +2830,7 @@ Partial Class frmMain Me.mnuFilePrint.Enabled = False Me.mnuFilePrint.Name = "mnuFilePrint" Me.mnuFilePrint.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.P), System.Windows.Forms.Keys) - Me.mnuFilePrint.Size = New System.Drawing.Size(351, 34) + Me.mnuFilePrint.Size = New System.Drawing.Size(232, 22) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -2862,7 +2839,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(351, 34) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(232, 22) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -2870,12 +2847,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" ' @@ -2883,7 +2860,7 @@ Partial Class frmMain ' Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditFindNext, Me.mnuEditReplace, Me.mnuEditCut, Me.mnuEditCopy, Me.mnuEditCopySpecial, Me.mnuEditPaste, Me.mnuPasteSpecial, Me.mnuEditPasteNewDataFrame, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.ToolStripSeparator71, Me.mnuEditScript}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(58, 29) + Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' @@ -2891,7 +2868,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(366, 34) + Me.mnuEditFind.Size = New System.Drawing.Size(244, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2899,14 +2876,14 @@ Partial Class frmMain ' Me.mnuEditFindNext.Enabled = False Me.mnuEditFindNext.Name = "mnuEditFindNext" - Me.mnuEditFindNext.Size = New System.Drawing.Size(366, 34) + Me.mnuEditFindNext.Size = New System.Drawing.Size(244, 22) Me.mnuEditFindNext.Text = "Find Next" ' 'mnuEditReplace ' Me.mnuEditReplace.Enabled = False Me.mnuEditReplace.Name = "mnuEditReplace" - Me.mnuEditReplace.Size = New System.Drawing.Size(366, 34) + Me.mnuEditReplace.Size = New System.Drawing.Size(244, 22) Me.mnuEditReplace.Tag = "Replace" Me.mnuEditReplace.Text = "Replace" ' @@ -2914,7 +2891,7 @@ Partial Class frmMain ' Me.mnuEditCut.Name = "mnuEditCut" Me.mnuEditCut.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.X), System.Windows.Forms.Keys) - Me.mnuEditCut.Size = New System.Drawing.Size(366, 34) + Me.mnuEditCut.Size = New System.Drawing.Size(244, 22) Me.mnuEditCut.Tag = "Cut" Me.mnuEditCut.Text = "Cut" ' @@ -2922,7 +2899,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(366, 34) + Me.mnuEditCopy.Size = New System.Drawing.Size(244, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2932,7 +2909,7 @@ Partial Class frmMain Me.mnuEditCopySpecial.Name = "mnuEditCopySpecial" Me.mnuEditCopySpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopySpecial.Size = New System.Drawing.Size(366, 34) + Me.mnuEditCopySpecial.Size = New System.Drawing.Size(244, 22) Me.mnuEditCopySpecial.Tag = "Copy_Special" Me.mnuEditCopySpecial.Text = "Copy Special" Me.mnuEditCopySpecial.Visible = False @@ -2941,7 +2918,7 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(366, 34) + Me.mnuEditPaste.Size = New System.Drawing.Size(244, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' @@ -2951,7 +2928,7 @@ Partial Class frmMain Me.mnuPasteSpecial.Name = "mnuPasteSpecial" Me.mnuPasteSpecial.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _ Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuPasteSpecial.Size = New System.Drawing.Size(366, 34) + Me.mnuPasteSpecial.Size = New System.Drawing.Size(244, 22) Me.mnuPasteSpecial.Tag = "Paste" Me.mnuPasteSpecial.Text = "Paste New Columns" Me.mnuPasteSpecial.Visible = False @@ -2959,51 +2936,50 @@ Partial Class frmMain 'mnuEditPasteNewDataFrame ' Me.mnuEditPasteNewDataFrame.Name = "mnuEditPasteNewDataFrame" - Me.mnuEditPasteNewDataFrame.Size = New System.Drawing.Size(366, 34) + Me.mnuEditPasteNewDataFrame.Size = New System.Drawing.Size(244, 22) Me.mnuEditPasteNewDataFrame.Tag = "Paste" Me.mnuEditPasteNewDataFrame.Text = "Paste New Data Frame" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(366, 34) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(244, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(366, 34) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(244, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(363, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(241, 6) ' 'mnuEditScript ' Me.mnuEditScript.Name = "mnuEditScript" - Me.mnuEditScript.Size = New System.Drawing.Size(366, 34) + Me.mnuEditScript.Size = New System.Drawing.Size(244, 22) Me.mnuEditScript.Text = "Script" ' 'stsStrip ' Me.stsStrip.ImageScalingSize = New System.Drawing.Size(24, 24) Me.stsStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstatus}) - Me.stsStrip.Location = New System.Drawing.Point(0, 691) + Me.stsStrip.Location = New System.Drawing.Point(0, 460) Me.stsStrip.Name = "stsStrip" - Me.stsStrip.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0) Me.stsStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional - Me.stsStrip.Size = New System.Drawing.Size(1251, 32) + Me.stsStrip.Size = New System.Drawing.Size(834, 22) Me.stsStrip.TabIndex = 8 Me.stsStrip.Text = "Status" ' 'tstatus ' Me.tstatus.Name = "tstatus" - Me.tstatus.Size = New System.Drawing.Size(182, 25) + Me.tstatus.Size = New System.Drawing.Size(119, 17) Me.tstatus.Text = "No worksheet loaded" ' 'Tool_strip @@ -3012,12 +2988,12 @@ Partial Class frmMain Me.Tool_strip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.Tool_strip.ImageScalingSize = New System.Drawing.Size(30, 30) Me.Tool_strip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTbOpen, Me.mnuTbOpenFromLibrary, Me.mnuTbSave, Me.toolStripSeparator, Me.mnuTbLast10Dialogs, Me.separator2, Me.mnuTbDataView, Me.mnuTbOutput, Me.ToolStripSeparator74, Me.mnuLastGraph, Me.ToolStripSeparator75, Me.mnuTbLogScript, Me.mnuMetadata, Me.ToolStripSeparator76, Me.mnuTbResetLayout, Me.separator3, Me.mnuTbHelp, Me.ToolStripSeparator77, Me.mnuTbLan, Me.separator1}) - Me.Tool_strip.Location = New System.Drawing.Point(0, 33) + Me.Tool_strip.Location = New System.Drawing.Point(0, 24) Me.Tool_strip.Name = "Tool_strip" - Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0) + Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) Me.Tool_strip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional Me.Tool_strip.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.Tool_strip.Size = New System.Drawing.Size(1251, 39) + Me.Tool_strip.Size = New System.Drawing.Size(834, 37) Me.Tool_strip.TabIndex = 7 Me.Tool_strip.Text = "Tool" ' @@ -3029,7 +3005,7 @@ Partial Class frmMain Me.mnuTbOpen.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpen.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpen.Name = "mnuTbOpen" - Me.mnuTbOpen.Size = New System.Drawing.Size(53, 36) + Me.mnuTbOpen.Size = New System.Drawing.Size(53, 34) Me.mnuTbOpen.Text = "&Open" Me.mnuTbOpen.ToolTipText = "Import" ' @@ -3040,7 +3016,7 @@ Partial Class frmMain Me.mnuTbOpenFromLibrary.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpenFromLibrary.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpenFromLibrary.Name = "mnuTbOpenFromLibrary" - Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 36) + Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 34) Me.mnuTbOpenFromLibrary.ToolTipText = "Import From Library" ' 'mnuTbSave @@ -3052,40 +3028,40 @@ Partial Class frmMain Me.mnuTbSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbSave.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbSave.Name = "mnuTbSave" - Me.mnuTbSave.Size = New System.Drawing.Size(53, 36) + Me.mnuTbSave.Size = New System.Drawing.Size(53, 34) Me.mnuTbSave.Text = "&Save" ' 'mnuSaveData ' Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveData.Name = "mnuSaveData" - Me.mnuSaveData.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveData.Size = New System.Drawing.Size(139, 22) Me.mnuSaveData.Text = "Save Data" ' 'mnuSaveOutput ' Me.mnuSaveOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveOutput.Name = "mnuSaveOutput" - Me.mnuSaveOutput.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveOutput.Size = New System.Drawing.Size(139, 22) Me.mnuSaveOutput.Text = "Save Output" ' 'mnuSaveScript ' Me.mnuSaveScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveScript.Name = "mnuSaveScript" - Me.mnuSaveScript.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveScript.Size = New System.Drawing.Size(139, 22) Me.mnuSaveScript.Text = "Save Script" ' 'mnuSaveLog ' Me.mnuSaveLog.Name = "mnuSaveLog" - Me.mnuSaveLog.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22) Me.mnuSaveLog.Text = "Save Log" ' 'toolStripSeparator ' Me.toolStripSeparator.Name = "toolStripSeparator" - Me.toolStripSeparator.Size = New System.Drawing.Size(6, 39) + Me.toolStripSeparator.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLast10Dialogs ' @@ -3101,7 +3077,7 @@ Partial Class frmMain 'separator2 ' Me.separator2.Name = "separator2" - Me.separator2.Size = New System.Drawing.Size(6, 39) + Me.separator2.Size = New System.Drawing.Size(6, 37) ' 'mnuTbDataView ' @@ -3111,7 +3087,7 @@ Partial Class frmMain Me.mnuTbDataView.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbDataView.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbDataView.Name = "mnuTbDataView" - Me.mnuTbDataView.Size = New System.Drawing.Size(34, 36) + Me.mnuTbDataView.Size = New System.Drawing.Size(34, 34) Me.mnuTbDataView.ToolTipText = "Toggle Data view open and closed" ' 'mnuTbOutput @@ -3122,13 +3098,13 @@ Partial Class frmMain Me.mnuTbOutput.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOutput.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOutput.Name = "mnuTbOutput" - Me.mnuTbOutput.Size = New System.Drawing.Size(34, 36) + Me.mnuTbOutput.Size = New System.Drawing.Size(34, 34) Me.mnuTbOutput.ToolTipText = "Toggle Output window open and closed" ' 'ToolStripSeparator74 ' Me.ToolStripSeparator74.Name = "ToolStripSeparator74" - Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 37) ' 'mnuLastGraph ' @@ -3145,25 +3121,25 @@ Partial Class frmMain 'mnuNormalViewer ' Me.mnuNormalViewer.Name = "mnuNormalViewer" - Me.mnuNormalViewer.Size = New System.Drawing.Size(194, 34) + Me.mnuNormalViewer.Size = New System.Drawing.Size(128, 22) Me.mnuNormalViewer.Text = "Viewer..." ' 'mnuploty ' Me.mnuploty.Name = "mnuploty" - Me.mnuploty.Size = New System.Drawing.Size(194, 34) + Me.mnuploty.Size = New System.Drawing.Size(128, 22) Me.mnuploty.Text = "Plotly..." ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" - Me.mnuRViewer.Size = New System.Drawing.Size(194, 34) + Me.mnuRViewer.Size = New System.Drawing.Size(128, 22) Me.mnuRViewer.Text = "R Viewer..." ' 'ToolStripSeparator75 ' Me.ToolStripSeparator75.Name = "ToolStripSeparator75" - Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLogScript ' @@ -3181,7 +3157,7 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(196, 34) + Me.mnuLogScript.Size = New System.Drawing.Size(129, 22) Me.mnuLogScript.Text = "Log/Script" ' 'mnuMetadata @@ -3200,20 +3176,20 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(307, 34) + Me.mnuColumnMetadat.Size = New System.Drawing.Size(202, 22) Me.mnuColumnMetadat.Text = " Column Metadata..." ' 'mnuDataFrameMetadat ' Me.mnuDataFrameMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataFrameMetadat.Name = "mnuDataFrameMetadat" - Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(307, 34) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(202, 22) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' 'ToolStripSeparator76 ' Me.ToolStripSeparator76.Name = "ToolStripSeparator76" - Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 37) ' 'mnuTbResetLayout ' @@ -3222,13 +3198,13 @@ Partial Class frmMain Me.mnuTbResetLayout.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbResetLayout.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbResetLayout.Name = "mnuTbResetLayout" - Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 36) + Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 34) Me.mnuTbResetLayout.ToolTipText = "Reset to Default Layout" ' 'separator3 ' Me.separator3.Name = "separator3" - Me.separator3.Size = New System.Drawing.Size(6, 39) + Me.separator3.Size = New System.Drawing.Size(6, 37) ' 'mnuTbHelp ' @@ -3237,13 +3213,13 @@ Partial Class frmMain Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbHelp.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbHelp.Name = "mnuTbHelp" - Me.mnuTbHelp.Size = New System.Drawing.Size(34, 36) + Me.mnuTbHelp.Size = New System.Drawing.Size(34, 34) Me.mnuTbHelp.Text = "He&lp" ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" - Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLan ' @@ -3252,28 +3228,28 @@ Partial Class frmMain Me.mnuTbLan.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbLan.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbLan.Name = "mnuTbLan" - Me.mnuTbLan.Size = New System.Drawing.Size(34, 36) + Me.mnuTbLan.Size = New System.Drawing.Size(34, 34) Me.mnuTbLan.ToolTipText = "Changes the menu language to English, and from English" ' 'separator1 ' Me.separator1.Name = "separator1" - Me.separator1.Size = New System.Drawing.Size(6, 39) + Me.separator1.Size = New System.Drawing.Size(6, 37) ' 'mnuBar ' Me.mnuBar.AllowMerge = False Me.mnuBar.BackColor = System.Drawing.SystemColors.ControlLightLight - Me.mnuBar.GripMargin = New System.Windows.Forms.Padding(2, 2, 0, 2) Me.mnuBar.ImageScalingSize = New System.Drawing.Size(24, 24) Me.mnuBar.ImeMode = System.Windows.Forms.ImeMode.[On] Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuPrepare, Me.mnuDescribe, Me.mnuModel, Me.mnuStructured, Me.mnuClimatic, Me.mnuProcurement, Me.mnuOptionsByContext, Me.mnuTools, Me.mnuView, Me.mnuHelp}) Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" + Me.mnuBar.Padding = New System.Windows.Forms.Padding(4, 1, 0, 1) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True - Me.mnuBar.Size = New System.Drawing.Size(1251, 33) + Me.mnuBar.Size = New System.Drawing.Size(834, 24) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' @@ -3281,7 +3257,7 @@ Partial Class frmMain ' Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" - Me.mnuFile.Size = New System.Drawing.Size(54, 29) + Me.mnuFile.Size = New System.Drawing.Size(37, 22) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3289,7 +3265,7 @@ Partial Class frmMain ' Me.mnuFileNewDataFrame.Name = "mnuFileNewDataFrame" Me.mnuFileNewDataFrame.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) - Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(351, 34) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(232, 22) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3297,33 +3273,33 @@ Partial Class frmMain ' Me.mnuFileImportFromFile.Name = "mnuFileImportFromFile" Me.mnuFileImportFromFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) - Me.mnuFileImportFromFile.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(348, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(229, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3331,7 +3307,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3339,82 +3315,82 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(351, 34) + Me.mnuFileConvert.Size = New System.Drawing.Size(232, 22) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(348, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(229, 6) ' 'mnuFileExport ' Me.mnuFileExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExportExportDataSet, Me.mnuFileExportExportRObjectsToolStripMenuItem, Me.mnuFileExportExportRWorkspace, Me.mnuFileExportExportGraphAsImage}) Me.mnuFileExport.Name = "mnuFileExport" - Me.mnuFileExport.Size = New System.Drawing.Size(351, 34) + Me.mnuFileExport.Size = New System.Drawing.Size(232, 22) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet ' Me.mnuFileExportExportDataSet.Name = "mnuFileExportExportDataSet" - Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportDataSet.Text = "Export Dataset..." ' 'mnuFileExportExportRObjectsToolStripMenuItem ' Me.mnuFileExportExportRObjectsToolStripMenuItem.Name = "mnuFileExportExportRObjectsToolStripMenuItem" - Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportRObjectsToolStripMenuItem.Text = "Export R Objects..." ' 'mnuFileExportExportRWorkspace ' Me.mnuFileExportExportRWorkspace.Name = "mnuFileExportExportRWorkspace" - Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportRWorkspace.Text = "Export R Workspace..." ' 'mnuFileExportExportGraphAsImage ' Me.mnuFileExportExportGraphAsImage.Name = "mnuFileExportExportGraphAsImage" - Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportGraphAsImage.Text = "Export Graph As Image..." ' 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(351, 34) + Me.mnuFileCloseData.Size = New System.Drawing.Size(232, 22) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(348, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(229, 6) ' 'mnuPrepare ' Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) Me.mnuPrepare.Name = "mnuPrepare" - Me.mnuPrepare.Size = New System.Drawing.Size(88, 29) + Me.mnuPrepare.Size = New System.Drawing.Size(59, 22) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -3422,105 +3398,105 @@ Partial Class frmMain ' Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameHideColumns, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' 'mnuPrepareDataFrameViewData ' Me.mnuPrepareDataFrameViewData.Name = "mnuPrepareDataFrameViewData" - Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameViewData.Tag = "View_Data..." Me.mnuPrepareDataFrameViewData.Text = "View Data..." ' 'mnuPrepareDataFrameRenameColumn ' Me.mnuPrepareDataFrameRenameColumn.Name = "mnuPrepareDataFrameRenameColumn" - Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameRenameColumn.Tag = "Rename_Column..." Me.mnuPrepareDataFrameRenameColumn.Text = "Rename Columns..." ' 'mnuPrepareDataFrameDuplicateColumn ' Me.mnuPrepareDataFrameDuplicateColumn.Name = "mnuPrepareDataFrameDuplicateColumn" - Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameDuplicateColumn.Text = "Duplicate Column..." ' 'mnuPrepareDataFrameRowNumbersNames ' Me.mnuPrepareDataFrameRowNumbersNames.Name = "mnuPrepareDataFrameRowNumbersNames" - Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameRowNumbersNames.Tag = "Row_Numbers/Names..." Me.mnuPrepareDataFrameRowNumbersNames.Text = "Row Numbers/Names..." ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameSort ' Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort" - Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' 'mnuPrepareDataFrameFilterRows ' Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" - Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" - Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' Me.mnuPrepareDataFrameReplaceValues.Name = "mnuPrepareDataFrameReplaceValues" - Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameReplaceValues.Tag = "Replace_Values..." Me.mnuPrepareDataFrameReplaceValues.Text = "Replace Values..." ' 'mnuPrepareDataFrameConvertColumns ' Me.mnuPrepareDataFrameConvertColumns.Name = "mnuPrepareDataFrameConvertColumns" - Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameConvertColumns.Tag = "Convert_Columns..." Me.mnuPrepareDataFrameConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameReorderColumns ' Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns" - Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameReorderColumns.Tag = "Reorder_Columns..." Me.mnuPrepareDataFrameReorderColumns.Text = "Reorder Columns..." ' 'mnuPrepareDataFrameAddMergeColumns ' Me.mnuPrepareDataFrameAddMergeColumns.Name = "mnuPrepareDataFrameAddMergeColumns" - Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameAddMergeColumns.Text = "Add (Merge) Columns..." ' 'mnuPrepareDataFrameInsertColumnsRows ' Me.mnuPrepareDataFrameInsertColumnsRows.Name = "mnuPrepareDataFrameInsertColumnsRows" - Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameInsertColumnsRows.Tag = "Insert_Columns/Rows..." Me.mnuPrepareDataFrameInsertColumnsRows.Text = "Insert Columns/Rows..." ' 'mnuPrepareDataFrameDeleteColumnsRows ' Me.mnuPrepareDataFrameDeleteColumnsRows.Name = "mnuPrepareDataFrameDeleteColumnsRows" - Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..." Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..." ' @@ -3528,7 +3504,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameProtectColumn.Enabled = False Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn" - Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameProtectColumn.Tag = "..." Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False @@ -3536,7 +3512,7 @@ Partial Class frmMain 'mnuPrepareDataFrameHideColumns ' Me.mnuPrepareDataFrameHideColumns.Name = "mnuPrepareDataFrameHideColumns" - Me.mnuPrepareDataFrameHideColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameHideColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameHideColumns.Tag = "Hide_Columns..." Me.mnuPrepareDataFrameHideColumns.Text = "Hide/Show Columns..." ' @@ -3544,7 +3520,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns" - Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..." Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..." Me.mnuPrepareDataFrameFreezeColumns.Visible = False @@ -3552,7 +3528,7 @@ Partial Class frmMain 'mnuPrepareDataframeColourByProperty ' Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty" - Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..." ' 'mnuPrepareCheckData @@ -3560,96 +3536,96 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn}) Me.mnuPrepareCheckData.Name = "mnuPrepareCheckData" - Me.mnuPrepareCheckData.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData ' Me.mnuPrepareCheckDataVisualiseData.Name = "mnuPrepareCheckDataVisualiseData" - Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..." ' 'mnuPrepareCheckDataDuplicates ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" - Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' Me.mnuPrepareCheckDataCompareColumns.Name = "mnuPrepareCheckDataCompareColumns" - Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataCompareColumns.Text = "Compare Columns..." ' 'mnuPrepareCheckDataNonNumericCases ' Me.mnuPrepareCheckDataNonNumericCases.Name = "mnuPrepareCheckDataNonNumericCases" - Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator49 ' Me.ToolStripSeparator49.Name = "ToolStripSeparator49" - Me.ToolStripSeparator49.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataBoxplot ' Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot" - Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataBoxplot.Text = "Boxplot..." ' 'mnuPrepareCheckDataOneVariableSummarise ' Me.mnuPrepareCheckDataOneVariableSummarise.Name = "mnuPrepareCheckDataOneVariableSummarise" - Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuPrepareCheckDataOneVariableGraph ' Me.mnuPrepareCheckDataOneVariableGraph.Name = "mnuPrepareCheckDataOneVariableGraph" - Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuPrepareCheckDataOneWayFrequencies ' Me.mnuPrepareCheckDataOneWayFrequencies.Name = "mnuPrepareCheckDataOneWayFrequencies" - Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..." ' 'mnuPrepareCheckDataViewDeleteLabels ' Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels" - Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..." ' 'ToolStripSeparator41 ' Me.ToolStripSeparator41.Name = "ToolStripSeparator41" - Me.ToolStripSeparator41.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataExportOpenRefine ' Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine" - Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataExportOpenRefine.Text = "Export To OpenRefine..." ' 'mnuPrepareCheckDataImportOpenRefine ' Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" - Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' Me.ToolStripSeparator40.Name = "ToolStripSeparator40" - Me.ToolStripSeparator40.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator40.Size = New System.Drawing.Size(242, 6) ' 'mnuPreparePrepareToShareJitter ' Me.mnuPreparePrepareToShareJitter.Enabled = False Me.mnuPreparePrepareToShareJitter.Name = "mnuPreparePrepareToShareJitter" - Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(370, 34) + Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22) Me.mnuPreparePrepareToShareJitter.Text = "Jitter..." Me.mnuPreparePrepareToShareJitter.Visible = False ' @@ -3657,25 +3633,25 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage" - Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Text = "Prepare to Share (sdc package)..." Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Visible = False ' 'mnuPrepareCheckDataAnonymiseIDColumn ' Me.mnuPrepareCheckDataAnonymiseIDColumn.Name = "mnuPrepareCheckDataAnonymiseIDColumn" - Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataAnonymiseIDColumn.Text = "Anonymise ID Column..." ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(272, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(183, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Column: Calculator..." ' @@ -3683,64 +3659,64 @@ Partial Class frmMain ' Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows}) Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate" - Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' 'mnuPrepareColumnNumericRegularSequence ' Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence" - Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRegularSequence.Tag = "Regular_Sequence..." Me.mnuPrepareColumnNumericRegularSequence.Text = "Regular Sequence..." ' 'mnuPrepareColumnNumericEnter ' Me.mnuPrepareColumnNumericEnter.Name = "mnuPrepareColumnNumericEnter" - Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericEnter.Text = "Enter..." ' 'ToolStripSeparator25 ' Me.ToolStripSeparator25.Name = "ToolStripSeparator25" - Me.ToolStripSeparator25.Size = New System.Drawing.Size(301, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRowSummaries.Text = "Row Summaries..." ' 'mnuPrepareColumnNumericTransform ' Me.mnuPrepareColumnNumericTransform.Name = "mnuPrepareColumnNumericTransform" - Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericTransform.Tag = "Rank..." Me.mnuPrepareColumnNumericTransform.Text = "Transform..." ' 'mnuPrepareColumnNumericPolynomials ' Me.mnuPrepareColumnNumericPolynomials.Name = "mnuPrepareColumnNumericPolynomials" - Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPolynomials.Tag = "Polynomials..." Me.mnuPrepareColumnNumericPolynomials.Text = "Polynomials..." ' 'ToolStripSeparator56 ' Me.ToolStripSeparator56.Name = "ToolStripSeparator56" - Me.ToolStripSeparator56.Size = New System.Drawing.Size(301, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRandomSamples.Tag = "Random_Samples..." Me.mnuPrepareColumnNumericRandomSamples.Text = "Random Samples..." ' 'mnuPrepareColumnNumericPermuteRows ' Me.mnuPrepareColumnNumericPermuteRows.Name = "mnuPrepareColumnNumericPermuteRows" - Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' @@ -3748,105 +3724,105 @@ Partial Class frmMain ' Me.mnuPrepareColumnFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnFactorConvertToFactor, Me.mnuPrepareColumnFactorRecodeNumeric, Me.mnuPrepareColumnFactorCountInFactor, Me.ToolStripSeparator12, Me.mnuPrepareColumnFactorRecodeFactor, Me.mnuPrepareColumnFactorCombineFactors, Me.mnuPrepareColumnFactorDummyVariables, Me.ToolStripSeparator14, Me.mnuPrepareColumnFactorLevelsLabels, Me.mnuPrepareColumnFactorReorderLevels, Me.mnuPrepareColumnFactorReferenceLevel, Me.mnuPrepareColumnFactorUnusedLevels, Me.mnuPrepareColumnFactorContrasts, Me.ToolStripSeparator19, Me.mnuPrepareColumnFactorFactorDataFrame}) Me.mnuPrepareColumnFactor.Name = "mnuPrepareColumnFactor" - Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' 'mnuPrepareColumnFactorConvertToFactor ' Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor" - Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor" Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..." ' 'mnuPrepareColumnFactorRecodeNumeric ' Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric" - Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..." Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..." ' 'mnuPrepareColumnFactorCountInFactor ' Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor" - Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorRecodeFactor ' Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor" - Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..." Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..." ' 'mnuPrepareColumnFactorCombineFactors ' Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors" - Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..." Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..." ' 'mnuPrepareColumnFactorDummyVariables ' Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables" - Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..." Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..." ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorLevelsLabels ' Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels" - Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..." Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..." ' 'mnuPrepareColumnFactorReorderLevels ' Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels" - Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..." Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..." ' 'mnuPrepareColumnFactorReferenceLevel ' Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel" - Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..." Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..." ' 'mnuPrepareColumnFactorUnusedLevels ' Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels" - Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..." Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..." ' 'mnuPrepareColumnFactorContrasts ' Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts" - Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..." Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..." ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorFactorDataFrame ' Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame" - Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame" Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..." ' @@ -3854,42 +3830,42 @@ Partial Class frmMain ' Me.mnuPrepareColumnText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnTextFindReplace, Me.mnuPrepareColumnTextSearch, Me.mnuPrepareColumnTextTransform, Me.mnuPrepareColumnTextSplit, Me.mnuPrepareColumnTextCombine, Me.mnuPrepareColumnTextMatch, Me.mnuPrepareColumnTextDistance}) Me.mnuPrepareColumnText.Name = "mnuPrepareColumnText" - Me.mnuPrepareColumnText.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' 'mnuPrepareColumnTextFindReplace ' Me.mnuPrepareColumnTextFindReplace.Name = "mnuPrepareColumnTextFindReplace" - Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextFindReplace.Tag = "Find/Replace..." Me.mnuPrepareColumnTextFindReplace.Text = "Find/Replace..." ' 'mnuPrepareColumnTextSearch ' Me.mnuPrepareColumnTextSearch.Name = "mnuPrepareColumnTextSearch" - Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextSearch.Text = "Search..." Me.mnuPrepareColumnTextSearch.Visible = False ' 'mnuPrepareColumnTextTransform ' Me.mnuPrepareColumnTextTransform.Name = "mnuPrepareColumnTextTransform" - Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextTransform.Tag = "Transform..." Me.mnuPrepareColumnTextTransform.Text = "Transform..." ' 'mnuPrepareColumnTextSplit ' Me.mnuPrepareColumnTextSplit.Name = "mnuPrepareColumnTextSplit" - Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextSplit.Tag = "Split..." Me.mnuPrepareColumnTextSplit.Text = "Split..." ' 'mnuPrepareColumnTextCombine ' Me.mnuPrepareColumnTextCombine.Name = "mnuPrepareColumnTextCombine" - Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextCombine.Tag = "Combine..." Me.mnuPrepareColumnTextCombine.Text = "Combine..." ' @@ -3897,7 +3873,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnTextMatch.Enabled = False Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch" - Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextMatch.Tag = "Match..." Me.mnuPrepareColumnTextMatch.Text = "Match..." Me.mnuPrepareColumnTextMatch.Visible = False @@ -3905,7 +3881,7 @@ Partial Class frmMain 'mnuPrepareColumnTextDistance ' Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance" - Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextDistance.Tag = "Distance..." Me.mnuPrepareColumnTextDistance.Text = "Distance..." ' @@ -3913,38 +3889,38 @@ Partial Class frmMain ' Me.mnuPrepareColumnDate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDateGenerateDate, Me.mnuPrepareColumnDateMakeDate, Me.mnuPrepareColumnDateInfillMissingDates, Me.mnuPrepareColumnDateUseDate, Me.mnuPrepareColumnDateMakeTime, Me.mnuPrepareColumnDateUseTime}) Me.mnuPrepareColumnDate.Name = "mnuPrepareColumnDate" - Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate ' Me.mnuPrepareColumnDateGenerateDate.Name = "mnuPrepareColumnDateGenerateDate" - Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateGenerateDate.Text = "Generate Dates..." ' 'mnuPrepareColumnDateMakeDate ' Me.mnuPrepareColumnDateMakeDate.Name = "mnuPrepareColumnDateMakeDate" - Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateMakeDate.Text = "Make Date..." ' 'mnuPrepareColumnDateInfillMissingDates ' Me.mnuPrepareColumnDateInfillMissingDates.Name = "mnuPrepareColumnDateInfillMissingDates" - Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuPrepareColumnDateUseDate ' Me.mnuPrepareColumnDateUseDate.Name = "mnuPrepareColumnDateUseDate" - Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateUseDate.Text = "Use Date..." ' 'mnuPrepareColumnDateMakeTime ' Me.mnuPrepareColumnDateMakeTime.Enabled = False Me.mnuPrepareColumnDateMakeTime.Name = "mnuPrepareColumnDateMakeTime" - Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..." Me.mnuPrepareColumnDateMakeTime.Visible = False ' @@ -3952,7 +3928,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDateUseTime.Enabled = False Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" - Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateUseTime.Text = "Use Time..." Me.mnuPrepareColumnDateUseTime.Visible = False ' @@ -3960,170 +3936,170 @@ Partial Class frmMain ' Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" - Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(263, 34) + Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22) Me.mnuPrepareColumnDefineConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator55 ' Me.ToolStripSeparator55.Name = "ToolStripSeparator55" - Me.ToolStripSeparator55.Size = New System.Drawing.Size(260, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(263, 34) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(272, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(183, 6) ' 'mnuPrepareDataReshape ' Me.mnuPrepareDataReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnReshapeColumnSummaries, Me.mnuPrepareColumnReshapeGeneralSummaries, Me.ToolStripSeparator10, Me.mnuPrepareColumnReshapeStack, Me.mnuPrepareColumnReshapeUnstack, Me.mnuPrepareColumnReshapeMerge, Me.ToolStripSeparator11, Me.mnuPrepareAppendDataFrame, Me.mnuPrepareColumnReshapeSubset, Me.mnuPrepareColumnReshapeRandomSubset, Me.mnuPrepareColumnReshapeTranspose, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" - Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' 'mnuPrepareColumnReshapeColumnSummaries ' Me.mnuPrepareColumnReshapeColumnSummaries.Name = "mnuPrepareColumnReshapeColumnSummaries" - Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeColumnSummaries.Tag = "Column_Summaries..." Me.mnuPrepareColumnReshapeColumnSummaries.Text = "Column Summaries..." ' 'mnuPrepareColumnReshapeGeneralSummaries ' Me.mnuPrepareColumnReshapeGeneralSummaries.Name = "mnuPrepareColumnReshapeGeneralSummaries" - Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeGeneralSummaries.Text = "General Summaries..." ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareColumnReshapeStack ' Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack" - Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeStack.Tag = "Stack..." Me.mnuPrepareColumnReshapeStack.Text = "Stack (Pivot Longer)..." ' 'mnuPrepareColumnReshapeUnstack ' Me.mnuPrepareColumnReshapeUnstack.Name = "mnuPrepareColumnReshapeUnstack" - Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeUnstack.Tag = "Unstack..." Me.mnuPrepareColumnReshapeUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuPrepareColumnReshapeMerge ' Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge" - Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..." Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..." ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareAppendDataFrame ' Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame" - Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareAppendDataFrame.Text = "Append (Bind Rows)..." ' 'mnuPrepareColumnReshapeSubset ' Me.mnuPrepareColumnReshapeSubset.Name = "mnuPrepareColumnReshapeSubset" - Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeSubset.Tag = "Subset..." Me.mnuPrepareColumnReshapeSubset.Text = "Subset..." ' 'mnuPrepareColumnReshapeRandomSubset ' Me.mnuPrepareColumnReshapeRandomSubset.Name = "mnuPrepareColumnReshapeRandomSubset" - Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeRandomSubset.Tag = "Random_Subset..." Me.mnuPrepareColumnReshapeRandomSubset.Text = "Random Subset..." ' 'mnuPrepareColumnReshapeTranspose ' Me.mnuPrepareColumnReshapeTranspose.Name = "mnuPrepareColumnReshapeTranspose" - Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeTranspose.Tag = "Transpose..." Me.mnuPrepareColumnReshapeTranspose.Text = "Transpose..." ' 'mnuPrepareDataReshapeScaleOrDistance ' Me.mnuPrepareDataReshapeScaleOrDistance.Name = "mnuPrepareDataReshapeScaleOrDistance" - Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..." ' 'mnuPrepareDataReshapeRandomSplit ' Me.mnuPrepareDataReshapeRandomSplit.Enabled = False Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" - Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(272, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(183, 6) ' 'mnuPrepareKeysAndLinks ' Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment}) Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks" - Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey ' Me.mnuPrepareKeysAndLinksAddKey.Name = "mnuPrepareKeysAndLinksAddKey" - Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddKey.Text = "Add Key..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKey ' Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Name = "mnuPrepareKeysAndLinksViewAndRemoveKey" - Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Text = "View and Remove Keys..." ' 'mnuPrepareKeysAndLinksAddLink ' Me.mnuPrepareKeysAndLinksAddLink.Name = "mnuPrepareKeysAndLinksAddLink" - Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddLink.Text = "Add Link..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKeys ' Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Name = "mnuPrepareKeysAndLinksViewAndRemoveKeys" - Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Text = "View and Remove Links..." ' 'mnuPrepareKeysAndLinksAddComment ' Me.mnuPrepareKeysAndLinksAddComment.Name = "mnuPrepareKeysAndLinksAddComment" - Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddComment.Text = "Add Comment..." ' 'mnuPrepareDataBook ' Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata}) Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook" - Me.mnuPrepareDataBook.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4131,7 +4107,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata" - Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDataFrameMetadata.Tag = "Data_Frame_Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Text = "Data Frame Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Visible = False @@ -4139,46 +4115,46 @@ Partial Class frmMain 'mnuPrepareDataObjectRenameDataFrame ' Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame" - Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectRenameDataFrame.Tag = "ReName_Data_Frame..." Me.mnuPrepareDataObjectRenameDataFrame.Text = "Rename Data Frame..." ' 'mnuPrepareDataObjectReorderDataFrames ' Me.mnuPrepareDataObjectReorderDataFrames.Name = "mnuPrepareDataObjectReorderDataFrames" - Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectReorderDataFrames.Tag = "Reorder_Data_Frames..." Me.mnuPrepareDataObjectReorderDataFrames.Text = "Reorder Data Frames..." ' 'mnuPrepareDataObjectCopyDataFrame ' Me.mnuPrepareDataObjectCopyDataFrame.Name = "mnuPrepareDataObjectCopyDataFrame" - Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectCopyDataFrame.Tag = "Copy_Data_Frame..." Me.mnuPrepareDataObjectCopyDataFrame.Text = "Copy Data Frame..." ' 'mnuPrepareDataObjectDeleteDataFrame ' Me.mnuPrepareDataObjectDeleteDataFrame.Name = "mnuPrepareDataObjectDeleteDataFrame" - Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDeleteDataFrame.Tag = "Delete_Data_Frame..." Me.mnuPrepareDataObjectDeleteDataFrame.Text = "Delete Data Frames..." ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(315, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6) ' 'mnuPrepareDataObjectHideDataframes ' Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes" - Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectHideDataframes.Text = "Hide/Show Data Frames..." ' 'mnuPrepareDataObjectMetadata ' Me.mnuPrepareDataObjectMetadata.Name = "mnuPrepareDataObjectMetadata" - Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..." Me.mnuPrepareDataObjectMetadata.Text = "Metadata..." ' @@ -4186,7 +4162,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectRenameMetadata.Enabled = False Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata" - Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Visible = False @@ -4195,7 +4171,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectReorderMetadata.Enabled = False Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata" - Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Visible = False @@ -4204,7 +4180,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata" - Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Visible = False @@ -4213,35 +4189,35 @@ Partial Class frmMain ' Me.mnuPrepareRObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareRObjectsView, Me.mnuPrepareRObjectsRename, Me.mnuPrepareRObjectsReorder, Me.mnuPrepareRObjectsDelete}) Me.mnuPrepareRObjects.Name = "mnuPrepareRObjects" - Me.mnuPrepareRObjects.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' 'mnuPrepareRObjectsView ' Me.mnuPrepareRObjectsView.Name = "mnuPrepareRObjectsView" - Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsView.Tag = "View..." Me.mnuPrepareRObjectsView.Text = "View..." ' 'mnuPrepareRObjectsRename ' Me.mnuPrepareRObjectsRename.Name = "mnuPrepareRObjectsRename" - Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsRename.Tag = "Rename..." Me.mnuPrepareRObjectsRename.Text = "Rename..." ' 'mnuPrepareRObjectsReorder ' Me.mnuPrepareRObjectsReorder.Name = "mnuPrepareRObjectsReorder" - Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsReorder.Tag = "Reorder" Me.mnuPrepareRObjectsReorder.Text = "Reorder..." ' 'mnuPrepareRObjectsDelete ' Me.mnuPrepareRObjectsDelete.Name = "mnuPrepareRObjectsDelete" - Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsDelete.Tag = "Delete..." Me.mnuPrepareRObjectsDelete.Text = "Delete..." ' @@ -4249,78 +4225,78 @@ Partial Class frmMain ' Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext, Me.mnuStructuredSurvey}) Me.mnuStructured.Name = "mnuStructured" - Me.mnuStructured.Size = New System.Drawing.Size(109, 29) + Me.mnuStructured.Size = New System.Drawing.Size(74, 22) Me.mnuStructured.Text = "Structured" ' 'mnuStructuredCircular ' Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine, Me.mnuStructuredCircularCalculator, Me.mnuStructuredCircularSummaries, Me.ToolStripSeparator46, Me.mnuStructuredCircularDensityPlot, Me.ToolStripSeparator67, Me.mnuStructuredCircularWindRose, Me.mnuStructuredCircularWindPollutionRose, Me.mnuStructuredCircularOtherRosePlots, Me.ToolStripSeparator68, Me.mnuStructuredCircularCirclize}) Me.mnuStructuredCircular.Name = "mnuStructuredCircular" - Me.mnuStructuredCircular.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredCircular.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredCircular.Text = "Circular" ' 'mnuStructuredCircularDefine ' Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" - Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularDefine.Text = "Define..." ' 'mnuStructuredCircularCalculator ' Me.mnuStructuredCircularCalculator.Name = "mnuStructuredCircularCalculator" - Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularCalculator.Text = "Calculator..." ' 'mnuStructuredCircularSummaries ' Me.mnuStructuredCircularSummaries.Name = "mnuStructuredCircularSummaries" - Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularSummaries.Text = "Summaries..." ' 'ToolStripSeparator46 ' Me.ToolStripSeparator46.Name = "ToolStripSeparator46" - Me.ToolStripSeparator46.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularDensityPlot ' Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot" - Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularDensityPlot.Text = "Circular Plots..." ' 'ToolStripSeparator67 ' Me.ToolStripSeparator67.Name = "ToolStripSeparator67" - Me.ToolStripSeparator67.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularWindRose ' Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose" - Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularWindRose.Text = "Wind Rose..." ' 'mnuStructuredCircularWindPollutionRose ' Me.mnuStructuredCircularWindPollutionRose.Name = "mnuStructuredCircularWindPollutionRose" - Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuStructuredCircularOtherRosePlots ' Me.mnuStructuredCircularOtherRosePlots.Name = "mnuStructuredCircularOtherRosePlots" - Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularOtherRosePlots.Text = "Other Rose Plots" ' 'ToolStripSeparator68 ' Me.ToolStripSeparator68.Name = "ToolStripSeparator68" - Me.ToolStripSeparator68.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator68.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularCirclize ' Me.mnuStructuredCircularCirclize.Enabled = False Me.mnuStructuredCircularCirclize.Name = "mnuStructuredCircularCirclize" - Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularCirclize.Text = "Circlize..." Me.mnuStructuredCircularCirclize.Visible = False ' @@ -4328,126 +4304,126 @@ Partial Class frmMain ' Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" - Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredLow_Flow.Text = "Low_Flow" Me.mnuStructuredLow_Flow.Visible = False ' 'mnuStructuredLow_FlowDefine ' Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" - Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(177, 34) + Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(117, 22) Me.mnuStructuredLow_FlowDefine.Text = "Define..." ' 'mnuStructuredSurvival ' Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" - Me.mnuStructuredSurvival.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredSurvival.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredSurvival.Text = "Survival" ' 'mnuStructuredSurvivalDefine ' Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" - Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(177, 34) + Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(117, 22) Me.mnuStructuredSurvivalDefine.Text = "Define..." ' 'mnuStructuredTimeSeries ' Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" - Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredTimeSeries.Text = "Time Series" Me.mnuStructuredTimeSeries.Visible = False ' 'mnuStructuredTimeSeriesDefine ' Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" - Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesDefine.Text = "Define..." ' 'ToolStripSeparator60 ' Me.ToolStripSeparator60.Name = "ToolStripSeparator60" - Me.ToolStripSeparator60.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator60.Size = New System.Drawing.Size(116, 6) ' 'mnuStructuredTimeSeriesDescribe ' Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" - Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesDescribe.Text = "Describe" ' 'mnuStructuredTimeSeriesDescribeOneVariable ' Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" - Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesDescribeOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesDescribeGeneral ' Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" - Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesDescribeGeneral.Text = "General..." ' 'ToolStripSeparator61 ' Me.ToolStripSeparator61.Name = "ToolStripSeparator61" - Me.ToolStripSeparator61.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator61.Size = New System.Drawing.Size(116, 6) ' 'mnuStructuredTimeSeriesModel ' Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" - Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesModel.Text = "Model" ' 'mnuStructuredTimeSeriesModelOneVariable ' Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesModelOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesModelGeneral ' Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesModelGeneral.Text = "General..." ' 'ToolStripSeparator62 ' Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - Me.ToolStripSeparator62.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6) ' 'ToolStripSeparator63 ' Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - Me.ToolStripSeparator63.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6) ' 'mnuStructuredClimatic ' Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - Me.mnuStructuredClimatic.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredClimatic.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredClimatic.Text = "Climatic..." Me.mnuStructuredClimatic.Visible = False ' 'mnuStructuredProcurement ' Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - Me.mnuStructuredProcurement.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredProcurement.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredProcurement.Text = "Procurement..." Me.mnuStructuredProcurement.Visible = False ' 'mnuStructuredOptionByContext ' Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredOptionByContext.Text = "Options by Context..." Me.mnuStructuredOptionByContext.Visible = False ' 'mnuStructuredSurvey ' Me.mnuStructuredSurvey.Name = "mnuStructuredSurvey" - Me.mnuStructuredSurvey.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredSurvey.Text = "Survey" Me.mnuStructuredSurvey.Visible = False ' @@ -4455,424 +4431,424 @@ Partial Class frmMain ' Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI}) Me.mnuProcurement.Name = "mnuProcurement" - Me.mnuProcurement.Size = New System.Drawing.Size(129, 29) + Me.mnuProcurement.Size = New System.Drawing.Size(88, 22) Me.mnuProcurement.Text = "Procurement" ' 'mnuProcurementOpenFromLibrary ' Me.mnuProcurementOpenFromLibrary.Name = "mnuProcurementOpenFromLibrary" - Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementOpenFromLibrary.Text = "Open From Library..." ' 'mnuProcurementDefineData ' Me.mnuProcurementDefineData.Name = "mnuProcurementDefineData" - Me.mnuProcurementDefineData.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDefineData.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDefineData.Text = "Define Procurement Data..." ' 'mnuProcurementPrepare ' Me.mnuProcurementPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementPrepareFilterByCountry, Me.ToolStripSeparator42, Me.mnuProcurementPrepareDefineContractValueCategories, Me.mnuProcurementPrepareRecodeNumericIntoQuantiles, Me.mnuProcurementPrepareSetFactorReferenceLevel, Me.mnuProcurementPrepareUseAwardDate, Me.ToolStripSeparator43, Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther, Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther, Me.mnuProcurementPrepareMergeAdditionalData}) Me.mnuProcurementPrepare.Name = "mnuProcurementPrepare" - Me.mnuProcurementPrepare.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementPrepare.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementPrepare.Text = "Prepare" ' 'mnuProcurementPrepareFilterByCountry ' Me.mnuProcurementPrepareFilterByCountry.Name = "mnuProcurementPrepareFilterByCountry" - Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareFilterByCountry.Text = "Filter by Country (or other)..." ' 'ToolStripSeparator42 ' Me.ToolStripSeparator42.Name = "ToolStripSeparator42" - Me.ToolStripSeparator42.Size = New System.Drawing.Size(536, 6) + Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareDefineContractValueCategories ' Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories" - Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareDefineContractValueCategories.Text = "Define Contract Value Categories..." ' 'mnuProcurementPrepareRecodeNumericIntoQuantiles ' Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Name = "mnuProcurementPrepareRecodeNumericIntoQuantiles" - Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Text = "Recode Numeric into Quantiles..." ' 'mnuProcurementPrepareSetFactorReferenceLevel ' Me.mnuProcurementPrepareSetFactorReferenceLevel.Name = "mnuProcurementPrepareSetFactorReferenceLevel" - Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSetFactorReferenceLevel.Text = "Set Factor Reference Level..." ' 'mnuProcurementPrepareUseAwardDate ' Me.mnuProcurementPrepareUseAwardDate.Name = "mnuProcurementPrepareUseAwardDate" - Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareUseAwardDate.Text = "Use Award Date (or other)..." ' 'ToolStripSeparator43 ' Me.ToolStripSeparator43.Name = "ToolStripSeparator43" - Me.ToolStripSeparator43.Size = New System.Drawing.Size(536, 6) + Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareSummariseRedFlagsByCountryorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Text = "Summarise Red Flags by Country (or other)..." ' 'mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Text = "Summarise Red Flags by Country and Year (or other)..." ' 'mnuProcurementPrepareMergeAdditionalData ' Me.mnuProcurementPrepareMergeAdditionalData.Name = "mnuProcurementPrepareMergeAdditionalData" - Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuProcurementDescribe ' Me.mnuProcurementDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeOneVariableSummarise, Me.mnuProcurementDescribeOneVariableGraph, Me.ToolStripSeparator44, Me.mnuProcurementDescribeCategorical, Me.mnuProcurementDescribeNumeric}) Me.mnuProcurementDescribe.Name = "mnuProcurementDescribe" - Me.mnuProcurementDescribe.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDescribe.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDescribe.Text = "Describe" ' 'mnuProcurementDescribeOneVariableSummarise ' Me.mnuProcurementDescribeOneVariableSummarise.Name = "mnuProcurementDescribeOneVariableSummarise" - Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuProcurementDescribeOneVariableGraph ' Me.mnuProcurementDescribeOneVariableGraph.Name = "mnuProcurementDescribeOneVariableGraph" - Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeOneVariableGraph.Text = "One Variable Graph..." ' 'ToolStripSeparator44 ' Me.ToolStripSeparator44.Name = "ToolStripSeparator44" - Me.ToolStripSeparator44.Size = New System.Drawing.Size(316, 6) + Me.ToolStripSeparator44.Size = New System.Drawing.Size(208, 6) ' 'mnuProcurementDescribeCategorical ' Me.mnuProcurementDescribeCategorical.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeCategoricalOneVarFreq, Me.mnuProcurementDescribeCategoricalTwoVarFreq, Me.ToolStripSeparator52, Me.mnuProcurementDescribeCategoricalBarCharts, Me.mnuProcurementDescribeCategoricalMosaic, Me.mnuProcurementDescribeCategoricalTreemap, Me.DisplayTopNToolStripMenuItem}) Me.mnuProcurementDescribeCategorical.Name = "mnuProcurementDescribeCategorical" - Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeCategorical.Text = "Categorical" ' 'mnuProcurementDescribeCategoricalOneVarFreq ' Me.mnuProcurementDescribeCategoricalOneVarFreq.Name = "mnuProcurementDescribeCategoricalOneVarFreq" - Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalOneVarFreq.Text = "One Variable Frequencies..." ' 'mnuProcurementDescribeCategoricalTwoVarFreq ' Me.mnuProcurementDescribeCategoricalTwoVarFreq.Name = "mnuProcurementDescribeCategoricalTwoVarFreq" - Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalTwoVarFreq.Text = "Two Variable Frequencies by Sector (or other)..." ' 'ToolStripSeparator52 ' Me.ToolStripSeparator52.Name = "ToolStripSeparator52" - Me.ToolStripSeparator52.Size = New System.Drawing.Size(479, 6) + Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6) ' 'mnuProcurementDescribeCategoricalBarCharts ' Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts" - Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalBarCharts.Text = "Bar Chart..." ' 'mnuProcurementDescribeCategoricalMosaic ' Me.mnuProcurementDescribeCategoricalMosaic.Name = "mnuProcurementDescribeCategoricalMosaic" - Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalMosaic.Text = "Mosaic Plot..." ' 'mnuProcurementDescribeCategoricalTreemap ' Me.mnuProcurementDescribeCategoricalTreemap.Name = "mnuProcurementDescribeCategoricalTreemap" - Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalTreemap.Text = "Treemap..." ' 'DisplayTopNToolStripMenuItem ' Me.DisplayTopNToolStripMenuItem.Name = "DisplayTopNToolStripMenuItem" - Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(482, 34) + Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(319, 22) Me.DisplayTopNToolStripMenuItem.Text = "Display Top N..." ' 'mnuProcurementDescribeNumeric ' Me.mnuProcurementDescribeNumeric.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeNumericBoxplot, Me.HistogramToolStripMenuItem, Me.ToolStripSeparator53, Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers}) Me.mnuProcurementDescribeNumeric.Name = "mnuProcurementDescribeNumeric" - Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeNumeric.Text = "Numeric" ' 'mnuProcurementDescribeNumericBoxplot ' Me.mnuProcurementDescribeNumericBoxplot.Name = "mnuProcurementDescribeNumericBoxplot" - Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(389, 34) + Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(258, 22) Me.mnuProcurementDescribeNumericBoxplot.Text = "Boxplot..." ' 'HistogramToolStripMenuItem ' Me.HistogramToolStripMenuItem.Name = "HistogramToolStripMenuItem" - Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(389, 34) + Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(258, 22) Me.HistogramToolStripMenuItem.Text = "Histogram..." ' 'ToolStripSeparator53 ' Me.ToolStripSeparator53.Name = "ToolStripSeparator53" - Me.ToolStripSeparator53.Size = New System.Drawing.Size(386, 6) + Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6) ' 'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers ' Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers" - Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(389, 34) + Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(258, 22) Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Text = "Correlations (Red Flags or others)..." ' 'mnuProcurementMapping ' Me.mnuProcurementMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementMappingMapCountryValues}) Me.mnuProcurementMapping.Name = "mnuProcurementMapping" - Me.mnuProcurementMapping.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementMapping.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementMapping.Text = "Mapping" ' 'mnuProcurementMappingMapCountryValues ' Me.mnuProcurementMappingMapCountryValues.Name = "mnuProcurementMappingMapCountryValues" - Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(285, 34) + Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(189, 22) Me.mnuProcurementMappingMapCountryValues.Text = "Map Country Values..." ' 'mnuProcurementModel ' Me.mnuProcurementModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementModelDefineCorruption, Me.mnuProcurementModelFitModelToolStripMenuItem}) Me.mnuProcurementModel.Name = "mnuProcurementModel" - Me.mnuProcurementModel.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementModel.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementModel.Text = "Model" ' 'mnuProcurementModelDefineCorruption ' Me.mnuProcurementModelDefineCorruption.Name = "mnuProcurementModelDefineCorruption" - Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(351, 34) + Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(233, 22) Me.mnuProcurementModelDefineCorruption.Text = "Define Corruption Indicators..." ' 'mnuProcurementModelFitModelToolStripMenuItem ' Me.mnuProcurementModelFitModelToolStripMenuItem.Name = "mnuProcurementModelFitModelToolStripMenuItem" - Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(351, 34) + Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(233, 22) Me.mnuProcurementModelFitModelToolStripMenuItem.Text = "Fit Model..." ' 'ToolStripSeparator45 ' Me.ToolStripSeparator45.Name = "ToolStripSeparator45" - Me.ToolStripSeparator45.Size = New System.Drawing.Size(324, 6) + Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6) ' 'mnuProcurementDefineRedFlags ' Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags" - Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDefineRedFlags.Text = "Define Red Flag Variables..." ' 'mnuProcurementUseCRI ' Me.mnuProcurementUseCRI.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementCTFVCalculateCRI, Me.mnuProcurementUseCRISummariseCRIbyCountry}) Me.mnuProcurementUseCRI.Name = "mnuProcurementUseCRI" - Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementUseCRI.Text = "Corruption Risk Index (CRI)" ' 'mnuProcurementCTFVCalculateCRI ' Me.mnuProcurementCTFVCalculateCRI.Name = "mnuProcurementCTFVCalculateCRI" - Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(418, 34) + Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(278, 22) Me.mnuProcurementCTFVCalculateCRI.Text = "Define Corruption Risk Index (CRI)..." ' 'mnuProcurementUseCRISummariseCRIbyCountry ' Me.mnuProcurementUseCRISummariseCRIbyCountry.Name = "mnuProcurementUseCRISummariseCRIbyCountry" - Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(418, 34) + Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(278, 22) Me.mnuProcurementUseCRISummariseCRIbyCountry.Text = "Summarise CRI by Country (or other)..." ' 'mnuOptionsByContext ' Me.mnuOptionsByContext.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckData, Me.mnuOptionsByContextDefine, Me.mnuOptionsByContextPrepare, Me.mnuOptionsByContextDescribe, Me.mnuOptionsByContextModel, Me.mnuOptionsByContextCropModel}) Me.mnuOptionsByContext.Name = "mnuOptionsByContext" - Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 29) + Me.mnuOptionsByContext.Size = New System.Drawing.Size(84, 22) Me.mnuOptionsByContext.Text = "Experiments" ' 'mnuOptionsByContextCheckData ' Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" - Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows ' Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" - Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' Me.mnuOptionsByContextCheckDataCompareColumns.Name = "mnuOptionsByContextCheckDataCompareColumns" - Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataCompareColumns.Text = "Compare Columns..." ' 'ToolStripSeparator47 ' Me.ToolStripSeparator47.Name = "ToolStripSeparator47" - Me.ToolStripSeparator47.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6) ' 'mnuOptionsByContextCheckDataOneVariableSummarise ' Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise" - Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuOptionsByContextCheckDataOneVariableGraph ' Me.mnuOptionsByContextCheckDataOneVariableGraph.Name = "mnuOptionsByContextCheckDataOneVariableGraph" - Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuOptionsByContextCheckDataOneVariableFrequencies ' Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Name = "mnuOptionsByContextCheckDataOneVariableFrequencies" - Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'mnuOptionsByContextDefine ' Me.mnuOptionsByContextDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDefineOnStation, Me.mnuOptionsByContextDefineOnFarm}) Me.mnuOptionsByContextDefine.Name = "mnuOptionsByContextDefine" - Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation ' Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" - Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(222, 34) + Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(147, 22) Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..." ' 'mnuOptionsByContextDefineOnFarm ' Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm" - Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(222, 34) + Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(147, 22) Me.mnuOptionsByContextDefineOnFarm.Text = "On - Farm..." ' 'mnuOptionsByContextPrepare ' Me.mnuOptionsByContextPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions, Me.ToolStripSeparator48, Me.mnuOptionsByContextMergeAdditionalData, Me.mnuOptionsByContextPrepareStack, Me.mnuOptionsByContextPrepareUnstack}) Me.mnuOptionsByContextPrepare.Name = "mnuOptionsByContextPrepare" - Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions ' Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Name = "mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions" - Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Text = "Calculate Difference Between Options..." ' 'ToolStripSeparator48 ' Me.ToolStripSeparator48.Name = "ToolStripSeparator48" - Me.ToolStripSeparator48.Size = New System.Drawing.Size(418, 6) + Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6) ' 'mnuOptionsByContextMergeAdditionalData ' Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData" - Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuOptionsByContextPrepareStack ' Me.mnuOptionsByContextPrepareStack.Name = "mnuOptionsByContextPrepareStack" - Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareStack.Text = "Stack (Pivot Longer)..." ' 'mnuOptionsByContextPrepareUnstack ' Me.mnuOptionsByContextPrepareUnstack.Name = "mnuOptionsByContextPrepareUnstack" - Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuOptionsByContextDescribe ' Me.mnuOptionsByContextDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDescribeCompareTwoTreatments, Me.mnuOptionsByContextDescribeCompareMultipleTreatments, Me.mnuOptionsByContextDescribeBoxplot}) Me.mnuOptionsByContextDescribe.Name = "mnuOptionsByContextDescribe" - Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments ' Me.mnuOptionsByContextDescribeCompareTwoTreatments.Name = "mnuOptionsByContextDescribeCompareTwoTreatments" - Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeCompareTwoTreatments.Text = "Compare Two Options..." ' 'mnuOptionsByContextDescribeCompareMultipleTreatments ' Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Enabled = False Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Name = "mnuOptionsByContextDescribeCompareMultipleTreatments" - Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Text = "Compare Multiple Options..." ' 'mnuOptionsByContextDescribeBoxplot ' Me.mnuOptionsByContextDescribeBoxplot.Name = "mnuOptionsByContextDescribeBoxplot" - Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeBoxplot.Text = "Boxplot..." ' 'mnuOptionsByContextModel ' Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel}) Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel" - Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel ' Me.mnuOptionsByContextModelFitModel.Name = "mnuOptionsByContextModelFitModel" - Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(265, 34) + Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextModelFitModel.Text = "Fit Model..." ' 'mnuOptionsByContextGeneralFitModel ' Me.mnuOptionsByContextGeneralFitModel.Name = "mnuOptionsByContextGeneralFitModel" - Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(265, 34) + Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextGeneralFitModel.Text = "General Fit Model..." ' 'mnuOptionsByContextCropModel ' Me.mnuOptionsByContextCropModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCropModelApsimxExamples}) Me.mnuOptionsByContextCropModel.Name = "mnuOptionsByContextCropModel" - Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextCropModel.Text = "Crop Model" ' 'mnuOptionsByContextCropModelApsimxExamples ' Me.mnuOptionsByContextCropModelApsimxExamples.Name = "mnuOptionsByContextCropModelApsimxExamples" - Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(264, 34) + Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextCropModelApsimxExamples.Text = "Apsimx Examples..." ' 'mnuTools ' Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsLoadOptions, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" - Me.mnuTools.Size = New System.Drawing.Size(69, 29) + Me.mnuTools.Size = New System.Drawing.Size(46, 22) Me.mnuTools.Text = "Tools" ' 'mnuToolsRunRCode ' Me.mnuToolsRunRCode.Enabled = False Me.mnuToolsRunRCode.Name = "mnuToolsRunRCode" - Me.mnuToolsRunRCode.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRunRCode.Tag = "Run_R_Code..." Me.mnuToolsRunRCode.Text = "Run R Code..." ' @@ -4880,7 +4856,7 @@ Partial Class frmMain ' Me.mnuToolsRestartR.Enabled = False Me.mnuToolsRestartR.Name = "mnuToolsRestartR" - Me.mnuToolsRestartR.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRestartR.Tag = "Restart_R" Me.mnuToolsRestartR.Text = "Restart R" ' @@ -4888,27 +4864,27 @@ Partial Class frmMain ' Me.mnuToolsCheckForUpdates.Enabled = False Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates" - Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(198, 22) Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates..." Me.mnuToolsCheckForUpdates.Text = "Check for Updates..." ' 'mnuToolsClearOutputWindow ' Me.mnuToolsClearOutputWindow.Name = "mnuToolsClearOutputWindow" - Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(198, 22) Me.mnuToolsClearOutputWindow.Tag = "Clear_Output_Window..." Me.mnuToolsClearOutputWindow.Text = "Clear Output Window..." ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(295, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(195, 6) ' 'mnuToolsSaveCurrentOptions ' Me.mnuToolsSaveCurrentOptions.Enabled = False Me.mnuToolsSaveCurrentOptions.Name = "mnuToolsSaveCurrentOptions" - Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' @@ -4916,20 +4892,20 @@ Partial Class frmMain ' Me.mnuToolsLoadOptions.Enabled = False Me.mnuToolsLoadOptions.Name = "mnuToolsLoadOptions" - Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsLoadOptions.Tag = "Load_Options..." Me.mnuToolsLoadOptions.Text = "Load Options..." ' 'mnuToolsInstallRPackage ' Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage" - Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(198, 22) Me.mnuToolsInstallRPackage.Text = "Install R Package..." ' 'mnuToolsOptions ' Me.mnuToolsOptions.Name = "mnuToolsOptions" - Me.mnuToolsOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' @@ -4943,8 +4919,7 @@ Partial Class frmMain ' Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill - Me.splOverall.Location = New System.Drawing.Point(0, 72) - Me.splOverall.Margin = New System.Windows.Forms.Padding(4) + Me.splOverall.Location = New System.Drawing.Point(0, 61) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -4957,9 +4932,9 @@ Partial Class frmMain ' Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) - Me.splOverall.Size = New System.Drawing.Size(1251, 619) - Me.splOverall.SplitterDistance = 259 - Me.splOverall.SplitterWidth = 8 + Me.splOverall.Size = New System.Drawing.Size(834, 399) + Me.splOverall.SplitterDistance = 166 + Me.splOverall.SplitterWidth = 5 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -4967,7 +4942,6 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) - Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -4979,9 +4953,9 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - Me.splExtraWindows.Size = New System.Drawing.Size(1251, 259) - Me.splExtraWindows.SplitterDistance = 381 - Me.splExtraWindows.SplitterWidth = 8 + Me.splExtraWindows.Size = New System.Drawing.Size(834, 166) + Me.splExtraWindows.SplitterDistance = 254 + Me.splExtraWindows.SplitterWidth = 5 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -4989,7 +4963,6 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) - Me.splMetadata.Margin = New System.Windows.Forms.Padding(4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -5000,9 +4973,9 @@ Partial Class frmMain ' Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) - Me.splMetadata.Size = New System.Drawing.Size(381, 259) - Me.splMetadata.SplitterDistance = 106 - Me.splMetadata.SplitterWidth = 8 + Me.splMetadata.Size = New System.Drawing.Size(254, 166) + Me.splMetadata.SplitterDistance = 70 + Me.splMetadata.SplitterWidth = 5 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -5012,9 +4985,9 @@ Partial Class frmMain Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrColumnMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(106, 259) + Me.ucrColumnMeta.Size = New System.Drawing.Size(70, 166) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5023,9 +4996,9 @@ Partial Class frmMain Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataFrameMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(267, 259) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 166) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5034,9 +5007,9 @@ Partial Class frmMain Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrScriptWindow.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) - Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(862, 259) + Me.ucrScriptWindow.Size = New System.Drawing.Size(575, 166) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5046,7 +5019,6 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) - Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5058,9 +5030,9 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - Me.splDataOutput.Size = New System.Drawing.Size(1251, 352) - Me.splDataOutput.SplitterDistance = 576 - Me.splDataOutput.SplitterWidth = 8 + Me.splDataOutput.Size = New System.Drawing.Size(834, 228) + Me.splDataOutput.SplitterDistance = 384 + Me.splDataOutput.SplitterWidth = 5 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5070,9 +5042,9 @@ Partial Class frmMain Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) - Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(576, 352) + Me.ucrDataViewer.Size = New System.Drawing.Size(384, 228) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5082,9 +5054,9 @@ Partial Class frmMain Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrOutput.Location = New System.Drawing.Point(0, 0) - Me.ucrOutput.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(667, 352) + Me.ucrOutput.Size = New System.Drawing.Size(445, 228) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5122,11 +5094,34 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' + 'mnuDescribeGraphGraphics + ' + Me.mnuDescribeGraphGraphics.Name = "mnuDescribeGraphGraphics" + Me.mnuDescribeGraphGraphics.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeGraphGraphics.Text = "Graphics..." + ' + 'mnuDescribeGeneralTables + ' + Me.mnuDescribeGeneralTables.Name = "mnuDescribeGeneralTables" + Me.mnuDescribeGeneralTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralTables.Text = "Tables..." + ' + 'mnuDescribeGeneralPivotTable + ' + Me.mnuDescribeGeneralPivotTable.Name = "mnuDescribeGeneralPivotTable" + Me.mnuDescribeGeneralPivotTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralPivotTable.Text = "Pivot Table..." + ' + 'ToolStripSeparator27 + ' + Me.ToolStripSeparator27.Name = "ToolStripSeparator27" + Me.ToolStripSeparator27.Size = New System.Drawing.Size(177, 6) + ' 'frmMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(1251, 723) + Me.ClientSize = New System.Drawing.Size(834, 482) Me.Controls.Add(Me.splOverall) Me.Controls.Add(Me.stsStrip) Me.Controls.Add(Me.Tool_strip) @@ -5134,7 +5129,6 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar - Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "frmMain" Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized @@ -5305,7 +5299,6 @@ Partial Class frmMain Friend WithEvents mnuDescribeTwoVariablesTabulate As ToolStripMenuItem Friend WithEvents mnuDescribeTwoVariablesGraph As ToolStripMenuItem Friend WithEvents mnuDescribeGeneral As ToolStripMenuItem - Friend WithEvents mnuDescribeGeneralColumnSummaries As ToolStripMenuItem Friend WithEvents mnuDescribeGeneralTabulation As ToolStripMenuItem Friend WithEvents mnuDescribeGeneralGraphics As ToolStripMenuItem Friend WithEvents mnuDescribeSpecificTablesGraphs As ToolStripMenuItem @@ -5530,8 +5523,6 @@ Partial Class frmMain Friend WithEvents mnuFileExportExportRWorkspace As ToolStripMenuItem Friend WithEvents mnuFileExportExportGraphAsImage As ToolStripMenuItem Friend WithEvents mnuFileExportExportRObjectsToolStripMenuItem As ToolStripMenuItem - Friend WithEvents mnuDescribeGeneralUseSummaries As ToolStripMenuItem - Friend WithEvents ToolStripSeparator38 As ToolStripSeparator Friend WithEvents mnuClimaticDescribeWindSpeedDirectionWindRose As ToolStripMenuItem Friend WithEvents mnuDescribeSpecificCummulativeDistribution As ToolStripMenuItem Friend WithEvents mnuProcurementUseCRISummariseCRIbyCountry As ToolStripMenuItem @@ -5750,7 +5741,6 @@ Partial Class frmMain Friend WithEvents mnuLastGraph As ToolStripSplitButton Friend WithEvents mnuRViewer As ToolStripMenuItem Friend WithEvents mnuploty As ToolStripMenuItem - Friend WithEvents ToolStripSeparator27 As ToolStripSeparator Friend WithEvents ToolStripSeparator71 As ToolStripSeparator Friend WithEvents mnuEditScript As ToolStripMenuItem Friend WithEvents mnuPrepareDataFrameSelectColumns As ToolStripMenuItem @@ -5817,4 +5807,8 @@ Partial Class frmMain Friend WithEvents mnuExamineEditDataDailyDataEditing As ToolStripMenuItem Friend WithEvents mnuExamineEditDataCompareColumns As ToolStripMenuItem Friend WithEvents mnuStructuredSurvey As ToolStripMenuItem + Friend WithEvents mnuDescribeGraphGraphics As ToolStripMenuItem + Friend WithEvents mnuDescribeGeneralPivotTable As ToolStripMenuItem + Friend WithEvents ToolStripSeparator27 As ToolStripSeparator + Friend WithEvents mnuDescribeGeneralTables As ToolStripMenuItem 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 d4704961478..48628286c33 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1124,7 +1124,6 @@ Public Class frmMain dlgEndOfRainsSeason.ShowDialog() End Sub - Private Sub mnuDescribeSpecificScatterPlot_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificPointPlot.Click dlgScatterPlot.ShowDialog() End Sub @@ -1173,10 +1172,6 @@ Public Class frmMain dlgCompareModels.ShowDialog() End Sub - Private Sub mnuDescribeGeneralColumnSummaries_Click(sender As Object, e As EventArgs) Handles mnuDescribeGeneralColumnSummaries.Click - dlgColumnStats.ShowDialog() - End Sub - Private Sub mnuOrganiseColumnUseDate_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnDateUseDate.Click dlgUseDate.ShowDialog() End Sub @@ -1505,9 +1500,6 @@ Public Class frmMain dlgExportRObjects.ShowDialog() End Sub - Private Sub FrequencyTablesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuDescribeGeneralUseSummaries.Click - dlgSummaryBarOrPieChart.ShowDialog() - End Sub Private Sub mnuClimaticPrepareClimaticSummaries_Click(sender As Object, e As EventArgs) Handles mnuClimaticPrepareClimaticSummaries.Click dlgClimaticSummary.ShowDialog() End Sub @@ -2519,4 +2511,17 @@ Public Class frmMain Private Sub mnuStructuredSurvey_Click(sender As Object, e As EventArgs) Handles mnuStructuredSurvey.Click dlgSurvey.ShowDialog() End Sub + + Private Sub PivotTableToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuDescribeGeneralPivotTable.Click + dlgThreeVariablePivotTable.enumPivotMode = dlgThreeVariablePivotTable.PivotMode.Describe + dlgThreeVariablePivotTable.ShowDialog() + End Sub + + Private Sub mnuDescribeGraphGraphics_Click(sender As Object, e As EventArgs) Handles mnuDescribeGraphGraphics.Click + dlgGeneralForGraphics.ShowDialog() + End Sub + + Private Sub mnuDescribeGeneralTables_Click(sender As Object, e As EventArgs) Handles mnuDescribeGeneralTables.Click + dlgSummaryTables.ShowDialog() + End Sub End Class From e6107181bcf69c80eec14bf0d19bf08372f1ec50 Mon Sep 17 00:00:00 2001 From: Stephen Lloyd Date: Tue, 25 Jul 2023 14:59:04 +0200 Subject: [PATCH 057/100] Allowed script window to use key words --- instat/Model/Output/clsOutputElement.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/Model/Output/clsOutputElement.vb b/instat/Model/Output/clsOutputElement.vb index 8fbb663af65..af040279fb7 100644 --- a/instat/Model/Output/clsOutputElement.vb +++ b/instat/Model/Output/clsOutputElement.vb @@ -93,7 +93,7 @@ Public Class clsOutputElement Get Dim _lstRScriptElements As New List(Of clsRScriptElement) Try - Dim rScript As New clsRScript(_strScript) + Dim rScript As New clsRScript("") Dim lstTokens As List(Of clsRToken) = rScript.GetLstTokens(rScript.GetLstLexemes(_strScript)) 'rScript.lstTokens If lstTokens IsNot Nothing Then For Each rToken In lstTokens From 414bf3a2d15a53bcb5dbb286c57ac633e105ce1b Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 26 Jul 2023 13:10:08 +0100 Subject: [PATCH 058/100] minor change --- instat/ucrAxes.Designer.vb | 57 +++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/instat/ucrAxes.Designer.vb b/instat/ucrAxes.Designer.vb index 43a7f7632d1..94fe59e1c70 100644 --- a/instat/ucrAxes.Designer.vb +++ b/instat/ucrAxes.Designer.vb @@ -101,11 +101,16 @@ Partial Class ucrAxes Me.grpMinorBreaks = New System.Windows.Forms.GroupBox() Me.lblMinorBreaksFrom = New System.Windows.Forms.Label() Me.rdoMinorBreaksNone = New System.Windows.Forms.RadioButton() + Me.grpSecondAxis = New System.Windows.Forms.GroupBox() + Me.ucrChckTransformation = New instat.ucrCheck() + Me.ucrInputSecondaryAxis = New instat.ucrInputComboBox() + Me.ucrInputTextSecondAxis = New instat.ucrInputTextBox() Me.grpAxisTitle.SuspendLayout() Me.grpMajorBreaks.SuspendLayout() Me.grpScales.SuspendLayout() Me.grpScaleXDate.SuspendLayout() Me.grpMinorBreaks.SuspendLayout() + Me.grpSecondAxis.SuspendLayout() Me.SuspendLayout() ' 'grpAxisTitle @@ -803,10 +808,54 @@ Partial Class ucrAxes Me.rdoMinorBreaksNone.Text = "None" Me.rdoMinorBreaksNone.UseVisualStyleBackColor = True ' + 'grpSecondAxis + ' + Me.grpSecondAxis.Controls.Add(Me.ucrInputTextSecondAxis) + Me.grpSecondAxis.Controls.Add(Me.ucrInputSecondaryAxis) + Me.grpSecondAxis.Controls.Add(Me.ucrChckTransformation) + Me.grpSecondAxis.Location = New System.Drawing.Point(9, 334) + Me.grpSecondAxis.Name = "grpSecondAxis" + Me.grpSecondAxis.Size = New System.Drawing.Size(315, 67) + Me.grpSecondAxis.TabIndex = 35 + Me.grpSecondAxis.TabStop = False + Me.grpSecondAxis.Text = "Secondary Axis" + ' + 'ucrChckTransformation + ' + Me.ucrChckTransformation.AutoSize = True + Me.ucrChckTransformation.Checked = False + Me.ucrChckTransformation.Location = New System.Drawing.Point(6, 19) + Me.ucrChckTransformation.Name = "ucrChckTransformation" + Me.ucrChckTransformation.Size = New System.Drawing.Size(124, 23) + Me.ucrChckTransformation.TabIndex = 24 + ' + 'ucrInputSecondaryAxis + ' + Me.ucrInputSecondaryAxis.AddQuotesIfUnrecognised = True + Me.ucrInputSecondaryAxis.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputSecondaryAxis.GetSetSelectedIndex = -1 + Me.ucrInputSecondaryAxis.IsReadOnly = False + Me.ucrInputSecondaryAxis.Location = New System.Drawing.Point(109, 19) + Me.ucrInputSecondaryAxis.Name = "ucrInputSecondaryAxis" + Me.ucrInputSecondaryAxis.Size = New System.Drawing.Size(78, 23) + Me.ucrInputSecondaryAxis.TabIndex = 27 + ' + 'ucrInputTextSecondAxis + ' + Me.ucrInputTextSecondAxis.AddQuotesIfUnrecognised = True + Me.ucrInputTextSecondAxis.AutoSize = True + Me.ucrInputTextSecondAxis.IsMultiline = False + Me.ucrInputTextSecondAxis.IsReadOnly = False + Me.ucrInputTextSecondAxis.Location = New System.Drawing.Point(208, 21) + Me.ucrInputTextSecondAxis.Name = "ucrInputTextSecondAxis" + Me.ucrInputTextSecondAxis.Size = New System.Drawing.Size(79, 21) + Me.ucrInputTextSecondAxis.TabIndex = 28 + ' 'ucrAxes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi + Me.Controls.Add(Me.grpSecondAxis) Me.Controls.Add(Me.grpScales) Me.Controls.Add(Me.grpScaleXDate) Me.Controls.Add(Me.grpMinorBreaks) @@ -814,7 +863,7 @@ Partial Class ucrAxes Me.Controls.Add(Me.grpMajorBreaks) Me.Controls.Add(Me.grpAxisTitle) Me.Name = "ucrAxes" - Me.Size = New System.Drawing.Size(667, 334) + Me.Size = New System.Drawing.Size(667, 422) Me.grpAxisTitle.ResumeLayout(False) Me.grpAxisTitle.PerformLayout() Me.grpMajorBreaks.ResumeLayout(False) @@ -825,6 +874,8 @@ Partial Class ucrAxes Me.grpScaleXDate.PerformLayout() Me.grpMinorBreaks.ResumeLayout(False) Me.grpMinorBreaks.PerformLayout() + Me.grpSecondAxis.ResumeLayout(False) + Me.grpSecondAxis.PerformLayout() Me.ResumeLayout(False) End Sub @@ -893,4 +944,8 @@ Partial Class ucrAxes Friend WithEvents ucrInputComboDateBreak As ucrInputComboBox Friend WithEvents ucrChkDateLabels As ucrCheck Friend WithEvents ucrInputComboDateLabel As ucrInputComboBox + Friend WithEvents grpSecondAxis As GroupBox + Friend WithEvents ucrInputTextSecondAxis As ucrInputTextBox + Friend WithEvents ucrInputSecondaryAxis As ucrInputComboBox + Friend WithEvents ucrChckTransformation As ucrCheck End Class From d67bd2ec742f7a274968fc53a3ddd9b366ad1dba Mon Sep 17 00:00:00 2001 From: Stephen Lloyd Date: Wed, 26 Jul 2023 16:51:52 +0200 Subject: [PATCH 059/100] draft issue #8308 changes --- instat/clsRLink.vb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index 7e9038b96b8..3f9a9c31270 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -810,10 +810,9 @@ Public Class RLink bAsFile = False Evaluate(strScript, bSilent:=bSilent, bSeparateThread:=bSeparateThread, bShowWaitDialogOverride:=bShowWaitDialogOverride) ElseIf iCallType = 1 OrElse iCallType = 4 Then - 'todo. this is used by the calculator dialog - 'todo. icall types 1 and 4 seem not to be used anywhere? remove this block? + 'this is used by the calculator dialog 'else if script output should be stored in a temp variable - ' TODO SJL In RInstat, iCallType only seems to be 0, 2 or 3. Are icall types 1 and 4 used? + ' TODO SJL In RInstat, iCallType only seems to be -1, 0, 1, 2 or 3. Is icallType 4 used? bAsFile = False Dim strTempAssignTo As String = ".temp_val" 'TODO check this is valid syntax in all cases @@ -823,6 +822,14 @@ Public Class RLink If expTemp IsNot Nothing Then strOutput = String.Join(Environment.NewLine, expTemp.AsCharacter()) & Environment.NewLine End If + ElseIf iCallType = 5 Then + 'else if script comes from script window + Dim bSuccess As Boolean = Evaluate(strScript, bSilent:=bSilent, bSeparateThread:=bSeparateThread, bShowWaitDialogOverride:=bShowWaitDialogOverride) + + 'if not an assignment operation, then capture the output + If Not strScript.Contains("<-") AndAlso bSuccess Then + strOutput = GetFileOutput("view_object_data(object = " & strScript & " , object_format = 'text' )", bSilent, bSeparateThread, bShowWaitDialogOverride) + End If Else 'else if script output should not be ignored or not stored as an object or variable @@ -949,11 +956,7 @@ Public Class RLink End If 'else execute command - Dim iCallType As Integer = 5 - If strScriptCmd.Contains(strInstatDataObject & "$get_graphs") Then - iCallType = 3 - End If - RunScript(strScriptCmd.Trim(vbLf), iCallType:=iCallType, strComment:=strNewComment, bSeparateThread:=False, bSilent:=False) + RunScript(strScriptCmd.Trim(vbLf), iCallType:=5, strComment:=strNewComment, bSeparateThread:=False, bSilent:=False) strScriptCmd = "" strNewComment = "" Next From 3b75cd82031bc8e7f4a92e5db9e00c7d5494f262 Mon Sep 17 00:00:00 2001 From: n-thony Date: Thu, 27 Jul 2023 03:06:01 +0300 Subject: [PATCH 060/100] Added select option button and R code --- instat/dlgFindInVariableOrFilter.Designer.vb | 52 +++++++++++++------ instat/dlgFindInVariableOrFilter.vb | 21 ++++++-- instat/static/InstatObject/R/data_object_R6.R | 10 ++++ .../static/InstatObject/R/instat_object_R6.R | 8 ++- 4 files changed, 69 insertions(+), 22 deletions(-) diff --git a/instat/dlgFindInVariableOrFilter.Designer.vb b/instat/dlgFindInVariableOrFilter.Designer.vb index b04c0b0078a..a4f749bd4de 100644 --- a/instat/dlgFindInVariableOrFilter.Designer.vb +++ b/instat/dlgFindInVariableOrFilter.Designer.vb @@ -27,15 +27,16 @@ Partial Class dlgFindInVariableOrFilter Me.grpSelect = New System.Windows.Forms.GroupBox() Me.rdoRow = New System.Windows.Forms.RadioButton() Me.rdoCell = New System.Windows.Forms.RadioButton() - Me.ucrPnlSelect = New instat.UcrPanel() Me.cmdFindNext = New System.Windows.Forms.Button() Me.rdoVariable = New System.Windows.Forms.RadioButton() Me.rdoInFilter = New System.Windows.Forms.RadioButton() Me.lblPattern = New System.Windows.Forms.Label() Me.lblVariable = New System.Windows.Forms.Label() Me.cmdFind = New System.Windows.Forms.Button() + Me.rdoSelect = New System.Windows.Forms.RadioButton() Me.ucrChkIncludeRegularExpressions = New instat.ucrCheck() Me.ucrChkIgnoreCase = New instat.ucrCheck() + Me.ucrPnlSelect = New instat.UcrPanel() Me.ucrPnlOptions = New instat.UcrPanel() Me.ucrSelectorFind = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverVariable = New instat.ucrReceiverSingle() @@ -96,15 +97,6 @@ Partial Class dlgFindInVariableOrFilter Me.rdoCell.Text = "Cell" Me.rdoCell.UseVisualStyleBackColor = True ' - 'ucrPnlSelect - ' - Me.ucrPnlSelect.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlSelect.Location = New System.Drawing.Point(9, 20) - Me.ucrPnlSelect.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrPnlSelect.Name = "ucrPnlSelect" - Me.ucrPnlSelect.Size = New System.Drawing.Size(182, 47) - Me.ucrPnlSelect.TabIndex = 0 - ' 'cmdFindNext ' Me.cmdFindNext.Location = New System.Drawing.Point(414, 346) @@ -124,10 +116,10 @@ Partial Class dlgFindInVariableOrFilter Me.rdoVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoVariable.Location = New System.Drawing.Point(107, 14) + Me.rdoVariable.Location = New System.Drawing.Point(123, 14) Me.rdoVariable.Margin = New System.Windows.Forms.Padding(4) Me.rdoVariable.Name = "rdoVariable" - Me.rdoVariable.Size = New System.Drawing.Size(202, 40) + Me.rdoVariable.Size = New System.Drawing.Size(127, 40) Me.rdoVariable.TabIndex = 54 Me.rdoVariable.Text = "Variable" Me.rdoVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -141,10 +133,10 @@ Partial Class dlgFindInVariableOrFilter Me.rdoInFilter.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoInFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoInFilter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoInFilter.Location = New System.Drawing.Point(306, 14) + Me.rdoInFilter.Location = New System.Drawing.Point(249, 14) Me.rdoInFilter.Margin = New System.Windows.Forms.Padding(4) Me.rdoInFilter.Name = "rdoInFilter" - Me.rdoInFilter.Size = New System.Drawing.Size(202, 40) + Me.rdoInFilter.Size = New System.Drawing.Size(127, 40) Me.rdoInFilter.TabIndex = 55 Me.rdoInFilter.Text = "Filter" Me.rdoInFilter.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -177,6 +169,23 @@ Partial Class dlgFindInVariableOrFilter Me.cmdFind.Text = "Find" Me.cmdFind.UseVisualStyleBackColor = True ' + 'rdoSelect + ' + Me.rdoSelect.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoSelect.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSelect.FlatAppearance.BorderSize = 2 + Me.rdoSelect.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoSelect.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoSelect.Location = New System.Drawing.Point(375, 14) + Me.rdoSelect.Margin = New System.Windows.Forms.Padding(4) + Me.rdoSelect.Name = "rdoSelect" + Me.rdoSelect.Size = New System.Drawing.Size(127, 40) + Me.rdoSelect.TabIndex = 70 + Me.rdoSelect.Text = "Select" + Me.rdoSelect.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSelect.UseVisualStyleBackColor = True + ' 'ucrChkIncludeRegularExpressions ' Me.ucrChkIncludeRegularExpressions.AutoSize = True @@ -197,13 +206,22 @@ Partial Class dlgFindInVariableOrFilter Me.ucrChkIgnoreCase.Size = New System.Drawing.Size(196, 34) Me.ucrChkIgnoreCase.TabIndex = 66 ' + 'ucrPnlSelect + ' + Me.ucrPnlSelect.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSelect.Location = New System.Drawing.Point(9, 20) + Me.ucrPnlSelect.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlSelect.Name = "ucrPnlSelect" + Me.ucrPnlSelect.Size = New System.Drawing.Size(182, 47) + Me.ucrPnlSelect.TabIndex = 0 + ' 'ucrPnlOptions ' Me.ucrPnlOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlOptions.Location = New System.Drawing.Point(99, 12) + Me.ucrPnlOptions.Location = New System.Drawing.Point(115, 12) Me.ucrPnlOptions.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlOptions.Name = "ucrPnlOptions" - Me.ucrPnlOptions.Size = New System.Drawing.Size(417, 52) + Me.ucrPnlOptions.Size = New System.Drawing.Size(398, 52) Me.ucrPnlOptions.TabIndex = 53 ' 'ucrSelectorFind @@ -249,6 +267,7 @@ Partial Class dlgFindInVariableOrFilter Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(625, 440) + Me.Controls.Add(Me.rdoSelect) Me.Controls.Add(Me.lblMatching) Me.Controls.Add(Me.cmdAddkeyboard) Me.Controls.Add(Me.ucrChkIncludeRegularExpressions) @@ -294,4 +313,5 @@ Partial Class dlgFindInVariableOrFilter Friend WithEvents lblPattern As Label Friend WithEvents lblVariable As Label Friend WithEvents cmdFind As Button + Friend WithEvents rdoSelect As RadioButton End Class diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index 35b7ea3eefb..e36690c04f5 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -22,7 +22,8 @@ Public Class dlgFindInVariableOrFilter Private iCurrentOccurenceIndex As Integer Private iCountClick As Integer Private clsDummyFunction As New RFunction - Private clsGetRowsFunction, clsGetRowHeadersFunction, clsGetFilterRowNamesFunction As New RFunction + Private clsGetRowsFunction, clsGetRowHeadersFunction, + clsGetFilterRowNamesFunction, clsGetColSelectionNamesFunction As New RFunction Private clsGetDataFrameFunction As New RFunction Private Sub dlgFindInVariableOrFilter_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -47,9 +48,11 @@ Public Class dlgFindInVariableOrFilter ucrPnlOptions.AddRadioButton(rdoVariable) ucrPnlOptions.AddRadioButton(rdoInFilter) + ucrPnlOptions.AddRadioButton(rdoSelect) ucrPnlOptions.SetParameter(New RParameter("check", 0)) ucrPnlOptions.AddParameterValuesCondition(rdoVariable, "check", "variable") ucrPnlOptions.AddParameterValuesCondition(rdoInFilter, "check", "filter") + ucrPnlOptions.AddParameterValuesCondition(rdoSelect, "check", "select") ucrPnlSelect.AddRadioButton(rdoCell) ucrPnlSelect.AddRadioButton(rdoRow) @@ -72,7 +75,6 @@ Public Class dlgFindInVariableOrFilter ucrChkIncludeRegularExpressions.SetParameter(New RParameter("use_regex", 4)) ucrChkIncludeRegularExpressions.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - 'ucrPnlOptions.AddToLinkedControls(ucrInputPattern, {rdoVariable}, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrInputPattern, ucrPnlSelect, ucrChkIgnoreCase, ucrChkIncludeRegularExpressions}, {rdoVariable}, bNewLinkedHideIfParameterMissing:=True) ucrInputPattern.SetLinkedDisplayControl(lblPattern) ucrPnlSelect.SetLinkedDisplayControl(grpSelect) @@ -83,6 +85,7 @@ Public Class dlgFindInVariableOrFilter clsGetRowsFunction = New RFunction clsGetRowHeadersFunction = New RFunction clsGetFilterRowNamesFunction = New RFunction + clsGetColSelectionNamesFunction = New RFunction clsGetDataFrameFunction = New RFunction ucrSelectorFind.Reset() @@ -94,6 +97,8 @@ Public Class dlgFindInVariableOrFilter clsGetFilterRowNamesFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_filter_row_names") + clsGetColSelectionNamesFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_column_selection_column_indexes") + clsGetDataFrameFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_frame") clsGetRowHeadersFunction.SetRCommand("getRowHeadersWithText") @@ -106,8 +111,10 @@ Public Class dlgFindInVariableOrFilter End Sub Private Sub SetRcodeForControls(bReset As Boolean) - ucrSelectorFind.AddAdditionalCodeParameterPair(clsGetFilterRowNamesFunction, ucrSelectorFind.GetParameter, iAdditionalPairNo:=1) + ucrSelectorFind.AddAdditionalCodeParameterPair(clsGetColSelectionNamesFunction, ucrSelectorFind.GetParameter, iAdditionalPairNo:=1) + ucrSelectorFind.AddAdditionalCodeParameterPair(clsGetFilterRowNamesFunction, ucrSelectorFind.GetParameter, iAdditionalPairNo:=2) ucrReceiverVariable.AddAdditionalCodeParameterPair(clsGetFilterRowNamesFunction, New RParameter("filter_name"), iAdditionalPairNo:=1) + ucrReceiverVariable.AddAdditionalCodeParameterPair(clsGetColSelectionNamesFunction, New RParameter("column_selection_name"), iAdditionalPairNo:=2) ucrSelectorFind.SetRCode(clsGetDataFrameFunction, bReset) ucrReceiverVariable.SetRCode(clsGetRowHeadersFunction, bReset) ucrChkIgnoreCase.SetRCode(clsGetRowHeadersFunction, bReset) @@ -118,7 +125,7 @@ Public Class dlgFindInVariableOrFilter Private Sub TestOkEnabled() cmdFind.Enabled = (rdoVariable.Checked AndAlso Not ucrReceiverVariable.IsEmpty AndAlso Not ucrInputPattern.IsEmpty) OrElse - (rdoInFilter.Checked AndAlso Not ucrReceiverVariable.IsEmpty) + ((rdoInFilter.Checked OrElse rdoSelect.Checked) AndAlso Not ucrReceiverVariable.IsEmpty) End Sub Private Sub cmdFind_Click(sender As Object, e As EventArgs) Handles cmdFind.Click @@ -240,6 +247,12 @@ Public Class dlgFindInVariableOrFilter ucrReceiverVariable.SetItemType("filter") ucrReceiverVariable.strSelectorHeading = "Filters" lblVariable.Text = "Filter:" + Else + clsGetRowsFunction = clsGetColSelectionNamesFunction + clsDummyFunction.AddParameter("check", "select", iPosition:=0) + ucrReceiverVariable.SetItemType("column_selection") + ucrReceiverVariable.strSelectorHeading = "Column selections" + lblVariable.Text = "Select:" End If End Sub End Class \ No newline at end of file diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 53ae064eed9..758e547c222 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -2038,6 +2038,16 @@ DataSheet$set("public", "get_column_selection_column_names", function(name) { return(all_column_names[out]) }) +DataSheet$set("public", "get_column_selection_column_indexes", function(data_name, column_selection_name = "") { + if(column_selection_name != "") { + selected_columns <- self$get_column_selection_column_names(column_selection_name) + curr_df <- self$get_data_frame(use_column_selection = FALSE) + out <- match(selected_columns, names(curr_df)) + return(out) + } +} +) + DataSheet$set("public", "column_selection_applied", function() { curr_sel <- private$.current_column_selection if (is.null(curr_sel) || length(curr_sel) == 0) { diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index e5b028df1b8..c0c5b65d313 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -783,8 +783,7 @@ DataBook$set("public", "get_current_filter", function(data_name) { DataBook$set("public", "get_filter_row_names", function(data_name, filter_name) { row_names <- row.names(self$get_data_frame(data_name, convert_to_character = FALSE, stack_data = FALSE, include_hidden_columns = TRUE, use_current_filter = TRUE, filter_name = filter_name, - use_column_selection = TRUE, column_selection_name = "", remove_attr = FALSE, retain_attr = FALSE, - drop_unused_filter_levels = FALSE)) + remove_attr = FALSE, retain_attr = FALSE, drop_unused_filter_levels = FALSE)) return(row_names) } @@ -854,6 +853,11 @@ DataBook$set("public", "get_column_selection_column_names", function(data_name, } ) +DataBook$set("public", "get_column_selection_column_indexes", function(data_name, column_selection_name = "") { + return(self$get_data_objects(data_name)$get_column_selection_column_indexes(column_selection_name = column_selection_name)) +} +) + DataBook$set("public", "get_current_column_selection", function(data_name) { self$get_data_objects(data_name)$get_current_column_selection() } From 560469f67c4efca24578fa7890bb51be2d11204f Mon Sep 17 00:00:00 2001 From: n-thony Date: Thu, 27 Jul 2023 12:47:20 +0300 Subject: [PATCH 061/100] Implemented the Select option and minor bug fix --- instat/Interface/IDataViewGrid.vb | 4 +- .../DataGrid/Linux/ucrDataViewLinuxGrid.vb | 8 ++- .../DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 55 +++++++++++--- instat/dlgFindInVariableOrFilter.vb | 71 +++++++++++-------- .../InstatObject/R/stand_alone_functions.R | 2 +- instat/ucrDataView.vb | 16 +++-- 6 files changed, 107 insertions(+), 49 deletions(-) diff --git a/instat/Interface/IDataViewGrid.vb b/instat/Interface/IDataViewGrid.vb index cec116facb4..e35063ade8c 100644 --- a/instat/Interface/IDataViewGrid.vb +++ b/instat/Interface/IDataViewGrid.vb @@ -37,9 +37,11 @@ Public Interface IDataViewGrid Sub AddRowData(dataFrame As clsDataFrame) - Sub SearchInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, + Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, Optional bCellOrRow As Boolean = False) + Sub SearchColumnInGrid(iColumn As Integer) + Sub AdjustColumnWidthAfterWrapping(strColumn As String, Optional bApplyWrap As Boolean = False) Function GetSelectedColumns() As List(Of clsColumnHeaderDisplay) diff --git a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb index 956349b3f08..01a1af6e37d 100644 --- a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb +++ b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb @@ -169,7 +169,11 @@ Public Class ucrDataViewLinuxGrid dataGrid.Rows(iRow).Cells(iColumn).Value = GetCurrentDataFrameFocus.DisplayedData(iRow, iColumn) End Sub - Public Sub SearchInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, - Optional bCellOrRow As Boolean = False) Implements IDataViewGrid.SearchInGrid + Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, + Optional bCellOrRow As Boolean = False) Implements IDataViewGrid.SearchRowInGrid + End Sub + + Public Sub SearchColumnInGrid(iColumn As Integer) Implements IDataViewGrid.SearchColumnInGrid + End Sub End Class \ No newline at end of file diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 62580a73cca..7fc27f1293c 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -103,7 +103,7 @@ Public Class ucrDataViewReoGrid End Sub Public Sub AdjustColumnWidthAfterWrapping(strColumn As String, Optional bApplyWrap As Boolean = False) Implements IDataViewGrid.AdjustColumnWidthAfterWrapping - Dim iColumnIndex As Integer = GetColumnIndex(grdData.CurrentWorksheet, strColumn) + Dim iColumnIndex As Integer = GetColumnIndex(grdData.CurrentWorksheet, strColName:=strColumn) If iColumnIndex < 0 OrElse grdData.CurrentWorksheet.ColumnHeaders(iColumnIndex).Text.Contains("(G)") Then MsgBox("Cannot wrap or unwrap this type of variable.") Exit Sub @@ -282,8 +282,13 @@ Public Class ucrDataViewReoGrid Return lstRowsIndexes End Function - Private Sub ScrollToCellPos(currWorkSheet As Worksheet, iRow As Integer, iCol As Integer) - currWorkSheet.FocusPos = currWorkSheet.Cells(row:=iRow, col:=iCol).Position + Private Sub ScrollToCellPos(currWorkSheet As Worksheet, iRow As Integer, iCol As Integer, bApplyToRow As Boolean) + + If bApplyToRow Then + currWorkSheet.FocusPos = currWorkSheet.Cells(row:=iRow, col:=iCol).Position + Else + currWorkSheet.SelectRows(iRow, 1) + End If currWorkSheet.ScrollToCell(currWorkSheet.Cells(row:=iRow, col:=iCol).Address) End Sub @@ -308,19 +313,16 @@ Public Class ucrDataViewReoGrid Next End Sub - Public Sub SearchInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, - Optional bApplyToRow As Boolean = False) Implements IDataViewGrid.SearchInGrid + Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, + Optional bApplyToRow As Boolean = False) Implements IDataViewGrid.SearchRowInGrid Dim currSheet = grdData.CurrentWorksheet If currSheet.RowHeaders.Any(Function(x) x.Text = iRow) Then Dim iRowIndex As Integer = GetRowIndex(currSheet, iRow) - Dim iColIndex As Integer = 0 - If strColumn <> "filter" Then - iColIndex = GetColumnIndex(currSheet, strColumn) - End If + Dim iColIndex As Integer = If(strColumn = Chr(34) & "filter" & Chr(34), 0, GetColumnIndex(currSheet, strColName:=strColumn)) If iRowIndex > -1 AndAlso iColIndex > -1 Then - ScrollToCellPos(currWorkSheet:=currSheet, iRow:=iRowIndex, iCol:=iColIndex) + ScrollToCellPos(currWorkSheet:=currSheet, iRow:=iRowIndex, iCol:=iColIndex, bApplyToRow:=bApplyToRow) If bApplyToRow Then SetRowOrCellBackgroundColor(currWorkSheet:=currSheet, rowNumbers:=GetRowsIndexes(currSheet, rowNumbers), colIndex:=iColIndex, bApplyToRow:=bApplyToRow, color:=Color.LightGreen) @@ -331,4 +333,37 @@ Public Class ucrDataViewReoGrid End If End If End Sub + + Private Function ColumnNumberToAlpha(ByVal columnNumber As Integer) As String + Dim dividend As Integer = columnNumber + Dim columnName As String = String.Empty + Dim modulo As Integer + + While dividend > 0 + modulo = (dividend - 1) Mod 26 + columnName = Convert.ToChar(65 + modulo) & columnName + dividend = CInt((dividend - modulo) / 26) + End While + + Return columnName + End Function + + + Public Sub SearchColumnInGrid(iColumn As Integer) Implements IDataViewGrid.SearchColumnInGrid + Dim currSheet = grdData.CurrentWorksheet + Dim strColumn As String = ColumnNumberToAlpha(iColumn) & "1" + + If String.IsNullOrEmpty(strColumn) Then + Exit Sub + End If + + currSheet.ScrollToCell(strColumn) + Dim iColIndex As Integer = iColumn - 1 + currSheet.SelectColumns(iColIndex, 1) + ' Set the background color for the entire column + currSheet.SetRangeStyles(0, iColIndex, currSheet.RowCount, 1, New WorksheetRangeStyle With { + .Flag = PlainStyleFlag.BackColor, + .BackColor = Color.LightGreen + }) + End Sub End Class diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index e36690c04f5..a0f9ffc5154 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -133,50 +133,59 @@ Public Class dlgFindInVariableOrFilter If (rdoVariable.Checked AndAlso String.IsNullOrEmpty(ucrInputPattern.GetText)) Then Exit Sub End If - Dim lstRowNumbers As New List(Of Integer) - lstRowNumbers = frmMain.clsRLink.RunInternalScriptGetValue(clsGetRowsFunction.ToScript()).AsInteger.ToList + Dim lstRowOrColumnsNumbers As New List(Of Integer) + lstRowOrColumnsNumbers = frmMain.clsRLink.RunInternalScriptGetValue(clsGetRowsFunction.ToScript()).AsInteger.ToList lblMatching.Visible = False - If lstRowNumbers.Count <= 0 Then + If lstRowOrColumnsNumbers.Count <= 0 Then lblMatching.ForeColor = Color.Red - lblMatching.Text = "There are no entries matching " & ucrInputPattern.GetText + Dim strMAtching As String = "There are no entries matching " + If rdoVariable.Checked Then strMAtching &= ucrInputPattern.GetText + + lblMatching.Text = strMAtching lblMatching.Visible = True Exit Sub End If - Dim iFirstRowOnPageRowNumber As Integer = frmMain.ucrDataViewer.GetFirstRowHeader ' e.g. 1 for first page, 1001, for second page etc. - Dim iCurrentOccurenceRowNumber As Integer = lstRowNumbers(iCurrentOccurenceIndex - 1) ' e.g. if 5 occurences of "Chris", then iCurrentOccurenceIndex is a value between 1 and 5 - ' Iterate over the list of row numbers to find the page where the row is displayed. - For i As Integer = 1 To lstRowNumbers.Count 'loop through occurences - Dim iLoopOccurenceRowNumber As Integer = lstRowNumbers(i - 1) - If iLoopOccurenceRowNumber >= iFirstRowOnPageRowNumber _ 'if row number of loop occurence is on or after current page + If rdoVariable.Checked OrElse rdoInFilter.Checked Then + Dim iFirstRowOnPageRowNumber As Integer = frmMain.ucrDataViewer.GetFirstRowHeader ' e.g. 1 for first page, 1001, for second page etc. + Dim iCurrentOccurenceRowNumber As Integer = lstRowOrColumnsNumbers(iCurrentOccurenceIndex - 1) ' e.g. if 5 occurences of "Chris", then iCurrentOccurenceIndex is a value between 1 and 5 + ' Iterate over the list of row numbers to find the page where the row is displayed. + For i As Integer = 1 To lstRowOrColumnsNumbers.Count 'loop through occurences + Dim iLoopOccurenceRowNumber As Integer = lstRowOrColumnsNumbers(i - 1) + If iLoopOccurenceRowNumber >= iFirstRowOnPageRowNumber _ 'if row number of loop occurence is on or after current page AndAlso (iCurrentOccurenceRowNumber < iLoopOccurenceRowNumber OrElse iCountClick = 1) Then 'And row number of previous occurence < row number of loop occurence. Or this is the first time we are clicking - iCurrentOccurenceIndex = i 'set the current occurence to be loop occurence - Exit For + iCurrentOccurenceIndex = i 'set the current occurence to be loop occurence + Exit For + End If + Next + + If iCurrentOccurenceRowNumber = lstRowOrColumnsNumbers.Max Then + If iCurrentOccurenceIndex > iCountClick Then + iCountClick = iCurrentOccurenceIndex + Else + iCountClick = 1 + End If + iCurrentOccurenceIndex = 1 End If - Next - If iCurrentOccurenceRowNumber = lstRowNumbers.Max Then - If iCurrentOccurenceIndex > iCountClick Then - iCountClick = iCurrentOccurenceIndex - Else + Dim strColumn As String = ucrReceiverVariable.GetVariableNames + + Dim iRow As Integer = lstRowOrColumnsNumbers(iCurrentOccurenceIndex - 1) + Dim iRowPage As Integer = Math.Ceiling(CDbl(iRow / frmMain.clsInstatOptions.iMaxRows)) + frmMain.ucrDataViewer.GoToSpecificRowPage(iRowPage) + Dim bApplyCell As Boolean = (rdoVariable.Checked AndAlso rdoRow.Checked) OrElse rdoInFilter.Checked + frmMain.ucrDataViewer.SearchRowInGrid(rowNumbers:=lstRowOrColumnsNumbers, strColumn:=strColumn, + iRow:=iRow, bCellOrRow:=Not bApplyCell) + Else + If iCountClick > lstRowOrColumnsNumbers.Count Then iCountClick = 1 End If - iCurrentOccurenceIndex = 1 - End If - - Dim strColumn As String = "filter" - - If rdoVariable.Checked Then - strColumn = ucrReceiverVariable.GetVariableNames + Dim iColumn As Integer = lstRowOrColumnsNumbers(iCountClick - 1) + Dim iColPage As Integer = Math.Ceiling(CDbl(iColumn / frmMain.clsInstatOptions.iMaxCols)) + frmMain.ucrDataViewer.GoToSpecificColumnPage(iColPage) + frmMain.ucrDataViewer.SearchColumnInGrid(iColumn) End If - - Dim iRow As Integer = lstRowNumbers(iCurrentOccurenceIndex - 1) - Dim iRowPage As Integer = Math.Ceiling(CDbl(iRow / frmMain.clsInstatOptions.iMaxRows)) - frmMain.ucrDataViewer.GoToSpecificRowPage(iRowPage) - Dim bApplyCell As Boolean = (rdoVariable.Checked AndAlso rdoRow.Checked) OrElse rdoInFilter.Checked - frmMain.ucrDataViewer.SearchInGrid(rowNumbers:=lstRowNumbers, strColumn:=strColumn, - iRow:=iRow, bCellOrRow:=Not bApplyCell) iCountClick += 1 Catch ex As Exception MsgBox(ex.Message) diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 4d52e31f9da..9fc96daa1bb 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2937,7 +2937,7 @@ getRowHeadersWithText <- function(data, column, searchText, ignore_case, use_reg # Find the rows that match the search text using regex matchingRows <- stringr::str_detect(data[[column]], stringr::regex(searchText, ignore_case = ignore_case)) }else if (is.na(searchText)){ - matchingRows <- apply(data, 1, function(row) any(is.na(row))) + matchingRows <- apply(data[, column, drop = FALSE], 1, function(row) any(is.na(row))) }else{ matchingRows <- grepl(searchText, data[[column]], ignore.case = ignore_case) } diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 4ebcf5f118b..859926aa2dd 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -943,6 +943,11 @@ Public Class ucrDataView End If End Sub + Public Sub GoToSpecificColumnPage(iPage As Integer) + GetCurrentDataFrameFocus().clsVisibleDataFramePage.GoToSpecificColumnPage(iPage) + RefreshWorksheet(_grid.CurrentWorksheet, GetCurrentDataFrameFocus()) + End Sub + Private Sub lblColDisplay_Click(sender As Object, e As EventArgs) Handles lblColDisplay.Click If lblColNext.Enabled OrElse lblColBack.Enabled Then sdgWindowNumber.enumWINNUMBERMode = sdgWindowNumber.WINNUMBERMode.Col @@ -955,8 +960,7 @@ Public Class ucrDataView sdgWindowNumber.iTotalRowOrColumn = iTotalCol sdgWindowNumber.iEndRowOrColumn = GetCurrentDataFrameFocus().clsVisibleDataFramePage.intEndColumn sdgWindowNumber.ShowDialog() - GetCurrentDataFrameFocus().clsVisibleDataFramePage.GoToSpecificColumnPage(sdgWindowNumber.iPage) - RefreshWorksheet(_grid.CurrentWorksheet, GetCurrentDataFrameFocus()) + GoToSpecificColumnPage(sdgWindowNumber.iPage) End If End Sub @@ -1004,9 +1008,13 @@ Public Class ucrDataView dlgFindInVariableOrFilter.ShowDialog() End Sub - Public Sub SearchInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, + Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, Optional bCellOrRow As Boolean = False) - _grid.SearchInGrid(rowNumbers, strColumn, iRow, bCellOrRow) + _grid.SearchRowInGrid(rowNumbers, strColumn, iRow, bCellOrRow) + End Sub + + Public Sub SearchColumnInGrid(iColumn As Integer) + _grid.SearchColumnInGrid(iColumn) End Sub End Class \ No newline at end of file From 237c71d1bc74a8245fc84246f4d80c6838df38bb Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Thu, 27 Jul 2023 13:49:58 +0300 Subject: [PATCH 062/100] database changesS --- instat/translations/rInstatTranslations.db | Bin 8302592 -> 8302592 bytes instat/translations/translateDynamic.txt | 1 + 2 files changed, 1 insertion(+) diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index c250e28c280322b7b0279d4933fb169d2d71f1cd..67cdf4b691db54b2da3a1f673862523295aa96ae 100644 GIT binary patch delta 550 zcmWN=$y3g80LO99QjZjgM4p}&%9r%BWXY09LLstC@!_#0`POS*2E) zwb)u>m0L@#3Tv6Q+^V!zSXI_aYn4@Pt+vuujg_%#tvajTYOvN=Ypq7B$yzs|Q1}@y z{gLmR4*kh^@l^iP-_ROQm3&^%9z|`rFEgP&KR+8LlZkW~&dvP}RYl(#lTnoW^)EE! zQs0|0?=ywK_1wT_Ze$B1ZsKNc;a0YC8@F=@ce0JUxSM;pm+jog4({gxcJd&*c!=FR z%p*L?9`^DWkMjikc#@~s&(l1^vpmQ1yugdR!~tIBAcuH`S1DfOb!K^kH+hSnZnyYU;hJZ2JGGd delta 548 zcmWN=NmI@N0LSrp7A>+>WU0p!#ozYiktGpYwJAc@($AwsmXsx;W^(wAt1h0i4&H%z z&P_AC053pObb2lvJN5m{d}f!{BD4Hl8cNNTHHA_iWreJ;6|th$1}n$PweqZdYok?Q zZL&67Tdb|tHmlGovWl(k)()%0+G*{wc3XR_Qmf30S$nOxRc`IG_FENJrFFnM_+3Hv zcR1%)rh6&qiH7sPWxoCis>8XpKPsb%L`{0(Z&03DTMd3jBLl%``rmR8PbcSl3%-mM z7p0T`cJnH)v4_`rgE!gBTfEIXyvuvM&p!6^0S72PWQvbC$RQ4MgpWDO lCw$6he9kex;5aAvlCSuhZ#c=fe8(xi=Lb$_V%eFM#dSRN>|_7{ diff --git a/instat/translations/translateDynamic.txt b/instat/translations/translateDynamic.txt index 3f9105d8cb3..71b9c8ac2cd 100644 --- a/instat/translations/translateDynamic.txt +++ b/instat/translations/translateDynamic.txt @@ -128,6 +128,7 @@ sdgSaveColumnPosition\_ucrChkKeepExistingPos% %\_cmdPlotOptions% %\_cmdTransform% %\_cmdVariables% +%\_dlgPICSARainfall% %\_frmMain% %\_grdCurrentWorkSheet% %\_grpCSV% From 4368f2c01f4450060cfa9ae2db7acbcfd6be4560 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Thu, 27 Jul 2023 15:54:02 +0300 Subject: [PATCH 063/100] minor_change --- instat/frmMain.Designer.vb | 73 +++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 6161a829c81..38cbf7a2f2b 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -69,10 +69,14 @@ Partial Class frmMain Me.mnuDescribeSpecificMosaic = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificCummulativeDistribution = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificParallelCoordinatePlot = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeGraphGraphics = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTables = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeGeneralPivotTable = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator27 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeGeneralTabulation = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeGeneralGraphics = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeGeneralTables = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeMultivariate = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeMultivariateCorrelations = New System.Windows.Forms.ToolStripMenuItem() @@ -677,10 +681,7 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeGraphGraphics = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeGeneralTables = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeGeneralPivotTable = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator27 = New System.Windows.Forms.ToolStripSeparator() + Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -721,18 +722,18 @@ Partial Class frmMain 'mnuDescribeOneVariableVisualiseData ' Me.mnuDescribeOneVariableVisualiseData.Name = "mnuDescribeOneVariableVisualiseData" - Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(180, 22) + 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(177, 6) + Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..." Me.mnuDescribeOneVariableSummarise.Text = "Summarise..." Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised" @@ -740,26 +741,26 @@ Partial Class frmMain 'mnuDescribeOneVariableGraph ' Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph" - Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(180, 22) + 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(177, 6) + Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(180, 22) + 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(180, 22) + Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -827,7 +828,7 @@ Partial Class frmMain ' 'mnuDescribeSpecificTablesGraphs ' - Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot, Me.mnuDescribeGraphGraphics}) + Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot, Me.ToolStripSeparator38, Me.mnuDescribeGraphGraphics}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" @@ -914,6 +915,12 @@ Partial Class frmMain Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' + 'mnuDescribeGraphGraphics + ' + Me.mnuDescribeGraphGraphics.Name = "mnuDescribeGraphGraphics" + Me.mnuDescribeGraphGraphics.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeGraphGraphics.Text = "Graphics..." + ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" @@ -930,6 +937,17 @@ Partial Class frmMain Me.mnuDescribeGeneral.Tag = "General" Me.mnuDescribeGeneral.Text = "General" ' + 'mnuDescribeGeneralPivotTable + ' + Me.mnuDescribeGeneralPivotTable.Name = "mnuDescribeGeneralPivotTable" + Me.mnuDescribeGeneralPivotTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralPivotTable.Text = "Pivot Table..." + ' + 'ToolStripSeparator27 + ' + Me.ToolStripSeparator27.Name = "ToolStripSeparator27" + Me.ToolStripSeparator27.Size = New System.Drawing.Size(177, 6) + ' 'mnuDescribeGeneralTabulation ' Me.mnuDescribeGeneralTabulation.Enabled = False @@ -946,6 +964,12 @@ Partial Class frmMain Me.mnuDescribeGeneralGraphics.Tag = "Graphics..." Me.mnuDescribeGeneralGraphics.Text = "Graphics..." ' + 'mnuDescribeGeneralTables + ' + Me.mnuDescribeGeneralTables.Name = "mnuDescribeGeneralTables" + Me.mnuDescribeGeneralTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralTables.Text = "Tables..." + ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" @@ -5094,28 +5118,10 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'mnuDescribeGraphGraphics - ' - Me.mnuDescribeGraphGraphics.Name = "mnuDescribeGraphGraphics" - Me.mnuDescribeGraphGraphics.Size = New System.Drawing.Size(209, 22) - Me.mnuDescribeGraphGraphics.Text = "Graphics..." - ' - 'mnuDescribeGeneralTables - ' - Me.mnuDescribeGeneralTables.Name = "mnuDescribeGeneralTables" - Me.mnuDescribeGeneralTables.Size = New System.Drawing.Size(180, 22) - Me.mnuDescribeGeneralTables.Text = "Tables..." + 'ToolStripSeparator38 ' - 'mnuDescribeGeneralPivotTable - ' - Me.mnuDescribeGeneralPivotTable.Name = "mnuDescribeGeneralPivotTable" - Me.mnuDescribeGeneralPivotTable.Size = New System.Drawing.Size(180, 22) - Me.mnuDescribeGeneralPivotTable.Text = "Pivot Table..." - ' - 'ToolStripSeparator27 - ' - Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator38.Name = "ToolStripSeparator38" + Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) ' 'frmMain ' @@ -5811,4 +5817,5 @@ Partial Class frmMain Friend WithEvents mnuDescribeGeneralPivotTable As ToolStripMenuItem Friend WithEvents ToolStripSeparator27 As ToolStripSeparator Friend WithEvents mnuDescribeGeneralTables As ToolStripMenuItem + Friend WithEvents ToolStripSeparator38 As ToolStripSeparator End Class From 46b311a88b1391fa187103c949d5de3a8fd2aa5e Mon Sep 17 00:00:00 2001 From: n-thony Date: Fri, 28 Jul 2023 09:38:19 +0300 Subject: [PATCH 064/100] Bug fix on paging by column + design improvement --- instat/Interface/IDataViewGrid.vb | 2 +- .../DataGrid/Linux/ucrDataViewLinuxGrid.vb | 2 +- .../DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 27 ++-- instat/dlgFindInVariableOrFilter.Designer.vb | 117 ++++++++++---- instat/dlgFindInVariableOrFilter.vb | 143 +++++++++++++----- instat/static/InstatObject/R/data_object_R6.R | 6 +- .../static/InstatObject/R/instat_object_R6.R | 4 +- instat/ucrDataView.vb | 4 +- 8 files changed, 217 insertions(+), 88 deletions(-) diff --git a/instat/Interface/IDataViewGrid.vb b/instat/Interface/IDataViewGrid.vb index e35063ade8c..de43560c6d2 100644 --- a/instat/Interface/IDataViewGrid.vb +++ b/instat/Interface/IDataViewGrid.vb @@ -40,7 +40,7 @@ Public Interface IDataViewGrid Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, Optional bCellOrRow As Boolean = False) - Sub SearchColumnInGrid(iColumn As Integer) + Sub SearchColumnInGrid(strColumn As String) Sub AdjustColumnWidthAfterWrapping(strColumn As String, Optional bApplyWrap As Boolean = False) diff --git a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb index 01a1af6e37d..3e6704d19b1 100644 --- a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb +++ b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb @@ -173,7 +173,7 @@ Public Class ucrDataViewLinuxGrid Optional bCellOrRow As Boolean = False) Implements IDataViewGrid.SearchRowInGrid End Sub - Public Sub SearchColumnInGrid(iColumn As Integer) Implements IDataViewGrid.SearchColumnInGrid + Public Sub SearchColumnInGrid(strColumn As String) Implements IDataViewGrid.SearchColumnInGrid End Sub End Class \ No newline at end of file diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 7fc27f1293c..e65f5e07842 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -103,7 +103,7 @@ Public Class ucrDataViewReoGrid End Sub Public Sub AdjustColumnWidthAfterWrapping(strColumn As String, Optional bApplyWrap As Boolean = False) Implements IDataViewGrid.AdjustColumnWidthAfterWrapping - Dim iColumnIndex As Integer = GetColumnIndex(grdData.CurrentWorksheet, strColName:=strColumn) + Dim iColumnIndex As Integer = GetColumnIndex(strColName:=strColumn) If iColumnIndex < 0 OrElse grdData.CurrentWorksheet.ColumnHeaders(iColumnIndex).Text.Contains("(G)") Then MsgBox("Cannot wrap or unwrap this type of variable.") Exit Sub @@ -243,10 +243,11 @@ Public Class ucrDataViewReoGrid End If End Sub - Private Function GetColumnIndex(currWorkSheet As Worksheet, strColName As String) As Integer - If currWorkSheet IsNot Nothing Then - For i As Integer = 0 To currWorkSheet.Columns - 1 - Dim strCol As String = currWorkSheet.ColumnHeaders(i).Text + Private Function GetColumnIndex(strColName As String) As Integer + Dim currWorksheet = grdData.CurrentWorksheet + If currWorksheet IsNot Nothing Then + For i As Integer = 0 To currWorksheet.Columns - 1 + Dim strCol As String = currWorksheet.ColumnHeaders(i).Text If Trim(strCol.Split("(")(0)) = strColName.Replace("""", "") Then Return i End If @@ -319,7 +320,7 @@ Public Class ucrDataViewReoGrid If currSheet.RowHeaders.Any(Function(x) x.Text = iRow) Then Dim iRowIndex As Integer = GetRowIndex(currSheet, iRow) - Dim iColIndex As Integer = If(strColumn = Chr(34) & "filter" & Chr(34), 0, GetColumnIndex(currSheet, strColName:=strColumn)) + Dim iColIndex As Integer = If(strColumn = Chr(34) & "filter" & Chr(34), 0, GetColumnIndex( strColName:=strColumn)) If iRowIndex > -1 AndAlso iColIndex > -1 Then ScrollToCellPos(currWorkSheet:=currSheet, iRow:=iRowIndex, iCol:=iColIndex, bApplyToRow:=bApplyToRow) @@ -334,7 +335,7 @@ Public Class ucrDataViewReoGrid End If End Sub - Private Function ColumnNumberToAlpha(ByVal columnNumber As Integer) As String + Private Function ColumnNumberToAlpha(columnNumber As Integer) As String Dim dividend As Integer = columnNumber Dim columnName As String = String.Empty Dim modulo As Integer @@ -349,19 +350,19 @@ Public Class ucrDataViewReoGrid End Function - Public Sub SearchColumnInGrid(iColumn As Integer) Implements IDataViewGrid.SearchColumnInGrid + Public Sub SearchColumnInGrid(strColumn As String) Implements IDataViewGrid.SearchColumnInGrid Dim currSheet = grdData.CurrentWorksheet - Dim strColumn As String = ColumnNumberToAlpha(iColumn) & "1" If String.IsNullOrEmpty(strColumn) Then Exit Sub End If + Dim iColumn As Integer = grdData.CurrentWorksheet.ColumnHeaders.Where(Function(col) col.Text.Split("(")(0).Trim = strColumn).FirstOrDefault().Index - currSheet.ScrollToCell(strColumn) - Dim iColIndex As Integer = iColumn - 1 - currSheet.SelectColumns(iColIndex, 1) + Dim strOriginalColumnName As String = ColumnNumberToAlpha(iColumn + 1) & "1" + currSheet.ScrollToCell(strOriginalColumnName) + currSheet.SelectColumns(iColumn, 1) ' Set the background color for the entire column - currSheet.SetRangeStyles(0, iColIndex, currSheet.RowCount, 1, New WorksheetRangeStyle With { + currSheet.SetRangeStyles(0, iColumn, currSheet.RowCount, 1, New WorksheetRangeStyle With { .Flag = PlainStyleFlag.BackColor, .BackColor = Color.LightGreen }) diff --git a/instat/dlgFindInVariableOrFilter.Designer.vb b/instat/dlgFindInVariableOrFilter.Designer.vb index a4f749bd4de..2ce4a7c194b 100644 --- a/instat/dlgFindInVariableOrFilter.Designer.vb +++ b/instat/dlgFindInVariableOrFilter.Designer.vb @@ -27,7 +27,8 @@ Partial Class dlgFindInVariableOrFilter Me.grpSelect = New System.Windows.Forms.GroupBox() Me.rdoRow = New System.Windows.Forms.RadioButton() Me.rdoCell = New System.Windows.Forms.RadioButton() - Me.cmdFindNext = New System.Windows.Forms.Button() + Me.ucrPnlSelect = New instat.UcrPanel() + Me.lblLabel = New System.Windows.Forms.Label() Me.rdoVariable = New System.Windows.Forms.RadioButton() Me.rdoInFilter = New System.Windows.Forms.RadioButton() Me.lblPattern = New System.Windows.Forms.Label() @@ -36,11 +37,15 @@ Partial Class dlgFindInVariableOrFilter Me.rdoSelect = New System.Windows.Forms.RadioButton() Me.ucrChkIncludeRegularExpressions = New instat.ucrCheck() Me.ucrChkIgnoreCase = New instat.ucrCheck() - Me.ucrPnlSelect = New instat.UcrPanel() Me.ucrPnlOptions = New instat.UcrPanel() Me.ucrSelectorFind = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverVariable = New instat.ucrReceiverSingle() Me.ucrInputPattern = New instat.ucrInputComboBox() + Me.ucrBase = New instat.ucrButtons() + Me.lblFoundRow = New System.Windows.Forms.Label() + Me.lblVariableFound = New System.Windows.Forms.Label() + Me.lblName = New System.Windows.Forms.Label() + Me.cmdFindNext = New System.Windows.Forms.Button() Me.grpSelect.SuspendLayout() Me.SuspendLayout() ' @@ -68,7 +73,7 @@ Partial Class dlgFindInVariableOrFilter Me.grpSelect.Controls.Add(Me.rdoRow) Me.grpSelect.Controls.Add(Me.rdoCell) Me.grpSelect.Controls.Add(Me.ucrPnlSelect) - Me.grpSelect.Location = New System.Drawing.Point(414, 200) + Me.grpSelect.Location = New System.Drawing.Point(414, 205) Me.grpSelect.Name = "grpSelect" Me.grpSelect.Size = New System.Drawing.Size(200, 73) Me.grpSelect.TabIndex = 64 @@ -97,15 +102,23 @@ Partial Class dlgFindInVariableOrFilter Me.rdoCell.Text = "Cell" Me.rdoCell.UseVisualStyleBackColor = True ' - 'cmdFindNext + 'ucrPnlSelect ' - Me.cmdFindNext.Location = New System.Drawing.Point(414, 346) - Me.cmdFindNext.Name = "cmdFindNext" - Me.cmdFindNext.Size = New System.Drawing.Size(180, 36) - Me.cmdFindNext.TabIndex = 61 - Me.cmdFindNext.Text = "Find Next" - Me.cmdFindNext.UseVisualStyleBackColor = True - Me.cmdFindNext.Visible = False + Me.ucrPnlSelect.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSelect.Location = New System.Drawing.Point(9, 20) + Me.ucrPnlSelect.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlSelect.Name = "ucrPnlSelect" + Me.ucrPnlSelect.Size = New System.Drawing.Size(182, 47) + Me.ucrPnlSelect.TabIndex = 0 + ' + 'lblLabel + ' + Me.lblLabel.AutoSize = True + Me.lblLabel.Location = New System.Drawing.Point(414, 187) + Me.lblLabel.Name = "lblLabel" + Me.lblLabel.Size = New System.Drawing.Size(57, 20) + Me.lblLabel.TabIndex = 75 + Me.lblLabel.Text = "Label1" ' 'rdoVariable ' @@ -116,7 +129,7 @@ Partial Class dlgFindInVariableOrFilter Me.rdoVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoVariable.Location = New System.Drawing.Point(123, 14) + Me.rdoVariable.Location = New System.Drawing.Point(124, 14) Me.rdoVariable.Margin = New System.Windows.Forms.Padding(4) Me.rdoVariable.Name = "rdoVariable" Me.rdoVariable.Size = New System.Drawing.Size(127, 40) @@ -133,7 +146,7 @@ Partial Class dlgFindInVariableOrFilter Me.rdoInFilter.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoInFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoInFilter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoInFilter.Location = New System.Drawing.Point(249, 14) + Me.rdoInFilter.Location = New System.Drawing.Point(250, 14) Me.rdoInFilter.Margin = New System.Windows.Forms.Padding(4) Me.rdoInFilter.Name = "rdoInFilter" Me.rdoInFilter.Size = New System.Drawing.Size(127, 40) @@ -154,7 +167,7 @@ Partial Class dlgFindInVariableOrFilter 'lblVariable ' Me.lblVariable.AutoSize = True - Me.lblVariable.Location = New System.Drawing.Point(414, 78) + Me.lblVariable.Location = New System.Drawing.Point(414, 75) Me.lblVariable.Name = "lblVariable" Me.lblVariable.Size = New System.Drawing.Size(71, 20) Me.lblVariable.TabIndex = 57 @@ -177,7 +190,7 @@ Partial Class dlgFindInVariableOrFilter Me.rdoSelect.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSelect.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSelect.Location = New System.Drawing.Point(375, 14) + Me.rdoSelect.Location = New System.Drawing.Point(376, 14) Me.rdoSelect.Margin = New System.Windows.Forms.Padding(4) Me.rdoSelect.Name = "rdoSelect" Me.rdoSelect.Size = New System.Drawing.Size(127, 40) @@ -206,19 +219,10 @@ Partial Class dlgFindInVariableOrFilter Me.ucrChkIgnoreCase.Size = New System.Drawing.Size(196, 34) Me.ucrChkIgnoreCase.TabIndex = 66 ' - 'ucrPnlSelect - ' - Me.ucrPnlSelect.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlSelect.Location = New System.Drawing.Point(9, 20) - Me.ucrPnlSelect.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrPnlSelect.Name = "ucrPnlSelect" - Me.ucrPnlSelect.Size = New System.Drawing.Size(182, 47) - Me.ucrPnlSelect.TabIndex = 0 - ' 'ucrPnlOptions ' Me.ucrPnlOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlOptions.Location = New System.Drawing.Point(115, 12) + Me.ucrPnlOptions.Location = New System.Drawing.Point(116, 12) Me.ucrPnlOptions.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlOptions.Name = "ucrPnlOptions" Me.ucrPnlOptions.Size = New System.Drawing.Size(398, 52) @@ -240,7 +244,7 @@ Partial Class dlgFindInVariableOrFilter ' Me.ucrReceiverVariable.AutoSize = True Me.ucrReceiverVariable.frmParent = Me - Me.ucrReceiverVariable.Location = New System.Drawing.Point(414, 101) + Me.ucrReceiverVariable.Location = New System.Drawing.Point(414, 98) Me.ucrReceiverVariable.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverVariable.Name = "ucrReceiverVariable" Me.ucrReceiverVariable.Selector = Nothing @@ -261,12 +265,64 @@ Partial Class dlgFindInVariableOrFilter Me.ucrInputPattern.Size = New System.Drawing.Size(191, 32) Me.ucrInputPattern.TabIndex = 65 ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(10, 438) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.TabIndex = 71 + ' + 'lblFoundRow + ' + Me.lblFoundRow.AutoSize = True + Me.lblFoundRow.Location = New System.Drawing.Point(418, 279) + Me.lblFoundRow.Name = "lblFoundRow" + Me.lblFoundRow.Size = New System.Drawing.Size(57, 20) + Me.lblFoundRow.TabIndex = 72 + Me.lblFoundRow.Text = "Label1" + ' + 'lblVariableFound + ' + Me.lblVariableFound.AutoSize = True + Me.lblVariableFound.Location = New System.Drawing.Point(414, 131) + Me.lblVariableFound.Name = "lblVariableFound" + Me.lblVariableFound.Size = New System.Drawing.Size(57, 20) + Me.lblVariableFound.TabIndex = 73 + Me.lblVariableFound.Text = "Label1" + ' + 'lblName + ' + Me.lblName.AutoSize = True + Me.lblName.Location = New System.Drawing.Point(414, 160) + Me.lblName.Name = "lblName" + Me.lblName.Size = New System.Drawing.Size(57, 20) + Me.lblName.TabIndex = 74 + Me.lblName.Text = "Label1" + ' + 'cmdFindNext + ' + Me.cmdFindNext.Location = New System.Drawing.Point(414, 346) + Me.cmdFindNext.Name = "cmdFindNext" + Me.cmdFindNext.Size = New System.Drawing.Size(180, 36) + Me.cmdFindNext.TabIndex = 61 + Me.cmdFindNext.Text = "Find Next" + Me.cmdFindNext.UseVisualStyleBackColor = True + Me.cmdFindNext.Visible = False + ' 'dlgFindInVariableOrFilter ' Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(625, 440) + Me.ClientSize = New System.Drawing.Size(625, 525) + Me.Controls.Add(Me.lblLabel) + Me.Controls.Add(Me.lblName) + Me.Controls.Add(Me.lblVariableFound) + Me.Controls.Add(Me.lblFoundRow) + Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.rdoSelect) Me.Controls.Add(Me.lblMatching) Me.Controls.Add(Me.cmdAddkeyboard) @@ -304,7 +360,6 @@ Partial Class dlgFindInVariableOrFilter Friend WithEvents rdoRow As RadioButton Friend WithEvents rdoCell As RadioButton Friend WithEvents ucrPnlSelect As UcrPanel - Friend WithEvents cmdFindNext As Button Friend WithEvents rdoVariable As RadioButton Friend WithEvents rdoInFilter As RadioButton Friend WithEvents ucrPnlOptions As UcrPanel @@ -314,4 +369,10 @@ Partial Class dlgFindInVariableOrFilter Friend WithEvents lblVariable As Label Friend WithEvents cmdFind As Button Friend WithEvents rdoSelect As RadioButton + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents lblFoundRow As Label + Friend WithEvents lblLabel As Label + Friend WithEvents lblName As Label + Friend WithEvents lblVariableFound As Label + Friend WithEvents cmdFindNext As Button End Class diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index a0f9ffc5154..2f3a9a348a2 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -20,7 +20,7 @@ Public Class dlgFindInVariableOrFilter Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private iCurrentOccurenceIndex As Integer - Private iCountClick As Integer + Private iCountRowClick, iColumnClick As Integer Private clsDummyFunction As New RFunction Private clsGetRowsFunction, clsGetRowHeadersFunction, clsGetFilterRowNamesFunction, clsGetColSelectionNamesFunction As New RFunction @@ -43,6 +43,8 @@ Public Class dlgFindInVariableOrFilter End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 50 + ucrSelectorFind.SetParameter(New RParameter("data_name", 0)) ucrSelectorFind.SetParameterIsString() @@ -78,6 +80,9 @@ Public Class dlgFindInVariableOrFilter ucrPnlOptions.AddToLinkedControls({ucrInputPattern, ucrPnlSelect, ucrChkIgnoreCase, ucrChkIncludeRegularExpressions}, {rdoVariable}, bNewLinkedHideIfParameterMissing:=True) ucrInputPattern.SetLinkedDisplayControl(lblPattern) ucrPnlSelect.SetLinkedDisplayControl(grpSelect) + + ucrBase.OKEnabled(False) + ucrBase.cmdReset.Enabled = False End Sub Private Sub SetDefaults() @@ -91,13 +96,15 @@ Public Class dlgFindInVariableOrFilter ucrSelectorFind.Reset() ucrInputPattern.SetName("") lblMatching.Visible = False + lblFoundRow.Visible = False + iColumnClick = 1 clsDummyFunction.AddParameter("check", "variable", iPosition:=0) clsDummyFunction.AddParameter("select", "cell", iPosition:=1) clsGetFilterRowNamesFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_filter_row_names") - clsGetColSelectionNamesFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_column_selection_column_indexes") + clsGetColSelectionNamesFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_column_selected_column_names") clsGetDataFrameFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_frame") @@ -130,68 +137,120 @@ Public Class dlgFindInVariableOrFilter Private Sub cmdFind_Click(sender As Object, e As EventArgs) Handles cmdFind.Click Try - If (rdoVariable.Checked AndAlso String.IsNullOrEmpty(ucrInputPattern.GetText)) Then - Exit Sub - End If - Dim lstRowOrColumnsNumbers As New List(Of Integer) - lstRowOrColumnsNumbers = frmMain.clsRLink.RunInternalScriptGetValue(clsGetRowsFunction.ToScript()).AsInteger.ToList - lblMatching.Visible = False - - If lstRowOrColumnsNumbers.Count <= 0 Then - lblMatching.ForeColor = Color.Red - Dim strMAtching As String = "There are no entries matching " - If rdoVariable.Checked Then strMAtching &= ucrInputPattern.GetText - - lblMatching.Text = strMAtching - lblMatching.Visible = True - Exit Sub - End If - If rdoVariable.Checked OrElse rdoInFilter.Checked Then + Dim lstRowNumbers As New List(Of Integer) + lstRowNumbers = frmMain.clsRLink.RunInternalScriptGetValue(clsGetRowsFunction.ToScript()).AsInteger.ToList + lblMatching.Visible = False + + If lstRowNumbers.Count <= 0 Then + lblMatching.ForeColor = Color.Red + Dim strMAtching As String = "There are no entries matching " + If rdoVariable.Checked Then strMAtching &= ucrInputPattern.GetText + + lblMatching.Text = strMAtching + lblMatching.Visible = True + lblFoundRow.Visible = False + Exit Sub + End If + Dim iFirstRowOnPageRowNumber As Integer = frmMain.ucrDataViewer.GetFirstRowHeader ' e.g. 1 for first page, 1001, for second page etc. - Dim iCurrentOccurenceRowNumber As Integer = lstRowOrColumnsNumbers(iCurrentOccurenceIndex - 1) ' e.g. if 5 occurences of "Chris", then iCurrentOccurenceIndex is a value between 1 and 5 + Dim iCurrentOccurenceRowNumber As Integer = lstRowNumbers(iCurrentOccurenceIndex - 1) ' e.g. if 5 occurences of "Chris", then iCurrentOccurenceIndex is a value between 1 and 5 ' Iterate over the list of row numbers to find the page where the row is displayed. - For i As Integer = 1 To lstRowOrColumnsNumbers.Count 'loop through occurences - Dim iLoopOccurenceRowNumber As Integer = lstRowOrColumnsNumbers(i - 1) + For i As Integer = 1 To lstRowNumbers.Count 'loop through occurences + Dim iLoopOccurenceRowNumber As Integer = lstRowNumbers(i - 1) If iLoopOccurenceRowNumber >= iFirstRowOnPageRowNumber _ 'if row number of loop occurence is on or after current page - AndAlso (iCurrentOccurenceRowNumber < iLoopOccurenceRowNumber OrElse iCountClick = 1) Then 'And row number of previous occurence < row number of loop occurence. Or this is the first time we are clicking + AndAlso (iCurrentOccurenceRowNumber < iLoopOccurenceRowNumber OrElse iCountRowClick = 1) Then 'And row number of previous occurence < row number of loop occurence. Or this is the first time we are clicking iCurrentOccurenceIndex = i 'set the current occurence to be loop occurence Exit For End If Next - If iCurrentOccurenceRowNumber = lstRowOrColumnsNumbers.Max Then - If iCurrentOccurenceIndex > iCountClick Then - iCountClick = iCurrentOccurenceIndex + If iCurrentOccurenceRowNumber = lstRowNumbers.Max Then + If iCurrentOccurenceIndex > iCountRowClick Then + iCountRowClick = iCurrentOccurenceIndex Else - iCountClick = 1 + iCountRowClick = 1 End If iCurrentOccurenceIndex = 1 End If Dim strColumn As String = ucrReceiverVariable.GetVariableNames - Dim iRow As Integer = lstRowOrColumnsNumbers(iCurrentOccurenceIndex - 1) + Dim iRow As Integer = lstRowNumbers(iCurrentOccurenceIndex - 1) Dim iRowPage As Integer = Math.Ceiling(CDbl(iRow / frmMain.clsInstatOptions.iMaxRows)) frmMain.ucrDataViewer.GoToSpecificRowPage(iRowPage) Dim bApplyCell As Boolean = (rdoVariable.Checked AndAlso rdoRow.Checked) OrElse rdoInFilter.Checked - frmMain.ucrDataViewer.SearchRowInGrid(rowNumbers:=lstRowOrColumnsNumbers, strColumn:=strColumn, + frmMain.ucrDataViewer.SearchRowInGrid(rowNumbers:=lstRowNumbers, strColumn:=strColumn, iRow:=iRow, bCellOrRow:=Not bApplyCell) + lblFoundRow.Text = "Found Row: " & iRow + lblFoundRow.ForeColor = Color.Green + lblFoundRow.Visible = True + iCountRowClick += 1 + SetControlsVisible(False) Else - If iCountClick > lstRowOrColumnsNumbers.Count Then - iCountClick = 1 + Dim lstColumnNames As New List(Of String) + lstColumnNames = frmMain.clsRLink.RunInternalScriptGetValue(clsGetRowsFunction.ToScript()).AsCharacter.ToList + If iColumnClick > lstColumnNames.Count Then + iColumnClick = 1 End If - Dim iColumn As Integer = lstRowOrColumnsNumbers(iCountClick - 1) + + Dim strColumn As String = lstColumnNames(iColumnClick - 1) + Dim iColumn As Integer = GetColumnIndex(strColumn) Dim iColPage As Integer = Math.Ceiling(CDbl(iColumn / frmMain.clsInstatOptions.iMaxCols)) frmMain.ucrDataViewer.GoToSpecificColumnPage(iColPage) - frmMain.ucrDataViewer.SearchColumnInGrid(iColumn) + frmMain.ucrDataViewer.SearchColumnInGrid(strColumn) + + lblVariableFound.Text = "Found Variable: " & strColumn + lblName.Text = "Name: " & strColumn + lblLabel.Text = "Label: " & GetColLabel(strColumn) + lblVariableFound.ForeColor = Color.Green + lblName.ForeColor = Color.Green + lblLabel.ForeColor = Color.Green + SetControlsVisible(True) + lblFoundRow.Visible = False + iColumnClick += 1 End If - iCountClick += 1 + Catch ex As Exception MsgBox(ex.Message) End Try End Sub + Private Function GetColumnIndex(strColumn As String) As Integer + Dim clsGetItems As New RFunction + clsGetItems.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_column_names") + clsGetItems.AddParameter("data_name", Chr(34) & ucrSelectorFind.strCurrentDataFrame & Chr(34)) + Dim lstColumns = frmMain.clsRLink.RunInternalScriptGetValue(clsGetItems.ToScript()).AsCharacter.ToList + + Return lstColumns.IndexOf(strColumn) + End Function + + Private Function GetColLabel(strColumn As String) + Dim strColLabel As String = "" + Dim clsColmnLabelsRFunction = New RFunction + Dim expItems As SymbolicExpression + + clsColmnLabelsRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_column_labels") + clsColmnLabelsRFunction.AddParameter("data_name", Chr(34) & ucrSelectorFind.strCurrentDataFrame & Chr(34), iPosition:=0) + clsColmnLabelsRFunction.AddParameter("columns", Chr(34) & strColumn & Chr(34), iPosition:=1) + + expItems = frmMain.clsRLink.RunInternalScriptGetValue(clsColmnLabelsRFunction.ToScript(), bSilent:=True) + + If expItems IsNot Nothing AndAlso Not (expItems.Type = Internals.SymbolicExpressionType.Null) Then + Dim strArr As String() = expItems.AsCharacter.ToArray + If strArr IsNot Nothing Then + 'the number of labels for a column expected is 1 + If strArr.Length = 1 Then + strColLabel = strArr(0) + ElseIf strArr.Length > 1 Then + MessageBox.Show(Me, "Developer error: retrieved column label should be one.", "Developer Error", MessageBoxButtons.OK, MessageBoxIcon.Error) + strColLabel = strArr(strArr.Length - 1) + End If + End If + End If + Return strColLabel + End Function + Private Sub cmdAddkeyboard_Click(sender As Object, e As EventArgs) Handles cmdAddkeyboard.Click sdgConstructRegexExpression.ShowDialog() ucrInputPattern.SetName(sdgConstructRegexExpression.ucrReceiverForRegex.GetText()) @@ -199,13 +258,13 @@ Public Class dlgFindInVariableOrFilter Private Sub ucrSelectorFind_DataFrameChanged() Handles ucrSelectorFind.DataFrameChanged cmdFindNext.Enabled = False - iCountClick = 1 + iCountRowClick = 1 iCurrentOccurenceIndex = 1 End Sub Private Sub ucrInputPattern_TextChanged(sender As Object, e As EventArgs) Handles ucrInputPattern.TextChanged cmdFindNext.Enabled = False - iCountClick = 1 + iCountRowClick = 1 iCurrentOccurenceIndex = 1 End Sub @@ -225,7 +284,7 @@ Public Class dlgFindInVariableOrFilter End Sub Private Sub ucrReceiverVariable_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverVariable.ControlValueChanged - iCountClick = 1 + iCountRowClick = 1 iCurrentOccurenceIndex = 1 End Sub @@ -241,21 +300,31 @@ Public Class dlgFindInVariableOrFilter End If End Sub + Private Sub SetControlsVisible(bVisible As Boolean) + lblLabel.Visible = bVisible + lblName.Visible = bVisible + lblVariableFound.Visible = bVisible + End Sub + Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged ucrReceiverVariable.Clear() lblMatching.Visible = False + lblFoundRow.Visible = False + If rdoVariable.Checked Then clsGetRowsFunction = clsGetRowHeadersFunction clsDummyFunction.AddParameter("check", "variable", iPosition:=0) ucrReceiverVariable.SetItemType("column") ucrReceiverVariable.strSelectorHeading = "Variables" lblVariable.Text = "Variable:" + SetControlsVisible(False) ElseIf rdoInFilter.Checked Then clsGetRowsFunction = clsGetFilterRowNamesFunction clsDummyFunction.AddParameter("check", "filter", iPosition:=0) ucrReceiverVariable.SetItemType("filter") ucrReceiverVariable.strSelectorHeading = "Filters" lblVariable.Text = "Filter:" + SetControlsVisible(False) Else clsGetRowsFunction = clsGetColSelectionNamesFunction clsDummyFunction.AddParameter("check", "select", iPosition:=0) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 758e547c222..ea243646ed2 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -2038,12 +2038,10 @@ DataSheet$set("public", "get_column_selection_column_names", function(name) { return(all_column_names[out]) }) -DataSheet$set("public", "get_column_selection_column_indexes", function(data_name, column_selection_name = "") { +DataSheet$set("public", "get_column_selected_column_names", function(column_selection_name = "") { if(column_selection_name != "") { selected_columns <- self$get_column_selection_column_names(column_selection_name) - curr_df <- self$get_data_frame(use_column_selection = FALSE) - out <- match(selected_columns, names(curr_df)) - return(out) + return(selected_columns) } } ) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index c0c5b65d313..8b0872d3b88 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -853,8 +853,8 @@ DataBook$set("public", "get_column_selection_column_names", function(data_name, } ) -DataBook$set("public", "get_column_selection_column_indexes", function(data_name, column_selection_name = "") { - return(self$get_data_objects(data_name)$get_column_selection_column_indexes(column_selection_name = column_selection_name)) +DataBook$set("public", "get_column_selected_column_names", function(data_name, column_selection_name = "") { + return(self$get_data_objects(data_name)$get_column_selected_column_names(column_selection_name)) } ) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 859926aa2dd..254c9805268 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -1013,8 +1013,8 @@ Public Class ucrDataView _grid.SearchRowInGrid(rowNumbers, strColumn, iRow, bCellOrRow) End Sub - Public Sub SearchColumnInGrid(iColumn As Integer) - _grid.SearchColumnInGrid(iColumn) + Public Sub SearchColumnInGrid(strColumn As String) + _grid.SearchColumnInGrid(strColumn) End Sub End Class \ No newline at end of file From f601285ebb7054e560d4250610390556139794fc Mon Sep 17 00:00:00 2001 From: n-thony Date: Fri, 28 Jul 2023 17:40:11 +0300 Subject: [PATCH 065/100] Resolved the comments --- instat/dlgFindInVariableOrFilter.Designer.vb | 129 ++++++++++--------- instat/dlgFindInVariableOrFilter.resx | 3 + instat/dlgFindInVariableOrFilter.vb | 40 +++++- 3 files changed, 102 insertions(+), 70 deletions(-) diff --git a/instat/dlgFindInVariableOrFilter.Designer.vb b/instat/dlgFindInVariableOrFilter.Designer.vb index 2ce4a7c194b..adfe6d640fa 100644 --- a/instat/dlgFindInVariableOrFilter.Designer.vb +++ b/instat/dlgFindInVariableOrFilter.Designer.vb @@ -22,12 +22,12 @@ Partial Class dlgFindInVariableOrFilter 'Do not modify it using the code editor. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Me.lblMatching = New System.Windows.Forms.Label() Me.cmdAddkeyboard = New System.Windows.Forms.Button() Me.grpSelect = New System.Windows.Forms.GroupBox() Me.rdoRow = New System.Windows.Forms.RadioButton() Me.rdoCell = New System.Windows.Forms.RadioButton() - Me.ucrPnlSelect = New instat.UcrPanel() Me.lblLabel = New System.Windows.Forms.Label() Me.rdoVariable = New System.Windows.Forms.RadioButton() Me.rdoInFilter = New System.Windows.Forms.RadioButton() @@ -35,17 +35,19 @@ Partial Class dlgFindInVariableOrFilter Me.lblVariable = New System.Windows.Forms.Label() Me.cmdFind = New System.Windows.Forms.Button() Me.rdoSelect = New System.Windows.Forms.RadioButton() + Me.lblFoundRow = New System.Windows.Forms.Label() + Me.lblVariableFound = New System.Windows.Forms.Label() + Me.lblName = New System.Windows.Forms.Label() + Me.cmdFindNext = New System.Windows.Forms.Button() + Me.ttLabels = New System.Windows.Forms.ToolTip(Me.components) + Me.ucrBase = New instat.ucrButtons() Me.ucrChkIncludeRegularExpressions = New instat.ucrCheck() Me.ucrChkIgnoreCase = New instat.ucrCheck() + Me.ucrPnlSelect = New instat.UcrPanel() Me.ucrPnlOptions = New instat.UcrPanel() Me.ucrSelectorFind = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverVariable = New instat.ucrReceiverSingle() Me.ucrInputPattern = New instat.ucrInputComboBox() - Me.ucrBase = New instat.ucrButtons() - Me.lblFoundRow = New System.Windows.Forms.Label() - Me.lblVariableFound = New System.Windows.Forms.Label() - Me.lblName = New System.Windows.Forms.Label() - Me.cmdFindNext = New System.Windows.Forms.Button() Me.grpSelect.SuspendLayout() Me.SuspendLayout() ' @@ -102,19 +104,10 @@ Partial Class dlgFindInVariableOrFilter Me.rdoCell.Text = "Cell" Me.rdoCell.UseVisualStyleBackColor = True ' - 'ucrPnlSelect - ' - Me.ucrPnlSelect.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlSelect.Location = New System.Drawing.Point(9, 20) - Me.ucrPnlSelect.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrPnlSelect.Name = "ucrPnlSelect" - Me.ucrPnlSelect.Size = New System.Drawing.Size(182, 47) - Me.ucrPnlSelect.TabIndex = 0 - ' 'lblLabel ' Me.lblLabel.AutoSize = True - Me.lblLabel.Location = New System.Drawing.Point(414, 187) + Me.lblLabel.Location = New System.Drawing.Point(414, 196) Me.lblLabel.Name = "lblLabel" Me.lblLabel.Size = New System.Drawing.Size(57, 20) Me.lblLabel.TabIndex = 75 @@ -199,6 +192,53 @@ Partial Class dlgFindInVariableOrFilter Me.rdoSelect.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoSelect.UseVisualStyleBackColor = True ' + 'lblFoundRow + ' + Me.lblFoundRow.AutoSize = True + Me.lblFoundRow.Location = New System.Drawing.Point(418, 279) + Me.lblFoundRow.Name = "lblFoundRow" + Me.lblFoundRow.Size = New System.Drawing.Size(57, 20) + Me.lblFoundRow.TabIndex = 72 + Me.lblFoundRow.Text = "Label1" + ' + 'lblVariableFound + ' + Me.lblVariableFound.AutoSize = True + Me.lblVariableFound.Location = New System.Drawing.Point(414, 137) + Me.lblVariableFound.Name = "lblVariableFound" + Me.lblVariableFound.Size = New System.Drawing.Size(57, 20) + Me.lblVariableFound.TabIndex = 73 + Me.lblVariableFound.Text = "Label1" + ' + 'lblName + ' + Me.lblName.AutoSize = True + Me.lblName.Location = New System.Drawing.Point(414, 166) + Me.lblName.Name = "lblName" + Me.lblName.Size = New System.Drawing.Size(57, 20) + Me.lblName.TabIndex = 74 + Me.lblName.Text = "Label1" + ' + 'cmdFindNext + ' + Me.cmdFindNext.Location = New System.Drawing.Point(414, 346) + Me.cmdFindNext.Name = "cmdFindNext" + Me.cmdFindNext.Size = New System.Drawing.Size(180, 36) + Me.cmdFindNext.TabIndex = 61 + Me.cmdFindNext.Text = "Find Next" + Me.cmdFindNext.UseVisualStyleBackColor = True + Me.cmdFindNext.Visible = False + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(10, 438) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.TabIndex = 71 + ' 'ucrChkIncludeRegularExpressions ' Me.ucrChkIncludeRegularExpressions.AutoSize = True @@ -219,6 +259,15 @@ Partial Class dlgFindInVariableOrFilter Me.ucrChkIgnoreCase.Size = New System.Drawing.Size(196, 34) Me.ucrChkIgnoreCase.TabIndex = 66 ' + 'ucrPnlSelect + ' + Me.ucrPnlSelect.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSelect.Location = New System.Drawing.Point(9, 20) + Me.ucrPnlSelect.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlSelect.Name = "ucrPnlSelect" + Me.ucrPnlSelect.Size = New System.Drawing.Size(182, 47) + Me.ucrPnlSelect.TabIndex = 0 + ' 'ucrPnlOptions ' Me.ucrPnlOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -265,53 +314,6 @@ Partial Class dlgFindInVariableOrFilter Me.ucrInputPattern.Size = New System.Drawing.Size(191, 32) Me.ucrInputPattern.TabIndex = 65 ' - 'ucrBase - ' - Me.ucrBase.AutoSize = True - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 438) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(611, 77) - Me.ucrBase.TabIndex = 71 - ' - 'lblFoundRow - ' - Me.lblFoundRow.AutoSize = True - Me.lblFoundRow.Location = New System.Drawing.Point(418, 279) - Me.lblFoundRow.Name = "lblFoundRow" - Me.lblFoundRow.Size = New System.Drawing.Size(57, 20) - Me.lblFoundRow.TabIndex = 72 - Me.lblFoundRow.Text = "Label1" - ' - 'lblVariableFound - ' - Me.lblVariableFound.AutoSize = True - Me.lblVariableFound.Location = New System.Drawing.Point(414, 131) - Me.lblVariableFound.Name = "lblVariableFound" - Me.lblVariableFound.Size = New System.Drawing.Size(57, 20) - Me.lblVariableFound.TabIndex = 73 - Me.lblVariableFound.Text = "Label1" - ' - 'lblName - ' - Me.lblName.AutoSize = True - Me.lblName.Location = New System.Drawing.Point(414, 160) - Me.lblName.Name = "lblName" - Me.lblName.Size = New System.Drawing.Size(57, 20) - Me.lblName.TabIndex = 74 - Me.lblName.Text = "Label1" - ' - 'cmdFindNext - ' - Me.cmdFindNext.Location = New System.Drawing.Point(414, 346) - Me.cmdFindNext.Name = "cmdFindNext" - Me.cmdFindNext.Size = New System.Drawing.Size(180, 36) - Me.cmdFindNext.TabIndex = 61 - Me.cmdFindNext.Text = "Find Next" - Me.cmdFindNext.UseVisualStyleBackColor = True - Me.cmdFindNext.Visible = False - ' 'dlgFindInVariableOrFilter ' Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) @@ -375,4 +377,5 @@ Partial Class dlgFindInVariableOrFilter Friend WithEvents lblName As Label Friend WithEvents lblVariableFound As Label Friend WithEvents cmdFindNext As Button + Friend WithEvents ttLabels As ToolTip End Class diff --git a/instat/dlgFindInVariableOrFilter.resx b/instat/dlgFindInVariableOrFilter.resx index 1af7de150c9..c26be3431c6 100644 --- a/instat/dlgFindInVariableOrFilter.resx +++ b/instat/dlgFindInVariableOrFilter.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index 2f3a9a348a2..172fe323976 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -135,6 +135,27 @@ Public Class dlgFindInVariableOrFilter ((rdoInFilter.Checked OrElse rdoSelect.Checked) AndAlso Not ucrReceiverVariable.IsEmpty) End Sub + Private Sub TruncateLabelText(label As Label, strName As String, maximumWidth As Integer) + Dim graphics As Graphics = label.CreateGraphics() + Dim originalText As String = strName + Dim font As Font = label.Font + Dim originalWidth As Integer = CInt(graphics.MeasureString(originalText, font).Width) + If originalWidth > maximumWidth Then + Dim truncatedText As String = originalText + Dim truncatedWidth As Integer = originalWidth + + While truncatedWidth > maximumWidth AndAlso truncatedText.Length > 0 + truncatedText = truncatedText.Substring(0, truncatedText.Length - 1) + truncatedWidth = CInt(graphics.MeasureString(truncatedText & "...", font).Width) + End While + + label.Text = truncatedText & "..." + Else + label.Text = strName + End If + End Sub + + Private Sub cmdFind_Click(sender As Object, e As EventArgs) Handles cmdFind.Click Try If rdoVariable.Checked OrElse rdoInFilter.Checked Then @@ -183,7 +204,6 @@ Public Class dlgFindInVariableOrFilter frmMain.ucrDataViewer.SearchRowInGrid(rowNumbers:=lstRowNumbers, strColumn:=strColumn, iRow:=iRow, bCellOrRow:=Not bApplyCell) lblFoundRow.Text = "Found Row: " & iRow - lblFoundRow.ForeColor = Color.Green lblFoundRow.Visible = True iCountRowClick += 1 SetControlsVisible(False) @@ -200,14 +220,20 @@ Public Class dlgFindInVariableOrFilter frmMain.ucrDataViewer.GoToSpecificColumnPage(iColPage) frmMain.ucrDataViewer.SearchColumnInGrid(strColumn) - lblVariableFound.Text = "Found Variable: " & strColumn - lblName.Text = "Name: " & strColumn - lblLabel.Text = "Label: " & GetColLabel(strColumn) - lblVariableFound.ForeColor = Color.Green - lblName.ForeColor = Color.Green - lblLabel.ForeColor = Color.Green + lblVariableFound.Text = "Found Variable: " & GetColumnIndex(strColumn) + 1 + Dim strName = "Name: " & strColumn + TruncateLabelText(lblName, strName, 135) + Dim strLabel = "Label: " & GetColLabel(strColumn) + TruncateLabelText(lblLabel, strLabel, 135) SetControlsVisible(True) lblFoundRow.Visible = False + + ' Create a ToolTip instance. + Dim tooltip As New ToolTip() + + ' Set the tooltip texts for the labels. + tooltip.SetToolTip(lblName, strColumn) + tooltip.SetToolTip(lblLabel, GetColLabel(strColumn)) iColumnClick += 1 End If From 0d2ddfeefae6d4f84254e392dfdd5134b1757854 Mon Sep 17 00:00:00 2001 From: n-thony Date: Fri, 28 Jul 2023 17:44:15 +0300 Subject: [PATCH 066/100] minor design chnage --- instat/dlgFindInVariableOrFilter.Designer.vb | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/instat/dlgFindInVariableOrFilter.Designer.vb b/instat/dlgFindInVariableOrFilter.Designer.vb index adfe6d640fa..ac40a27be97 100644 --- a/instat/dlgFindInVariableOrFilter.Designer.vb +++ b/instat/dlgFindInVariableOrFilter.Designer.vb @@ -28,6 +28,7 @@ Partial Class dlgFindInVariableOrFilter Me.grpSelect = New System.Windows.Forms.GroupBox() Me.rdoRow = New System.Windows.Forms.RadioButton() Me.rdoCell = New System.Windows.Forms.RadioButton() + Me.ucrPnlSelect = New instat.UcrPanel() Me.lblLabel = New System.Windows.Forms.Label() Me.rdoVariable = New System.Windows.Forms.RadioButton() Me.rdoInFilter = New System.Windows.Forms.RadioButton() @@ -43,7 +44,6 @@ Partial Class dlgFindInVariableOrFilter Me.ucrBase = New instat.ucrButtons() Me.ucrChkIncludeRegularExpressions = New instat.ucrCheck() Me.ucrChkIgnoreCase = New instat.ucrCheck() - Me.ucrPnlSelect = New instat.UcrPanel() Me.ucrPnlOptions = New instat.UcrPanel() Me.ucrSelectorFind = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverVariable = New instat.ucrReceiverSingle() @@ -104,10 +104,19 @@ Partial Class dlgFindInVariableOrFilter Me.rdoCell.Text = "Cell" Me.rdoCell.UseVisualStyleBackColor = True ' + 'ucrPnlSelect + ' + Me.ucrPnlSelect.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSelect.Location = New System.Drawing.Point(9, 20) + Me.ucrPnlSelect.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlSelect.Name = "ucrPnlSelect" + Me.ucrPnlSelect.Size = New System.Drawing.Size(182, 47) + Me.ucrPnlSelect.TabIndex = 0 + ' 'lblLabel ' Me.lblLabel.AutoSize = True - Me.lblLabel.Location = New System.Drawing.Point(414, 196) + Me.lblLabel.Location = New System.Drawing.Point(413, 198) Me.lblLabel.Name = "lblLabel" Me.lblLabel.Size = New System.Drawing.Size(57, 20) Me.lblLabel.TabIndex = 75 @@ -204,7 +213,7 @@ Partial Class dlgFindInVariableOrFilter 'lblVariableFound ' Me.lblVariableFound.AutoSize = True - Me.lblVariableFound.Location = New System.Drawing.Point(414, 137) + Me.lblVariableFound.Location = New System.Drawing.Point(413, 138) Me.lblVariableFound.Name = "lblVariableFound" Me.lblVariableFound.Size = New System.Drawing.Size(57, 20) Me.lblVariableFound.TabIndex = 73 @@ -213,7 +222,7 @@ Partial Class dlgFindInVariableOrFilter 'lblName ' Me.lblName.AutoSize = True - Me.lblName.Location = New System.Drawing.Point(414, 166) + Me.lblName.Location = New System.Drawing.Point(413, 166) Me.lblName.Name = "lblName" Me.lblName.Size = New System.Drawing.Size(57, 20) Me.lblName.TabIndex = 74 @@ -259,15 +268,6 @@ Partial Class dlgFindInVariableOrFilter Me.ucrChkIgnoreCase.Size = New System.Drawing.Size(196, 34) Me.ucrChkIgnoreCase.TabIndex = 66 ' - 'ucrPnlSelect - ' - Me.ucrPnlSelect.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlSelect.Location = New System.Drawing.Point(9, 20) - Me.ucrPnlSelect.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrPnlSelect.Name = "ucrPnlSelect" - Me.ucrPnlSelect.Size = New System.Drawing.Size(182, 47) - Me.ucrPnlSelect.TabIndex = 0 - ' 'ucrPnlOptions ' Me.ucrPnlOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink From f4307e87ac8abffe9cd90e2151f90d422cfe7362 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 31 Jul 2023 11:35:20 +0100 Subject: [PATCH 067/100] Added Secondary Axis on Plot options --- instat/ucrAxes.Designer.vb | 68 +++++++++++++++++++++++++------------ instat/ucrAxes.vb | 69 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 114 insertions(+), 23 deletions(-) diff --git a/instat/ucrAxes.Designer.vb b/instat/ucrAxes.Designer.vb index 94fe59e1c70..961cb1156f9 100644 --- a/instat/ucrAxes.Designer.vb +++ b/instat/ucrAxes.Designer.vb @@ -102,9 +102,11 @@ Partial Class ucrAxes Me.lblMinorBreaksFrom = New System.Windows.Forms.Label() Me.rdoMinorBreaksNone = New System.Windows.Forms.RadioButton() Me.grpSecondAxis = New System.Windows.Forms.GroupBox() - Me.ucrChckTransformation = New instat.ucrCheck() - Me.ucrInputSecondaryAxis = New instat.ucrInputComboBox() + Me.ucrInputTextNameSAxis = New instat.ucrInputTextBox() Me.ucrInputTextSecondAxis = New instat.ucrInputTextBox() + Me.ucrInputSecondaryAxis = New instat.ucrInputComboBox() + Me.ucrChkSecondaryAxis = New instat.ucrCheck() + Me.lblTitleSA = New System.Windows.Forms.Label() Me.grpAxisTitle.SuspendLayout() Me.grpMajorBreaks.SuspendLayout() Me.grpScales.SuspendLayout() @@ -810,24 +812,39 @@ Partial Class ucrAxes ' 'grpSecondAxis ' + Me.grpSecondAxis.Controls.Add(Me.lblTitleSA) + Me.grpSecondAxis.Controls.Add(Me.ucrInputTextNameSAxis) Me.grpSecondAxis.Controls.Add(Me.ucrInputTextSecondAxis) Me.grpSecondAxis.Controls.Add(Me.ucrInputSecondaryAxis) - Me.grpSecondAxis.Controls.Add(Me.ucrChckTransformation) + Me.grpSecondAxis.Controls.Add(Me.ucrChkSecondaryAxis) Me.grpSecondAxis.Location = New System.Drawing.Point(9, 334) Me.grpSecondAxis.Name = "grpSecondAxis" - Me.grpSecondAxis.Size = New System.Drawing.Size(315, 67) + Me.grpSecondAxis.Size = New System.Drawing.Size(441, 67) Me.grpSecondAxis.TabIndex = 35 Me.grpSecondAxis.TabStop = False Me.grpSecondAxis.Text = "Secondary Axis" ' - 'ucrChckTransformation + 'ucrInputTextNameSAxis + ' + Me.ucrInputTextNameSAxis.AddQuotesIfUnrecognised = True + Me.ucrInputTextNameSAxis.AutoSize = True + Me.ucrInputTextNameSAxis.IsMultiline = False + Me.ucrInputTextNameSAxis.IsReadOnly = False + Me.ucrInputTextNameSAxis.Location = New System.Drawing.Point(340, 19) + Me.ucrInputTextNameSAxis.Name = "ucrInputTextNameSAxis" + Me.ucrInputTextNameSAxis.Size = New System.Drawing.Size(79, 21) + Me.ucrInputTextNameSAxis.TabIndex = 29 ' - Me.ucrChckTransformation.AutoSize = True - Me.ucrChckTransformation.Checked = False - Me.ucrChckTransformation.Location = New System.Drawing.Point(6, 19) - Me.ucrChckTransformation.Name = "ucrChckTransformation" - Me.ucrChckTransformation.Size = New System.Drawing.Size(124, 23) - Me.ucrChckTransformation.TabIndex = 24 + 'ucrInputTextSecondAxis + ' + Me.ucrInputTextSecondAxis.AddQuotesIfUnrecognised = True + Me.ucrInputTextSecondAxis.AutoSize = True + Me.ucrInputTextSecondAxis.IsMultiline = False + Me.ucrInputTextSecondAxis.IsReadOnly = False + Me.ucrInputTextSecondAxis.Location = New System.Drawing.Point(208, 19) + Me.ucrInputTextSecondAxis.Name = "ucrInputTextSecondAxis" + Me.ucrInputTextSecondAxis.Size = New System.Drawing.Size(79, 21) + Me.ucrInputTextSecondAxis.TabIndex = 28 ' 'ucrInputSecondaryAxis ' @@ -840,16 +857,23 @@ Partial Class ucrAxes Me.ucrInputSecondaryAxis.Size = New System.Drawing.Size(78, 23) Me.ucrInputSecondaryAxis.TabIndex = 27 ' - 'ucrInputTextSecondAxis + 'ucrChkSecondaryAxis ' - Me.ucrInputTextSecondAxis.AddQuotesIfUnrecognised = True - Me.ucrInputTextSecondAxis.AutoSize = True - Me.ucrInputTextSecondAxis.IsMultiline = False - Me.ucrInputTextSecondAxis.IsReadOnly = False - Me.ucrInputTextSecondAxis.Location = New System.Drawing.Point(208, 21) - Me.ucrInputTextSecondAxis.Name = "ucrInputTextSecondAxis" - Me.ucrInputTextSecondAxis.Size = New System.Drawing.Size(79, 21) - Me.ucrInputTextSecondAxis.TabIndex = 28 + Me.ucrChkSecondaryAxis.AutoSize = True + Me.ucrChkSecondaryAxis.Checked = False + Me.ucrChkSecondaryAxis.Location = New System.Drawing.Point(6, 19) + Me.ucrChkSecondaryAxis.Name = "ucrChkSecondaryAxis" + Me.ucrChkSecondaryAxis.Size = New System.Drawing.Size(124, 23) + Me.ucrChkSecondaryAxis.TabIndex = 24 + ' + 'lblTitleSA + ' + Me.lblTitleSA.AutoSize = True + Me.lblTitleSA.Location = New System.Drawing.Point(304, 22) + Me.lblTitleSA.Name = "lblTitleSA" + Me.lblTitleSA.Size = New System.Drawing.Size(30, 13) + Me.lblTitleSA.TabIndex = 30 + Me.lblTitleSA.Text = "Title:" ' 'ucrAxes ' @@ -947,5 +971,7 @@ Partial Class ucrAxes Friend WithEvents grpSecondAxis As GroupBox Friend WithEvents ucrInputTextSecondAxis As ucrInputTextBox Friend WithEvents ucrInputSecondaryAxis As ucrInputComboBox - Friend WithEvents ucrChckTransformation As ucrCheck + Friend WithEvents ucrChkSecondaryAxis As ucrCheck + Friend WithEvents ucrInputTextNameSAxis As ucrInputTextBox + Friend WithEvents lblTitleSA As Label End Class diff --git a/instat/ucrAxes.vb b/instat/ucrAxes.vb index bcd2d86a966..3478223ebea 100644 --- a/instat/ucrAxes.vb +++ b/instat/ucrAxes.vb @@ -27,6 +27,8 @@ Public Class ucrAxes Public clsMinorBreaksSeqFunction As New RFunction Public clsXYScaleDateBreakOperator As New ROperator Public clsXYScaleDateLimitFunction As New RFunction + Public clsXYSecondaryAxisFunction As New RFunction + Public clsDummyFunction As New RFunction Public strAxis As String 'e.g. discrete, continuous Public strAxisType As String @@ -38,6 +40,9 @@ Public Class ucrAxes Public Sub InitialiseControl() Dim dctTickMarkers As New Dictionary(Of String, String) Dim dctDateFormat As New Dictionary(Of String, String) + Dim dctTempSecondaryAxis As New Dictionary(Of String, String) + + 'Axis Section ucrPnlAxisTitle.AddRadioButton(rdoTitleAuto) @@ -190,6 +195,33 @@ Public Class ucrAxes ucrChkExpand.AddToLinkedControls(ucrInputExpand, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.05,0") ucrInputExpand.SetValidationTypeAsNumericList() + + + ucrChkSecondaryAxis.SetParameter(New RParameter("sec.axis")) + ucrChkSecondaryAxis.SetText("Transformation") + ucrChkSecondaryAxis.AddParameterPresentCondition(True, "sec.axis", True) + ucrChkSecondaryAxis.AddParameterPresentCondition(False, "sec.axis", False) + ucrChkSecondaryAxis.AddToLinkedControls(ucrInputSecondaryAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="*") + ucrChkSecondaryAxis.AddToLinkedControls(ucrInputTextNameSAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkSecondaryAxis.AddToLinkedControls(ucrInputTextSecondAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="1") + + ucrInputSecondaryAxis.SetParameter(New RParameter("trans", bNewIncludeArgumentName:=False)) + dctTempSecondaryAxis.Add("*", "*") + dctTempSecondaryAxis.Add("/", "/") + dctTempSecondaryAxis.Add("+", "+") + dctTempSecondaryAxis.Add("-", "-") + ucrInputSecondaryAxis.SetItems(dctTempSecondaryAxis) + ucrInputSecondaryAxis.SetDropDownStyleAsNonEditable() + + ucrInputTextSecondAxis.SetParameter(New RParameter("number", bNewIncludeArgumentName:=False)) + ucrInputTextSecondAxis.SetParameterIncludeArgumentName(False) + ucrInputTextSecondAxis.SetValidationTypeAsNumeric() + ucrInputTextSecondAxis.AddQuotesIfUnrecognised = False + + ucrInputTextNameSAxis.SetParameter(New RParameter("name", 6)) + ucrInputTextNameSAxis.SetParameterIncludeArgumentName(False) + ucrInputTextNameSAxis.SetLinkedDisplayControl(lblTitleSA) + 'Date X Scale dctDateFormat.Add("Year, with century (0000-9999)", Chr(34) & "%Y" & Chr(34)) dctDateFormat.Add("Year, without century (00-99)", Chr(34) & "%y" & Chr(34)) @@ -254,7 +286,7 @@ Public Class ucrAxes bControlsInitialised = True End Sub - Public Sub SetRCodeForControl(bIsXAxis As Boolean, Optional strNewAxisType As String = "continuous", Optional clsNewXYScaleContinuousFunction As RFunction = Nothing, Optional clsNewXYlabTitleFunction As RFunction = Nothing, Optional clsNewXYScaleDateFunction As RFunction = Nothing, Optional clsNewBaseOperator As ROperator = Nothing, Optional bReset As Boolean = False, Optional bCloneIfNeeded As Boolean = False) + Public Sub SetRCodeForControl(bIsXAxis As Boolean, Optional strNewAxisType As String = "continuous", Optional clsNewXYScaleContinuousFunction As RFunction = Nothing, Optional clsNewXYlabTitleFunction As RFunction = Nothing, Optional clsNewXYSecondaryAxisFunction As RFunction = Nothing, Optional clsNewXYScaleDateFunction As RFunction = Nothing, Optional clsNewBaseOperator As ROperator = Nothing, Optional bReset As Boolean = False, Optional bCloneIfNeeded As Boolean = False) Dim clsTempBreaksParam As RParameter Dim clsTempMinorBreaksParam As RParameter @@ -293,6 +325,14 @@ Public Class ucrAxes clsXYScaleDateBreakOperator.bSpaceAroundOperation = False clsXYScaleDateBreakOperator.bToScriptAsRString = True + clsDummyFunction = New RFunction + clsDummyFunction.AddParameter("sec.axis", "TRUE", iPosition:=0) + + clsXYSecondaryAxisFunction = New RFunction + clsXYSecondaryAxisFunction.SetRCommand("sec_axis") + clsXYSecondaryAxisFunction.AddParameter("trans", "~.*5", bIncludeArgumentName:=False, iPosition:=0) + clsXYSecondaryAxisFunction.AddParameter("name", Chr(34) & Chr(34), bIncludeArgumentName:=True, iPosition:=1) + clsXYlabTitleFunction = clsNewXYlabTitleFunction clsXYScaleDateFunction = clsNewXYScaleDateFunction clsXYScaleContinuousFunction = clsNewXYScaleContinuousFunction @@ -345,6 +385,12 @@ Public Class ucrAxes ucrPnlAxisTitle.SetRCode(clsXYlabTitleFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrInputTitle.SetRCode(clsXYlabTitleFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) + If bReset Then + ucrChkSecondaryAxis.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) + ucrInputSecondaryAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) + ucrInputTextNameSAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) + End If + 'scales functions ucrPnlScales.SetRCode(clsXYScaleContinuousFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrInputLowerLimit.SetRCode(clsLimitsFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) @@ -445,7 +491,7 @@ Public Class ucrAxes Private Sub ucrInputAxisType_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputAxisType.ControlValueChanged SetAxisTypeControls() AddRemoveScaleFunctions() - + SecondaryAxis() End Sub Private Sub SetAxisTypeControls() @@ -537,6 +583,21 @@ Public Class ucrAxes AddRemoveContinuousXYScales() End Sub + Private Sub SecondaryAxis() + If ucrInputAxisType.GetText = "continuous" Then + clsBaseOperator.AddParameter("scale" & "_" & strAxis & "_" & "continuous", clsRFunctionParameter:=clsXYScaleContinuousFunction) + If ucrChkSecondaryAxis.Checked Then + clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTextSecondAxis.GetText, bIncludeArgumentName:=False, iPosition:=0) + + clsXYSecondaryAxisFunction.AddParameter("name", Chr(34) & ucrInputTextNameSAxis.GetText() & Chr(34), bIncludeArgumentName:=True) + clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) + Else + clsXYScaleContinuousFunction.RemoveParameterByName("sec.axis") + End If + End If + End Sub + + Private Sub ScaleDateFunction_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLimits.ControlValueChanged, ucrChkBreaks.ControlValueChanged If bRCodeSet Then If ucrChkLimits.Checked Then @@ -547,4 +608,8 @@ Public Class ucrAxes End If End If End Sub + + Private Sub ucrChkSecondaryAxis_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSecondaryAxis.ControlValueChanged, ucrInputTextNameSAxis.ControlValueChanged, ucrInputSecondaryAxis.ControlValueChanged, ucrInputTextSecondAxis.ControlValueChanged + SecondaryAxis() + End Sub End Class \ No newline at end of file From bcb27d94034a78571216bdbc8e25a7827041e72a Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 1 Aug 2023 12:11:26 +0100 Subject: [PATCH 068/100] minor change --- instat/sdgPlots.Designer.vb | 148 ++++++++++++++++++------------------ instat/ucrAxes.Designer.vb | 81 ++++++++++++++++---- instat/ucrAxes.vb | 60 ++++++++++++--- 3 files changed, 192 insertions(+), 97 deletions(-) diff --git a/instat/sdgPlots.Designer.vb b/instat/sdgPlots.Designer.vb index f590d6644df..046a8ff2cd9 100644 --- a/instat/sdgPlots.Designer.vb +++ b/instat/sdgPlots.Designer.vb @@ -62,12 +62,7 @@ Partial Class sdgPlots Me.ucrPlotsAdditionalLayers = New instat.ucrAdditionalLayers() Me.tbpTitles = New System.Windows.Forms.TabPage() Me.lblLegendSize = New System.Windows.Forms.Label() - Me.ucrNudLegendSize = New instat.ucrNud() Me.lblTagSize = New System.Windows.Forms.Label() - Me.ucrNudTagSize = New instat.ucrNud() - Me.ucrChkTag = New instat.ucrCheck() - Me.ucrChkNewLegend = New instat.ucrCheck() - Me.ucrInputGraphCaption = New instat.ucrInputTextBox() Me.lblCaptionSize = New System.Windows.Forms.Label() Me.lblSubTitleSize = New System.Windows.Forms.Label() Me.lblTitleSize = New System.Windows.Forms.Label() @@ -83,6 +78,11 @@ Partial Class sdgPlots Me.rdoLegendTitleCustom = New System.Windows.Forms.RadioButton() Me.rdoLegendTitleAuto = New System.Windows.Forms.RadioButton() Me.ucrPnlLegendTitle = New instat.UcrPanel() + Me.ucrNudLegendSize = New instat.ucrNud() + Me.ucrNudTagSize = New instat.ucrNud() + Me.ucrChkTag = New instat.ucrCheck() + Me.ucrChkNewLegend = New instat.ucrCheck() + Me.ucrInputGraphCaption = New instat.ucrInputTextBox() Me.ucrNudCaptionSize = New instat.ucrNud() Me.ucrNudSubTitleSize = New instat.ucrNud() Me.ucrNudTitleSize = New instat.ucrNud() @@ -230,7 +230,7 @@ Partial Class sdgPlots Me.tbpPlotsOptions.Location = New System.Drawing.Point(7, 3) Me.tbpPlotsOptions.Name = "tbpPlotsOptions" Me.tbpPlotsOptions.SelectedIndex = 0 - Me.tbpPlotsOptions.Size = New System.Drawing.Size(677, 449) + Me.tbpPlotsOptions.Size = New System.Drawing.Size(677, 481) Me.tbpPlotsOptions.TabIndex = 0 ' 'tbpFacet @@ -255,7 +255,7 @@ Partial Class sdgPlots Me.tbpFacet.Location = New System.Drawing.Point(4, 22) Me.tbpFacet.Name = "tbpFacet" Me.tbpFacet.Padding = New System.Windows.Forms.Padding(3) - Me.tbpFacet.Size = New System.Drawing.Size(669, 423) + Me.tbpFacet.Size = New System.Drawing.Size(669, 455) Me.tbpFacet.TabIndex = 3 Me.tbpFacet.Tag = "Facet" Me.tbpFacet.Text = "Facets" @@ -462,12 +462,7 @@ Partial Class sdgPlots 'tbpTitles ' Me.tbpTitles.Controls.Add(Me.lblLegendSize) - Me.tbpTitles.Controls.Add(Me.ucrNudLegendSize) Me.tbpTitles.Controls.Add(Me.lblTagSize) - Me.tbpTitles.Controls.Add(Me.ucrNudTagSize) - Me.tbpTitles.Controls.Add(Me.ucrChkTag) - Me.tbpTitles.Controls.Add(Me.ucrChkNewLegend) - Me.tbpTitles.Controls.Add(Me.ucrInputGraphCaption) Me.tbpTitles.Controls.Add(Me.lblCaptionSize) Me.tbpTitles.Controls.Add(Me.lblSubTitleSize) Me.tbpTitles.Controls.Add(Me.lblTitleSize) @@ -477,6 +472,11 @@ Partial Class sdgPlots Me.tbpTitles.Controls.Add(Me.lblSubTitle) Me.tbpTitles.Controls.Add(Me.Label1) Me.tbpTitles.Controls.Add(Me.grpLegendTitle) + Me.tbpTitles.Controls.Add(Me.ucrNudLegendSize) + Me.tbpTitles.Controls.Add(Me.ucrNudTagSize) + Me.tbpTitles.Controls.Add(Me.ucrChkTag) + Me.tbpTitles.Controls.Add(Me.ucrChkNewLegend) + Me.tbpTitles.Controls.Add(Me.ucrInputGraphCaption) Me.tbpTitles.Controls.Add(Me.ucrNudCaptionSize) Me.tbpTitles.Controls.Add(Me.ucrNudSubTitleSize) Me.tbpTitles.Controls.Add(Me.ucrNudTitleSize) @@ -503,20 +503,6 @@ Partial Class sdgPlots Me.lblLegendSize.TabIndex = 54 Me.lblLegendSize.Text = "Legend Size:" ' - 'ucrNudLegendSize - ' - Me.ucrNudLegendSize.AutoSize = True - Me.ucrNudLegendSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLegendSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLegendSize.Location = New System.Drawing.Point(434, 179) - Me.ucrNudLegendSize.Margin = New System.Windows.Forms.Padding(5) - Me.ucrNudLegendSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLegendSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLegendSize.Name = "ucrNudLegendSize" - Me.ucrNudLegendSize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudLegendSize.TabIndex = 53 - Me.ucrNudLegendSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'lblTagSize ' Me.lblTagSize.AutoSize = True @@ -527,50 +513,6 @@ Partial Class sdgPlots Me.lblTagSize.TabIndex = 52 Me.lblTagSize.Text = "Tag Size:" ' - 'ucrNudTagSize - ' - Me.ucrNudTagSize.AutoSize = True - Me.ucrNudTagSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTagSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTagSize.Location = New System.Drawing.Point(434, 141) - Me.ucrNudTagSize.Margin = New System.Windows.Forms.Padding(5) - Me.ucrNudTagSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudTagSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTagSize.Name = "ucrNudTagSize" - Me.ucrNudTagSize.Size = New System.Drawing.Size(50, 20) - Me.ucrNudTagSize.TabIndex = 51 - Me.ucrNudTagSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrChkTag - ' - Me.ucrChkTag.AutoSize = True - Me.ucrChkTag.Checked = False - Me.ucrChkTag.Location = New System.Drawing.Point(6, 141) - Me.ucrChkTag.Name = "ucrChkTag" - Me.ucrChkTag.Size = New System.Drawing.Size(104, 23) - Me.ucrChkTag.TabIndex = 50 - ' - 'ucrChkNewLegend - ' - Me.ucrChkNewLegend.AutoSize = True - Me.ucrChkNewLegend.Checked = False - Me.ucrChkNewLegend.Location = New System.Drawing.Point(6, 179) - Me.ucrChkNewLegend.Name = "ucrChkNewLegend" - Me.ucrChkNewLegend.Size = New System.Drawing.Size(125, 23) - Me.ucrChkNewLegend.TabIndex = 49 - ' - 'ucrInputGraphCaption - ' - Me.ucrInputGraphCaption.AddQuotesIfUnrecognised = True - Me.ucrInputGraphCaption.AutoSize = True - Me.ucrInputGraphCaption.IsMultiline = True - Me.ucrInputGraphCaption.IsReadOnly = False - Me.ucrInputGraphCaption.Location = New System.Drawing.Point(126, 72) - Me.ucrInputGraphCaption.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrInputGraphCaption.Name = "ucrInputGraphCaption" - Me.ucrInputGraphCaption.Size = New System.Drawing.Size(181, 53) - Me.ucrInputGraphCaption.TabIndex = 48 - ' 'lblCaptionSize ' Me.lblCaptionSize.AutoSize = True @@ -728,6 +670,64 @@ Partial Class sdgPlots Me.ucrPnlLegendTitle.Size = New System.Drawing.Size(117, 25) Me.ucrPnlLegendTitle.TabIndex = 12 ' + 'ucrNudLegendSize + ' + Me.ucrNudLegendSize.AutoSize = True + Me.ucrNudLegendSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLegendSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLegendSize.Location = New System.Drawing.Point(434, 179) + Me.ucrNudLegendSize.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudLegendSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLegendSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLegendSize.Name = "ucrNudLegendSize" + Me.ucrNudLegendSize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLegendSize.TabIndex = 53 + Me.ucrNudLegendSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudTagSize + ' + Me.ucrNudTagSize.AutoSize = True + Me.ucrNudTagSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTagSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudTagSize.Location = New System.Drawing.Point(434, 141) + Me.ucrNudTagSize.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudTagSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudTagSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTagSize.Name = "ucrNudTagSize" + Me.ucrNudTagSize.Size = New System.Drawing.Size(50, 20) + Me.ucrNudTagSize.TabIndex = 51 + Me.ucrNudTagSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkTag + ' + Me.ucrChkTag.AutoSize = True + Me.ucrChkTag.Checked = False + Me.ucrChkTag.Location = New System.Drawing.Point(6, 141) + Me.ucrChkTag.Name = "ucrChkTag" + Me.ucrChkTag.Size = New System.Drawing.Size(104, 23) + Me.ucrChkTag.TabIndex = 50 + ' + 'ucrChkNewLegend + ' + Me.ucrChkNewLegend.AutoSize = True + Me.ucrChkNewLegend.Checked = False + Me.ucrChkNewLegend.Location = New System.Drawing.Point(6, 179) + Me.ucrChkNewLegend.Name = "ucrChkNewLegend" + Me.ucrChkNewLegend.Size = New System.Drawing.Size(125, 23) + Me.ucrChkNewLegend.TabIndex = 49 + ' + 'ucrInputGraphCaption + ' + Me.ucrInputGraphCaption.AddQuotesIfUnrecognised = True + Me.ucrInputGraphCaption.AutoSize = True + Me.ucrInputGraphCaption.IsMultiline = True + Me.ucrInputGraphCaption.IsReadOnly = False + Me.ucrInputGraphCaption.Location = New System.Drawing.Point(126, 72) + Me.ucrInputGraphCaption.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrInputGraphCaption.Name = "ucrInputGraphCaption" + Me.ucrInputGraphCaption.Size = New System.Drawing.Size(181, 53) + Me.ucrInputGraphCaption.TabIndex = 48 + ' 'ucrNudCaptionSize ' Me.ucrNudCaptionSize.AutoSize = True @@ -832,7 +832,7 @@ Partial Class sdgPlots Me.ucrXAxis.AutoSize = True Me.ucrXAxis.Location = New System.Drawing.Point(-4, 3) Me.ucrXAxis.Name = "ucrXAxis" - Me.ucrXAxis.Size = New System.Drawing.Size(669, 436) + Me.ucrXAxis.Size = New System.Drawing.Size(669, 463) Me.ucrXAxis.TabIndex = 0 ' 'tbpYAxis @@ -851,7 +851,7 @@ Partial Class sdgPlots Me.ucrYAxis.AutoSize = True Me.ucrYAxis.Location = New System.Drawing.Point(0, 1) Me.ucrYAxis.Name = "ucrYAxis" - Me.ucrYAxis.Size = New System.Drawing.Size(669, 416) + Me.ucrYAxis.Size = New System.Drawing.Size(669, 463) Me.ucrYAxis.TabIndex = 0 ' 'tbpTheme @@ -2037,7 +2037,7 @@ Partial Class sdgPlots 'ucrBaseSubdialog ' Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(232, 470) + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(232, 490) Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 1 @@ -2047,7 +2047,7 @@ Partial Class sdgPlots 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(687, 502) + Me.ClientSize = New System.Drawing.Size(687, 529) Me.Controls.Add(Me.ucrBaseSubdialog) Me.Controls.Add(Me.tbpPlotsOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow diff --git a/instat/ucrAxes.Designer.vb b/instat/ucrAxes.Designer.vb index 961cb1156f9..d11e71385a9 100644 --- a/instat/ucrAxes.Designer.vb +++ b/instat/ucrAxes.Designer.vb @@ -102,11 +102,15 @@ Partial Class ucrAxes Me.lblMinorBreaksFrom = New System.Windows.Forms.Label() Me.rdoMinorBreaksNone = New System.Windows.Forms.RadioButton() Me.grpSecondAxis = New System.Windows.Forms.GroupBox() + Me.rdoSecondAxisSpecifyTitle = New System.Windows.Forms.RadioButton() + Me.rdoSecondAxisNoTitle = New System.Windows.Forms.RadioButton() + Me.rdoSecondAxisTitleAuto = New System.Windows.Forms.RadioButton() + Me.ucrPnlSecondAxisTitle = New instat.UcrPanel() + Me.lblTitleSA = New System.Windows.Forms.Label() Me.ucrInputTextNameSAxis = New instat.ucrInputTextBox() Me.ucrInputTextSecondAxis = New instat.ucrInputTextBox() Me.ucrInputSecondaryAxis = New instat.ucrInputComboBox() Me.ucrChkSecondaryAxis = New instat.ucrCheck() - Me.lblTitleSA = New System.Windows.Forms.Label() Me.grpAxisTitle.SuspendLayout() Me.grpMajorBreaks.SuspendLayout() Me.grpScales.SuspendLayout() @@ -812,25 +816,79 @@ Partial Class ucrAxes ' 'grpSecondAxis ' + Me.grpSecondAxis.Controls.Add(Me.rdoSecondAxisSpecifyTitle) + Me.grpSecondAxis.Controls.Add(Me.rdoSecondAxisNoTitle) + Me.grpSecondAxis.Controls.Add(Me.rdoSecondAxisTitleAuto) + Me.grpSecondAxis.Controls.Add(Me.ucrPnlSecondAxisTitle) Me.grpSecondAxis.Controls.Add(Me.lblTitleSA) Me.grpSecondAxis.Controls.Add(Me.ucrInputTextNameSAxis) Me.grpSecondAxis.Controls.Add(Me.ucrInputTextSecondAxis) Me.grpSecondAxis.Controls.Add(Me.ucrInputSecondaryAxis) Me.grpSecondAxis.Controls.Add(Me.ucrChkSecondaryAxis) - Me.grpSecondAxis.Location = New System.Drawing.Point(9, 334) + Me.grpSecondAxis.Location = New System.Drawing.Point(3, 324) Me.grpSecondAxis.Name = "grpSecondAxis" - Me.grpSecondAxis.Size = New System.Drawing.Size(441, 67) + Me.grpSecondAxis.Size = New System.Drawing.Size(320, 109) Me.grpSecondAxis.TabIndex = 35 Me.grpSecondAxis.TabStop = False Me.grpSecondAxis.Text = "Secondary Axis" ' + 'rdoSecondAxisSpecifyTitle + ' + Me.rdoSecondAxisSpecifyTitle.AutoSize = True + Me.rdoSecondAxisSpecifyTitle.Location = New System.Drawing.Point(94, 53) + Me.rdoSecondAxisSpecifyTitle.Name = "rdoSecondAxisSpecifyTitle" + Me.rdoSecondAxisSpecifyTitle.Size = New System.Drawing.Size(83, 17) + Me.rdoSecondAxisSpecifyTitle.TabIndex = 32 + Me.rdoSecondAxisSpecifyTitle.TabStop = True + Me.rdoSecondAxisSpecifyTitle.Text = "Specify Title" + Me.rdoSecondAxisSpecifyTitle.UseVisualStyleBackColor = True + ' + 'rdoSecondAxisNoTitle + ' + Me.rdoSecondAxisNoTitle.AutoSize = True + Me.rdoSecondAxisNoTitle.Location = New System.Drawing.Point(215, 53) + Me.rdoSecondAxisNoTitle.Name = "rdoSecondAxisNoTitle" + Me.rdoSecondAxisNoTitle.Size = New System.Drawing.Size(62, 17) + Me.rdoSecondAxisNoTitle.TabIndex = 33 + Me.rdoSecondAxisNoTitle.TabStop = True + Me.rdoSecondAxisNoTitle.Text = "No Title" + Me.rdoSecondAxisNoTitle.UseVisualStyleBackColor = True + ' + 'rdoSecondAxisTitleAuto + ' + Me.rdoSecondAxisTitleAuto.AutoSize = True + Me.rdoSecondAxisTitleAuto.Location = New System.Drawing.Point(7, 53) + Me.rdoSecondAxisTitleAuto.Name = "rdoSecondAxisTitleAuto" + Me.rdoSecondAxisTitleAuto.Size = New System.Drawing.Size(47, 17) + Me.rdoSecondAxisTitleAuto.TabIndex = 31 + Me.rdoSecondAxisTitleAuto.TabStop = True + Me.rdoSecondAxisTitleAuto.Text = "Auto" + Me.rdoSecondAxisTitleAuto.UseVisualStyleBackColor = True + ' + 'ucrPnlSecondAxisTitle + ' + Me.ucrPnlSecondAxisTitle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSecondAxisTitle.Location = New System.Drawing.Point(6, 50) + Me.ucrPnlSecondAxisTitle.Name = "ucrPnlSecondAxisTitle" + Me.ucrPnlSecondAxisTitle.Size = New System.Drawing.Size(290, 23) + Me.ucrPnlSecondAxisTitle.TabIndex = 34 + ' + 'lblTitleSA + ' + Me.lblTitleSA.AutoSize = True + Me.lblTitleSA.Location = New System.Drawing.Point(4, 83) + Me.lblTitleSA.Name = "lblTitleSA" + Me.lblTitleSA.Size = New System.Drawing.Size(30, 13) + Me.lblTitleSA.TabIndex = 30 + Me.lblTitleSA.Text = "Title:" + ' 'ucrInputTextNameSAxis ' Me.ucrInputTextNameSAxis.AddQuotesIfUnrecognised = True Me.ucrInputTextNameSAxis.AutoSize = True Me.ucrInputTextNameSAxis.IsMultiline = False Me.ucrInputTextNameSAxis.IsReadOnly = False - Me.ucrInputTextNameSAxis.Location = New System.Drawing.Point(340, 19) + Me.ucrInputTextNameSAxis.Location = New System.Drawing.Point(40, 80) Me.ucrInputTextNameSAxis.Name = "ucrInputTextNameSAxis" Me.ucrInputTextNameSAxis.Size = New System.Drawing.Size(79, 21) Me.ucrInputTextNameSAxis.TabIndex = 29 @@ -866,15 +924,6 @@ Partial Class ucrAxes Me.ucrChkSecondaryAxis.Size = New System.Drawing.Size(124, 23) Me.ucrChkSecondaryAxis.TabIndex = 24 ' - 'lblTitleSA - ' - Me.lblTitleSA.AutoSize = True - Me.lblTitleSA.Location = New System.Drawing.Point(304, 22) - Me.lblTitleSA.Name = "lblTitleSA" - Me.lblTitleSA.Size = New System.Drawing.Size(30, 13) - Me.lblTitleSA.TabIndex = 30 - Me.lblTitleSA.Text = "Title:" - ' 'ucrAxes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -887,7 +936,7 @@ Partial Class ucrAxes Me.Controls.Add(Me.grpMajorBreaks) Me.Controls.Add(Me.grpAxisTitle) Me.Name = "ucrAxes" - Me.Size = New System.Drawing.Size(667, 422) + Me.Size = New System.Drawing.Size(670, 489) Me.grpAxisTitle.ResumeLayout(False) Me.grpAxisTitle.PerformLayout() Me.grpMajorBreaks.ResumeLayout(False) @@ -974,4 +1023,8 @@ Partial Class ucrAxes Friend WithEvents ucrChkSecondaryAxis As ucrCheck Friend WithEvents ucrInputTextNameSAxis As ucrInputTextBox Friend WithEvents lblTitleSA As Label + Friend WithEvents rdoSecondAxisSpecifyTitle As RadioButton + Friend WithEvents rdoSecondAxisNoTitle As RadioButton + Friend WithEvents rdoSecondAxisTitleAuto As RadioButton + Friend WithEvents ucrPnlSecondAxisTitle As UcrPanel End Class diff --git a/instat/ucrAxes.vb b/instat/ucrAxes.vb index 3478223ebea..ab245b72845 100644 --- a/instat/ucrAxes.vb +++ b/instat/ucrAxes.vb @@ -195,14 +195,24 @@ Public Class ucrAxes ucrChkExpand.AddToLinkedControls(ucrInputExpand, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.05,0") ucrInputExpand.SetValidationTypeAsNumericList() - + 'secondary axis' + ucrPnlSecondAxisTitle.SetParameter(New RParameter("name", iNewPosition:=1)) + ucrPnlSecondAxisTitle.AddRadioButton(rdoSecondAxisTitleAuto) + ucrPnlSecondAxisTitle.AddRadioButton(rdoSecondAxisNoTitle) + ucrPnlSecondAxisTitle.AddRadioButton(rdoSecondAxisSpecifyTitle) + ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisTitleAuto, "name", "auto") + ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisNoTitle, "name", "notitle") + 'ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisNoTitle, "name", Chr(34) & Chr(34), True) + ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisSpecifyTitle, "name", "title") + 'ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisSpecifyTitle, "name", Chr(34) & Chr(34), False) + ucrPnlSecondAxisTitle.AddToLinkedControls(ucrInputTextNameSAxis, {rdoSecondAxisSpecifyTitle}, bNewLinkedHideIfParameterMissing:=True) ucrChkSecondaryAxis.SetParameter(New RParameter("sec.axis")) ucrChkSecondaryAxis.SetText("Transformation") ucrChkSecondaryAxis.AddParameterPresentCondition(True, "sec.axis", True) ucrChkSecondaryAxis.AddParameterPresentCondition(False, "sec.axis", False) ucrChkSecondaryAxis.AddToLinkedControls(ucrInputSecondaryAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="*") - ucrChkSecondaryAxis.AddToLinkedControls(ucrInputTextNameSAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + 'ucrChkSecondaryAxis.AddToLinkedControls(ucrInputTextNameSAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkSecondaryAxis.AddToLinkedControls(ucrInputTextSecondAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="1") ucrInputSecondaryAxis.SetParameter(New RParameter("trans", bNewIncludeArgumentName:=False)) @@ -218,8 +228,8 @@ Public Class ucrAxes ucrInputTextSecondAxis.SetValidationTypeAsNumeric() ucrInputTextSecondAxis.AddQuotesIfUnrecognised = False - ucrInputTextNameSAxis.SetParameter(New RParameter("name", 6)) - ucrInputTextNameSAxis.SetParameterIncludeArgumentName(False) + 'ucrInputTextNameSAxis.SetParameter(New RParameter("name")) + 'ucrInputTextNameSAxis.SetParameterIncludeArgumentName(False) ucrInputTextNameSAxis.SetLinkedDisplayControl(lblTitleSA) 'Date X Scale @@ -284,6 +294,7 @@ Public Class ucrAxes ucrChkLimits.SetParameter(New RParameter("limits", 2), bNewChangeParameterValue:=False) bControlsInitialised = True + 'SetNameSecondaryAxis() End Sub Public Sub SetRCodeForControl(bIsXAxis As Boolean, Optional strNewAxisType As String = "continuous", Optional clsNewXYScaleContinuousFunction As RFunction = Nothing, Optional clsNewXYlabTitleFunction As RFunction = Nothing, Optional clsNewXYSecondaryAxisFunction As RFunction = Nothing, Optional clsNewXYScaleDateFunction As RFunction = Nothing, Optional clsNewBaseOperator As ROperator = Nothing, Optional bReset As Boolean = False, Optional bCloneIfNeeded As Boolean = False) @@ -327,11 +338,12 @@ Public Class ucrAxes clsDummyFunction = New RFunction clsDummyFunction.AddParameter("sec.axis", "TRUE", iPosition:=0) + clsDummyFunction.AddParameter("name", "auto", iPosition:=1) clsXYSecondaryAxisFunction = New RFunction clsXYSecondaryAxisFunction.SetRCommand("sec_axis") - clsXYSecondaryAxisFunction.AddParameter("trans", "~.*5", bIncludeArgumentName:=False, iPosition:=0) - clsXYSecondaryAxisFunction.AddParameter("name", Chr(34) & Chr(34), bIncludeArgumentName:=True, iPosition:=1) + 'clsXYSecondaryAxisFunction.AddParameter("trans", "~.*5", bIncludeArgumentName:=False, iPosition:=0) + 'clsXYSecondaryAxisFunction.AddParameter("name", bIncludeArgumentName:=True, iPosition:=1) clsXYlabTitleFunction = clsNewXYlabTitleFunction clsXYScaleDateFunction = clsNewXYScaleDateFunction @@ -386,9 +398,10 @@ Public Class ucrAxes ucrInputTitle.SetRCode(clsXYlabTitleFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) If bReset Then + ucrPnlSecondAxisTitle.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrChkSecondaryAxis.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrInputSecondaryAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) - ucrInputTextNameSAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) + 'ucrInputTextNameSAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) End If 'scales functions @@ -438,6 +451,7 @@ Public Class ucrAxes bRCodeSet = True SetLabel() AddRemoveContinuousXYScales() + 'SetNameSecondaryAxis() End Sub Private Sub AddRemoveLabs() @@ -589,7 +603,7 @@ Public Class ucrAxes If ucrChkSecondaryAxis.Checked Then clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTextSecondAxis.GetText, bIncludeArgumentName:=False, iPosition:=0) - clsXYSecondaryAxisFunction.AddParameter("name", Chr(34) & ucrInputTextNameSAxis.GetText() & Chr(34), bIncludeArgumentName:=True) + 'clsXYSecondaryAxisFunction.AddParameter("name", Chr(34) & ucrInputTextNameSAxis.GetText() & Chr(34), bIncludeArgumentName:=True) clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) Else clsXYScaleContinuousFunction.RemoveParameterByName("sec.axis") @@ -609,7 +623,35 @@ Public Class ucrAxes End If End Sub - Private Sub ucrChkSecondaryAxis_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSecondaryAxis.ControlValueChanged, ucrInputTextNameSAxis.ControlValueChanged, ucrInputSecondaryAxis.ControlValueChanged, ucrInputTextSecondAxis.ControlValueChanged + Private Sub ucrChkSecondaryAxis_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSecondaryAxis.ControlValueChanged, ucrInputSecondaryAxis.ControlValueChanged, ucrInputTextSecondAxis.ControlValueChanged SecondaryAxis() End Sub + + 'Private Sub AddRemoveName() + ' If bRCodeSet Then + ' If rdoSecondAxisNoTitle.Checked Then + ' clsXYlabTitleFunction.AddParameter("label", Chr(34) & ucrInputTextNameSAxis.GetText() & Chr(34)) + ' clsBaseOperator.AddParameter(strAxis & "lab", clsRFunctionParameter:=clsXYlabTitleFunction) + ' ElseIf rdoSecondAxisSpecifyTitle.Checked AndAlso Not ucrInputTextNameSAxis.IsEmpty Then + ' clsXYlabTitleFunction.AddParameter("label", Chr(34) & Chr(34)) + ' clsBaseOperator.AddParameter(strAxis & "lab", clsRFunctionParameter:=clsXYlabTitleFunction) + ' Else + ' clsBaseOperator.RemoveParameterByName(strAxis & "lab") + ' End If + ' End If + 'End Sub + + Private Sub SetNameSecondaryAxis() + + clsXYSecondaryAxisFunction.RemoveParameterByName("name") + If rdoSecondAxisNoTitle.Checked Then + clsXYSecondaryAxisFunction.AddParameter("name", Chr(34) & Chr(34), iPosition:=1) + ElseIf rdoSecondAxisSpecifyTitle.Checked AndAlso Not ucrInputTextNameSAxis.IsEmpty Then + clsXYSecondaryAxisFunction.AddParameter("name", Chr(34) & ucrInputTextNameSAxis.GetText() & Chr(34), iPosition:=1) + End If + + End Sub + Private Sub ucrPnlSecondAxisTitle_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSecondAxisTitle.ControlValueChanged, ucrInputTextNameSAxis.ControlValueChanged + SetNameSecondaryAxis() + End Sub End Class \ No newline at end of file From edc93152d6b6eb4f2e33a6b48356e55f8eeb2c26 Mon Sep 17 00:00:00 2001 From: n-thony Date: Tue, 1 Aug 2023 18:07:23 +0300 Subject: [PATCH 069/100] bug fixing --- instat/ucrAxes.vb | 46 +++++++++++++--------------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/instat/ucrAxes.vb b/instat/ucrAxes.vb index ab245b72845..bd259b6f8b9 100644 --- a/instat/ucrAxes.vb +++ b/instat/ucrAxes.vb @@ -515,11 +515,14 @@ Public Class ucrAxes grpMinorBreaks.Hide() grpScales.Hide() grpScaleXDate.Hide() + grpSecondAxis.Hide() + If strAxisType.ToLower = "continuous" Then 'show continous panels 'TODO put controls in panels so group boxes can be used for multiple cases grpMajorBreaks.Show() grpMinorBreaks.Show() + grpSecondAxis.Show() grpScales.Show() ElseIf strAxisType.ToLower = "discrete" Then 'show discrete panels @@ -598,17 +601,13 @@ Public Class ucrAxes End Sub Private Sub SecondaryAxis() - If ucrInputAxisType.GetText = "continuous" Then - clsBaseOperator.AddParameter("scale" & "_" & strAxis & "_" & "continuous", clsRFunctionParameter:=clsXYScaleContinuousFunction) - If ucrChkSecondaryAxis.Checked Then - clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTextSecondAxis.GetText, bIncludeArgumentName:=False, iPosition:=0) - - 'clsXYSecondaryAxisFunction.AddParameter("name", Chr(34) & ucrInputTextNameSAxis.GetText() & Chr(34), bIncludeArgumentName:=True) - clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) - Else - clsXYScaleContinuousFunction.RemoveParameterByName("sec.axis") - End If - End If + If ucrChkSecondaryAxis.Checked Then + clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTextSecondAxis.GetText, bIncludeArgumentName:=False, iPosition:=0) + clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) + Else + clsXYScaleContinuousFunction.RemoveParameterByName("sec.axis") + End If + AddRemoveContinuousXYScales() End Sub @@ -622,36 +621,17 @@ Public Class ucrAxes End If End If End Sub - - Private Sub ucrChkSecondaryAxis_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSecondaryAxis.ControlValueChanged, ucrInputSecondaryAxis.ControlValueChanged, ucrInputTextSecondAxis.ControlValueChanged - SecondaryAxis() - End Sub - - 'Private Sub AddRemoveName() - ' If bRCodeSet Then - ' If rdoSecondAxisNoTitle.Checked Then - ' clsXYlabTitleFunction.AddParameter("label", Chr(34) & ucrInputTextNameSAxis.GetText() & Chr(34)) - ' clsBaseOperator.AddParameter(strAxis & "lab", clsRFunctionParameter:=clsXYlabTitleFunction) - ' ElseIf rdoSecondAxisSpecifyTitle.Checked AndAlso Not ucrInputTextNameSAxis.IsEmpty Then - ' clsXYlabTitleFunction.AddParameter("label", Chr(34) & Chr(34)) - ' clsBaseOperator.AddParameter(strAxis & "lab", clsRFunctionParameter:=clsXYlabTitleFunction) - ' Else - ' clsBaseOperator.RemoveParameterByName(strAxis & "lab") - ' End If - ' End If - 'End Sub - Private Sub SetNameSecondaryAxis() - clsXYSecondaryAxisFunction.RemoveParameterByName("name") If rdoSecondAxisNoTitle.Checked Then clsXYSecondaryAxisFunction.AddParameter("name", Chr(34) & Chr(34), iPosition:=1) ElseIf rdoSecondAxisSpecifyTitle.Checked AndAlso Not ucrInputTextNameSAxis.IsEmpty Then clsXYSecondaryAxisFunction.AddParameter("name", Chr(34) & ucrInputTextNameSAxis.GetText() & Chr(34), iPosition:=1) End If - End Sub - Private Sub ucrPnlSecondAxisTitle_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSecondAxisTitle.ControlValueChanged, ucrInputTextNameSAxis.ControlValueChanged + + Private Sub ucrChkSecondaryAxis_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSecondaryAxis.ControlValueChanged, ucrInputSecondaryAxis.ControlValueChanged, ucrInputTextSecondAxis.ControlValueChanged, ucrPnlSecondAxisTitle.ControlValueChanged, ucrInputTextNameSAxis.ControlValueChanged SetNameSecondaryAxis() + SecondaryAxis() End Sub End Class \ No newline at end of file From 78d02324f64627d648182922a41e59fb0f9cd586 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 1 Aug 2023 16:43:48 +0100 Subject: [PATCH 070/100] Added secondary axis on plot options --- instat/sdgPlots.vb | 3 ++- instat/ucrAxes.vb | 15 --------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 2456bc8f38c..8d97db4f870 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -312,9 +312,10 @@ Public Class sdgPlots 'Theme Tab Checkboxes under grpCommonOptions ucrChkLegendPosition.SetText("Legend Position") - ucrChkLegendPosition.AddToLinkedControls(ucrInputLegendPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkLegendPosition.AddToLinkedControls(ucrInputLegendPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") ucrInputLegendPosition.SetDropDownStyleAsNonEditable() ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) + dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34)) dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34)) dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34)) dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34)) diff --git a/instat/ucrAxes.vb b/instat/ucrAxes.vb index bd259b6f8b9..c59cab5576b 100644 --- a/instat/ucrAxes.vb +++ b/instat/ucrAxes.vb @@ -42,8 +42,6 @@ Public Class ucrAxes Dim dctDateFormat As New Dictionary(Of String, String) Dim dctTempSecondaryAxis As New Dictionary(Of String, String) - - 'Axis Section ucrPnlAxisTitle.AddRadioButton(rdoTitleAuto) ucrPnlAxisTitle.AddRadioButton(rdoNoTitle) @@ -202,9 +200,7 @@ Public Class ucrAxes ucrPnlSecondAxisTitle.AddRadioButton(rdoSecondAxisSpecifyTitle) ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisTitleAuto, "name", "auto") ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisNoTitle, "name", "notitle") - 'ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisNoTitle, "name", Chr(34) & Chr(34), True) ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisSpecifyTitle, "name", "title") - 'ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisSpecifyTitle, "name", Chr(34) & Chr(34), False) ucrPnlSecondAxisTitle.AddToLinkedControls(ucrInputTextNameSAxis, {rdoSecondAxisSpecifyTitle}, bNewLinkedHideIfParameterMissing:=True) ucrChkSecondaryAxis.SetParameter(New RParameter("sec.axis")) @@ -212,7 +208,6 @@ Public Class ucrAxes ucrChkSecondaryAxis.AddParameterPresentCondition(True, "sec.axis", True) ucrChkSecondaryAxis.AddParameterPresentCondition(False, "sec.axis", False) ucrChkSecondaryAxis.AddToLinkedControls(ucrInputSecondaryAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="*") - 'ucrChkSecondaryAxis.AddToLinkedControls(ucrInputTextNameSAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkSecondaryAxis.AddToLinkedControls(ucrInputTextSecondAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="1") ucrInputSecondaryAxis.SetParameter(New RParameter("trans", bNewIncludeArgumentName:=False)) @@ -228,8 +223,6 @@ Public Class ucrAxes ucrInputTextSecondAxis.SetValidationTypeAsNumeric() ucrInputTextSecondAxis.AddQuotesIfUnrecognised = False - 'ucrInputTextNameSAxis.SetParameter(New RParameter("name")) - 'ucrInputTextNameSAxis.SetParameterIncludeArgumentName(False) ucrInputTextNameSAxis.SetLinkedDisplayControl(lblTitleSA) 'Date X Scale @@ -257,13 +250,10 @@ Public Class ucrAxes dctDateFormat.Add("Day-Month(Full Name)-Year(4-digit)", Chr(34) & "%d-%B-%Y" & Chr(34)) dctDateFormat.Add("Day/Month(Full Name)/Year(4-digit)", Chr(34) & "%d/%B/%Y" & Chr(34)) - ucrInputComboDateLabel.SetParameter(New RParameter("date_labels", 3)) ucrInputComboDateLabel.SetItems(dctDateFormat) ucrInputComboDateLabel.SetDropDownStyleAsEditable(bAdditionsAllowed:=True) - - ucrChkDateLabels.SetText("Date labels") ucrChkDateLabels.SetParameter(New RParameter("date_labels"), bNewChangeParameterValue:=False) @@ -294,7 +284,6 @@ Public Class ucrAxes ucrChkLimits.SetParameter(New RParameter("limits", 2), bNewChangeParameterValue:=False) bControlsInitialised = True - 'SetNameSecondaryAxis() End Sub Public Sub SetRCodeForControl(bIsXAxis As Boolean, Optional strNewAxisType As String = "continuous", Optional clsNewXYScaleContinuousFunction As RFunction = Nothing, Optional clsNewXYlabTitleFunction As RFunction = Nothing, Optional clsNewXYSecondaryAxisFunction As RFunction = Nothing, Optional clsNewXYScaleDateFunction As RFunction = Nothing, Optional clsNewBaseOperator As ROperator = Nothing, Optional bReset As Boolean = False, Optional bCloneIfNeeded As Boolean = False) @@ -342,8 +331,6 @@ Public Class ucrAxes clsXYSecondaryAxisFunction = New RFunction clsXYSecondaryAxisFunction.SetRCommand("sec_axis") - 'clsXYSecondaryAxisFunction.AddParameter("trans", "~.*5", bIncludeArgumentName:=False, iPosition:=0) - 'clsXYSecondaryAxisFunction.AddParameter("name", bIncludeArgumentName:=True, iPosition:=1) clsXYlabTitleFunction = clsNewXYlabTitleFunction clsXYScaleDateFunction = clsNewXYScaleDateFunction @@ -401,7 +388,6 @@ Public Class ucrAxes ucrPnlSecondAxisTitle.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrChkSecondaryAxis.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrInputSecondaryAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) - 'ucrInputTextNameSAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) End If 'scales functions @@ -451,7 +437,6 @@ Public Class ucrAxes bRCodeSet = True SetLabel() AddRemoveContinuousXYScales() - 'SetNameSecondaryAxis() End Sub Private Sub AddRemoveLabs() From 5d724d322a2cb892a3e5bc1623231d47c9709529 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 1 Aug 2023 16:50:58 +0100 Subject: [PATCH 071/100] minor change --- instat/sdgPlots.vb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 8d97db4f870..2456bc8f38c 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -312,10 +312,9 @@ Public Class sdgPlots 'Theme Tab Checkboxes under grpCommonOptions ucrChkLegendPosition.SetText("Legend Position") - ucrChkLegendPosition.AddToLinkedControls(ucrInputLegendPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") + ucrChkLegendPosition.AddToLinkedControls(ucrInputLegendPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") ucrInputLegendPosition.SetDropDownStyleAsNonEditable() ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) - dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34)) dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34)) dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34)) dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34)) From 449245a79535f6758f79822a5064a6834eadbca3 Mon Sep 17 00:00:00 2001 From: n-thony Date: Wed, 2 Aug 2023 10:42:58 +0300 Subject: [PATCH 072/100] Minor bug fix on Calculator dialogue --- instat/dlgCalculator.vb | 1 + instat/ucrInputComboBox.vb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index e20a868d104..f623284a996 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -89,6 +89,7 @@ Public Class dlgCalculator ucrCalc.ucrSaveResultInto.SetIsComboBox() ucrCalc.ucrSaveResultInto.SetCheckBoxText("Save Result") ucrCalc.ucrSaveResultInto.SetAssignToIfUncheckedValue("last_calc") + ucrCalc.ucrSaveResultInto.ucrInputComboSave.bKeyPress = False ucrCalc.ucrSaveResultInto.SetDataFrameSelector(ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames) ucrCalc.ucrTryCalculator.StrvecOutputRequired() diff --git a/instat/ucrInputComboBox.vb b/instat/ucrInputComboBox.vb index 2bebec68f59..58e9be59bda 100644 --- a/instat/ucrInputComboBox.vb +++ b/instat/ucrInputComboBox.vb @@ -18,6 +18,7 @@ Imports System.ComponentModel Public Class ucrInputComboBox Private _strRObjectItemsTypeLabel As String = "" + Public bKeyPress As Boolean = True Public Sub New() @@ -225,7 +226,7 @@ Public Class ucrInputComboBox End Sub Private Sub cboInput_KeyPress(sender As Object, e As KeyPressEventArgs) Handles cboInput.KeyPress - bUserTyped = True + bUserTyped = bKeyPress End Sub 'Public Sub SetEditable(bEditable As Boolean) From abc4a5c8db4f45b322e6852b8984ce3d7988eabc Mon Sep 17 00:00:00 2001 From: n-thony Date: Wed, 2 Aug 2023 11:49:24 +0300 Subject: [PATCH 073/100] Minor code change --- instat/dlgCalculator.vb | 1 - instat/ucrInputComboBox.vb | 2 +- instat/ucrInputTextBox.vb | 2 +- instat/ucrVariablename.vb | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index f623284a996..e20a868d104 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -89,7 +89,6 @@ Public Class dlgCalculator ucrCalc.ucrSaveResultInto.SetIsComboBox() ucrCalc.ucrSaveResultInto.SetCheckBoxText("Save Result") ucrCalc.ucrSaveResultInto.SetAssignToIfUncheckedValue("last_calc") - ucrCalc.ucrSaveResultInto.ucrInputComboSave.bKeyPress = False ucrCalc.ucrSaveResultInto.SetDataFrameSelector(ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames) ucrCalc.ucrTryCalculator.StrvecOutputRequired() diff --git a/instat/ucrInputComboBox.vb b/instat/ucrInputComboBox.vb index 58e9be59bda..48aeb421cb2 100644 --- a/instat/ucrInputComboBox.vb +++ b/instat/ucrInputComboBox.vb @@ -226,7 +226,7 @@ Public Class ucrInputComboBox End Sub Private Sub cboInput_KeyPress(sender As Object, e As KeyPressEventArgs) Handles cboInput.KeyPress - bUserTyped = bKeyPress + bUserTyped = False End Sub 'Public Sub SetEditable(bEditable As Boolean) diff --git a/instat/ucrInputTextBox.vb b/instat/ucrInputTextBox.vb index f911cce9ee3..9b98ebc4e35 100644 --- a/instat/ucrInputTextBox.vb +++ b/instat/ucrInputTextBox.vb @@ -31,7 +31,7 @@ Public Class ucrInputTextBox End Sub Private Sub txtInput_KeyPress(sender As Object, e As KeyPressEventArgs) Handles txtInput.KeyPress - bUserTyped = True + bUserTyped = False End Sub Private Sub txtInput_Validating(sender As Object, e As CancelEventArgs) Handles txtInput.Validating diff --git a/instat/ucrVariablename.vb b/instat/ucrVariablename.vb index f722270326e..45e801dfca5 100644 --- a/instat/ucrVariablename.vb +++ b/instat/ucrVariablename.vb @@ -24,7 +24,7 @@ Public Class ucrVariableName Public Event NameChanged() 'TODO this has a bug if using for setting default values in textbox if user does not use keyboard Private Sub txtValidation_KeyPress(sender As Object, e As KeyPressEventArgs) Handles txtValidation.KeyPress - bUserTyped = True + bUserTyped = False End Sub From 63692ad64a18831ea773b537057a7dca07733c42 Mon Sep 17 00:00:00 2001 From: Vitalis95 <89011415+Vitalis95@users.noreply.github.com> Date: Wed, 2 Aug 2023 12:03:21 +0300 Subject: [PATCH 074/100] Update instat/translations/translateDynamic.txt Co-authored-by: lloyddewit <57253949+lloyddewit@users.noreply.github.com> --- instat/translations/translateDynamic.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/translations/translateDynamic.txt b/instat/translations/translateDynamic.txt index 71b9c8ac2cd..e11e87a1c57 100644 --- a/instat/translations/translateDynamic.txt +++ b/instat/translations/translateDynamic.txt @@ -128,7 +128,7 @@ sdgSaveColumnPosition\_ucrChkKeepExistingPos% %\_cmdPlotOptions% %\_cmdTransform% %\_cmdVariables% -%\_dlgPICSARainfall% +dlgPICSARainfall %\_frmMain% %\_grdCurrentWorkSheet% %\_grpCSV% From bd3bbbfee09aecac43902e13010c747a5e4c0703 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 2 Aug 2023 13:50:57 +0300 Subject: [PATCH 075/100] Update instat/dlgFindInVariableOrFilter.vb Co-authored-by: lloyddewit <57253949+lloyddewit@users.noreply.github.com> --- instat/dlgFindInVariableOrFilter.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index 172fe323976..8e7759d132d 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -222,9 +222,9 @@ Public Class dlgFindInVariableOrFilter lblVariableFound.Text = "Found Variable: " & GetColumnIndex(strColumn) + 1 Dim strName = "Name: " & strColumn - TruncateLabelText(lblName, strName, 135) + lblName.Text = TruncateLabelText(lblName, strName, 135) Dim strLabel = "Label: " & GetColLabel(strColumn) - TruncateLabelText(lblLabel, strLabel, 135) + lblLabel.Text = TruncateLabelText(lblLabel, strLabel, 135) SetControlsVisible(True) lblFoundRow.Visible = False From c62d8263c6b24348e19f43e6e2a2dabd12095da7 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 2 Aug 2023 13:51:09 +0300 Subject: [PATCH 076/100] Update instat/dlgFindInVariableOrFilter.vb Co-authored-by: lloyddewit <57253949+lloyddewit@users.noreply.github.com> --- instat/dlgFindInVariableOrFilter.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index 8e7759d132d..2e2676bdd63 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -149,9 +149,9 @@ Public Class dlgFindInVariableOrFilter truncatedWidth = CInt(graphics.MeasureString(truncatedText & "...", font).Width) End While - label.Text = truncatedText & "..." + Return truncatedText & "..." Else - label.Text = strName + Return strName End If End Sub From c6c81c3919af94492448b86eda0478eb4dde3ea1 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 2 Aug 2023 13:51:19 +0300 Subject: [PATCH 077/100] Update instat/dlgFindInVariableOrFilter.vb Co-authored-by: lloyddewit <57253949+lloyddewit@users.noreply.github.com> --- instat/dlgFindInVariableOrFilter.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index 2e2676bdd63..e3b2411f026 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -155,7 +155,6 @@ Public Class dlgFindInVariableOrFilter End If End Sub - Private Sub cmdFind_Click(sender As Object, e As EventArgs) Handles cmdFind.Click Try If rdoVariable.Checked OrElse rdoInFilter.Checked Then From aaeb23ae20d8a579172d047619ccab9c4a3f6a83 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 2 Aug 2023 13:51:33 +0300 Subject: [PATCH 078/100] Update instat/dlgFindInVariableOrFilter.vb Co-authored-by: lloyddewit <57253949+lloyddewit@users.noreply.github.com> --- instat/dlgFindInVariableOrFilter.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index e3b2411f026..3ab0091ee76 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -135,7 +135,7 @@ Public Class dlgFindInVariableOrFilter ((rdoInFilter.Checked OrElse rdoSelect.Checked) AndAlso Not ucrReceiverVariable.IsEmpty) End Sub - Private Sub TruncateLabelText(label As Label, strName As String, maximumWidth As Integer) + Private Function TruncateLabelText(label As Label, strName As String, maximumWidth As Integer) As String Dim graphics As Graphics = label.CreateGraphics() Dim originalText As String = strName Dim font As Font = label.Font From d9a605858774eb9193782ba78fd3d3a92b955eda Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 2 Aug 2023 13:51:53 +0300 Subject: [PATCH 079/100] Update instat/dlgFindInVariableOrFilter.vb Co-authored-by: lloyddewit <57253949+lloyddewit@users.noreply.github.com> --- instat/dlgFindInVariableOrFilter.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index 3ab0091ee76..586fdeda793 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -268,7 +268,7 @@ Public Class dlgFindInVariableOrFilter If strArr.Length = 1 Then strColLabel = strArr(0) ElseIf strArr.Length > 1 Then - MessageBox.Show(Me, "Developer error: retrieved column label should be one.", "Developer Error", MessageBoxButtons.OK, MessageBoxIcon.Error) + MessageBox.Show(Me, "Developer error: more than one column label found.", "Developer Error", MessageBoxButtons.OK, MessageBoxIcon.Error) strColLabel = strArr(strArr.Length - 1) End If End If From 6e50eabccf22e9ef9e18f9f4131217cf4a543efe Mon Sep 17 00:00:00 2001 From: n-thony Date: Wed, 2 Aug 2023 14:18:13 +0300 Subject: [PATCH 080/100] Resolved comments --- instat/Interface/IDataViewGrid.vb | 4 +-- .../DataGrid/Linux/ucrDataViewLinuxGrid.vb | 4 +-- .../DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 36 +++++++++++-------- instat/dlgFindInVariableOrFilter.vb | 14 ++++---- instat/ucrDataView.vb | 8 ++--- 5 files changed, 37 insertions(+), 29 deletions(-) diff --git a/instat/Interface/IDataViewGrid.vb b/instat/Interface/IDataViewGrid.vb index de43560c6d2..fa8914db568 100644 --- a/instat/Interface/IDataViewGrid.vb +++ b/instat/Interface/IDataViewGrid.vb @@ -38,9 +38,9 @@ Public Interface IDataViewGrid Sub AddRowData(dataFrame As clsDataFrame) Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, - Optional bCellOrRow As Boolean = False) + Optional bApplyToRows As Boolean = False) - Sub SearchColumnInGrid(strColumn As String) + Sub SelectColumnInGrid(strColumn As String) Sub AdjustColumnWidthAfterWrapping(strColumn As String, Optional bApplyWrap As Boolean = False) diff --git a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb index 3e6704d19b1..b899d906312 100644 --- a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb +++ b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb @@ -170,10 +170,10 @@ Public Class ucrDataViewLinuxGrid End Sub Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, - Optional bCellOrRow As Boolean = False) Implements IDataViewGrid.SearchRowInGrid + Optional bApplyToRows As Boolean = False) Implements IDataViewGrid.SearchRowInGrid End Sub - Public Sub SearchColumnInGrid(strColumn As String) Implements IDataViewGrid.SearchColumnInGrid + Public Sub SelectColumnInGrid(strColumn As String) Implements IDataViewGrid.SelectColumnInGrid End Sub End Class \ No newline at end of file diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index e65f5e07842..33cd364f3f4 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -283,9 +283,9 @@ Public Class ucrDataViewReoGrid Return lstRowsIndexes End Function - Private Sub ScrollToCellPos(currWorkSheet As Worksheet, iRow As Integer, iCol As Integer, bApplyToRow As Boolean) + Private Sub ScrollToCellPos(currWorkSheet As Worksheet, iRow As Integer, iCol As Integer, bApplyToRows As Boolean) - If bApplyToRow Then + If bApplyToRows Then currWorkSheet.FocusPos = currWorkSheet.Cells(row:=iRow, col:=iCol).Position Else currWorkSheet.SelectRows(iRow, 1) @@ -293,7 +293,7 @@ Public Class ucrDataViewReoGrid currWorkSheet.ScrollToCell(currWorkSheet.Cells(row:=iRow, col:=iCol).Address) End Sub - Private Sub SetRowOrCellBackgroundColor(currWorkSheet As Worksheet, rowNumbers As List(Of Integer), colIndex As Integer, bApplyToRow As Boolean, color As Color) + Private Sub SetRowOrCellBackgroundColor(currWorkSheet As Worksheet, rowNumbers As List(Of Integer), colIndex As Integer, bApplyToRows As Boolean, color As Color) ' Create a new style object for the row background color Dim rowStyle As WorksheetRangeStyle = New WorksheetRangeStyle With { .Flag = PlainStyleFlag.BackColor, @@ -304,7 +304,7 @@ Public Class ucrDataViewReoGrid For Each rowNumber As Integer In rowNumbers ' Check if the row index is within the valid range If rowNumber >= 0 AndAlso rowNumber < currWorkSheet.RowCount Then - If bApplyToRow Then + If bApplyToRows Then ' Apply the row style to the entire row currWorkSheet.Cells(rowNumber, colIndex).Style.BackColor = color Else @@ -315,26 +315,32 @@ Public Class ucrDataViewReoGrid End Sub Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, - Optional bApplyToRow As Boolean = False) Implements IDataViewGrid.SearchRowInGrid + Optional bApplyToRows As Boolean = False) Implements IDataViewGrid.SearchRowInGrid Dim currSheet = grdData.CurrentWorksheet If currSheet.RowHeaders.Any(Function(x) x.Text = iRow) Then Dim iRowIndex As Integer = GetRowIndex(currSheet, iRow) - Dim iColIndex As Integer = If(strColumn = Chr(34) & "filter" & Chr(34), 0, GetColumnIndex( strColName:=strColumn)) + Dim iColIndex As Integer = If(strColumn = Chr(34) & "filter" & Chr(34), 0, GetColumnIndex(strColName:=strColumn)) If iRowIndex > -1 AndAlso iColIndex > -1 Then - ScrollToCellPos(currWorkSheet:=currSheet, iRow:=iRowIndex, iCol:=iColIndex, bApplyToRow:=bApplyToRow) - If bApplyToRow Then + ScrollToCellPos(currWorkSheet:=currSheet, iRow:=iRowIndex, iCol:=iColIndex, bApplyToRows:=bApplyToRows) + If bApplyToRows Then SetRowOrCellBackgroundColor(currWorkSheet:=currSheet, rowNumbers:=GetRowsIndexes(currSheet, rowNumbers), - colIndex:=iColIndex, bApplyToRow:=bApplyToRow, color:=Color.LightGreen) + colIndex:=iColIndex, bApplyToRows:=bApplyToRows, color:=Color.LightGreen) Else SetRowOrCellBackgroundColor(currWorkSheet:=currSheet, rowNumbers:=GetRowsIndexes(currSheet, rowNumbers), - colIndex:=currSheet.ColumnCount, bApplyToRow:=bApplyToRow, color:=Color.LightGreen) + colIndex:=currSheet.ColumnCount, bApplyToRows:=bApplyToRows, color:=Color.LightGreen) End If End If End If End Sub + ''' + ''' This function takes an integer columnNumber as input and returns a string representing the corresponding Reogrid-style column letter. + ''' For example, 1 will be converted to "A", 26 to "Z", 27 to "AA", 28 to "AB", and so on. + ''' + ''' + ''' Private Function ColumnNumberToAlpha(columnNumber As Integer) As String Dim dividend As Integer = columnNumber Dim columnName As String = String.Empty @@ -349,14 +355,16 @@ Public Class ucrDataViewReoGrid Return columnName End Function - - Public Sub SearchColumnInGrid(strColumn As String) Implements IDataViewGrid.SearchColumnInGrid - Dim currSheet = grdData.CurrentWorksheet + Public Sub SelectColumnInGrid(strColumn As String) Implements IDataViewGrid.SelectColumnInGrid If String.IsNullOrEmpty(strColumn) Then Exit Sub End If - Dim iColumn As Integer = grdData.CurrentWorksheet.ColumnHeaders.Where(Function(col) col.Text.Split("(")(0).Trim = strColumn).FirstOrDefault().Index + + Dim currSheet = grdData.CurrentWorksheet + Dim iColumn As Integer = grdData.CurrentWorksheet.ColumnHeaders. + Where(Function(col) col.Text.Split("(")(0).Trim = strColumn). + FirstOrDefault().Index ' Get the correspond index of a column from a column name. Dim strOriginalColumnName As String = ColumnNumberToAlpha(iColumn + 1) & "1" currSheet.ScrollToCell(strOriginalColumnName) diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index 586fdeda793..d4a8f9c7042 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -98,6 +98,7 @@ Public Class dlgFindInVariableOrFilter lblMatching.Visible = False lblFoundRow.Visible = False iColumnClick = 1 + iCountRowClick = 1 clsDummyFunction.AddParameter("check", "variable", iPosition:=0) clsDummyFunction.AddParameter("select", "cell", iPosition:=1) @@ -137,11 +138,10 @@ Public Class dlgFindInVariableOrFilter Private Function TruncateLabelText(label As Label, strName As String, maximumWidth As Integer) As String Dim graphics As Graphics = label.CreateGraphics() - Dim originalText As String = strName Dim font As Font = label.Font - Dim originalWidth As Integer = CInt(graphics.MeasureString(originalText, font).Width) + Dim originalWidth As Integer = CInt(graphics.MeasureString(strName, font).Width) If originalWidth > maximumWidth Then - Dim truncatedText As String = originalText + Dim truncatedText As String = strName Dim truncatedWidth As Integer = originalWidth While truncatedWidth > maximumWidth AndAlso truncatedText.Length > 0 @@ -153,7 +153,7 @@ Public Class dlgFindInVariableOrFilter Else Return strName End If - End Sub + End Function Private Sub cmdFind_Click(sender As Object, e As EventArgs) Handles cmdFind.Click Try @@ -199,9 +199,9 @@ Public Class dlgFindInVariableOrFilter Dim iRow As Integer = lstRowNumbers(iCurrentOccurenceIndex - 1) Dim iRowPage As Integer = Math.Ceiling(CDbl(iRow / frmMain.clsInstatOptions.iMaxRows)) frmMain.ucrDataViewer.GoToSpecificRowPage(iRowPage) - Dim bApplyCell As Boolean = (rdoVariable.Checked AndAlso rdoRow.Checked) OrElse rdoInFilter.Checked + Dim bApplyToRows As Boolean = (rdoVariable.Checked AndAlso rdoRow.Checked) OrElse rdoInFilter.Checked frmMain.ucrDataViewer.SearchRowInGrid(rowNumbers:=lstRowNumbers, strColumn:=strColumn, - iRow:=iRow, bCellOrRow:=Not bApplyCell) + iRow:=iRow, bApplyToRows:=Not bApplyToRows) lblFoundRow.Text = "Found Row: " & iRow lblFoundRow.Visible = True iCountRowClick += 1 @@ -217,7 +217,7 @@ Public Class dlgFindInVariableOrFilter Dim iColumn As Integer = GetColumnIndex(strColumn) Dim iColPage As Integer = Math.Ceiling(CDbl(iColumn / frmMain.clsInstatOptions.iMaxCols)) frmMain.ucrDataViewer.GoToSpecificColumnPage(iColPage) - frmMain.ucrDataViewer.SearchColumnInGrid(strColumn) + frmMain.ucrDataViewer.SelectColumnInGrid(strColumn) lblVariableFound.Text = "Found Variable: " & GetColumnIndex(strColumn) + 1 Dim strName = "Name: " & strColumn diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 254c9805268..b0e2760b91b 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -1009,12 +1009,12 @@ Public Class ucrDataView End Sub Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, - Optional bCellOrRow As Boolean = False) - _grid.SearchRowInGrid(rowNumbers, strColumn, iRow, bCellOrRow) + Optional bApplyToRows As Boolean = False) + _grid.SearchRowInGrid(rowNumbers, strColumn, iRow, bApplyToRows) End Sub - Public Sub SearchColumnInGrid(strColumn As String) - _grid.SearchColumnInGrid(strColumn) + Public Sub SelectColumnInGrid(strColumn As String) + _grid.SelectColumnInGrid(strColumn) End Sub End Class \ No newline at end of file From 012f7a55a46118b3661318c0532ec3a0756d5346 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 2 Aug 2023 14:33:53 +0100 Subject: [PATCH 081/100] Added Offset check box --- instat/ucrAxes.Designer.vb | 74 +++++++++++++++++++++++++------------- instat/ucrAxes.vb | 71 +++++++++++++++++++++++++++++------- 2 files changed, 108 insertions(+), 37 deletions(-) diff --git a/instat/ucrAxes.Designer.vb b/instat/ucrAxes.Designer.vb index d11e71385a9..2c76ec33bbc 100644 --- a/instat/ucrAxes.Designer.vb +++ b/instat/ucrAxes.Designer.vb @@ -102,15 +102,17 @@ Partial Class ucrAxes Me.lblMinorBreaksFrom = New System.Windows.Forms.Label() Me.rdoMinorBreaksNone = New System.Windows.Forms.RadioButton() Me.grpSecondAxis = New System.Windows.Forms.GroupBox() + Me.ucrInputOffset = New instat.ucrInputComboBox() + Me.ucrChkOffset = New instat.ucrCheck() Me.rdoSecondAxisSpecifyTitle = New System.Windows.Forms.RadioButton() Me.rdoSecondAxisNoTitle = New System.Windows.Forms.RadioButton() Me.rdoSecondAxisTitleAuto = New System.Windows.Forms.RadioButton() Me.ucrPnlSecondAxisTitle = New instat.UcrPanel() Me.lblTitleSA = New System.Windows.Forms.Label() Me.ucrInputTextNameSAxis = New instat.ucrInputTextBox() - Me.ucrInputTextSecondAxis = New instat.ucrInputTextBox() Me.ucrInputSecondaryAxis = New instat.ucrInputComboBox() Me.ucrChkSecondaryAxis = New instat.ucrCheck() + Me.ucrInputTrans = New instat.ucrInputComboBox() Me.grpAxisTitle.SuspendLayout() Me.grpMajorBreaks.SuspendLayout() Me.grpScales.SuspendLayout() @@ -137,7 +139,7 @@ Partial Class ucrAxes 'lblTitle ' Me.lblTitle.AutoSize = True - Me.lblTitle.Location = New System.Drawing.Point(6, 51) + Me.lblTitle.Location = New System.Drawing.Point(4, 51) Me.lblTitle.Name = "lblTitle" Me.lblTitle.Size = New System.Drawing.Size(30, 13) Me.lblTitle.TabIndex = 20 @@ -146,7 +148,7 @@ Partial Class ucrAxes 'rdoSpecifyTitle ' Me.rdoSpecifyTitle.AutoSize = True - Me.rdoSpecifyTitle.Location = New System.Drawing.Point(93, 21) + Me.rdoSpecifyTitle.Location = New System.Drawing.Point(94, 21) Me.rdoSpecifyTitle.Name = "rdoSpecifyTitle" Me.rdoSpecifyTitle.Size = New System.Drawing.Size(83, 17) Me.rdoSpecifyTitle.TabIndex = 3 @@ -157,7 +159,7 @@ Partial Class ucrAxes 'rdoNoTitle ' Me.rdoNoTitle.AutoSize = True - Me.rdoNoTitle.Location = New System.Drawing.Point(214, 21) + Me.rdoNoTitle.Location = New System.Drawing.Point(215, 21) Me.rdoNoTitle.Name = "rdoNoTitle" Me.rdoNoTitle.Size = New System.Drawing.Size(62, 17) Me.rdoNoTitle.TabIndex = 3 @@ -168,7 +170,7 @@ Partial Class ucrAxes 'rdoTitleAuto ' Me.rdoTitleAuto.AutoSize = True - Me.rdoTitleAuto.Location = New System.Drawing.Point(6, 21) + Me.rdoTitleAuto.Location = New System.Drawing.Point(7, 21) Me.rdoTitleAuto.Name = "rdoTitleAuto" Me.rdoTitleAuto.Size = New System.Drawing.Size(47, 17) Me.rdoTitleAuto.TabIndex = 2 @@ -816,22 +818,44 @@ Partial Class ucrAxes ' 'grpSecondAxis ' + Me.grpSecondAxis.Controls.Add(Me.ucrInputTrans) + Me.grpSecondAxis.Controls.Add(Me.ucrInputOffset) Me.grpSecondAxis.Controls.Add(Me.rdoSecondAxisSpecifyTitle) Me.grpSecondAxis.Controls.Add(Me.rdoSecondAxisNoTitle) Me.grpSecondAxis.Controls.Add(Me.rdoSecondAxisTitleAuto) Me.grpSecondAxis.Controls.Add(Me.ucrPnlSecondAxisTitle) Me.grpSecondAxis.Controls.Add(Me.lblTitleSA) Me.grpSecondAxis.Controls.Add(Me.ucrInputTextNameSAxis) - Me.grpSecondAxis.Controls.Add(Me.ucrInputTextSecondAxis) Me.grpSecondAxis.Controls.Add(Me.ucrInputSecondaryAxis) Me.grpSecondAxis.Controls.Add(Me.ucrChkSecondaryAxis) + Me.grpSecondAxis.Controls.Add(Me.ucrChkOffset) Me.grpSecondAxis.Location = New System.Drawing.Point(3, 324) Me.grpSecondAxis.Name = "grpSecondAxis" - Me.grpSecondAxis.Size = New System.Drawing.Size(320, 109) + Me.grpSecondAxis.Size = New System.Drawing.Size(384, 109) Me.grpSecondAxis.TabIndex = 35 Me.grpSecondAxis.TabStop = False Me.grpSecondAxis.Text = "Secondary Axis" ' + 'ucrInputOffset + ' + Me.ucrInputOffset.AddQuotesIfUnrecognised = True + Me.ucrInputOffset.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputOffset.GetSetSelectedIndex = -1 + Me.ucrInputOffset.IsReadOnly = False + Me.ucrInputOffset.Location = New System.Drawing.Point(325, 16) + Me.ucrInputOffset.Name = "ucrInputOffset" + Me.ucrInputOffset.Size = New System.Drawing.Size(40, 23) + Me.ucrInputOffset.TabIndex = 35 + ' + 'ucrChkOffset + ' + Me.ucrChkOffset.AutoSize = True + Me.ucrChkOffset.Checked = False + Me.ucrChkOffset.Location = New System.Drawing.Point(267, 17) + Me.ucrChkOffset.Name = "ucrChkOffset" + Me.ucrChkOffset.Size = New System.Drawing.Size(93, 23) + Me.ucrChkOffset.TabIndex = 36 + ' 'rdoSecondAxisSpecifyTitle ' Me.rdoSecondAxisSpecifyTitle.AutoSize = True @@ -888,42 +912,42 @@ Partial Class ucrAxes Me.ucrInputTextNameSAxis.AutoSize = True Me.ucrInputTextNameSAxis.IsMultiline = False Me.ucrInputTextNameSAxis.IsReadOnly = False - Me.ucrInputTextNameSAxis.Location = New System.Drawing.Point(40, 80) + Me.ucrInputTextNameSAxis.Location = New System.Drawing.Point(62, 80) Me.ucrInputTextNameSAxis.Name = "ucrInputTextNameSAxis" - Me.ucrInputTextNameSAxis.Size = New System.Drawing.Size(79, 21) + Me.ucrInputTextNameSAxis.Size = New System.Drawing.Size(131, 21) Me.ucrInputTextNameSAxis.TabIndex = 29 ' - 'ucrInputTextSecondAxis - ' - Me.ucrInputTextSecondAxis.AddQuotesIfUnrecognised = True - Me.ucrInputTextSecondAxis.AutoSize = True - Me.ucrInputTextSecondAxis.IsMultiline = False - Me.ucrInputTextSecondAxis.IsReadOnly = False - Me.ucrInputTextSecondAxis.Location = New System.Drawing.Point(208, 19) - Me.ucrInputTextSecondAxis.Name = "ucrInputTextSecondAxis" - Me.ucrInputTextSecondAxis.Size = New System.Drawing.Size(79, 21) - Me.ucrInputTextSecondAxis.TabIndex = 28 - ' 'ucrInputSecondaryAxis ' Me.ucrInputSecondaryAxis.AddQuotesIfUnrecognised = True Me.ucrInputSecondaryAxis.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputSecondaryAxis.GetSetSelectedIndex = -1 Me.ucrInputSecondaryAxis.IsReadOnly = False - Me.ucrInputSecondaryAxis.Location = New System.Drawing.Point(109, 19) + Me.ucrInputSecondaryAxis.Location = New System.Drawing.Point(107, 15) Me.ucrInputSecondaryAxis.Name = "ucrInputSecondaryAxis" - Me.ucrInputSecondaryAxis.Size = New System.Drawing.Size(78, 23) + Me.ucrInputSecondaryAxis.Size = New System.Drawing.Size(40, 23) Me.ucrInputSecondaryAxis.TabIndex = 27 ' 'ucrChkSecondaryAxis ' Me.ucrChkSecondaryAxis.AutoSize = True Me.ucrChkSecondaryAxis.Checked = False - Me.ucrChkSecondaryAxis.Location = New System.Drawing.Point(6, 19) + Me.ucrChkSecondaryAxis.Location = New System.Drawing.Point(9, 17) Me.ucrChkSecondaryAxis.Name = "ucrChkSecondaryAxis" Me.ucrChkSecondaryAxis.Size = New System.Drawing.Size(124, 23) Me.ucrChkSecondaryAxis.TabIndex = 24 ' + 'ucrInputTrans + ' + Me.ucrInputTrans.AddQuotesIfUnrecognised = True + Me.ucrInputTrans.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputTrans.GetSetSelectedIndex = -1 + Me.ucrInputTrans.IsReadOnly = False + Me.ucrInputTrans.Location = New System.Drawing.Point(170, 15) + Me.ucrInputTrans.Name = "ucrInputTrans" + Me.ucrInputTrans.Size = New System.Drawing.Size(78, 23) + Me.ucrInputTrans.TabIndex = 37 + ' 'ucrAxes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -1018,7 +1042,6 @@ Partial Class ucrAxes Friend WithEvents ucrChkDateLabels As ucrCheck Friend WithEvents ucrInputComboDateLabel As ucrInputComboBox Friend WithEvents grpSecondAxis As GroupBox - Friend WithEvents ucrInputTextSecondAxis As ucrInputTextBox Friend WithEvents ucrInputSecondaryAxis As ucrInputComboBox Friend WithEvents ucrChkSecondaryAxis As ucrCheck Friend WithEvents ucrInputTextNameSAxis As ucrInputTextBox @@ -1027,4 +1050,7 @@ Partial Class ucrAxes Friend WithEvents rdoSecondAxisNoTitle As RadioButton Friend WithEvents rdoSecondAxisTitleAuto As RadioButton Friend WithEvents ucrPnlSecondAxisTitle As UcrPanel + Friend WithEvents ucrChkOffset As ucrCheck + Friend WithEvents ucrInputOffset As ucrInputComboBox + Friend WithEvents ucrInputTrans As ucrInputComboBox End Class diff --git a/instat/ucrAxes.vb b/instat/ucrAxes.vb index c59cab5576b..77e7957aacf 100644 --- a/instat/ucrAxes.vb +++ b/instat/ucrAxes.vb @@ -41,6 +41,8 @@ Public Class ucrAxes Dim dctTickMarkers As New Dictionary(Of String, String) Dim dctDateFormat As New Dictionary(Of String, String) Dim dctTempSecondaryAxis As New Dictionary(Of String, String) + Dim dctOffset As New Dictionary(Of String, String) + Dim dctTransValue As New Dictionary(Of String, String) 'Axis Section ucrPnlAxisTitle.AddRadioButton(rdoTitleAuto) @@ -203,12 +205,13 @@ Public Class ucrAxes ucrPnlSecondAxisTitle.AddParameterValuesCondition(rdoSecondAxisSpecifyTitle, "name", "title") ucrPnlSecondAxisTitle.AddToLinkedControls(ucrInputTextNameSAxis, {rdoSecondAxisSpecifyTitle}, bNewLinkedHideIfParameterMissing:=True) - ucrChkSecondaryAxis.SetParameter(New RParameter("sec.axis")) ucrChkSecondaryAxis.SetText("Transformation") - ucrChkSecondaryAxis.AddParameterPresentCondition(True, "sec.axis", True) - ucrChkSecondaryAxis.AddParameterPresentCondition(False, "sec.axis", False) + ucrChkSecondaryAxis.AddParameterPresentCondition(True, True) + ucrChkSecondaryAxis.AddParameterPresentCondition(False, False) ucrChkSecondaryAxis.AddToLinkedControls(ucrInputSecondaryAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="*") - ucrChkSecondaryAxis.AddToLinkedControls(ucrInputTextSecondAxis, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="1") + ucrChkSecondaryAxis.AddToLinkedControls(ucrInputTrans, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="1") + ucrChkSecondaryAxis.AddToLinkedControls(ucrPnlSecondAxisTitle, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkSecondaryAxis.AddToLinkedControls(ucrChkOffset, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrInputSecondaryAxis.SetParameter(New RParameter("trans", bNewIncludeArgumentName:=False)) dctTempSecondaryAxis.Add("*", "*") @@ -218,10 +221,39 @@ Public Class ucrAxes ucrInputSecondaryAxis.SetItems(dctTempSecondaryAxis) ucrInputSecondaryAxis.SetDropDownStyleAsNonEditable() - ucrInputTextSecondAxis.SetParameter(New RParameter("number", bNewIncludeArgumentName:=False)) - ucrInputTextSecondAxis.SetParameterIncludeArgumentName(False) - ucrInputTextSecondAxis.SetValidationTypeAsNumeric() - ucrInputTextSecondAxis.AddQuotesIfUnrecognised = False + ucrChkOffset.SetText("Offset") + ucrChkOffset.AddParameterPresentCondition(True, True) + ucrChkOffset.AddParameterPresentCondition(False, False) + ucrChkOffset.AddToLinkedControls(ucrInputOffset, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0") + + ucrInputOffset.SetParameter(New RParameter("signe", bNewIncludeArgumentName:=False)) + dctOffset.Add("0", "0") + dctOffset.Add("32", "32") + dctOffset.Add("-32", "-32") + ucrInputOffset.SetItems(dctOffset) + ucrInputOffset.SetDropDownStyleAsNonEditable() + + ucrInputTrans.SetParameter(New RParameter("number", bNewIncludeArgumentName:=False)) + dctTransValue.Add("1", "1") + dctTransValue.Add("1.09361", "1.09361") + dctTransValue.Add("1.34", "1.34") + dctTransValue.Add("1.8", "1.8") + dctTransValue.Add("2.20462", "2.20462") + dctTransValue.Add("2.54", "2.54") + dctTransValue.Add("7", "7") + dctTransValue.Add("9.632", "9.632") + dctTransValue.Add("10.15", "10.15") + dctTransValue.Add("13", "13") + dctTransValue.Add("20", "20") + dctTransValue.Add("25.0128", "25.0128") + dctTransValue.Add("100", "100") + dctTransValue.Add("30.6682", "30.6682") + dctTransValue.Add("40", "40") + dctTransValue.Add("600.26", "600.26") + dctTransValue.Add("1000", "1000") + ucrInputTrans.SetItems(dctTransValue) + ucrInputTrans.SetDropDownStyleAsNonEditable() + ucrInputTrans.SetDropDownStyleAsEditable(True) ucrInputTextNameSAxis.SetLinkedDisplayControl(lblTitleSA) @@ -326,7 +358,6 @@ Public Class ucrAxes clsXYScaleDateBreakOperator.bToScriptAsRString = True clsDummyFunction = New RFunction - clsDummyFunction.AddParameter("sec.axis", "TRUE", iPosition:=0) clsDummyFunction.AddParameter("name", "auto", iPosition:=1) clsXYSecondaryAxisFunction = New RFunction @@ -386,7 +417,7 @@ Public Class ucrAxes If bReset Then ucrPnlSecondAxisTitle.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) - ucrChkSecondaryAxis.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) + ucrChkSecondaryAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrInputSecondaryAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) End If @@ -587,8 +618,22 @@ Public Class ucrAxes Private Sub SecondaryAxis() If ucrChkSecondaryAxis.Checked Then - clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTextSecondAxis.GetText, bIncludeArgumentName:=False, iPosition:=0) - clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) + If ucrChkOffset.Checked Then + If ucrInputOffset.GetText = "0" Then + clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTrans.GetText, bIncludeArgumentName:=False, iPosition:=0) + clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) + ElseIf ucrInputOffset.GetText = "-32" Then + clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTrans.GetText & ucrInputOffset.GetText, bIncludeArgumentName:=False, iPosition:=0) + clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) + ElseIf ucrInputOffset.GetText = "32" Then + clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTrans.GetText & "+" & ucrInputOffset.GetText, bIncludeArgumentName:=False, iPosition:=0) + clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) + End If + Else + clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTrans.GetText, bIncludeArgumentName:=False, iPosition:=0) + clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) + + End If Else clsXYScaleContinuousFunction.RemoveParameterByName("sec.axis") End If @@ -615,7 +660,7 @@ Public Class ucrAxes End If End Sub - Private Sub ucrChkSecondaryAxis_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSecondaryAxis.ControlValueChanged, ucrInputSecondaryAxis.ControlValueChanged, ucrInputTextSecondAxis.ControlValueChanged, ucrPnlSecondAxisTitle.ControlValueChanged, ucrInputTextNameSAxis.ControlValueChanged + Private Sub ucrChkSecondaryAxis_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSecondaryAxis.ControlValueChanged, ucrInputSecondaryAxis.ControlValueChanged, ucrPnlSecondAxisTitle.ControlValueChanged, ucrInputTextNameSAxis.ControlValueChanged, ucrInputTrans.ControlValueChanged, ucrChkOffset.ControlValueChanged, ucrInputOffset.ControlValueChanged SetNameSecondaryAxis() SecondaryAxis() End Sub From c09154374ea4fdbf8d49a47fdbccac6217adcd87 Mon Sep 17 00:00:00 2001 From: n-thony Date: Thu, 3 Aug 2023 12:38:31 +0300 Subject: [PATCH 082/100] Fixed the column position --- instat/dlgCalculator.vb | 8 +++++++- instat/sdgSaveColumnPosition.vb | 2 +- instat/ucrSave.vb | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index e20a868d104..58002ce15bc 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -119,7 +119,13 @@ Public Class dlgCalculator Private Sub SaveResults() If ucrCalc.ucrSaveResultInto.ucrChkSave.Checked AndAlso ucrCalc.ucrSaveResultInto.IsComplete Then clsRemoveLabelsFunction.AddParameter("col_names", Chr(34) & ucrCalc.ucrSaveResultInto.GetText() & Chr(34), iPosition:=1) - ucrBase.clsRsyntax.SetAssignTo(ucrCalc.ucrSaveResultInto.GetText(), strTempColumn:=ucrCalc.ucrSaveResultInto.GetText(), strTempDataframe:=ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bAssignToIsPrefix:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToIsPrefix, bAssignToColumnWithoutNames:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToColumnWithoutNames, bInsertColumnBefore:=ucrBase.clsRsyntax.clsBaseCommandString.bInsertColumnBefore, bRequireCorrectLength:=ucrBase.clsRsyntax.clsBaseCommandString.bRequireCorrectLength) + ucrBase.clsRsyntax.SetAssignTo(ucrCalc.ucrSaveResultInto.GetText(), strTempColumn:=ucrCalc.ucrSaveResultInto.GetText(), + strTempDataframe:=ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.Text, + bAssignToIsPrefix:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToIsPrefix, + bAssignToColumnWithoutNames:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToColumnWithoutNames, + bInsertColumnBefore:=ucrBase.clsRsyntax.clsBaseCommandString.bInsertColumnBefore, + bRequireCorrectLength:=ucrBase.clsRsyntax.clsBaseCommandString.bRequireCorrectLength, + strAdjacentColumn:=ucrCalc.ucrSaveResultInto.AdjacentColumnName) ucrBase.clsRsyntax.AddToAfterCodes(clsRemoveLabelsFunction, 1) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = True ucrBase.clsRsyntax.iCallType = 0 diff --git a/instat/sdgSaveColumnPosition.vb b/instat/sdgSaveColumnPosition.vb index 17721b2de29..1928d2df1bd 100644 --- a/instat/sdgSaveColumnPosition.vb +++ b/instat/sdgSaveColumnPosition.vb @@ -29,7 +29,7 @@ Imports instat.Translations Public Class sdgSaveColumnPosition - Private clsColPosFunction As RFunction + Private clsColPosFunction As New RFunction Public bControlsNotInitialised As Boolean = True Public bUserSelected As Boolean = False Public bRcodeFlag As Boolean = False diff --git a/instat/ucrSave.vb b/instat/ucrSave.vb index 5cd56cbc3d7..c48672c9a02 100644 --- a/instat/ucrSave.vb +++ b/instat/ucrSave.vb @@ -775,6 +775,14 @@ Public Class ucrSave End If End Function '''-------------------------------------------------------------------------------------------- + ''' Gets the adjacent column name from the Save Column Position Sub Dialogue. + ''' + ''' The adjacent column name from the Save Column Position Sub Dialogue. + '''-------------------------------------------------------------------------------------------- + Public Function AdjacentColumnName() As String + Return sdgSaveColumnPosition.AdjacentColumn + End Function + '''-------------------------------------------------------------------------------------------- ''' True if the user has entered text into the text/combo box, else false. ''' ''' True if the user has entered text into the text/combo box, else false. From 509bb6c2b744a8fc070927a2cf9ad2b2cd7a9efd Mon Sep 17 00:00:00 2001 From: n-thony Date: Fri, 4 Aug 2023 12:40:30 +0300 Subject: [PATCH 083/100] Minor code change --- instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 33cd364f3f4..0d47807c6a5 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -286,9 +286,9 @@ Public Class ucrDataViewReoGrid Private Sub ScrollToCellPos(currWorkSheet As Worksheet, iRow As Integer, iCol As Integer, bApplyToRows As Boolean) If bApplyToRows Then - currWorkSheet.FocusPos = currWorkSheet.Cells(row:=iRow, col:=iCol).Position - Else currWorkSheet.SelectRows(iRow, 1) + Else + currWorkSheet.FocusPos = currWorkSheet.Cells(row:=iRow, col:=iCol).Position End If currWorkSheet.ScrollToCell(currWorkSheet.Cells(row:=iRow, col:=iCol).Address) End Sub From ace54029643f4b59283fba4878d602ae054199d9 Mon Sep 17 00:00:00 2001 From: n-thony Date: Fri, 4 Aug 2023 12:47:20 +0300 Subject: [PATCH 084/100] Code changes --- instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 4 ++-- instat/dlgFindInVariableOrFilter.vb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 0d47807c6a5..b7c4c9d77b7 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -326,10 +326,10 @@ Public Class ucrDataViewReoGrid ScrollToCellPos(currWorkSheet:=currSheet, iRow:=iRowIndex, iCol:=iColIndex, bApplyToRows:=bApplyToRows) If bApplyToRows Then SetRowOrCellBackgroundColor(currWorkSheet:=currSheet, rowNumbers:=GetRowsIndexes(currSheet, rowNumbers), - colIndex:=iColIndex, bApplyToRows:=bApplyToRows, color:=Color.LightGreen) + colIndex:=currSheet.ColumnCount, bApplyToRows:=bApplyToRows, color:=Color.LightGreen) Else SetRowOrCellBackgroundColor(currWorkSheet:=currSheet, rowNumbers:=GetRowsIndexes(currSheet, rowNumbers), - colIndex:=currSheet.ColumnCount, bApplyToRows:=bApplyToRows, color:=Color.LightGreen) + colIndex:=iColIndex, bApplyToRows:=bApplyToRows, color:=Color.LightGreen) End If End If End If diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index d4a8f9c7042..b4964cbbc12 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -201,7 +201,7 @@ Public Class dlgFindInVariableOrFilter frmMain.ucrDataViewer.GoToSpecificRowPage(iRowPage) Dim bApplyToRows As Boolean = (rdoVariable.Checked AndAlso rdoRow.Checked) OrElse rdoInFilter.Checked frmMain.ucrDataViewer.SearchRowInGrid(rowNumbers:=lstRowNumbers, strColumn:=strColumn, - iRow:=iRow, bApplyToRows:=Not bApplyToRows) + iRow:=iRow, bApplyToRows:=bApplyToRows) lblFoundRow.Text = "Found Row: " & iRow lblFoundRow.Visible = True iCountRowClick += 1 From dea6df506901e42a36b8ddc5fc688c87af826d5d Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Fri, 4 Aug 2023 12:58:29 +0300 Subject: [PATCH 085/100] small change --- instat/sdgPlots.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 2456bc8f38c..8d97db4f870 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -312,9 +312,10 @@ Public Class sdgPlots 'Theme Tab Checkboxes under grpCommonOptions ucrChkLegendPosition.SetText("Legend Position") - ucrChkLegendPosition.AddToLinkedControls(ucrInputLegendPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") + ucrChkLegendPosition.AddToLinkedControls(ucrInputLegendPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") ucrInputLegendPosition.SetDropDownStyleAsNonEditable() ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) + dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34)) dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34)) dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34)) dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34)) From 426dd2dc3187296310594f707958952d65bb645a Mon Sep 17 00:00:00 2001 From: lloyddewit <57253949+lloyddewit@users.noreply.github.com> Date: Fri, 4 Aug 2023 15:23:54 +0200 Subject: [PATCH 086/100] Update instat/ucrAxes.vb --- instat/ucrAxes.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/ucrAxes.vb b/instat/ucrAxes.vb index 77e7957aacf..dd459cc1cef 100644 --- a/instat/ucrAxes.vb +++ b/instat/ucrAxes.vb @@ -632,7 +632,6 @@ Public Class ucrAxes Else clsXYSecondaryAxisFunction.AddParameter("trans", "~." & ucrInputSecondaryAxis.GetText & ucrInputTrans.GetText, bIncludeArgumentName:=False, iPosition:=0) clsXYScaleContinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsXYSecondaryAxisFunction, bIncludeArgumentName:=True) - End If Else clsXYScaleContinuousFunction.RemoveParameterByName("sec.axis") From 71027be69b114644af9f296a6dd47928b95c388c Mon Sep 17 00:00:00 2001 From: lloyddewit <57253949+lloyddewit@users.noreply.github.com> Date: Fri, 4 Aug 2023 15:24:02 +0200 Subject: [PATCH 087/100] Update instat/ucrAxes.vb --- instat/ucrAxes.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/ucrAxes.vb b/instat/ucrAxes.vb index dd459cc1cef..79b473a30a8 100644 --- a/instat/ucrAxes.vb +++ b/instat/ucrAxes.vb @@ -639,7 +639,6 @@ Public Class ucrAxes AddRemoveContinuousXYScales() End Sub - Private Sub ScaleDateFunction_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLimits.ControlValueChanged, ucrChkBreaks.ControlValueChanged If bRCodeSet Then If ucrChkLimits.Checked Then From e9943a0dcf0b2d9f369ec1c171d741b46b8eafc9 Mon Sep 17 00:00:00 2001 From: lloyddewit <57253949+lloyddewit@users.noreply.github.com> Date: Fri, 4 Aug 2023 15:24:12 +0200 Subject: [PATCH 088/100] Update instat/ucrAxes.vb --- instat/ucrAxes.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/ucrAxes.vb b/instat/ucrAxes.vb index 79b473a30a8..6ee738d7e59 100644 --- a/instat/ucrAxes.vb +++ b/instat/ucrAxes.vb @@ -649,6 +649,7 @@ Public Class ucrAxes End If End If End Sub + Private Sub SetNameSecondaryAxis() clsXYSecondaryAxisFunction.RemoveParameterByName("name") If rdoSecondAxisNoTitle.Checked Then From 537e3481771d6b3df661b8bacc077e44024440ac Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 4 Aug 2023 16:32:25 +0300 Subject: [PATCH 089/100] Update instat/ucrInputComboBox.vb Co-authored-by: lloyddewit <57253949+lloyddewit@users.noreply.github.com> --- instat/ucrInputComboBox.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/ucrInputComboBox.vb b/instat/ucrInputComboBox.vb index 48aeb421cb2..02e3d485ea5 100644 --- a/instat/ucrInputComboBox.vb +++ b/instat/ucrInputComboBox.vb @@ -18,7 +18,6 @@ Imports System.ComponentModel Public Class ucrInputComboBox Private _strRObjectItemsTypeLabel As String = "" - Public bKeyPress As Boolean = True Public Sub New() From bb407a528e6496f4732fe04f4b006bd112122f96 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Mon, 7 Aug 2023 13:56:54 +0300 Subject: [PATCH 090/100] changes to the code --- instat/frmMain.Designer.vb | 35 +++++++++++++++++++++++++---------- instat/frmMain.vb | 5 +++++ 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 9beca326202..7cbc6becb7e 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -69,6 +69,7 @@ Partial Class frmMain Me.mnuDescribeSpecificMosaic = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificCummulativeDistribution = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificParallelCoordinatePlot = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeGraphGraphics = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTables = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() @@ -681,7 +682,8 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuPrepareCheckDataPivotTable = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator50 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -915,6 +917,11 @@ Partial Class frmMain Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' + 'ToolStripSeparator38 + ' + Me.ToolStripSeparator38.Name = "ToolStripSeparator38" + Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) + ' 'mnuDescribeGraphGraphics ' Me.mnuDescribeGraphGraphics.Name = "mnuDescribeGraphGraphics" @@ -940,19 +947,19 @@ Partial Class frmMain 'mnuDescribeGeneralPivotTable ' Me.mnuDescribeGeneralPivotTable.Name = "mnuDescribeGeneralPivotTable" - Me.mnuDescribeGeneralPivotTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralPivotTable.Size = New System.Drawing.Size(140, 22) Me.mnuDescribeGeneralPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(137, 6) ' 'mnuDescribeGeneralTabulation ' Me.mnuDescribeGeneralTabulation.Enabled = False Me.mnuDescribeGeneralTabulation.Name = "mnuDescribeGeneralTabulation" - Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralTabulation.Size = New System.Drawing.Size(140, 22) Me.mnuDescribeGeneralTabulation.Tag = "Tabulation..." Me.mnuDescribeGeneralTabulation.Text = "Tabulation..." Me.mnuDescribeGeneralTabulation.Visible = False @@ -960,14 +967,14 @@ Partial Class frmMain 'mnuDescribeGeneralGraphics ' Me.mnuDescribeGeneralGraphics.Name = "mnuDescribeGeneralGraphics" - Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralGraphics.Size = New System.Drawing.Size(140, 22) Me.mnuDescribeGeneralGraphics.Tag = "Graphics..." Me.mnuDescribeGeneralGraphics.Text = "Graphics..." ' 'mnuDescribeGeneralTables ' Me.mnuDescribeGeneralTables.Name = "mnuDescribeGeneralTables" - Me.mnuDescribeGeneralTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneralTables.Size = New System.Drawing.Size(140, 22) Me.mnuDescribeGeneralTables.Text = "Tables..." ' 'ToolStripSeparator9 @@ -3558,7 +3565,7 @@ Partial Class frmMain 'mnuPrepareCheckData ' Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn}) + Me.mnuPrepareCheckData.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.Text = "Check Data" @@ -5117,10 +5124,16 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'ToolStripSeparator38 + 'mnuPrepareCheckDataPivotTable ' - Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) + Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable" + 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(242, 6) ' 'frmMain ' @@ -5817,4 +5830,6 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator27 As ToolStripSeparator Friend WithEvents mnuDescribeGeneralTables As ToolStripMenuItem Friend WithEvents ToolStripSeparator38 As ToolStripSeparator + Friend WithEvents mnuPrepareCheckDataPivotTable As ToolStripMenuItem + Friend WithEvents ToolStripSeparator50 As ToolStripSeparator End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 48628286c33..6c518dc92d5 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2524,4 +2524,9 @@ Public Class frmMain Private Sub mnuDescribeGeneralTables_Click(sender As Object, e As EventArgs) Handles mnuDescribeGeneralTables.Click dlgSummaryTables.ShowDialog() End Sub + + Private Sub mnuPrepareCheckDataPivotTable_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataPivotTable.Click + dlgThreeVariablePivotTable.enumPivotMode = dlgThreeVariablePivotTable.PivotMode.Describe + dlgThreeVariablePivotTable.ShowDialog() + End Sub End Class From 73608e64be2370ca1d0b66b3e12b8c3dac07aaf1 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Mon, 7 Aug 2023 15:01:57 +0300 Subject: [PATCH 091/100] changes made --- instat/sdgPlots.Designer.vb | 92 +++++++++++++++++++++---------------- instat/sdgPlots.vb | 36 ++++++++++++++- 2 files changed, 86 insertions(+), 42 deletions(-) diff --git a/instat/sdgPlots.Designer.vb b/instat/sdgPlots.Designer.vb index 046a8ff2cd9..3c09a16c317 100644 --- a/instat/sdgPlots.Designer.vb +++ b/instat/sdgPlots.Designer.vb @@ -61,6 +61,7 @@ Partial Class sdgPlots Me.tbpLayers = New System.Windows.Forms.TabPage() Me.ucrPlotsAdditionalLayers = New instat.ucrAdditionalLayers() Me.tbpTitles = New System.Windows.Forms.TabPage() + Me.ucrChkIncludeTitles = New instat.ucrCheck() Me.lblLegendSize = New System.Windows.Forms.Label() Me.lblTagSize = New System.Windows.Forms.Label() Me.lblCaptionSize = New System.Windows.Forms.Label() @@ -70,7 +71,7 @@ Partial Class sdgPlots Me.lblTag = New System.Windows.Forms.Label() Me.lblCaption = New System.Windows.Forms.Label() Me.lblSubTitle = New System.Windows.Forms.Label() - Me.Label1 = New System.Windows.Forms.Label() + Me.lblTitle = New System.Windows.Forms.Label() Me.grpLegendTitle = New System.Windows.Forms.GroupBox() Me.ucrChkOverwriteLegendTitle = New instat.ucrCheck() Me.ucrChkDisplayLegendTitle = New instat.ucrCheck() @@ -445,7 +446,7 @@ Partial Class sdgPlots Me.tbpLayers.Location = New System.Drawing.Point(4, 22) Me.tbpLayers.Name = "tbpLayers" Me.tbpLayers.Padding = New System.Windows.Forms.Padding(3) - Me.tbpLayers.Size = New System.Drawing.Size(669, 423) + Me.tbpLayers.Size = New System.Drawing.Size(669, 455) Me.tbpLayers.TabIndex = 4 Me.tbpLayers.Tag = "Layers" Me.tbpLayers.Text = "Layers" @@ -461,6 +462,7 @@ Partial Class sdgPlots ' 'tbpTitles ' + Me.tbpTitles.Controls.Add(Me.ucrChkIncludeTitles) Me.tbpTitles.Controls.Add(Me.lblLegendSize) Me.tbpTitles.Controls.Add(Me.lblTagSize) Me.tbpTitles.Controls.Add(Me.lblCaptionSize) @@ -470,7 +472,7 @@ Partial Class sdgPlots Me.tbpTitles.Controls.Add(Me.lblTag) Me.tbpTitles.Controls.Add(Me.lblCaption) Me.tbpTitles.Controls.Add(Me.lblSubTitle) - Me.tbpTitles.Controls.Add(Me.Label1) + Me.tbpTitles.Controls.Add(Me.lblTitle) Me.tbpTitles.Controls.Add(Me.grpLegendTitle) Me.tbpTitles.Controls.Add(Me.ucrNudLegendSize) Me.tbpTitles.Controls.Add(Me.ucrNudTagSize) @@ -487,17 +489,26 @@ Partial Class sdgPlots Me.tbpTitles.Location = New System.Drawing.Point(4, 22) Me.tbpTitles.Name = "tbpTitles" Me.tbpTitles.Padding = New System.Windows.Forms.Padding(3) - Me.tbpTitles.Size = New System.Drawing.Size(669, 423) + Me.tbpTitles.Size = New System.Drawing.Size(669, 455) Me.tbpTitles.TabIndex = 2 Me.tbpTitles.Tag = "Titles" Me.tbpTitles.Text = "Titles" Me.tbpTitles.UseVisualStyleBackColor = True ' + 'ucrChkIncludeTitles + ' + Me.ucrChkIncludeTitles.AutoSize = True + Me.ucrChkIncludeTitles.Checked = False + Me.ucrChkIncludeTitles.Location = New System.Drawing.Point(11, 7) + Me.ucrChkIncludeTitles.Name = "ucrChkIncludeTitles" + Me.ucrChkIncludeTitles.Size = New System.Drawing.Size(121, 23) + Me.ucrChkIncludeTitles.TabIndex = 55 + ' 'lblLegendSize ' Me.lblLegendSize.AutoSize = True Me.lblLegendSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLegendSize.Location = New System.Drawing.Point(320, 183) + Me.lblLegendSize.Location = New System.Drawing.Point(320, 202) Me.lblLegendSize.Name = "lblLegendSize" Me.lblLegendSize.Size = New System.Drawing.Size(69, 13) Me.lblLegendSize.TabIndex = 54 @@ -507,7 +518,7 @@ Partial Class sdgPlots ' Me.lblTagSize.AutoSize = True Me.lblTagSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTagSize.Location = New System.Drawing.Point(320, 144) + Me.lblTagSize.Location = New System.Drawing.Point(320, 163) Me.lblTagSize.Name = "lblTagSize" Me.lblTagSize.Size = New System.Drawing.Size(52, 13) Me.lblTagSize.TabIndex = 52 @@ -517,7 +528,7 @@ Partial Class sdgPlots ' Me.lblCaptionSize.AutoSize = True Me.lblCaptionSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCaptionSize.Location = New System.Drawing.Point(320, 91) + Me.lblCaptionSize.Location = New System.Drawing.Point(320, 110) Me.lblCaptionSize.Name = "lblCaptionSize" Me.lblCaptionSize.Size = New System.Drawing.Size(69, 13) Me.lblCaptionSize.TabIndex = 45 @@ -527,7 +538,7 @@ Partial Class sdgPlots ' Me.lblSubTitleSize.AutoSize = True Me.lblSubTitleSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSubTitleSize.Location = New System.Drawing.Point(318, 48) + Me.lblSubTitleSize.Location = New System.Drawing.Point(318, 67) Me.lblSubTitleSize.Name = "lblSubTitleSize" Me.lblSubTitleSize.Size = New System.Drawing.Size(75, 13) Me.lblSubTitleSize.TabIndex = 46 @@ -537,7 +548,7 @@ Partial Class sdgPlots ' Me.lblTitleSize.AutoSize = True Me.lblTitleSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTitleSize.Location = New System.Drawing.Point(318, 18) + Me.lblTitleSize.Location = New System.Drawing.Point(318, 37) Me.lblTitleSize.Name = "lblTitleSize" Me.lblTitleSize.Size = New System.Drawing.Size(53, 13) Me.lblTitleSize.TabIndex = 47 @@ -547,7 +558,7 @@ Partial Class sdgPlots ' Me.lblLegendTitle.AutoSize = True Me.lblLegendTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLegendTitle.Location = New System.Drawing.Point(126, 183) + Me.lblLegendTitle.Location = New System.Drawing.Point(126, 202) Me.lblLegendTitle.Name = "lblLegendTitle" Me.lblLegendTitle.Size = New System.Drawing.Size(72, 13) Me.lblLegendTitle.TabIndex = 40 @@ -557,7 +568,7 @@ Partial Class sdgPlots ' Me.lblTag.AutoSize = True Me.lblTag.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTag.Location = New System.Drawing.Point(126, 144) + Me.lblTag.Location = New System.Drawing.Point(126, 163) Me.lblTag.Name = "lblTag" Me.lblTag.Size = New System.Drawing.Size(29, 13) Me.lblTag.TabIndex = 36 @@ -567,7 +578,7 @@ Partial Class sdgPlots ' Me.lblCaption.AutoSize = True Me.lblCaption.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCaption.Location = New System.Drawing.Point(6, 90) + Me.lblCaption.Location = New System.Drawing.Point(6, 109) Me.lblCaption.Name = "lblCaption" Me.lblCaption.Size = New System.Drawing.Size(78, 13) Me.lblCaption.TabIndex = 10 @@ -577,21 +588,21 @@ Partial Class sdgPlots ' Me.lblSubTitle.AutoSize = True Me.lblSubTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSubTitle.Location = New System.Drawing.Point(6, 41) + Me.lblSubTitle.Location = New System.Drawing.Point(6, 60) Me.lblSubTitle.Name = "lblSubTitle" Me.lblSubTitle.Size = New System.Drawing.Size(84, 13) Me.lblSubTitle.TabIndex = 10 Me.lblSubTitle.Text = "Graph Sub Title:" ' - 'Label1 + 'lblTitle ' - Me.Label1.AutoSize = True - Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(7, 17) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(62, 13) - Me.Label1.TabIndex = 10 - Me.Label1.Text = "Graph Title:" + Me.lblTitle.AutoSize = True + Me.lblTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblTitle.Location = New System.Drawing.Point(7, 36) + Me.lblTitle.Name = "lblTitle" + Me.lblTitle.Size = New System.Drawing.Size(62, 13) + Me.lblTitle.TabIndex = 10 + Me.lblTitle.Text = "Graph Title:" ' 'grpLegendTitle ' @@ -675,7 +686,7 @@ Partial Class sdgPlots Me.ucrNudLegendSize.AutoSize = True Me.ucrNudLegendSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLegendSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLegendSize.Location = New System.Drawing.Point(434, 179) + Me.ucrNudLegendSize.Location = New System.Drawing.Point(434, 198) Me.ucrNudLegendSize.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudLegendSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLegendSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -689,7 +700,7 @@ Partial Class sdgPlots Me.ucrNudTagSize.AutoSize = True Me.ucrNudTagSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTagSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTagSize.Location = New System.Drawing.Point(434, 141) + Me.ucrNudTagSize.Location = New System.Drawing.Point(434, 160) Me.ucrNudTagSize.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudTagSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudTagSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -702,7 +713,7 @@ Partial Class sdgPlots ' Me.ucrChkTag.AutoSize = True Me.ucrChkTag.Checked = False - Me.ucrChkTag.Location = New System.Drawing.Point(6, 141) + Me.ucrChkTag.Location = New System.Drawing.Point(6, 160) Me.ucrChkTag.Name = "ucrChkTag" Me.ucrChkTag.Size = New System.Drawing.Size(104, 23) Me.ucrChkTag.TabIndex = 50 @@ -711,7 +722,7 @@ Partial Class sdgPlots ' Me.ucrChkNewLegend.AutoSize = True Me.ucrChkNewLegend.Checked = False - Me.ucrChkNewLegend.Location = New System.Drawing.Point(6, 179) + Me.ucrChkNewLegend.Location = New System.Drawing.Point(6, 198) Me.ucrChkNewLegend.Name = "ucrChkNewLegend" Me.ucrChkNewLegend.Size = New System.Drawing.Size(125, 23) Me.ucrChkNewLegend.TabIndex = 49 @@ -722,7 +733,7 @@ Partial Class sdgPlots Me.ucrInputGraphCaption.AutoSize = True Me.ucrInputGraphCaption.IsMultiline = True Me.ucrInputGraphCaption.IsReadOnly = False - Me.ucrInputGraphCaption.Location = New System.Drawing.Point(126, 72) + Me.ucrInputGraphCaption.Location = New System.Drawing.Point(126, 91) Me.ucrInputGraphCaption.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) Me.ucrInputGraphCaption.Name = "ucrInputGraphCaption" Me.ucrInputGraphCaption.Size = New System.Drawing.Size(181, 53) @@ -733,7 +744,7 @@ Partial Class sdgPlots Me.ucrNudCaptionSize.AutoSize = True Me.ucrNudCaptionSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudCaptionSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudCaptionSize.Location = New System.Drawing.Point(434, 89) + Me.ucrNudCaptionSize.Location = New System.Drawing.Point(434, 108) Me.ucrNudCaptionSize.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudCaptionSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudCaptionSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -747,7 +758,7 @@ Partial Class sdgPlots Me.ucrNudSubTitleSize.AutoSize = True Me.ucrNudSubTitleSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSubTitleSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSubTitleSize.Location = New System.Drawing.Point(434, 43) + Me.ucrNudSubTitleSize.Location = New System.Drawing.Point(434, 62) Me.ucrNudSubTitleSize.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudSubTitleSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSubTitleSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -761,7 +772,7 @@ Partial Class sdgPlots Me.ucrNudTitleSize.AutoSize = True Me.ucrNudTitleSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTitleSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTitleSize.Location = New System.Drawing.Point(434, 13) + Me.ucrNudTitleSize.Location = New System.Drawing.Point(434, 32) Me.ucrNudTitleSize.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudTitleSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudTitleSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -776,7 +787,7 @@ Partial Class sdgPlots Me.ucrInputLegendTitle.AutoSize = True Me.ucrInputLegendTitle.IsMultiline = False Me.ucrInputLegendTitle.IsReadOnly = False - Me.ucrInputLegendTitle.Location = New System.Drawing.Point(205, 179) + Me.ucrInputLegendTitle.Location = New System.Drawing.Point(205, 198) Me.ucrInputLegendTitle.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) Me.ucrInputLegendTitle.Name = "ucrInputLegendTitle" Me.ucrInputLegendTitle.Size = New System.Drawing.Size(71, 21) @@ -788,7 +799,7 @@ Partial Class sdgPlots Me.ucrInputTag.AutoSize = True Me.ucrInputTag.IsMultiline = False Me.ucrInputTag.IsReadOnly = False - Me.ucrInputTag.Location = New System.Drawing.Point(205, 141) + Me.ucrInputTag.Location = New System.Drawing.Point(205, 160) Me.ucrInputTag.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) Me.ucrInputTag.Name = "ucrInputTag" Me.ucrInputTag.Size = New System.Drawing.Size(71, 21) @@ -800,7 +811,7 @@ Partial Class sdgPlots Me.ucrInputGraphSubTitle.AutoSize = True Me.ucrInputGraphSubTitle.IsMultiline = False Me.ucrInputGraphSubTitle.IsReadOnly = False - Me.ucrInputGraphSubTitle.Location = New System.Drawing.Point(126, 44) + Me.ucrInputGraphSubTitle.Location = New System.Drawing.Point(126, 63) Me.ucrInputGraphSubTitle.Name = "ucrInputGraphSubTitle" Me.ucrInputGraphSubTitle.Size = New System.Drawing.Size(166, 21) Me.ucrInputGraphSubTitle.TabIndex = 9 @@ -811,7 +822,7 @@ Partial Class sdgPlots Me.ucrInputGraphTitle.AutoSize = True Me.ucrInputGraphTitle.IsMultiline = False Me.ucrInputGraphTitle.IsReadOnly = False - Me.ucrInputGraphTitle.Location = New System.Drawing.Point(126, 17) + Me.ucrInputGraphTitle.Location = New System.Drawing.Point(126, 36) Me.ucrInputGraphTitle.Name = "ucrInputGraphTitle" Me.ucrInputGraphTitle.Size = New System.Drawing.Size(166, 21) Me.ucrInputGraphTitle.TabIndex = 9 @@ -822,7 +833,7 @@ Partial Class sdgPlots Me.tbpXAxis.Location = New System.Drawing.Point(4, 22) Me.tbpXAxis.Name = "tbpXAxis" Me.tbpXAxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbpXAxis.Size = New System.Drawing.Size(669, 423) + Me.tbpXAxis.Size = New System.Drawing.Size(669, 455) Me.tbpXAxis.TabIndex = 5 Me.tbpXAxis.Text = "X-Axis" Me.tbpXAxis.UseVisualStyleBackColor = True @@ -841,7 +852,7 @@ Partial Class sdgPlots Me.tbpYAxis.Location = New System.Drawing.Point(4, 22) Me.tbpYAxis.Name = "tbpYAxis" Me.tbpYAxis.Padding = New System.Windows.Forms.Padding(3) - Me.tbpYAxis.Size = New System.Drawing.Size(669, 423) + Me.tbpYAxis.Size = New System.Drawing.Size(669, 455) Me.tbpYAxis.TabIndex = 6 Me.tbpYAxis.Text = "Y-Axis" Me.tbpYAxis.UseVisualStyleBackColor = True @@ -865,7 +876,7 @@ Partial Class sdgPlots Me.tbpTheme.Location = New System.Drawing.Point(4, 22) Me.tbpTheme.Name = "tbpTheme" Me.tbpTheme.Padding = New System.Windows.Forms.Padding(3) - Me.tbpTheme.Size = New System.Drawing.Size(669, 423) + Me.tbpTheme.Size = New System.Drawing.Size(669, 455) Me.tbpTheme.TabIndex = 1 Me.tbpTheme.Tag = "Theme" Me.tbpTheme.Text = "Themes" @@ -1079,7 +1090,7 @@ Partial Class sdgPlots Me.tbpCoordinates.Location = New System.Drawing.Point(4, 22) Me.tbpCoordinates.Name = "tbpCoordinates" Me.tbpCoordinates.Padding = New System.Windows.Forms.Padding(3) - Me.tbpCoordinates.Size = New System.Drawing.Size(669, 423) + Me.tbpCoordinates.Size = New System.Drawing.Size(669, 455) Me.tbpCoordinates.TabIndex = 7 Me.tbpCoordinates.Text = "Coordinates" Me.tbpCoordinates.UseVisualStyleBackColor = True @@ -1198,7 +1209,7 @@ Partial Class sdgPlots Me.tbpColour.Location = New System.Drawing.Point(4, 22) Me.tbpColour.Name = "tbpColour" Me.tbpColour.Padding = New System.Windows.Forms.Padding(3) - Me.tbpColour.Size = New System.Drawing.Size(669, 423) + Me.tbpColour.Size = New System.Drawing.Size(669, 455) Me.tbpColour.TabIndex = 8 Me.tbpColour.Text = "Colour" Me.tbpColour.UseVisualStyleBackColor = True @@ -1482,7 +1493,7 @@ Partial Class sdgPlots Me.tbpAnnotation.Location = New System.Drawing.Point(4, 22) Me.tbpAnnotation.Name = "tbpAnnotation" Me.tbpAnnotation.Padding = New System.Windows.Forms.Padding(3) - Me.tbpAnnotation.Size = New System.Drawing.Size(669, 423) + Me.tbpAnnotation.Size = New System.Drawing.Size(669, 455) Me.tbpAnnotation.TabIndex = 9 Me.tbpAnnotation.Text = "Annotation" Me.tbpAnnotation.UseVisualStyleBackColor = True @@ -2116,7 +2127,7 @@ Partial Class sdgPlots Friend WithEvents grpLegendTitle As GroupBox Friend WithEvents rdoLegendTitleCustom As RadioButton Friend WithEvents rdoLegendTitleAuto As RadioButton - Friend WithEvents Label1 As Label + Friend WithEvents lblTitle As Label Friend WithEvents ucrInputGraphTitle As ucrInputTextBox Friend WithEvents ucrXAxis As ucrAxes Friend WithEvents ucrYAxis As ucrAxes @@ -2254,6 +2265,7 @@ Partial Class sdgPlots Friend WithEvents ucrNudTagSize As ucrNud Friend WithEvents lblLegendSize As Label Friend WithEvents ucrNudLegendSize As ucrNud + Friend WithEvents ucrChkIncludeTitles As ucrCheck End Class diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 8d97db4f870..97108ef4702 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -128,6 +128,11 @@ Public Class sdgPlots ucrChkIncludeFacets.AddParameterPresentCondition(True, "facets", True) ucrChkIncludeFacets.AddParameterPresentCondition(False, "facets", False) + ucrChkIncludeTitles.SetText("Include Titles") + ucrChkIncludeTitles.AddParameterPresentCondition(True, "titles", True) + ucrChkIncludeTitles.AddParameterPresentCondition(False, "titles", False) + + ucrChkMargin.SetText("Margins") ucrChkMargin.SetParameter(New RParameter("margins", 2), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=False) ucrChkMargin.SetValuesCheckedAndUnchecked("TRUE", "FALSE") @@ -201,17 +206,24 @@ Public Class sdgPlots ucrInputTag.SetParameter(New RParameter("tag")) ucrInputLegendTitle.SetParameter(New RParameter("colour")) + ucrInputGraphTitle.SetLinkedDisplayControl(lblTitle) + ucrInputGraphSubTitle.SetLinkedDisplayControl(lblSubTitle) + ucrInputGraphCaption.SetLinkedDisplayControl(lblCaption) + ucrNudTitleSize.SetParameter(New RParameter("size")) ucrNudTitleSize.SetMinMax(0, Integer.MaxValue) ucrNudTitleSize.SetRDefault(20) + ucrNudTitleSize.SetLinkedDisplayControl(lblTitleSize) ucrNudSubTitleSize.SetParameter(New RParameter("size")) ucrNudSubTitleSize.SetMinMax(0, Integer.MaxValue) ucrNudSubTitleSize.SetRDefault(15) + ucrNudSubTitleSize.SetLinkedDisplayControl(lblSubTitleSize) ucrNudCaptionSize.SetParameter(New RParameter("size")) ucrNudCaptionSize.SetMinMax(0, Integer.MaxValue) ucrNudCaptionSize.SetRDefault(8) + ucrNudCaptionSize.SetLinkedDisplayControl(lblCaptionSize) ucrNudTagSize.SetParameter(New RParameter("size")) ucrNudTagSize.SetMinMax(0, Integer.MaxValue) @@ -238,6 +250,17 @@ Public Class sdgPlots ucrNudTagSize.SetLinkedDisplayControl(lblTagSize) ucrNudLegendSize.SetLinkedDisplayControl(lblLegendSize) + + + ucrChkIncludeTitles.AddToLinkedControls(ucrChkTag, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkIncludeTitles.AddToLinkedControls(ucrChkNewLegend, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkIncludeTitles.AddToLinkedControls(ucrInputGraphTitle, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkIncludeTitles.AddToLinkedControls(ucrInputGraphSubTitle, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkIncludeTitles.AddToLinkedControls(ucrInputGraphCaption, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkIncludeTitles.AddToLinkedControls(ucrNudTitleSize, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkIncludeTitles.AddToLinkedControls(ucrNudSubTitleSize, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkIncludeTitles.AddToLinkedControls(ucrNudCaptionSize, {True}, bNewLinkedHideIfParameterMissing:=True) + 'TODO what about the subtitle argument of labs? 'TODO what about the caption argument of labs? @@ -717,6 +740,7 @@ Public Class sdgPlots ucrChkTag.SetRCode(clsLabsFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrChkNewLegend.SetRCode(clsLabsFunction, bReset, bCloneIfNeeded:=True) + ucrChkIncludeTitles.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) End If ucrInputThemes.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) @@ -999,8 +1023,12 @@ Public Class sdgPlots Private Sub AddRemoveLabs() If bRCodeSet Then - If Not ucrInputGraphTitle.IsEmpty() OrElse Not ucrInputGraphSubTitle.IsEmpty() OrElse Not ucrInputGraphCaption.IsEmpty() OrElse Not ucrInputTag.IsEmpty OrElse Not ucrInputLegendTitle.IsEmpty Then - clsBaseOperator.AddParameter("labs", clsRFunctionParameter:=clsLabsFunction) + If ucrChkIncludeTitles.Checked Then + If Not ucrInputGraphTitle.IsEmpty() OrElse Not ucrInputGraphSubTitle.IsEmpty() OrElse Not ucrInputGraphCaption.IsEmpty() OrElse Not ucrInputTag.IsEmpty OrElse Not ucrInputLegendTitle.IsEmpty Then + clsBaseOperator.AddParameter("labs", clsRFunctionParameter:=clsLabsFunction) + Else + clsBaseOperator.RemoveParameterByName("labs") + End If Else clsBaseOperator.RemoveParameterByName("labs") End If @@ -1278,4 +1306,8 @@ Public Class sdgPlots Private Sub ucrNudLegendSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudLegendSize.ControlValueChanged clsPlotLegendTitleFunction.AddParameter("size", ucrNudLegendSize.GetText) End Sub + + Private Sub ucrChkIncludeTitles_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeTitles.ControlValueChanged + AddRemoveLabs() + End Sub End Class \ No newline at end of file From d529070e0885c060268bf64946121d74207a17f9 Mon Sep 17 00:00:00 2001 From: Stephen Lloyd Date: Mon, 7 Aug 2023 14:32:41 +0200 Subject: [PATCH 092/100] Fixes #8308 --- instat/clsRLink.vb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index 3f9a9c31270..b96462c6da6 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -828,7 +828,10 @@ Public Class RLink 'if not an assignment operation, then capture the output If Not strScript.Contains("<-") AndAlso bSuccess Then - strOutput = GetFileOutput("view_object_data(object = " & strScript & " , object_format = 'text' )", bSilent, bSeparateThread, bShowWaitDialogOverride) + Dim strScriptAsSingleLine As String = strScript.Replace(vbCrLf, String.Empty) + strScriptAsSingleLine = strScriptAsSingleLine.Replace(vbCr, String.Empty) + strScriptAsSingleLine = strScriptAsSingleLine.Replace(vbLf, String.Empty) + strOutput = GetFileOutput("view_object_data(object = " & strScriptAsSingleLine & " , object_format = 'text' )", bSilent, bSeparateThread, bShowWaitDialogOverride) End If Else 'else if script output should not be ignored or not stored as an object or variable From 65076295f61afc294931b166cdc9aa38dea6f384 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Mon, 7 Aug 2023 15:44:16 +0300 Subject: [PATCH 093/100] changes made --- instat/sdgPlots.Designer.vb | 46 ++++++++++++++++++------------------- instat/sdgPlots.vb | 5 ++-- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/instat/sdgPlots.Designer.vb b/instat/sdgPlots.Designer.vb index 3c09a16c317..5de86935b32 100644 --- a/instat/sdgPlots.Designer.vb +++ b/instat/sdgPlots.Designer.vb @@ -499,7 +499,7 @@ Partial Class sdgPlots ' Me.ucrChkIncludeTitles.AutoSize = True Me.ucrChkIncludeTitles.Checked = False - Me.ucrChkIncludeTitles.Location = New System.Drawing.Point(11, 7) + Me.ucrChkIncludeTitles.Location = New System.Drawing.Point(6, 10) Me.ucrChkIncludeTitles.Name = "ucrChkIncludeTitles" Me.ucrChkIncludeTitles.Size = New System.Drawing.Size(121, 23) Me.ucrChkIncludeTitles.TabIndex = 55 @@ -508,7 +508,7 @@ Partial Class sdgPlots ' Me.lblLegendSize.AutoSize = True Me.lblLegendSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLegendSize.Location = New System.Drawing.Point(320, 202) + Me.lblLegendSize.Location = New System.Drawing.Point(320, 207) Me.lblLegendSize.Name = "lblLegendSize" Me.lblLegendSize.Size = New System.Drawing.Size(69, 13) Me.lblLegendSize.TabIndex = 54 @@ -518,7 +518,7 @@ Partial Class sdgPlots ' Me.lblTagSize.AutoSize = True Me.lblTagSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTagSize.Location = New System.Drawing.Point(320, 163) + Me.lblTagSize.Location = New System.Drawing.Point(320, 168) Me.lblTagSize.Name = "lblTagSize" Me.lblTagSize.Size = New System.Drawing.Size(52, 13) Me.lblTagSize.TabIndex = 52 @@ -528,7 +528,7 @@ Partial Class sdgPlots ' Me.lblCaptionSize.AutoSize = True Me.lblCaptionSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCaptionSize.Location = New System.Drawing.Point(320, 110) + Me.lblCaptionSize.Location = New System.Drawing.Point(320, 115) Me.lblCaptionSize.Name = "lblCaptionSize" Me.lblCaptionSize.Size = New System.Drawing.Size(69, 13) Me.lblCaptionSize.TabIndex = 45 @@ -538,7 +538,7 @@ Partial Class sdgPlots ' Me.lblSubTitleSize.AutoSize = True Me.lblSubTitleSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSubTitleSize.Location = New System.Drawing.Point(318, 67) + Me.lblSubTitleSize.Location = New System.Drawing.Point(318, 72) Me.lblSubTitleSize.Name = "lblSubTitleSize" Me.lblSubTitleSize.Size = New System.Drawing.Size(75, 13) Me.lblSubTitleSize.TabIndex = 46 @@ -548,7 +548,7 @@ Partial Class sdgPlots ' Me.lblTitleSize.AutoSize = True Me.lblTitleSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTitleSize.Location = New System.Drawing.Point(318, 37) + Me.lblTitleSize.Location = New System.Drawing.Point(318, 42) Me.lblTitleSize.Name = "lblTitleSize" Me.lblTitleSize.Size = New System.Drawing.Size(53, 13) Me.lblTitleSize.TabIndex = 47 @@ -558,7 +558,7 @@ Partial Class sdgPlots ' Me.lblLegendTitle.AutoSize = True Me.lblLegendTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLegendTitle.Location = New System.Drawing.Point(126, 202) + Me.lblLegendTitle.Location = New System.Drawing.Point(126, 207) Me.lblLegendTitle.Name = "lblLegendTitle" Me.lblLegendTitle.Size = New System.Drawing.Size(72, 13) Me.lblLegendTitle.TabIndex = 40 @@ -568,7 +568,7 @@ Partial Class sdgPlots ' Me.lblTag.AutoSize = True Me.lblTag.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTag.Location = New System.Drawing.Point(126, 163) + Me.lblTag.Location = New System.Drawing.Point(126, 168) Me.lblTag.Name = "lblTag" Me.lblTag.Size = New System.Drawing.Size(29, 13) Me.lblTag.TabIndex = 36 @@ -578,7 +578,7 @@ Partial Class sdgPlots ' Me.lblCaption.AutoSize = True Me.lblCaption.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCaption.Location = New System.Drawing.Point(6, 109) + Me.lblCaption.Location = New System.Drawing.Point(6, 114) Me.lblCaption.Name = "lblCaption" Me.lblCaption.Size = New System.Drawing.Size(78, 13) Me.lblCaption.TabIndex = 10 @@ -588,7 +588,7 @@ Partial Class sdgPlots ' Me.lblSubTitle.AutoSize = True Me.lblSubTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSubTitle.Location = New System.Drawing.Point(6, 60) + Me.lblSubTitle.Location = New System.Drawing.Point(6, 65) Me.lblSubTitle.Name = "lblSubTitle" Me.lblSubTitle.Size = New System.Drawing.Size(84, 13) Me.lblSubTitle.TabIndex = 10 @@ -598,7 +598,7 @@ Partial Class sdgPlots ' Me.lblTitle.AutoSize = True Me.lblTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTitle.Location = New System.Drawing.Point(7, 36) + Me.lblTitle.Location = New System.Drawing.Point(7, 41) Me.lblTitle.Name = "lblTitle" Me.lblTitle.Size = New System.Drawing.Size(62, 13) Me.lblTitle.TabIndex = 10 @@ -686,7 +686,7 @@ Partial Class sdgPlots Me.ucrNudLegendSize.AutoSize = True Me.ucrNudLegendSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLegendSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLegendSize.Location = New System.Drawing.Point(434, 198) + Me.ucrNudLegendSize.Location = New System.Drawing.Point(434, 203) Me.ucrNudLegendSize.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudLegendSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLegendSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -700,7 +700,7 @@ Partial Class sdgPlots Me.ucrNudTagSize.AutoSize = True Me.ucrNudTagSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTagSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTagSize.Location = New System.Drawing.Point(434, 160) + Me.ucrNudTagSize.Location = New System.Drawing.Point(434, 165) Me.ucrNudTagSize.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudTagSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudTagSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -713,7 +713,7 @@ Partial Class sdgPlots ' Me.ucrChkTag.AutoSize = True Me.ucrChkTag.Checked = False - Me.ucrChkTag.Location = New System.Drawing.Point(6, 160) + Me.ucrChkTag.Location = New System.Drawing.Point(6, 165) Me.ucrChkTag.Name = "ucrChkTag" Me.ucrChkTag.Size = New System.Drawing.Size(104, 23) Me.ucrChkTag.TabIndex = 50 @@ -722,7 +722,7 @@ Partial Class sdgPlots ' Me.ucrChkNewLegend.AutoSize = True Me.ucrChkNewLegend.Checked = False - Me.ucrChkNewLegend.Location = New System.Drawing.Point(6, 198) + Me.ucrChkNewLegend.Location = New System.Drawing.Point(6, 203) Me.ucrChkNewLegend.Name = "ucrChkNewLegend" Me.ucrChkNewLegend.Size = New System.Drawing.Size(125, 23) Me.ucrChkNewLegend.TabIndex = 49 @@ -733,7 +733,7 @@ Partial Class sdgPlots Me.ucrInputGraphCaption.AutoSize = True Me.ucrInputGraphCaption.IsMultiline = True Me.ucrInputGraphCaption.IsReadOnly = False - Me.ucrInputGraphCaption.Location = New System.Drawing.Point(126, 91) + Me.ucrInputGraphCaption.Location = New System.Drawing.Point(126, 96) Me.ucrInputGraphCaption.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) Me.ucrInputGraphCaption.Name = "ucrInputGraphCaption" Me.ucrInputGraphCaption.Size = New System.Drawing.Size(181, 53) @@ -744,7 +744,7 @@ Partial Class sdgPlots Me.ucrNudCaptionSize.AutoSize = True Me.ucrNudCaptionSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudCaptionSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudCaptionSize.Location = New System.Drawing.Point(434, 108) + Me.ucrNudCaptionSize.Location = New System.Drawing.Point(434, 113) Me.ucrNudCaptionSize.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudCaptionSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudCaptionSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -758,7 +758,7 @@ Partial Class sdgPlots Me.ucrNudSubTitleSize.AutoSize = True Me.ucrNudSubTitleSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSubTitleSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSubTitleSize.Location = New System.Drawing.Point(434, 62) + Me.ucrNudSubTitleSize.Location = New System.Drawing.Point(434, 67) Me.ucrNudSubTitleSize.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudSubTitleSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSubTitleSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -772,7 +772,7 @@ Partial Class sdgPlots Me.ucrNudTitleSize.AutoSize = True Me.ucrNudTitleSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTitleSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTitleSize.Location = New System.Drawing.Point(434, 32) + Me.ucrNudTitleSize.Location = New System.Drawing.Point(434, 37) Me.ucrNudTitleSize.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudTitleSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudTitleSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -787,7 +787,7 @@ Partial Class sdgPlots Me.ucrInputLegendTitle.AutoSize = True Me.ucrInputLegendTitle.IsMultiline = False Me.ucrInputLegendTitle.IsReadOnly = False - Me.ucrInputLegendTitle.Location = New System.Drawing.Point(205, 198) + Me.ucrInputLegendTitle.Location = New System.Drawing.Point(205, 203) Me.ucrInputLegendTitle.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) Me.ucrInputLegendTitle.Name = "ucrInputLegendTitle" Me.ucrInputLegendTitle.Size = New System.Drawing.Size(71, 21) @@ -799,7 +799,7 @@ Partial Class sdgPlots Me.ucrInputTag.AutoSize = True Me.ucrInputTag.IsMultiline = False Me.ucrInputTag.IsReadOnly = False - Me.ucrInputTag.Location = New System.Drawing.Point(205, 160) + Me.ucrInputTag.Location = New System.Drawing.Point(205, 165) Me.ucrInputTag.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) Me.ucrInputTag.Name = "ucrInputTag" Me.ucrInputTag.Size = New System.Drawing.Size(71, 21) @@ -811,7 +811,7 @@ Partial Class sdgPlots Me.ucrInputGraphSubTitle.AutoSize = True Me.ucrInputGraphSubTitle.IsMultiline = False Me.ucrInputGraphSubTitle.IsReadOnly = False - Me.ucrInputGraphSubTitle.Location = New System.Drawing.Point(126, 63) + Me.ucrInputGraphSubTitle.Location = New System.Drawing.Point(126, 68) Me.ucrInputGraphSubTitle.Name = "ucrInputGraphSubTitle" Me.ucrInputGraphSubTitle.Size = New System.Drawing.Size(166, 21) Me.ucrInputGraphSubTitle.TabIndex = 9 @@ -822,7 +822,7 @@ Partial Class sdgPlots Me.ucrInputGraphTitle.AutoSize = True Me.ucrInputGraphTitle.IsMultiline = False Me.ucrInputGraphTitle.IsReadOnly = False - Me.ucrInputGraphTitle.Location = New System.Drawing.Point(126, 36) + Me.ucrInputGraphTitle.Location = New System.Drawing.Point(126, 41) Me.ucrInputGraphTitle.Name = "ucrInputGraphTitle" Me.ucrInputGraphTitle.Size = New System.Drawing.Size(166, 21) Me.ucrInputGraphTitle.TabIndex = 9 diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 97108ef4702..37cffd2c873 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -132,7 +132,6 @@ Public Class sdgPlots ucrChkIncludeTitles.AddParameterPresentCondition(True, "titles", True) ucrChkIncludeTitles.AddParameterPresentCondition(False, "titles", False) - ucrChkMargin.SetText("Margins") ucrChkMargin.SetParameter(New RParameter("margins", 2), bNewChangeParameterValue:=True, bNewAddRemoveParameter:=False) ucrChkMargin.SetValuesCheckedAndUnchecked("TRUE", "FALSE") @@ -250,8 +249,6 @@ Public Class sdgPlots ucrNudTagSize.SetLinkedDisplayControl(lblTagSize) ucrNudLegendSize.SetLinkedDisplayControl(lblLegendSize) - - ucrChkIncludeTitles.AddToLinkedControls(ucrChkTag, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkIncludeTitles.AddToLinkedControls(ucrChkNewLegend, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkIncludeTitles.AddToLinkedControls(ucrInputGraphTitle, {True}, bNewLinkedHideIfParameterMissing:=True) @@ -1024,6 +1021,7 @@ Public Class sdgPlots Private Sub AddRemoveLabs() If bRCodeSet Then If ucrChkIncludeTitles.Checked Then + clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) If Not ucrInputGraphTitle.IsEmpty() OrElse Not ucrInputGraphSubTitle.IsEmpty() OrElse Not ucrInputGraphCaption.IsEmpty() OrElse Not ucrInputTag.IsEmpty OrElse Not ucrInputLegendTitle.IsEmpty Then clsBaseOperator.AddParameter("labs", clsRFunctionParameter:=clsLabsFunction) Else @@ -1031,6 +1029,7 @@ Public Class sdgPlots End If Else clsBaseOperator.RemoveParameterByName("labs") + clsBaseOperator.RemoveParameterByName("theme") End If End If End Sub From 69466533e16d9543c1dbe89a4a8211bbb41fc135 Mon Sep 17 00:00:00 2001 From: n-thony Date: Mon, 7 Aug 2023 19:03:46 +0300 Subject: [PATCH 094/100] Minor code change --- .../DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 1 + instat/static/InstatObject/R/instat_object_R6.R | 5 +++++ .../static/InstatObject/R/stand_alone_functions.R | 15 +++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index b7c4c9d77b7..053a8e3d281 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -78,6 +78,7 @@ Public Class ucrDataViewReoGrid Dim strData As String = dataFrame.DisplayedData(i, j) If grdData.CurrentWorksheet.ColumnHeaders.Item(j).Text.Contains("(LT)") Then strData = GetInnerBracketedString(strData) + strData = If(strData.Contains(":"), strData.Replace(":", " ,"), strData) End If grdData.CurrentWorksheet(row:=i, col:=j) = strData Next diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 8b0872d3b88..a0cf4e77ef8 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -2738,8 +2738,13 @@ DataBook$set("public","wrap_or_unwrap_data", function(data_name, col_name, colum if (original_type != class(column_data)) { if (original_type %in% c("factor", "ordered_factor")){ column_data <- make_factor(column_data) + }else if(original_type == "list"){ + column_data <- lapply(column_data, convert_to_list) }else{ column_data <- as(column_data, original_type) } } + curr_data <- self$get_data_frame(data_name=data_name, retain_attr = TRUE) + # retain the attributes of the column after wrapping or unwrapping + attributes(column_data) <- attributes(curr_data[[col_name]]) self$add_columns_to_data(data_name=data_name, col_name=col_name, col_data=column_data, before=FALSE) } } diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 9fc96daa1bb..3ae330833d6 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2947,3 +2947,18 @@ getRowHeadersWithText <- function(data, column, searchText, ignore_case, use_reg # Return the row headers return(rowHeaders) } + +# Function to convert character strings to lists +convert_to_list <- function(x) { + if (startsWith(x, "c(") && endsWith(x, ")")) { + x <- substring(x, 3, nchar(x) - 1) # Remove the 'c(' and ')' characters + return(as.list(as.numeric(unlist(strsplit(x, ", "))))) + } else if (grepl(":", x)){ + x <- gsub(":", ",", x, fixed = TRUE) # Replace ':' with ',' + return(as.list(as.numeric(unlist(strsplit(x, "[, ]+"))))) + } else if (x == "numeric(0)") { + return(list()) + } else { + return(as.list(as.numeric(x))) + } +} \ No newline at end of file From 9ef012bae9b2d6f06ac49ffd71073e633dee7238 Mon Sep 17 00:00:00 2001 From: n-thony Date: Tue, 8 Aug 2023 10:26:10 +0300 Subject: [PATCH 095/100] Minor bug fix --- instat/static/InstatObject/R/instat_object_R6.R | 7 ++++--- .../InstatObject/R/stand_alone_functions.R | 16 +++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index a0cf4e77ef8..444a9c9ea3d 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -2733,16 +2733,17 @@ DataBook$set("public","wrap_or_unwrap_data", function(data_name, col_name, colum if (!is.null(width) && wrap) { column_data <- stringr::str_wrap(column_data, width = width) } - + curr_data <- self$get_data_frame(data_name=data_name, retain_attr = TRUE) # Convert back to the original data type if necessary if (original_type != class(column_data)) { if (original_type %in% c("factor", "ordered_factor")){ column_data <- make_factor(column_data) }else if(original_type == "list"){ - column_data <- lapply(column_data, convert_to_list) + result <- curr_data %>% + dplyr::mutate(list_column = lapply(column_data, convert_to_list)) + column_data <- result$list_column }else{ column_data <- as(column_data, original_type) } } - curr_data <- self$get_data_frame(data_name=data_name, retain_attr = TRUE) # retain the attributes of the column after wrapping or unwrapping attributes(column_data) <- attributes(curr_data[[col_name]]) self$add_columns_to_data(data_name=data_name, col_name=col_name, col_data=column_data, before=FALSE) diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 3ae330833d6..70950362c5f 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2948,17 +2948,15 @@ getRowHeadersWithText <- function(data, column, searchText, ignore_case, use_reg return(rowHeaders) } -# Function to convert character strings to lists +# Custom function to convert character to list of numeric vector convert_to_list <- function(x) { - if (startsWith(x, "c(") && endsWith(x, ")")) { - x <- substring(x, 3, nchar(x) - 1) # Remove the 'c(' and ')' characters - return(as.list(as.numeric(unlist(strsplit(x, ", "))))) - } else if (grepl(":", x)){ + if (grepl("^c\\(", x)) { + x <- gsub("^c\\(|\\)$", "", x) # Remove 'c(' and ')' + return(as.numeric(unlist(strsplit(x, ",")))) + } else if (grepl(":", x)) { x <- gsub(":", ",", x, fixed = TRUE) # Replace ':' with ',' - return(as.list(as.numeric(unlist(strsplit(x, "[, ]+"))))) - } else if (x == "numeric(0)") { - return(list()) + return(as.numeric(unlist(strsplit(x, ",")))) } else { - return(as.list(as.numeric(x))) + return(as.numeric(x)) } } \ No newline at end of file From 03ac9ecd156e385f4f54054726dba5d411ec4b88 Mon Sep 17 00:00:00 2001 From: n-thony Date: Tue, 8 Aug 2023 14:53:10 +0300 Subject: [PATCH 096/100] minor display fix --- instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 053a8e3d281..851cc274fa5 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -78,7 +78,7 @@ Public Class ucrDataViewReoGrid Dim strData As String = dataFrame.DisplayedData(i, j) If grdData.CurrentWorksheet.ColumnHeaders.Item(j).Text.Contains("(LT)") Then strData = GetInnerBracketedString(strData) - strData = If(strData.Contains(":"), strData.Replace(":", " ,"), strData) + strData = If(strData.Contains(":"), strData.Replace(":", ", "), strData) End If grdData.CurrentWorksheet(row:=i, col:=j) = strData Next From b9816ce0f902359d81a12cfc6a0aa296fffb31e2 Mon Sep 17 00:00:00 2001 From: n-thony Date: Tue, 8 Aug 2023 15:24:44 +0300 Subject: [PATCH 097/100] Improved the display of numeric(0) --- instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 851cc274fa5..27f08883b3b 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -76,7 +76,8 @@ Public Class ucrDataViewReoGrid For i = 0 To grdData.CurrentWorksheet.Rows - 1 For j = 0 To grdData.CurrentWorksheet.Columns - 1 Dim strData As String = dataFrame.DisplayedData(i, j) - If grdData.CurrentWorksheet.ColumnHeaders.Item(j).Text.Contains("(LT)") Then + If grdData.CurrentWorksheet.ColumnHeaders.Item(j).Text.Contains("(LT)") AndAlso + strData IsNot Nothing Then strData = GetInnerBracketedString(strData) strData = If(strData.Contains(":"), strData.Replace(":", ", "), strData) End If @@ -130,6 +131,8 @@ Public Class ucrDataViewReoGrid Dim intLastLeftBracket As Integer = InStrRev(strData, "(") If intFirstRightBracket = 0 Or intLastLeftBracket = 0 Then Return strData + ElseIf strData = "numeric(0)" Then + Return String.Empty Else Dim strOutput As String = Mid(strData, intLastLeftBracket + 1, intFirstRightBracket - intLastLeftBracket - 1) Return strOutput From 68025cc9965840d62034dcc3249152507f19d5e1 Mon Sep 17 00:00:00 2001 From: n-thony Date: Tue, 8 Aug 2023 17:57:33 +0300 Subject: [PATCH 098/100] Fixed the bug when filter is applied --- instat/static/InstatObject/R/data_object_R6.R | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index ea243646ed2..4d0b9692678 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -335,15 +335,20 @@ DataSheet$set("public", "get_data_frame", function(convert_to_character = FALSE, # If a filter has been done, some column attributes are lost. # This ensures they are present in the returned data. - if(retain_attr) { - for(col_name in names(out)) { - for(attr_name in names(attributes(private$data[[col_name]]))) { - if(!attr_name %in% c("class", "levels")) { - attr(out[[col_name]], attr_name) <- attr(private$data[[col_name]][1:nrow(out)], attr_name) + if (retain_attr) { + for (col_name in names(out)) { + private_attr_names <- names(attributes(private$data[[col_name]])) + for (attr_name in private_attr_names) { + if (!attr_name %in% c("class", "names")) { + private_attr <- attr(private$data[[col_name]], attr_name) + if (!is.null(private_attr)) { + attr(out[[col_name]], attr_name) <- private_attr + } } } } } + # If there is a start column, return columns from start onwards if (!missing(start_col) && start_col <= ncol(out)) #out <- out[start_col:max_cols] { From ff9a5c4c614aace93fe7af4b88247fd0082d925d Mon Sep 17 00:00:00 2001 From: n-thony Date: Thu, 10 Aug 2023 10:56:05 +0300 Subject: [PATCH 099/100] minor design change --- instat/dlgDescribeTwoVariable.Designer.vb | 230 +++++++++++++--------- 1 file changed, 135 insertions(+), 95 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index 53bd7c7cee4..51a8ff99b8b 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -97,9 +97,10 @@ Partial Class dlgDescribeTwoVariable Me.rdoThreeVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoThreeVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoThreeVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoThreeVariable.Location = New System.Drawing.Point(235, 8) + Me.rdoThreeVariable.Location = New System.Drawing.Point(432, 12) + Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoThreeVariable.Name = "rdoThreeVariable" - Me.rdoThreeVariable.Size = New System.Drawing.Size(100, 28) + Me.rdoThreeVariable.Size = New System.Drawing.Size(150, 42) Me.rdoThreeVariable.TabIndex = 26 Me.rdoThreeVariable.Text = "Three Variables" Me.rdoThreeVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -108,9 +109,10 @@ Partial Class dlgDescribeTwoVariable 'cmdFormatTable ' Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFormatTable.Location = New System.Drawing.Point(317, 423) + Me.cmdFormatTable.Location = New System.Drawing.Point(489, 634) + Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdFormatTable.Name = "cmdFormatTable" - Me.cmdFormatTable.Size = New System.Drawing.Size(104, 23) + Me.cmdFormatTable.Size = New System.Drawing.Size(156, 34) Me.cmdFormatTable.TabIndex = 44 Me.cmdFormatTable.Text = "Format Table..." Me.cmdFormatTable.UseVisualStyleBackColor = True @@ -118,9 +120,10 @@ Partial Class dlgDescribeTwoVariable 'lblThreeVariableSecondFactor ' Me.lblThreeVariableSecondFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(306, 150) + Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(472, 225) + Me.lblThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblThreeVariableSecondFactor.Name = "lblThreeVariableSecondFactor" - Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(100, 15) + Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(150, 22) Me.lblThreeVariableSecondFactor.TabIndex = 35 Me.lblThreeVariableSecondFactor.Tag = "" Me.lblThreeVariableSecondFactor.Text = "Second Variable :" @@ -128,9 +131,10 @@ Partial Class dlgDescribeTwoVariable 'cmdMissingOptions ' Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMissingOptions.Location = New System.Drawing.Point(158, 296) + Me.cmdMissingOptions.Location = New System.Drawing.Point(250, 444) + Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdMissingOptions.Name = "cmdMissingOptions" - Me.cmdMissingOptions.Size = New System.Drawing.Size(105, 23) + Me.cmdMissingOptions.Size = New System.Drawing.Size(158, 34) Me.cmdMissingOptions.TabIndex = 46 Me.cmdMissingOptions.Text = "Missing Options..." Me.cmdMissingOptions.UseVisualStyleBackColor = True @@ -138,9 +142,10 @@ Partial Class dlgDescribeTwoVariable 'lbSecondVariable ' Me.lbSecondVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lbSecondVariable.Location = New System.Drawing.Point(306, 150) + Me.lbSecondVariable.Location = New System.Drawing.Point(472, 225) + Me.lbSecondVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lbSecondVariable.Name = "lbSecondVariable" - Me.lbSecondVariable.Size = New System.Drawing.Size(100, 15) + Me.lbSecondVariable.Size = New System.Drawing.Size(150, 22) Me.lbSecondVariable.TabIndex = 27 Me.lbSecondVariable.Tag = "" Me.lbSecondVariable.Text = "Second Variable:" @@ -149,9 +154,10 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstVariable.AutoSize = True Me.lblFirstVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstVariable.Location = New System.Drawing.Point(306, 49) + Me.lblFirstVariable.Location = New System.Drawing.Point(472, 74) + Me.lblFirstVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFirstVariable.Name = "lblFirstVariable" - Me.lblFirstVariable.Size = New System.Drawing.Size(75, 13) + Me.lblFirstVariable.Size = New System.Drawing.Size(114, 20) Me.lblFirstVariable.TabIndex = 31 Me.lblFirstVariable.Tag = "" Me.lblFirstVariable.Text = "First Variables:" @@ -163,9 +169,11 @@ Partial Class dlgDescribeTwoVariable Me.grpColumnFactor.Controls.Add(Me.rdoSummaryVariable) Me.grpColumnFactor.Controls.Add(Me.rdoNoColumnFactor) Me.grpColumnFactor.Controls.Add(Me.ucrPnlColumnFactor) - Me.grpColumnFactor.Location = New System.Drawing.Point(5, 336) + Me.grpColumnFactor.Location = New System.Drawing.Point(21, 504) + Me.grpColumnFactor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpColumnFactor.Name = "grpColumnFactor" - Me.grpColumnFactor.Size = New System.Drawing.Size(255, 97) + Me.grpColumnFactor.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpColumnFactor.Size = New System.Drawing.Size(382, 146) Me.grpColumnFactor.TabIndex = 51 Me.grpColumnFactor.TabStop = False Me.grpColumnFactor.Text = "Columns" @@ -174,11 +182,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverColumnFactor.AutoSize = True Me.ucrReceiverColumnFactor.frmParent = Me - Me.ucrReceiverColumnFactor.Location = New System.Drawing.Point(132, 43) + Me.ucrReceiverColumnFactor.Location = New System.Drawing.Point(198, 64) Me.ucrReceiverColumnFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumnFactor.Name = "ucrReceiverColumnFactor" Me.ucrReceiverColumnFactor.Selector = Nothing - Me.ucrReceiverColumnFactor.Size = New System.Drawing.Size(119, 20) + Me.ucrReceiverColumnFactor.Size = New System.Drawing.Size(178, 30) Me.ucrReceiverColumnFactor.strNcFilePath = "" Me.ucrReceiverColumnFactor.TabIndex = 52 Me.ucrReceiverColumnFactor.ucrSelector = Nothing @@ -186,9 +194,10 @@ Partial Class dlgDescribeTwoVariable 'rdoVariableFactor ' Me.rdoVariableFactor.AutoSize = True - Me.rdoVariableFactor.Location = New System.Drawing.Point(15, 45) + Me.rdoVariableFactor.Location = New System.Drawing.Point(22, 68) + Me.rdoVariableFactor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoVariableFactor.Name = "rdoVariableFactor" - Me.rdoVariableFactor.Size = New System.Drawing.Size(96, 17) + Me.rdoVariableFactor.Size = New System.Drawing.Size(142, 24) Me.rdoVariableFactor.TabIndex = 51 Me.rdoVariableFactor.TabStop = True Me.rdoVariableFactor.Text = "Variable Factor" @@ -197,9 +206,10 @@ Partial Class dlgDescribeTwoVariable 'rdoSummaryVariable ' Me.rdoSummaryVariable.AutoSize = True - Me.rdoSummaryVariable.Location = New System.Drawing.Point(15, 23) + Me.rdoSummaryVariable.Location = New System.Drawing.Point(22, 34) + Me.rdoSummaryVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoSummaryVariable.Name = "rdoSummaryVariable" - Me.rdoSummaryVariable.Size = New System.Drawing.Size(109, 17) + Me.rdoSummaryVariable.Size = New System.Drawing.Size(163, 24) Me.rdoSummaryVariable.TabIndex = 47 Me.rdoSummaryVariable.TabStop = True Me.rdoSummaryVariable.Text = "Summary Variable" @@ -208,9 +218,10 @@ Partial Class dlgDescribeTwoVariable 'rdoNoColumnFactor ' Me.rdoNoColumnFactor.AutoSize = True - Me.rdoNoColumnFactor.Location = New System.Drawing.Point(15, 66) + Me.rdoNoColumnFactor.Location = New System.Drawing.Point(22, 99) + Me.rdoNoColumnFactor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoNoColumnFactor.Name = "rdoNoColumnFactor" - Me.rdoNoColumnFactor.Size = New System.Drawing.Size(110, 17) + Me.rdoNoColumnFactor.Size = New System.Drawing.Size(162, 24) Me.rdoNoColumnFactor.TabIndex = 50 Me.rdoNoColumnFactor.TabStop = True Me.rdoNoColumnFactor.Text = "No Column Factor" @@ -219,9 +230,10 @@ Partial Class dlgDescribeTwoVariable 'ucrPnlColumnFactor ' Me.ucrPnlColumnFactor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlColumnFactor.Location = New System.Drawing.Point(6, 18) + Me.ucrPnlColumnFactor.Location = New System.Drawing.Point(9, 27) + Me.ucrPnlColumnFactor.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrPnlColumnFactor.Name = "ucrPnlColumnFactor" - Me.ucrPnlColumnFactor.Size = New System.Drawing.Size(123, 72) + Me.ucrPnlColumnFactor.Size = New System.Drawing.Size(184, 108) Me.ucrPnlColumnFactor.TabIndex = 48 ' 'grpSummaries @@ -233,9 +245,11 @@ Partial Class dlgDescribeTwoVariable Me.grpSummaries.Controls.Add(Me.lblSummary) Me.grpSummaries.Controls.Add(Me.lblBy) Me.grpSummaries.Controls.Add(Me.lblSecondType) - Me.grpSummaries.Location = New System.Drawing.Point(3, 219) + Me.grpSummaries.Location = New System.Drawing.Point(17, 328) + Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Size = New System.Drawing.Size(210, 72) + Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Size = New System.Drawing.Size(315, 108) Me.grpSummaries.TabIndex = 39 Me.grpSummaries.TabStop = False ' @@ -243,18 +257,20 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstType.AutoSize = True Me.lblFirstType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstType.Location = New System.Drawing.Point(12, 18) + Me.lblFirstType.Location = New System.Drawing.Point(18, 27) + Me.lblFirstType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFirstType.Name = "lblFirstType" - Me.lblFirstType.Size = New System.Drawing.Size(0, 13) + Me.lblFirstType.Size = New System.Drawing.Size(0, 20) Me.lblFirstType.TabIndex = 0 ' 'lblSecondBy ' Me.lblSecondBy.AutoSize = True Me.lblSecondBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondBy.Location = New System.Drawing.Point(180, 16) + Me.lblSecondBy.Location = New System.Drawing.Point(270, 24) + Me.lblSecondBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSecondBy.Name = "lblSecondBy" - Me.lblSecondBy.Size = New System.Drawing.Size(18, 13) + Me.lblSecondBy.Size = New System.Drawing.Size(25, 20) Me.lblSecondBy.TabIndex = 1 Me.lblSecondBy.Text = "by" ' @@ -262,9 +278,10 @@ Partial Class dlgDescribeTwoVariable ' Me.lblThreeVariableCategorical.AutoSize = True Me.lblThreeVariableCategorical.ForeColor = System.Drawing.SystemColors.Highlight - Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(12, 33) + Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(18, 50) + Me.lblThreeVariableCategorical.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblThreeVariableCategorical.Name = "lblThreeVariableCategorical" - Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(59, 13) + Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(86, 20) Me.lblThreeVariableCategorical.TabIndex = 3 Me.lblThreeVariableCategorical.Text = "categorical" ' @@ -272,18 +289,20 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSummaryName.AutoSize = True Me.lblSummaryName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummaryName.Location = New System.Drawing.Point(70, 51) + Me.lblSummaryName.Location = New System.Drawing.Point(105, 76) + Me.lblSummaryName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSummaryName.Name = "lblSummaryName" - Me.lblSummaryName.Size = New System.Drawing.Size(0, 13) + Me.lblSummaryName.Size = New System.Drawing.Size(0, 20) Me.lblSummaryName.TabIndex = 5 ' 'lblSummary ' Me.lblSummary.AutoSize = True Me.lblSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummary.Location = New System.Drawing.Point(12, 51) + Me.lblSummary.Location = New System.Drawing.Point(18, 76) + Me.lblSummary.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSummary.Name = "lblSummary" - Me.lblSummary.Size = New System.Drawing.Size(53, 13) + Me.lblSummary.Size = New System.Drawing.Size(80, 20) Me.lblSummary.TabIndex = 4 Me.lblSummary.Text = "Summary:" ' @@ -291,9 +310,10 @@ Partial Class dlgDescribeTwoVariable ' Me.lblBy.AutoSize = True Me.lblBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblBy.Location = New System.Drawing.Point(82, 16) + Me.lblBy.Location = New System.Drawing.Point(123, 24) + Me.lblBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblBy.Name = "lblBy" - Me.lblBy.Size = New System.Drawing.Size(18, 13) + Me.lblBy.Size = New System.Drawing.Size(25, 20) Me.lblBy.TabIndex = 6 Me.lblBy.Text = "by" ' @@ -301,17 +321,19 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSecondType.AutoSize = True Me.lblSecondType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondType.Location = New System.Drawing.Point(106, 18) + Me.lblSecondType.Location = New System.Drawing.Point(159, 27) + Me.lblSecondType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSecondType.Name = "lblSecondType" - Me.lblSecondType.Size = New System.Drawing.Size(0, 13) + Me.lblSecondType.Size = New System.Drawing.Size(0, 20) Me.lblSecondType.TabIndex = 0 ' 'lblFirstGroupByFactor ' Me.lblFirstGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(306, 149) + Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(472, 224) + Me.lblFirstGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFirstGroupByFactor.Name = "lblFirstGroupByFactor" - Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(100, 15) + Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(150, 22) Me.lblFirstGroupByFactor.TabIndex = 29 Me.lblFirstGroupByFactor.Tag = "" Me.lblFirstGroupByFactor.Text = "Factor (Optional) :" @@ -324,9 +346,10 @@ Partial Class dlgDescribeTwoVariable Me.rdoSkim.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSkim.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSkim.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSkim.Location = New System.Drawing.Point(42, 8) + Me.rdoSkim.Location = New System.Drawing.Point(143, 12) + Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoSkim.Name = "rdoSkim" - Me.rdoSkim.Size = New System.Drawing.Size(100, 28) + Me.rdoSkim.Size = New System.Drawing.Size(150, 42) Me.rdoSkim.TabIndex = 23 Me.rdoSkim.Text = "Skim" Me.rdoSkim.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -335,9 +358,10 @@ Partial Class dlgDescribeTwoVariable 'lblThirdVariable ' Me.lblThirdVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThirdVariable.Location = New System.Drawing.Point(306, 191) + Me.lblThirdVariable.Location = New System.Drawing.Point(472, 286) + Me.lblThirdVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblThirdVariable.Name = "lblThirdVariable" - Me.lblThirdVariable.Size = New System.Drawing.Size(154, 15) + Me.lblThirdVariable.Size = New System.Drawing.Size(231, 22) Me.lblThirdVariable.TabIndex = 37 Me.lblThirdVariable.Tag = "" Me.lblThirdVariable.Text = "Third Variable :" @@ -345,9 +369,10 @@ Partial Class dlgDescribeTwoVariable 'lblSecondGroupByFactor ' Me.lblSecondGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(306, 191) + Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(472, 286) + Me.lblSecondGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSecondGroupByFactor.Name = "lblSecondGroupByFactor" - Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(137, 15) + Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(206, 22) Me.lblSecondGroupByFactor.TabIndex = 33 Me.lblSecondGroupByFactor.Tag = "" Me.lblSecondGroupByFactor.Text = "Second Factor (Optional) :" @@ -360,9 +385,10 @@ Partial Class dlgDescribeTwoVariable Me.rdoTwoVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoTwoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTwoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoTwoVariable.Location = New System.Drawing.Point(137, 8) + Me.rdoTwoVariable.Location = New System.Drawing.Point(286, 12) + Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoTwoVariable.Name = "rdoTwoVariable" - Me.rdoTwoVariable.Size = New System.Drawing.Size(100, 28) + Me.rdoTwoVariable.Size = New System.Drawing.Size(150, 42) Me.rdoTwoVariable.TabIndex = 24 Me.rdoTwoVariable.Text = "Two Variables" Me.rdoTwoVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -371,9 +397,10 @@ Partial Class dlgDescribeTwoVariable 'cmdSummaries ' Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSummaries.Location = New System.Drawing.Point(301, 229) + Me.cmdSummaries.Location = New System.Drawing.Point(465, 344) + Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdSummaries.Name = "cmdSummaries" - Me.cmdSummaries.Size = New System.Drawing.Size(120, 23) + Me.cmdSummaries.Size = New System.Drawing.Size(180, 34) Me.cmdSummaries.TabIndex = 1 Me.cmdSummaries.Tag = "Summaries" Me.cmdSummaries.Text = "Choose Summaries..." @@ -382,9 +409,10 @@ Partial Class dlgDescribeTwoVariable 'lblMarginName ' Me.lblMarginName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMarginName.Location = New System.Drawing.Point(6, 320) + Me.lblMarginName.Location = New System.Drawing.Point(22, 480) + Me.lblMarginName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMarginName.Name = "lblMarginName" - Me.lblMarginName.Size = New System.Drawing.Size(93, 15) + Me.lblMarginName.Size = New System.Drawing.Size(140, 22) Me.lblMarginName.TabIndex = 54 Me.lblMarginName.Tag = "" Me.lblMarginName.Text = "Margin Name:" @@ -395,9 +423,11 @@ Partial Class dlgDescribeTwoVariable Me.grpDisplay.Controls.Add(Me.lblFactorAsPercentage) Me.grpDisplay.Controls.Add(Me.ucrReceiverPercentages) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) - Me.grpDisplay.Location = New System.Drawing.Point(266, 205) + Me.grpDisplay.Location = New System.Drawing.Point(412, 308) + Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Size = New System.Drawing.Size(194, 115) + Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDisplay.Size = New System.Drawing.Size(291, 172) Me.grpDisplay.TabIndex = 56 Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" @@ -406,17 +436,19 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkPercentageProportion.AutoSize = True Me.ucrChkPercentageProportion.Checked = False - Me.ucrChkPercentageProportion.Location = New System.Drawing.Point(12, 84) + Me.ucrChkPercentageProportion.Location = New System.Drawing.Point(18, 126) + Me.ucrChkPercentageProportion.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkPercentageProportion.Name = "ucrChkPercentageProportion" - Me.ucrChkPercentageProportion.Size = New System.Drawing.Size(143, 23) + Me.ucrChkPercentageProportion.Size = New System.Drawing.Size(214, 51) Me.ucrChkPercentageProportion.TabIndex = 57 ' 'lblFactorAsPercentage ' Me.lblFactorAsPercentage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFactorAsPercentage.Location = New System.Drawing.Point(9, 42) + Me.lblFactorAsPercentage.Location = New System.Drawing.Point(14, 63) + Me.lblFactorAsPercentage.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFactorAsPercentage.Name = "lblFactorAsPercentage" - Me.lblFactorAsPercentage.Size = New System.Drawing.Size(154, 15) + Me.lblFactorAsPercentage.Size = New System.Drawing.Size(231, 22) Me.lblFactorAsPercentage.TabIndex = 56 Me.lblFactorAsPercentage.Tag = "" Me.lblFactorAsPercentage.Text = "Factor as Percentage:" @@ -425,11 +457,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverPercentages.AutoSize = True Me.ucrReceiverPercentages.frmParent = Me - Me.ucrReceiverPercentages.Location = New System.Drawing.Point(12, 57) + Me.ucrReceiverPercentages.Location = New System.Drawing.Point(18, 86) Me.ucrReceiverPercentages.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPercentages.Name = "ucrReceiverPercentages" Me.ucrReceiverPercentages.Selector = Nothing - Me.ucrReceiverPercentages.Size = New System.Drawing.Size(143, 20) + Me.ucrReceiverPercentages.Size = New System.Drawing.Size(214, 30) Me.ucrReceiverPercentages.strNcFilePath = "" Me.ucrReceiverPercentages.TabIndex = 55 Me.ucrReceiverPercentages.ucrSelector = Nothing @@ -438,9 +470,10 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkDisplayAsPercentage.AutoSize = True Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(12, 17) + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(18, 26) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(143, 23) + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(214, 51) Me.ucrChkDisplayAsPercentage.TabIndex = 54 ' 'ucrInputMarginName @@ -449,16 +482,18 @@ Partial Class dlgDescribeTwoVariable Me.ucrInputMarginName.AutoSize = True Me.ucrInputMarginName.IsMultiline = False Me.ucrInputMarginName.IsReadOnly = False - Me.ucrInputMarginName.Location = New System.Drawing.Point(105, 318) + Me.ucrInputMarginName.Location = New System.Drawing.Point(171, 477) + Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) Me.ucrInputMarginName.Name = "ucrInputMarginName" - Me.ucrInputMarginName.Size = New System.Drawing.Size(137, 21) + Me.ucrInputMarginName.Size = New System.Drawing.Size(206, 32) Me.ucrInputMarginName.TabIndex = 55 ' 'ucrReorderSummary ' - Me.ucrReorderSummary.Location = New System.Drawing.Point(266, 258) + Me.ucrReorderSummary.Location = New System.Drawing.Point(412, 387) + Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrReorderSummary.Name = "ucrReorderSummary" - Me.ucrReorderSummary.Size = New System.Drawing.Size(194, 156) + Me.ucrReorderSummary.Size = New System.Drawing.Size(291, 234) Me.ucrReorderSummary.TabIndex = 52 Me.ucrReorderSummary.ucrDataFrameList = Nothing Me.ucrReorderSummary.ucrReceiver = Nothing @@ -467,29 +502,31 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkDisplayMargins.AutoSize = True Me.ucrChkDisplayMargins.Checked = False - Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(8, 296) + Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(25, 444) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" - Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(143, 23) + Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) Me.ucrChkDisplayMargins.TabIndex = 53 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(7, 489) + Me.ucrBase.Location = New System.Drawing.Point(23, 734) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 43 ' 'ucrReceiverThreeVariableThirdVariable ' Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me - Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(301, 204) + Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 306) Me.ucrReceiverThreeVariableThirdVariable.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableThirdVariable.Name = "ucrReceiverThreeVariableThirdVariable" Me.ucrReceiverThreeVariableThirdVariable.Selector = Nothing - Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverThreeVariableThirdVariable.strNcFilePath = "" Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 38 Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing @@ -498,11 +535,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverSecondSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSecondSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(301, 204) + Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(465, 306) Me.ucrReceiverSecondSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondSkimrGroupByFactor.Name = "ucrReceiverSecondSkimrGroupByFactor" Me.ucrReceiverSecondSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSecondSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSecondSkimrGroupByFactor.TabIndex = 34 Me.ucrReceiverSecondSkimrGroupByFactor.ucrSelector = Nothing @@ -511,11 +548,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverSecondTwoVariableFactor.AutoSize = True Me.ucrReceiverSecondTwoVariableFactor.frmParent = Me - Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(301, 164) + Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(465, 246) Me.ucrReceiverSecondTwoVariableFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondTwoVariableFactor.Name = "ucrReceiverSecondTwoVariableFactor" Me.ucrReceiverSecondTwoVariableFactor.Selector = Nothing - Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSecondTwoVariableFactor.strNcFilePath = "" Me.ucrReceiverSecondTwoVariableFactor.TabIndex = 25 Me.ucrReceiverSecondTwoVariableFactor.ucrSelector = Nothing @@ -526,21 +563,21 @@ Partial Class dlgDescribeTwoVariable Me.ucrSelectorDescribeTwoVar.bDropUnusedFilterLevels = False Me.ucrSelectorDescribeTwoVar.bShowHiddenColumns = False Me.ucrSelectorDescribeTwoVar.bUseCurrentFilter = True - Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(3, 36) + Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(17, 54) Me.ucrSelectorDescribeTwoVar.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorDescribeTwoVar.Name = "ucrSelectorDescribeTwoVar" - Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(320, 274) Me.ucrSelectorDescribeTwoVar.TabIndex = 28 ' 'ucrReceiverFirstVars ' Me.ucrReceiverFirstVars.AutoSize = True Me.ucrReceiverFirstVars.frmParent = Me - Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(301, 64) + Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(465, 96) Me.ucrReceiverFirstVars.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFirstVars.Name = "ucrReceiverFirstVars" Me.ucrReceiverFirstVars.Selector = Nothing - Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(120, 79) + Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(180, 118) Me.ucrReceiverFirstVars.strNcFilePath = "" Me.ucrReceiverFirstVars.TabIndex = 30 Me.ucrReceiverFirstVars.ucrSelector = Nothing @@ -548,20 +585,21 @@ Partial Class dlgDescribeTwoVariable 'ucrPnlDescribe ' Me.ucrPnlDescribe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlDescribe.Location = New System.Drawing.Point(39, 3) + Me.ucrPnlDescribe.Location = New System.Drawing.Point(138, 4) + Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrPnlDescribe.Name = "ucrPnlDescribe" - Me.ucrPnlDescribe.Size = New System.Drawing.Size(317, 34) + Me.ucrPnlDescribe.Size = New System.Drawing.Size(476, 51) Me.ucrPnlDescribe.TabIndex = 22 ' 'ucrReceiverThreeVariableSecondFactor ' Me.ucrReceiverThreeVariableSecondFactor.AutoSize = True Me.ucrReceiverThreeVariableSecondFactor.frmParent = Me - Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(301, 164) + Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(465, 246) Me.ucrReceiverThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableSecondFactor.Name = "ucrReceiverThreeVariableSecondFactor" Me.ucrReceiverThreeVariableSecondFactor.Selector = Nothing - Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverThreeVariableSecondFactor.strNcFilePath = "" Me.ucrReceiverThreeVariableSecondFactor.TabIndex = 36 Me.ucrReceiverThreeVariableSecondFactor.ucrSelector = Nothing @@ -570,11 +608,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(301, 164) + Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(465, 246) Me.ucrReceiverSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSkimrGroupByFactor.Name = "ucrReceiverSkimrGroupByFactor" Me.ucrReceiverSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSkimrGroupByFactor.TabIndex = 32 Me.ucrReceiverSkimrGroupByFactor.ucrSelector = Nothing @@ -583,26 +621,27 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkOmitMissing.AutoSize = True Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(8, 296) + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(25, 444) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" - Me.ucrChkOmitMissing.Size = New System.Drawing.Size(143, 23) + Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) Me.ucrChkOmitMissing.TabIndex = 0 ' 'ucrSaveTable ' Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTable.Location = New System.Drawing.Point(7, 457) - Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTable.Location = New System.Drawing.Point(23, 686) + Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveTable.Name = "ucrSaveTable" - Me.ucrSaveTable.Size = New System.Drawing.Size(399, 24) + Me.ucrSaveTable.Size = New System.Drawing.Size(598, 36) Me.ucrSaveTable.TabIndex = 57 ' 'dlgDescribeTwoVariable ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ClientSize = New System.Drawing.Size(482, 548) + Me.ClientSize = New System.Drawing.Size(723, 822) Me.Controls.Add(Me.ucrSaveTable) Me.Controls.Add(Me.grpDisplay) Me.Controls.Add(Me.ucrInputMarginName) @@ -634,6 +673,7 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.lblThreeVariableSecondFactor) Me.Controls.Add(Me.ucrChkOmitMissing) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDescribeTwoVariable" From ccfe12c60e08eefe26721dbd7c78cdc3d9a3469b Mon Sep 17 00:00:00 2001 From: n-thony Date: Thu, 10 Aug 2023 11:26:52 +0300 Subject: [PATCH 100/100] Minor bug fix with save control --- instat/dlgDescribeTwoVariable.Designer.vb | 50 +++++++++++------------ instat/dlgDescribeTwoVariable.vb | 31 +++++++++----- 2 files changed, 46 insertions(+), 35 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index 51a8ff99b8b..7f4d038e0ef 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -98,7 +98,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoThreeVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoThreeVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoThreeVariable.Location = New System.Drawing.Point(432, 12) - Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4) Me.rdoThreeVariable.Name = "rdoThreeVariable" Me.rdoThreeVariable.Size = New System.Drawing.Size(150, 42) Me.rdoThreeVariable.TabIndex = 26 @@ -110,7 +110,7 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdFormatTable.Location = New System.Drawing.Point(489, 634) - Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4) Me.cmdFormatTable.Name = "cmdFormatTable" Me.cmdFormatTable.Size = New System.Drawing.Size(156, 34) Me.cmdFormatTable.TabIndex = 44 @@ -132,7 +132,7 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdMissingOptions.Location = New System.Drawing.Point(250, 444) - Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4) Me.cmdMissingOptions.Name = "cmdMissingOptions" Me.cmdMissingOptions.Size = New System.Drawing.Size(158, 34) Me.cmdMissingOptions.TabIndex = 46 @@ -170,9 +170,9 @@ Partial Class dlgDescribeTwoVariable Me.grpColumnFactor.Controls.Add(Me.rdoNoColumnFactor) Me.grpColumnFactor.Controls.Add(Me.ucrPnlColumnFactor) Me.grpColumnFactor.Location = New System.Drawing.Point(21, 504) - Me.grpColumnFactor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpColumnFactor.Margin = New System.Windows.Forms.Padding(4) Me.grpColumnFactor.Name = "grpColumnFactor" - Me.grpColumnFactor.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpColumnFactor.Padding = New System.Windows.Forms.Padding(4) Me.grpColumnFactor.Size = New System.Drawing.Size(382, 146) Me.grpColumnFactor.TabIndex = 51 Me.grpColumnFactor.TabStop = False @@ -195,7 +195,7 @@ Partial Class dlgDescribeTwoVariable ' Me.rdoVariableFactor.AutoSize = True Me.rdoVariableFactor.Location = New System.Drawing.Point(22, 68) - Me.rdoVariableFactor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoVariableFactor.Margin = New System.Windows.Forms.Padding(4) Me.rdoVariableFactor.Name = "rdoVariableFactor" Me.rdoVariableFactor.Size = New System.Drawing.Size(142, 24) Me.rdoVariableFactor.TabIndex = 51 @@ -207,7 +207,7 @@ Partial Class dlgDescribeTwoVariable ' Me.rdoSummaryVariable.AutoSize = True Me.rdoSummaryVariable.Location = New System.Drawing.Point(22, 34) - Me.rdoSummaryVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoSummaryVariable.Margin = New System.Windows.Forms.Padding(4) Me.rdoSummaryVariable.Name = "rdoSummaryVariable" Me.rdoSummaryVariable.Size = New System.Drawing.Size(163, 24) Me.rdoSummaryVariable.TabIndex = 47 @@ -219,7 +219,7 @@ Partial Class dlgDescribeTwoVariable ' Me.rdoNoColumnFactor.AutoSize = True Me.rdoNoColumnFactor.Location = New System.Drawing.Point(22, 99) - Me.rdoNoColumnFactor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoNoColumnFactor.Margin = New System.Windows.Forms.Padding(4) Me.rdoNoColumnFactor.Name = "rdoNoColumnFactor" Me.rdoNoColumnFactor.Size = New System.Drawing.Size(162, 24) Me.rdoNoColumnFactor.TabIndex = 50 @@ -231,7 +231,7 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrPnlColumnFactor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlColumnFactor.Location = New System.Drawing.Point(9, 27) - Me.ucrPnlColumnFactor.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrPnlColumnFactor.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlColumnFactor.Name = "ucrPnlColumnFactor" Me.ucrPnlColumnFactor.Size = New System.Drawing.Size(184, 108) Me.ucrPnlColumnFactor.TabIndex = 48 @@ -246,9 +246,9 @@ Partial Class dlgDescribeTwoVariable Me.grpSummaries.Controls.Add(Me.lblBy) Me.grpSummaries.Controls.Add(Me.lblSecondType) Me.grpSummaries.Location = New System.Drawing.Point(17, 328) - Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4) Me.grpSummaries.Size = New System.Drawing.Size(315, 108) Me.grpSummaries.TabIndex = 39 Me.grpSummaries.TabStop = False @@ -347,7 +347,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoSkim.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSkim.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoSkim.Location = New System.Drawing.Point(143, 12) - Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4) Me.rdoSkim.Name = "rdoSkim" Me.rdoSkim.Size = New System.Drawing.Size(150, 42) Me.rdoSkim.TabIndex = 23 @@ -386,7 +386,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoTwoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTwoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoTwoVariable.Location = New System.Drawing.Point(286, 12) - Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4) Me.rdoTwoVariable.Name = "rdoTwoVariable" Me.rdoTwoVariable.Size = New System.Drawing.Size(150, 42) Me.rdoTwoVariable.TabIndex = 24 @@ -398,7 +398,7 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdSummaries.Location = New System.Drawing.Point(465, 344) - Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4) Me.cmdSummaries.Name = "cmdSummaries" Me.cmdSummaries.Size = New System.Drawing.Size(180, 34) Me.cmdSummaries.TabIndex = 1 @@ -424,9 +424,9 @@ Partial Class dlgDescribeTwoVariable Me.grpDisplay.Controls.Add(Me.ucrReceiverPercentages) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) Me.grpDisplay.Location = New System.Drawing.Point(412, 308) - Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4) Me.grpDisplay.Size = New System.Drawing.Size(291, 172) Me.grpDisplay.TabIndex = 56 Me.grpDisplay.TabStop = False @@ -437,7 +437,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkPercentageProportion.AutoSize = True Me.ucrChkPercentageProportion.Checked = False Me.ucrChkPercentageProportion.Location = New System.Drawing.Point(18, 126) - Me.ucrChkPercentageProportion.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkPercentageProportion.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkPercentageProportion.Name = "ucrChkPercentageProportion" Me.ucrChkPercentageProportion.Size = New System.Drawing.Size(214, 51) Me.ucrChkPercentageProportion.TabIndex = 57 @@ -471,7 +471,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkDisplayAsPercentage.AutoSize = True Me.ucrChkDisplayAsPercentage.Checked = False Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(18, 26) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(214, 51) Me.ucrChkDisplayAsPercentage.TabIndex = 54 @@ -483,7 +483,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrInputMarginName.IsMultiline = False Me.ucrInputMarginName.IsReadOnly = False Me.ucrInputMarginName.Location = New System.Drawing.Point(171, 477) - Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) + Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputMarginName.Name = "ucrInputMarginName" Me.ucrInputMarginName.Size = New System.Drawing.Size(206, 32) Me.ucrInputMarginName.TabIndex = 55 @@ -491,7 +491,7 @@ Partial Class dlgDescribeTwoVariable 'ucrReorderSummary ' Me.ucrReorderSummary.Location = New System.Drawing.Point(412, 387) - Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9) Me.ucrReorderSummary.Name = "ucrReorderSummary" Me.ucrReorderSummary.Size = New System.Drawing.Size(291, 234) Me.ucrReorderSummary.TabIndex = 52 @@ -503,7 +503,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkDisplayMargins.AutoSize = True Me.ucrChkDisplayMargins.Checked = False Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(25, 444) - Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) Me.ucrChkDisplayMargins.TabIndex = 53 @@ -513,7 +513,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(23, 734) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 43 @@ -586,7 +586,7 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrPnlDescribe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlDescribe.Location = New System.Drawing.Point(138, 4) - Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlDescribe.Name = "ucrPnlDescribe" Me.ucrPnlDescribe.Size = New System.Drawing.Size(476, 51) Me.ucrPnlDescribe.TabIndex = 22 @@ -622,7 +622,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkOmitMissing.AutoSize = True Me.ucrChkOmitMissing.Checked = False Me.ucrChkOmitMissing.Location = New System.Drawing.Point(25, 444) - Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) Me.ucrChkOmitMissing.TabIndex = 0 @@ -673,7 +673,7 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.lblThreeVariableSecondFactor) Me.Controls.Add(Me.ucrChkOmitMissing) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDescribeTwoVariable" diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index e69f9299662..fcf36e3f9a3 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -167,7 +167,7 @@ Public Class dlgDescribeTwoVariable ucrReceiverColumnFactor.Selector = ucrSelectorDescribeTwoVar ucrReceiverColumnFactor.SetDataType("factor") - ucrSaveTable.SetPrefix("summary_table") + 'ucrSaveTable.SetPrefix("summary_table") ucrSaveTable.SetDataFrameSelector(ucrSelectorDescribeTwoVar.ucrAvailableDataFrames) ucrSaveTable.SetIsTextBox() @@ -348,6 +348,7 @@ Public Class dlgDescribeTwoVariable clsThreeVariableCombineFrequencyParametersFunction.SetRCommand("c") + ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetBaseROperator(clsGroupByPipeOperator) bResetSubdialog = True End Sub @@ -363,7 +364,7 @@ Public Class dlgDescribeTwoVariable ucrSelectorDescribeTwoVar.AddAdditionalCodeParameterPair(clsRAnovaFunction, ucrSelectorDescribeTwoVar.GetParameter(), iAdditionalPairNo:=1) ucrSelectorDescribeTwoVar.AddAdditionalCodeParameterPair(clsSummaryTableFunction, ucrSelectorDescribeTwoVar.GetParameter(), iAdditionalPairNo:=2) - ucrSaveTable.AddAdditionalRCode(clsGroupByPipeOperator, iAdditionalPairNo:=1) + ucrSaveTable.AddAdditionalRCode(clsJoiningPipeOperator, iAdditionalPairNo:=1) ucrChkOmitMissing.SetRCode(clsSummaryTableFunction, bReset) ucrReceiverFirstVars.SetRCode(clsSummaryTableFunction, bReset) @@ -379,7 +380,7 @@ Public Class dlgDescribeTwoVariable ucrReceiverThreeVariableThirdVariable.SetRCode(clsSummaryTableCombineFactorsFunction, bReset) ucrPnlColumnFactor.SetRCode(clsDummyFunction, bReset) ucrChkDisplayMargins.SetRCode(clsCombineFrequencyParametersFunction, bReset) - ucrSaveTable.SetRCode(clsJoiningPipeOperator, bReset) + ucrSaveTable.SetRCode(clsGroupByPipeOperator, bReset) bRcodeSet = True FillListView() @@ -465,16 +466,16 @@ Public Class dlgDescribeTwoVariable clsDummyFunction.AddParameter("checked", "skim", iPosition:=0) ucrSaveTable.Visible = True - 'ucrSaveTable.SetPrefix("summary_table") + ucrSaveTable.SetPrefix("summary_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Summary, strRObjectFormat:=RObjectFormat.Text) ucrSaveTable.SetAssignToIfUncheckedValue("last_summary") ucrSaveTable.SetCheckBoxText("Save Summary") ucrBase.clsRsyntax.SetBaseROperator(clsGroupByPipeOperator) - 'clsGroupByPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_summary", - ' strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Summary, - ' strRObjectFormatToAssignTo:=RObjectFormat.Text, - ' strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, - ' strObjectName:="last_summary") + clsGroupByPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_summary", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Summary, + strRObjectFormatToAssignTo:=RObjectFormat.Text, + strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + strObjectName:="last_summary") ElseIf rdoTwoVariable.Checked Then clsDummyFunction.AddParameter("checked", "customize", iPosition:=0) @@ -492,6 +493,11 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") ucrSaveTable.SetCheckBoxText("Save Table") + clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + strRObjectFormatToAssignTo:=RObjectFormat.Text, + strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + strObjectName:="last_table") ElseIf IsFactorByFactor() Then ucrSaveTable.Visible = True clsDummyFunction.AddParameter("factor_cols", "FactorVar", iPosition:=1) @@ -500,6 +506,11 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") ucrSaveTable.SetCheckBoxText("Save Table") + clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + strRObjectFormatToAssignTo:=RObjectFormat.Text, + strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + strObjectName:="last_table") End If ElseIf rdoThreeVariable.Checked Then clsDummyFunction.AddParameter("checked", "three_variable", iPosition:=0) @@ -581,7 +592,7 @@ Public Class dlgDescribeTwoVariable lblSecondType.Location = New Point(12, 33) lblSecondBy.Visible = True Else - ucrSaveTable.Location = New Point(10, 457) + ucrSaveTable.Location = New Point(23, 686) ucrReceiverFirstVars.SetSingleTypeStatus(True, bIsCategoricalNumeric:=True) lblThreeVariableCategorical.Visible = False lblThreeVariableCategorical.Location = New Point(12, 33)