From c0b46ff6d69b3ae174a90cde45ff19a2a4326323 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 16 Oct 2024 16:01:48 +0100 Subject: [PATCH 01/50] Have the summary variables filled in automatically in the Climograph dialog. --- instat/dlgClimograph.vb | 262 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 241 insertions(+), 21 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 6939f27a81..0f8a5388d2 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -15,8 +15,10 @@ ' along with this program. If not, see . Imports instat.Translations +Imports System.Text.RegularExpressions Public Class dlgClimograph + Private isFilling As Boolean = False Private bFirstload As Boolean = True Private bReset As Boolean = True Private clsGgwalterliethFunction, clsDummyFunction As RFunction @@ -114,6 +116,12 @@ Public Class dlgClimograph Private clsAesTmaxBarFunction1, clsAesTminBarFunction1, clsAesTemGgplotFunction, clsAesRainGgplotFunction, clsSecAxisRainFunction, clsSecAxisTemFunction As New RFunction Private clsAesRainBarTextFunction, clsPlotGridFunction, clsAesTmaxBarTextFunction, clsAesTminBarTextFunction, clsRainRoundFunction, clsTmaxRoundFunction, clsTminRoundFunction As New RFunction Private strScale As String = "scale_Factor" + Private lstRainReceivers As New List(Of ucrReceiverSingle) + Private lstTmaxReceivers As New List(Of ucrReceiverSingle) + Private lstTminReceivers As New List(Of ucrReceiverSingle) + Private lstTminminReceivers As New List(Of ucrReceiverSingle) + + Dim lstRecognisedTypes As New List(Of KeyValuePair(Of String, List(Of String))) Private Sub dlgClimograph_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then @@ -128,9 +136,28 @@ Public Class dlgClimograph TestOKEnabled() autoTranslate(Me) ResizeDialogue() + AutoFillRainReceivers() + AutoFillTmaxReceivers() + AutoFillTminReceivers() + AutoFillTminminReceivers() End Sub Private Sub InitialiseDialog() + Dim kvpRain As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("rain", {"sumrainfall", "rain", "rainfall", "prec", "rr", "prcp", "sum_rainfall", "sum_rain", "sum_precip", "sum_precipitation", "sum_rr", "sum_pre", "sum_prcp", "mean_rainfall", "mean_rain", "mean_precip", "mean_precipitation", "mean_rr", "mean_pre", "mean_prcp", "max_rainfall", "max_rain", "max_precip", "max_precipitation", "max_rr", "max_pre", "max_prcp", "min_rainfall", "min_rain", "min_precip", "min_precipitation", "min_rr", "min_pre", "min_prcp", "mean_sum_rain", "mean_sum_precip", "mean_sum_precipitation", "mean_sum_rr", "mean_sum_pre", "mean_sum_prcp", "mean_sum_rainfall", "max_sum_rain", "max_sum_precip", "max_sum_precipitation", "max_sum_rr", "max_sum_pre", "max_sum_prcp", "max_sum_rainfall", "min_sum_rain", "min_sum_precip", "min_sum_precipitation", "min_sum_rr", "min_sum_pre", "min_sum_prcp", "min_sum_rainfall"}.ToList()) + Dim kvpTMax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"tmax", "tx", "tempmax", "tmp_max", "tmpmax", "max_temperature", "temperature_max", "mean_tmax", "mean_tx", "mean_tempmax", "mean_tmp_max", "mean_tmpmax", "mean_temperature_max", "mean_max_temperature", "max_tmax", "max_tx", "max_tempmax", "max_tmp_max", "max_tmpmax", "max_temperature_max", "max_max_temperature", "min_tmax", "min_tx", "min_tempmax", "min_tmp_max", "min_tmpmax", "min_temperature_max", "min_max_temperature"}.ToList()) + Dim kvpTMin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"tmin", "tn", "tempmin", "tmp_min", "tmpmin", "min_temperature", "temperature_min", "mean_tmin", "mean_tn", "mean_tempmin", "mean_tmp_min", "mean_tmpmin", "mean_temperature_min", "mean_min_temperature", "max_tmin", "max_tn", "max_tempmin", "max_tmp_min", "max_tmpmin", "max_temperature_min", "max_min_temperature"}.ToList()) + Dim kvpTMinmin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("tem_min_min", {"min_tmin", "min_tn", "min_tempmin", "min_tmp_min", "min_tmpmin", "min_temperature_min", "min_min_temperature"}.ToList()) + + lstRecognisedTypes.AddRange({kvpRain, kvpTMax, kvpTMin, kvpTMinmin}) + + lstRainReceivers.AddRange({ucrReceiverRainBar, ucrReceiverRain, ucrReceiverRainC}) + + lstTmaxReceivers.AddRange({ucrReceiverElement1, ucrReceiverElement1Bar, ucrReceiverMaxtem}) + + lstTminReceivers.AddRange({ucrReceiverElement2, ucrReceiverElement2Bar, ucrReceiverMintemp}) + + lstTminminReceivers.AddRange({ucrReceiverAbsolute}) + Dim dctLegendPosition As New Dictionary(Of String, String) Dim dctColourPallette As New Dictionary(Of String, String) Dim dctPalette As New Dictionary(Of String, String) @@ -176,42 +203,34 @@ Public Class dlgClimograph ucrReceiverRain.SetParameter(New RParameter("p_mes", 3)) ucrReceiverRain.SetParameterIsString() ucrReceiverRain.Selector = ucrSelectorClimograph - ucrReceiverRain.SetClimaticType("rain") - ucrReceiverRain.bAutoFill = True - ucrReceiverRain.strSelectorHeading = "Rain Variables" + ucrReceiverRain.Tag = "rain" ucrReceiverRain.SetLinkedDisplayControl(lblRain) ucrReceiverRainC.SetParameter(New RParameter("y", 1)) ucrReceiverRainC.SetParameterIsRFunction() ucrReceiverRainC.Selector = ucrSelectorClimograph ucrReceiverRainC.bWithQuotes = False - ucrReceiverRainC.SetClimaticType("rain") - ucrReceiverRainC.bAutoFill = True - ucrReceiverRainC.strSelectorHeading = "Rain Variables" + ucrReceiverRainC.Tag = "rain" ucrReceiverRainC.SetLinkedDisplayControl(lblRainC) ucrReceiverRainBar.SetParameter(New RParameter("y", 1)) ucrReceiverRainBar.SetParameterIsRFunction() ucrReceiverRainBar.Selector = ucrSelectorClimograph ucrReceiverRainBar.bWithQuotes = False - ucrReceiverRainBar.SetClimaticType("rain") - ucrReceiverRainBar.bAutoFill = True - ucrReceiverRainBar.strSelectorHeading = "Rain Variables" + ucrReceiverRainBar.Tag = "rain" ucrReceiverRainBar.SetLinkedDisplayControl(lblRainBar) ucrReceiverMaxtem.SetParameter(New RParameter("tm_max", 4)) ucrReceiverMaxtem.SetParameterIsString() ucrReceiverMaxtem.Selector = ucrSelectorClimograph - ucrReceiverMaxtem.SetClimaticType("temp_max") - ucrReceiverMaxtem.bAutoFill = True + ucrReceiverMaxtem.Tag = "temp_max" ucrReceiverMaxtem.strSelectorHeading = "Variables" ucrReceiverMaxtem.SetLinkedDisplayControl(lblMaxtem) ucrReceiverMintemp.SetParameter(New RParameter("tm_min", 5)) ucrReceiverMintemp.SetParameterIsString() ucrReceiverMintemp.Selector = ucrSelectorClimograph - ucrReceiverMintemp.SetClimaticType("temp_min") - ucrReceiverMintemp.bAutoFill = True + ucrReceiverMintemp.Tag = "temp_min" ucrReceiverMintemp.strSelectorHeading = "Variables" ucrReceiverMintemp.SetLinkedDisplayControl(lblMintem) @@ -219,8 +238,7 @@ Public Class dlgClimograph ucrReceiverElement1.SetParameterIsRFunction() ucrReceiverElement1.Selector = ucrSelectorClimograph ucrReceiverElement1.bWithQuotes = False - ucrReceiverElement1.SetClimaticType("temp_max") - ucrReceiverElement1.bAutoFill = True + ucrReceiverElement1.Tag = "temp_max" ucrReceiverElement1.strSelectorHeading = "Variables" ucrReceiverElement1.SetLinkedDisplayControl(lblElement1) @@ -228,8 +246,7 @@ Public Class dlgClimograph ucrReceiverElement1Bar.SetParameterIsRFunction() ucrReceiverElement1Bar.Selector = ucrSelectorClimograph ucrReceiverElement1Bar.bWithQuotes = False - ucrReceiverElement1Bar.SetClimaticType("temp_max") - ucrReceiverElement1Bar.bAutoFill = True + ucrReceiverElement1Bar.Tag = "temp_max" ucrReceiverElement1Bar.strSelectorHeading = "Variables" ucrReceiverElement1Bar.SetLinkedDisplayControl(lblElement1Bar) @@ -237,8 +254,7 @@ Public Class dlgClimograph ucrReceiverElement2.SetParameterIsRFunction() ucrReceiverElement2.Selector = ucrSelectorClimograph ucrReceiverElement2.bWithQuotes = False - ucrReceiverElement2.SetClimaticType("temp_min") - ucrReceiverElement2.bAutoFill = True + ucrReceiverElement2.Tag = "temp_min" ucrReceiverElement2.strSelectorHeading = "Variables" ucrReceiverElement2.SetLinkedDisplayControl(lblElement2) @@ -246,8 +262,7 @@ Public Class dlgClimograph ucrReceiverElement2Bar.SetParameterIsRFunction() ucrReceiverElement2Bar.Selector = ucrSelectorClimograph ucrReceiverElement2Bar.bWithQuotes = False - ucrReceiverElement2Bar.SetClimaticType("temp_min") - ucrReceiverElement2Bar.bAutoFill = True + ucrReceiverElement2Bar.Tag = "temp_min" ucrReceiverElement2Bar.strSelectorHeading = "Variables" ucrReceiverElement2Bar.SetLinkedDisplayControl(lblElement2Bar) @@ -276,6 +291,7 @@ Public Class dlgClimograph ucrReceiverAbsolute.SetParameter(New RParameter("ta_min", 6)) ucrReceiverAbsolute.SetParameterIsString() ucrReceiverAbsolute.Selector = ucrSelectorClimograph + ucrReceiverAbsolute.Tag = "tem_min_min" ucrReceiverAbsolute.strSelectorHeading = "Variables" ucrReceiverAbsolute.SetLinkedDisplayControl(lblAbsolute) @@ -850,6 +866,10 @@ Public Class dlgClimograph ucrPnlColour.SetRCode(clsDummyFunction, bReset) ucrChkColour.SetRCode(clsBaseOperator, bReset) End If + AutoFillRainReceivers() + AutoFillTmaxReceivers() + AutoFillTminReceivers() + AutoFillTminminReceivers() End Sub Private Sub TestOKEnabled() @@ -1313,6 +1333,10 @@ Public Class dlgClimograph AddRemoveGeomRibbon() Dataframechange() AddRemoveTemBars() + AutoFillRainReceivers() + AutoFillTmaxReceivers() + AutoFillTminReceivers() + AutoFillTminminReceivers() End Sub Private Sub GetParameterValue(clsOperator As ROperator) @@ -1807,4 +1831,200 @@ Public Class dlgClimograph Private Sub ucrReceiverElement1Bar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElement1Bar.ControlValueChanged, ucrReceiverMonthBar.ControlValueChanged, ucrReceiverRainBar.ControlValueChanged, ucrReceiverElement2Bar.ControlValueChanged AddRemoveTemBars() End Sub + + Private Sub AutoFillRainReceivers() + If isFilling Then + Exit Sub + End If + isFilling = True + + ' Temporarily remove the event handler + RemoveHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillRainReceivers + + Dim lstRecognisedValues As List(Of String) + Dim ucrCurrentReceiver As ucrReceiver + Dim bFound As Boolean = False + + ucrCurrentReceiver = ucrSelectorClimograph.CurrentReceiver + + For Each ucrTempReceiver As ucrReceiver In lstRainReceivers + ucrTempReceiver.SetMeAsReceiver() + lstRecognisedValues = GetRecognisedValues(ucrTempReceiver.Tag) + + If lstRecognisedValues.Count > 0 Then + For Each lviTempVariable As ListViewItem In ucrSelectorClimograph.lstAvailableVariable.Items + For Each strValue As String In lstRecognisedValues + If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]", String.Empty).Equals(strValue) Then + ucrTempReceiver.Add(lviTempVariable.Text, ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + bFound = True + Exit For + End If + Next + If bFound Then + bFound = False + Exit For + End If + Next + End If + Next + + If ucrCurrentReceiver IsNot Nothing Then + ucrCurrentReceiver.SetMeAsReceiver() + End If + + ' Re-enable the event handler + AddHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillRainReceivers + + isFilling = False + End Sub + + Private Sub AutoFillTmaxReceivers() + If isFilling Then + Exit Sub + End If + isFilling = True + + ' Temporarily remove the event handler + RemoveHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillTmaxReceivers + + Dim lstRecognisedValues As List(Of String) + Dim ucrCurrentReceiver As ucrReceiver + Dim bFound As Boolean = False + + ucrCurrentReceiver = ucrSelectorClimograph.CurrentReceiver + + For Each ucrTempReceiver As ucrReceiver In lstTmaxReceivers + ucrTempReceiver.SetMeAsReceiver() + lstRecognisedValues = GetRecognisedValues(ucrTempReceiver.Tag) + + If lstRecognisedValues.Count > 0 Then + For Each lviTempVariable As ListViewItem In ucrSelectorClimograph.lstAvailableVariable.Items + For Each strValue As String In lstRecognisedValues + If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]", String.Empty).Equals(strValue) Then + ucrTempReceiver.Add(lviTempVariable.Text, ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + bFound = True + Exit For + End If + Next + If bFound Then + bFound = False + Exit For + End If + Next + End If + Next + + If ucrCurrentReceiver IsNot Nothing Then + ucrCurrentReceiver.SetMeAsReceiver() + End If + + ' Re-enable the event handler + AddHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillTmaxReceivers + + isFilling = False + End Sub + + Private Sub AutoFillTminReceivers() + If isFilling Then + Exit Sub + End If + isFilling = True + + ' Temporarily remove the event handler + RemoveHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillTminReceivers + + Dim lstRecognisedValues As List(Of String) + Dim ucrCurrentReceiver As ucrReceiver + Dim bFound As Boolean = False + + ucrCurrentReceiver = ucrSelectorClimograph.CurrentReceiver + + For Each ucrTempReceiver As ucrReceiver In lstTminReceivers + ucrTempReceiver.SetMeAsReceiver() + lstRecognisedValues = GetRecognisedValues(ucrTempReceiver.Tag) + + If lstRecognisedValues.Count > 0 Then + For Each lviTempVariable As ListViewItem In ucrSelectorClimograph.lstAvailableVariable.Items + For Each strValue As String In lstRecognisedValues + If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]", String.Empty).Equals(strValue) Then + ucrTempReceiver.Add(lviTempVariable.Text, ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + bFound = True + Exit For + End If + Next + If bFound Then + bFound = False + Exit For + End If + Next + End If + Next + + If ucrCurrentReceiver IsNot Nothing Then + ucrCurrentReceiver.SetMeAsReceiver() + End If + + ' Re-enable the event handler + AddHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillTminReceivers + + isFilling = False + End Sub + + Private Sub AutoFillTminminReceivers() + If isFilling Then + Exit Sub + End If + isFilling = True + + ' Temporarily remove the event handler + RemoveHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillTminminReceivers + + Dim lstRecognisedValues As List(Of String) + Dim ucrCurrentReceiver As ucrReceiver + Dim bFound As Boolean = False + + ucrCurrentReceiver = ucrSelectorClimograph.CurrentReceiver + + For Each ucrTempReceiver As ucrReceiver In lstTminminReceivers + ucrTempReceiver.SetMeAsReceiver() + lstRecognisedValues = GetRecognisedValues(ucrTempReceiver.Tag) + + If lstRecognisedValues.Count > 0 Then + For Each lviTempVariable As ListViewItem In ucrSelectorClimograph.lstAvailableVariable.Items + For Each strValue As String In lstRecognisedValues + If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]", String.Empty).Equals(strValue) Then + ucrTempReceiver.Add(lviTempVariable.Text, ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + bFound = True + Exit For + End If + Next + If bFound Then + bFound = False + Exit For + End If + Next + End If + Next + + If ucrCurrentReceiver IsNot Nothing Then + ucrCurrentReceiver.SetMeAsReceiver() + End If + + ' Re-enable the event handler + AddHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillTminminReceivers + + isFilling = False + End Sub + + Private Function GetRecognisedValues(strVariable As String) As List(Of String) + Dim lstValues As New List(Of String) + + For Each kvpTemp As KeyValuePair(Of String, List(Of String)) In lstRecognisedTypes + If kvpTemp.Key = strVariable Then + lstValues = kvpTemp.Value + Exit For + End If + Next + Return lstValues + End Function End Class \ No newline at end of file From 2963a324807f25be583f7fa8adf50fe13aeec00c Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 31 Oct 2024 11:56:50 +0100 Subject: [PATCH 02/50] Change made --- instat/dlgClimograph.vb | 207 ++++++++-------------------------------- 1 file changed, 39 insertions(+), 168 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 0f8a5388d2..87befd208f 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -136,10 +136,10 @@ Public Class dlgClimograph TestOKEnabled() autoTranslate(Me) ResizeDialogue() - AutoFillRainReceivers() - AutoFillTmaxReceivers() - AutoFillTminReceivers() - AutoFillTminminReceivers() + 'AutoFillRainReceivers() + 'AutoFillTmaxReceivers() + 'AutoFillTminReceivers() + 'AutoFillTminminReceivers() End Sub Private Sub InitialiseDialog() @@ -866,10 +866,10 @@ Public Class dlgClimograph ucrPnlColour.SetRCode(clsDummyFunction, bReset) ucrChkColour.SetRCode(clsBaseOperator, bReset) End If - AutoFillRainReceivers() - AutoFillTmaxReceivers() - AutoFillTminReceivers() - AutoFillTminminReceivers() + 'AutoFillRainReceivers() + 'AutoFillTmaxReceivers() + 'AutoFillTminReceivers() + 'AutoFillTminminReceivers() End Sub Private Sub TestOKEnabled() @@ -1333,10 +1333,34 @@ Public Class dlgClimograph AddRemoveGeomRibbon() Dataframechange() AddRemoveTemBars() - AutoFillRainReceivers() - AutoFillTmaxReceivers() - AutoFillTminReceivers() - AutoFillTminminReceivers() + 'AutoFillRainReceivers() + 'AutoFillTmaxReceivers() + 'AutoFillTminReceivers() + 'AutoFillTminminReceivers() + If isFilling Then + Exit Sub + End If + isFilling = True + + Dim lstReceivers As List(Of ucrReceiverSingle) = Nothing + If ucrSelectorClimograph.CurrentReceiver IsNot Nothing Then + Select Case ucrSelectorClimograph.CurrentReceiver.Tag ' Or any property that differentiates the lists + Case "Rain" + lstReceivers = lstRainReceivers + Case "Tmax" + lstReceivers = lstTmaxReceivers + Case "Tmin" + lstReceivers = lstTminReceivers + Case "Tminmin" + lstReceivers = lstTminminReceivers + ' Add additional cases as necessary + End Select + End If + If lstReceivers IsNot Nothing Then + AutoFillReceivers(lstReceivers) + End If + + isFilling = False End Sub Private Sub GetParameterValue(clsOperator As ROperator) @@ -1832,114 +1856,12 @@ Public Class dlgClimograph AddRemoveTemBars() End Sub - Private Sub AutoFillRainReceivers() - If isFilling Then - Exit Sub - End If - isFilling = True - - ' Temporarily remove the event handler - RemoveHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillRainReceivers - - Dim lstRecognisedValues As List(Of String) - Dim ucrCurrentReceiver As ucrReceiver - Dim bFound As Boolean = False - - ucrCurrentReceiver = ucrSelectorClimograph.CurrentReceiver - - For Each ucrTempReceiver As ucrReceiver In lstRainReceivers - ucrTempReceiver.SetMeAsReceiver() - lstRecognisedValues = GetRecognisedValues(ucrTempReceiver.Tag) - - If lstRecognisedValues.Count > 0 Then - For Each lviTempVariable As ListViewItem In ucrSelectorClimograph.lstAvailableVariable.Items - For Each strValue As String In lstRecognisedValues - If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]", String.Empty).Equals(strValue) Then - ucrTempReceiver.Add(lviTempVariable.Text, ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) - bFound = True - Exit For - End If - Next - If bFound Then - bFound = False - Exit For - End If - Next - End If - Next - - If ucrCurrentReceiver IsNot Nothing Then - ucrCurrentReceiver.SetMeAsReceiver() - End If - - ' Re-enable the event handler - AddHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillRainReceivers - - isFilling = False - End Sub - - Private Sub AutoFillTmaxReceivers() - If isFilling Then - Exit Sub - End If - isFilling = True - - ' Temporarily remove the event handler - RemoveHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillTmaxReceivers - - Dim lstRecognisedValues As List(Of String) - Dim ucrCurrentReceiver As ucrReceiver - Dim bFound As Boolean = False - - ucrCurrentReceiver = ucrSelectorClimograph.CurrentReceiver - - For Each ucrTempReceiver As ucrReceiver In lstTmaxReceivers - ucrTempReceiver.SetMeAsReceiver() - lstRecognisedValues = GetRecognisedValues(ucrTempReceiver.Tag) - - If lstRecognisedValues.Count > 0 Then - For Each lviTempVariable As ListViewItem In ucrSelectorClimograph.lstAvailableVariable.Items - For Each strValue As String In lstRecognisedValues - If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]", String.Empty).Equals(strValue) Then - ucrTempReceiver.Add(lviTempVariable.Text, ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) - bFound = True - Exit For - End If - Next - If bFound Then - bFound = False - Exit For - End If - Next - End If - Next - - If ucrCurrentReceiver IsNot Nothing Then - ucrCurrentReceiver.SetMeAsReceiver() - End If - - ' Re-enable the event handler - AddHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillTmaxReceivers - - isFilling = False - End Sub - - Private Sub AutoFillTminReceivers() - If isFilling Then - Exit Sub - End If - isFilling = True - - ' Temporarily remove the event handler - RemoveHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillTminReceivers - + Private Sub AutoFillReceivers(lstReceivers As List(Of ucrReceiverSingle)) Dim lstRecognisedValues As List(Of String) - Dim ucrCurrentReceiver As ucrReceiver + Dim ucrCurrentReceiver As ucrReceiver = ucrSelectorClimograph.CurrentReceiver Dim bFound As Boolean = False - ucrCurrentReceiver = ucrSelectorClimograph.CurrentReceiver - - For Each ucrTempReceiver As ucrReceiver In lstTminReceivers + For Each ucrTempReceiver As ucrReceiver In lstReceivers ucrTempReceiver.SetMeAsReceiver() lstRecognisedValues = GetRecognisedValues(ucrTempReceiver.Tag) @@ -1963,57 +1885,6 @@ Public Class dlgClimograph If ucrCurrentReceiver IsNot Nothing Then ucrCurrentReceiver.SetMeAsReceiver() End If - - ' Re-enable the event handler - AddHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillTminReceivers - - isFilling = False - End Sub - - Private Sub AutoFillTminminReceivers() - If isFilling Then - Exit Sub - End If - isFilling = True - - ' Temporarily remove the event handler - RemoveHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillTminminReceivers - - Dim lstRecognisedValues As List(Of String) - Dim ucrCurrentReceiver As ucrReceiver - Dim bFound As Boolean = False - - ucrCurrentReceiver = ucrSelectorClimograph.CurrentReceiver - - For Each ucrTempReceiver As ucrReceiver In lstTminminReceivers - ucrTempReceiver.SetMeAsReceiver() - lstRecognisedValues = GetRecognisedValues(ucrTempReceiver.Tag) - - If lstRecognisedValues.Count > 0 Then - For Each lviTempVariable As ListViewItem In ucrSelectorClimograph.lstAvailableVariable.Items - For Each strValue As String In lstRecognisedValues - If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]", String.Empty).Equals(strValue) Then - ucrTempReceiver.Add(lviTempVariable.Text, ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) - bFound = True - Exit For - End If - Next - If bFound Then - bFound = False - Exit For - End If - Next - End If - Next - - If ucrCurrentReceiver IsNot Nothing Then - ucrCurrentReceiver.SetMeAsReceiver() - End If - - ' Re-enable the event handler - AddHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillTminminReceivers - - isFilling = False End Sub Private Function GetRecognisedValues(strVariable As String) As List(Of String) From 960d70e2388ae7d00cb9ef44efcbb1afef96be34 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 31 Oct 2024 14:27:45 +0100 Subject: [PATCH 03/50] minor change made --- instat/dlgClimograph.vb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 72a7c39e3b..7b7da02428 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -1336,14 +1336,12 @@ Public Class dlgClimograph Dataframechange() AddRemoveTemBars() - AutoFillReceivers(lstRainReceivers) AutoFillReceivers(lstTmaxReceivers) AutoFillReceivers(lstTminReceivers) AutoFillReceivers(lstTminminReceivers) End Sub - Private Sub AutoFillRainReceivers() If isFilling Then Exit Sub @@ -1390,8 +1388,6 @@ Public Class dlgClimograph isFilling = False End Sub - - Private Sub GetParameterValue(clsOperator As ROperator) Dim i As Integer = 0 For Each clsTempParam As RParameter In clsOperator.clsParameters @@ -1931,8 +1927,6 @@ Public Class dlgClimograph isFilling = False End Sub - - Private Function GetRecognisedValues(strVariable As String) As List(Of String) Dim lstValues As New List(Of String) From 744fb3c99dced81d5dd7cd54446322142b0c06ca Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 4 Nov 2024 09:40:36 +0100 Subject: [PATCH 04/50] Bug Fixes in Parallel Coordinate Plot --- instat/dlgParallelCoordinatePlot.vb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/instat/dlgParallelCoordinatePlot.vb b/instat/dlgParallelCoordinatePlot.vb index b3cd4519c9..ecd4be35ee 100644 --- a/instat/dlgParallelCoordinatePlot.vb +++ b/instat/dlgParallelCoordinatePlot.vb @@ -173,11 +173,14 @@ Public Class dlgParallelCoordinatePlot ucrSaveGraph.Reset() bResetSubdialog = True + clsMatchFunction.SetRCommand("match") + clsMatchFunction.SetAssignTo("column_numbers") + clsGGParCoordFunc.SetPackageName("GGally") clsGGParCoordFunc.SetRCommand("ggparcoord") - clsGGParCoordFunc.AddParameter("columns", "column_numbers", iPosition:=1) + clsGGParCoordFunc.AddParameter("columns", clsRFunctionParameter:=clsMatchFunction, iPosition:=1) clsGGParCoordFunc.AddParameter("missing", Chr(34) & "exclude" & Chr(34), iPosition:=6) - clsGGParCoordFunc.AddParameter("order", clsRFunctionParameter:=clsMatchFunction, iPosition:=7) + clsGGParCoordFunc.AddParameter("order", Chr(34) & "anyClass" & Chr(34), iPosition:=7) clsGGParCoordFunc.AddParameter("centerObsID", "1", iPosition:=8) clsBaseOperator.SetOperation("+") @@ -199,8 +202,7 @@ Public Class dlgParallelCoordinatePlot clsGroupByFunction.SetPackageName("dplyr") clsGroupByFunction.SetRCommand("group_by") - clsMatchFunction.SetRCommand("match") - clsMatchFunction.SetAssignTo("column_numbers") + clsNamesFunction.SetRCommand("names") From fbf212fd4083a5aacbfdc5d5dbc4bd42b86d310d Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 25 Nov 2024 14:27:59 +0300 Subject: [PATCH 05/50] Added min and max recongnition auto fill in define climatic dialogue --- instat/DlgDefineClimaticData.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/DlgDefineClimaticData.vb b/instat/DlgDefineClimaticData.vb index 5055c7d8a0..3b88a7c821 100644 --- a/instat/DlgDefineClimaticData.vb +++ b/instat/DlgDefineClimaticData.vb @@ -55,8 +55,8 @@ Public Class DlgDefineClimaticData Dim kvpLongitude As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("lon", {"lon", "lont", "longitude"}.ToList()) Dim kvpLatitude As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("lat", {"lat", "latitude"}.ToList()) Dim kvpCloudCover As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("cloud_cover", {"cloud", "cldtot"}.ToList()) - Dim kvpTempMax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"tmax", "tx", "tempmax", "tmp_max", "tmpmax"}.ToList()) - Dim kvpTempMin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"tmin", "tn", "tempmin", "tmp_min", "tmpmin"}.ToList()) + Dim kvpTempMax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"tmax", "tx", "tempmax", "tmp_max", "tmpmax", "max"}.ToList()) + Dim kvpTempMin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"tmin", "tn", "tempmin", "tmp_min", "tmpmin", "min"}.ToList()) Dim kvpRadiation As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("radiation", {"radiation", "rad", "radgls", "radsky", "radres", "radnaw", "raddwn", "radup", "raddsl"}.ToList()) Dim kvpSunshineHours As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("sunshine_hours", {"sunshine", "sunh", "sunhrs", "sun"}.ToList()) Dim kvpWindDirection As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("wind_direction", {"winddirection", "pkgstd"}.ToList()) From 9ae2d14b9f11be59f94349ddf7ed56a2f174f845 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 25 Nov 2024 14:46:39 +0300 Subject: [PATCH 06/50] tab orders --- instat/DlgDefineClimaticData.Designer.vb | 365 +++++++++++++---------- 1 file changed, 200 insertions(+), 165 deletions(-) diff --git a/instat/DlgDefineClimaticData.Designer.vb b/instat/DlgDefineClimaticData.Designer.vb index f68af97596..0883023416 100644 --- a/instat/DlgDefineClimaticData.Designer.vb +++ b/instat/DlgDefineClimaticData.Designer.vb @@ -107,10 +107,11 @@ Partial Class DlgDefineClimaticData 'cmdCheckUnique ' Me.cmdCheckUnique.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCheckUnique.Location = New System.Drawing.Point(6, 437) + Me.cmdCheckUnique.Location = New System.Drawing.Point(9, 656) + Me.cmdCheckUnique.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdCheckUnique.Name = "cmdCheckUnique" - Me.cmdCheckUnique.Size = New System.Drawing.Size(139, 23) - Me.cmdCheckUnique.TabIndex = 17 + Me.cmdCheckUnique.Size = New System.Drawing.Size(208, 34) + Me.cmdCheckUnique.TabIndex = 9 Me.cmdCheckUnique.Text = "Check Duplicates" Me.cmdCheckUnique.UseVisualStyleBackColor = True ' @@ -118,9 +119,10 @@ Partial Class DlgDefineClimaticData ' Me.lblStationName.AutoSize = True Me.lblStationName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblStationName.Location = New System.Drawing.Point(10, 14) + Me.lblStationName.Location = New System.Drawing.Point(15, 21) + Me.lblStationName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblStationName.Name = "lblStationName" - Me.lblStationName.Size = New System.Drawing.Size(38, 13) + Me.lblStationName.Size = New System.Drawing.Size(55, 20) Me.lblStationName.TabIndex = 0 Me.lblStationName.Text = "Name:" ' @@ -128,19 +130,21 @@ Partial Class DlgDefineClimaticData ' Me.lblDOY.AutoSize = True Me.lblDOY.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDOY.Location = New System.Drawing.Point(12, 155) + Me.lblDOY.Location = New System.Drawing.Point(18, 232) + Me.lblDOY.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDOY.Name = "lblDOY" - Me.lblDOY.Size = New System.Drawing.Size(66, 13) - Me.lblDOY.TabIndex = 8 + Me.lblDOY.Size = New System.Drawing.Size(97, 20) + Me.lblDOY.TabIndex = 7 Me.lblDOY.Text = "Day of Year:" ' 'lblLongitude ' Me.lblLongitude.AutoSize = True Me.lblLongitude.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLongitude.Location = New System.Drawing.Point(10, 133) + Me.lblLongitude.Location = New System.Drawing.Point(15, 200) + Me.lblLongitude.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblLongitude.Name = "lblLongitude" - Me.lblLongitude.Size = New System.Drawing.Size(57, 13) + Me.lblLongitude.Size = New System.Drawing.Size(84, 20) Me.lblLongitude.TabIndex = 6 Me.lblLongitude.Text = "Longitude:" ' @@ -148,9 +152,10 @@ Partial Class DlgDefineClimaticData ' Me.lblLatitude.AutoSize = True Me.lblLatitude.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLatitude.Location = New System.Drawing.Point(10, 95) + Me.lblLatitude.Location = New System.Drawing.Point(15, 142) + Me.lblLatitude.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblLatitude.Name = "lblLatitude" - Me.lblLatitude.Size = New System.Drawing.Size(48, 13) + Me.lblLatitude.Size = New System.Drawing.Size(71, 20) Me.lblLatitude.TabIndex = 4 Me.lblLatitude.Text = "Latitude:" ' @@ -158,10 +163,11 @@ Partial Class DlgDefineClimaticData ' Me.lblAltitude.AutoSize = True Me.lblAltitude.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblAltitude.Location = New System.Drawing.Point(10, 172) + Me.lblAltitude.Location = New System.Drawing.Point(15, 258) + Me.lblAltitude.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblAltitude.Name = "lblAltitude" - Me.lblAltitude.Size = New System.Drawing.Size(45, 13) - Me.lblAltitude.TabIndex = 2 + Me.lblAltitude.Size = New System.Drawing.Size(67, 20) + Me.lblAltitude.TabIndex = 8 Me.lblAltitude.Text = "Altitude:" ' 'grpStation @@ -176,10 +182,12 @@ Partial Class DlgDefineClimaticData Me.grpStation.Controls.Add(Me.ucrReceiverLongitude) Me.grpStation.Controls.Add(Me.ucrReceiverLatitude) Me.grpStation.Controls.Add(Me.ucrReceiverAltitude) - Me.grpStation.Location = New System.Drawing.Point(242, 211) + Me.grpStation.Location = New System.Drawing.Point(363, 316) + Me.grpStation.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpStation.Name = "grpStation" - Me.grpStation.Size = New System.Drawing.Size(126, 216) - Me.grpStation.TabIndex = 14 + Me.grpStation.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpStation.Size = New System.Drawing.Size(189, 324) + Me.grpStation.TabIndex = 4 Me.grpStation.TabStop = False Me.grpStation.Tag = "" Me.grpStation.Text = "Station" @@ -188,73 +196,74 @@ Partial Class DlgDefineClimaticData ' Me.lblDiscrit.AutoSize = True Me.lblDiscrit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDiscrit.Location = New System.Drawing.Point(10, 57) + Me.lblDiscrit.Location = New System.Drawing.Point(15, 86) + Me.lblDiscrit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDiscrit.Name = "lblDiscrit" - Me.lblDiscrit.Size = New System.Drawing.Size(40, 13) - Me.lblDiscrit.TabIndex = 10 + Me.lblDiscrit.Size = New System.Drawing.Size(59, 20) + Me.lblDiscrit.TabIndex = 2 Me.lblDiscrit.Text = "district:" ' 'ucrReceiverDiscrit ' Me.ucrReceiverDiscrit.AutoSize = True Me.ucrReceiverDiscrit.frmParent = Me - Me.ucrReceiverDiscrit.Location = New System.Drawing.Point(10, 72) + Me.ucrReceiverDiscrit.Location = New System.Drawing.Point(15, 108) Me.ucrReceiverDiscrit.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDiscrit.Name = "ucrReceiverDiscrit" Me.ucrReceiverDiscrit.Selector = Nothing - Me.ucrReceiverDiscrit.Size = New System.Drawing.Size(100, 20) + Me.ucrReceiverDiscrit.Size = New System.Drawing.Size(150, 30) Me.ucrReceiverDiscrit.strNcFilePath = "" - Me.ucrReceiverDiscrit.TabIndex = 11 + Me.ucrReceiverDiscrit.TabIndex = 3 Me.ucrReceiverDiscrit.ucrSelector = Nothing ' 'ucrReceiverStation ' Me.ucrReceiverStation.AutoSize = True Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Location = New System.Drawing.Point(10, 29) + Me.ucrReceiverStation.Location = New System.Drawing.Point(15, 44) Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStation.Name = "ucrReceiverStation" Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(100, 20) + Me.ucrReceiverStation.Size = New System.Drawing.Size(150, 30) Me.ucrReceiverStation.strNcFilePath = "" - Me.ucrReceiverStation.TabIndex = 6 + Me.ucrReceiverStation.TabIndex = 1 Me.ucrReceiverStation.ucrSelector = Nothing ' 'ucrReceiverLongitude ' Me.ucrReceiverLongitude.AutoSize = True Me.ucrReceiverLongitude.frmParent = Me - Me.ucrReceiverLongitude.Location = New System.Drawing.Point(10, 148) + Me.ucrReceiverLongitude.Location = New System.Drawing.Point(15, 222) Me.ucrReceiverLongitude.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverLongitude.Name = "ucrReceiverLongitude" Me.ucrReceiverLongitude.Selector = Nothing - Me.ucrReceiverLongitude.Size = New System.Drawing.Size(100, 20) + Me.ucrReceiverLongitude.Size = New System.Drawing.Size(150, 30) Me.ucrReceiverLongitude.strNcFilePath = "" - Me.ucrReceiverLongitude.TabIndex = 8 + Me.ucrReceiverLongitude.TabIndex = 7 Me.ucrReceiverLongitude.ucrSelector = Nothing ' 'ucrReceiverLatitude ' Me.ucrReceiverLatitude.AutoSize = True Me.ucrReceiverLatitude.frmParent = Me - Me.ucrReceiverLatitude.Location = New System.Drawing.Point(10, 110) + Me.ucrReceiverLatitude.Location = New System.Drawing.Point(15, 165) Me.ucrReceiverLatitude.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverLatitude.Name = "ucrReceiverLatitude" Me.ucrReceiverLatitude.Selector = Nothing - Me.ucrReceiverLatitude.Size = New System.Drawing.Size(100, 20) + Me.ucrReceiverLatitude.Size = New System.Drawing.Size(150, 30) Me.ucrReceiverLatitude.strNcFilePath = "" - Me.ucrReceiverLatitude.TabIndex = 7 + Me.ucrReceiverLatitude.TabIndex = 5 Me.ucrReceiverLatitude.ucrSelector = Nothing ' 'ucrReceiverAltitude ' Me.ucrReceiverAltitude.AutoSize = True Me.ucrReceiverAltitude.frmParent = Me - Me.ucrReceiverAltitude.Location = New System.Drawing.Point(10, 187) + Me.ucrReceiverAltitude.Location = New System.Drawing.Point(15, 280) Me.ucrReceiverAltitude.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverAltitude.Name = "ucrReceiverAltitude" Me.ucrReceiverAltitude.Selector = Nothing - Me.ucrReceiverAltitude.Size = New System.Drawing.Size(100, 20) + Me.ucrReceiverAltitude.Size = New System.Drawing.Size(150, 30) Me.ucrReceiverAltitude.strNcFilePath = "" Me.ucrReceiverAltitude.TabIndex = 9 Me.ucrReceiverAltitude.ucrSelector = Nothing @@ -271,10 +280,12 @@ Partial Class DlgDefineClimaticData Me.grpDateTime.Controls.Add(Me.ucrReceiverMonth) Me.grpDateTime.Controls.Add(Me.ucrReceiverDay) Me.grpDateTime.Controls.Add(Me.lblDay) - Me.grpDateTime.Location = New System.Drawing.Point(242, 12) + Me.grpDateTime.Location = New System.Drawing.Point(363, 18) + Me.grpDateTime.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpDateTime.Name = "grpDateTime" - Me.grpDateTime.Size = New System.Drawing.Size(126, 196) - Me.grpDateTime.TabIndex = 15 + Me.grpDateTime.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDateTime.Size = New System.Drawing.Size(189, 294) + Me.grpDateTime.TabIndex = 3 Me.grpDateTime.TabStop = False Me.grpDateTime.Tag = "" Me.grpDateTime.Text = "Date and Time" @@ -283,11 +294,11 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverYear.AutoSize = True Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(12, 62) + Me.ucrReceiverYear.Location = New System.Drawing.Point(18, 93) Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYear.Name = "ucrReceiverYear" Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.Size = New System.Drawing.Size(98, 20) + Me.ucrReceiverYear.Size = New System.Drawing.Size(147, 30) Me.ucrReceiverYear.strNcFilePath = "" Me.ucrReceiverYear.TabIndex = 2 Me.ucrReceiverYear.ucrSelector = Nothing @@ -296,9 +307,10 @@ Partial Class DlgDefineClimaticData ' Me.lblDate.AutoSize = True Me.lblDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDate.Location = New System.Drawing.Point(12, 13) + Me.lblDate.Location = New System.Drawing.Point(18, 20) + Me.lblDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDate.Name = "lblDate" - Me.lblDate.Size = New System.Drawing.Size(33, 13) + Me.lblDate.Size = New System.Drawing.Size(48, 20) Me.lblDate.TabIndex = 0 Me.lblDate.Text = "Date:" ' @@ -306,32 +318,34 @@ Partial Class DlgDefineClimaticData ' Me.lblMonth.AutoSize = True Me.lblMonth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMonth.Location = New System.Drawing.Point(12, 84) + Me.lblMonth.Location = New System.Drawing.Point(18, 126) + Me.lblMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMonth.Name = "lblMonth" - Me.lblMonth.Size = New System.Drawing.Size(40, 13) - Me.lblMonth.TabIndex = 4 + Me.lblMonth.Size = New System.Drawing.Size(58, 20) + Me.lblMonth.TabIndex = 3 Me.lblMonth.Text = "Month:" ' 'ucrReceiverDOY ' Me.ucrReceiverDOY.AutoSize = True Me.ucrReceiverDOY.frmParent = Me - Me.ucrReceiverDOY.Location = New System.Drawing.Point(12, 170) + Me.ucrReceiverDOY.Location = New System.Drawing.Point(18, 255) Me.ucrReceiverDOY.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDOY.Name = "ucrReceiverDOY" Me.ucrReceiverDOY.Selector = Nothing - Me.ucrReceiverDOY.Size = New System.Drawing.Size(98, 20) + Me.ucrReceiverDOY.Size = New System.Drawing.Size(147, 30) Me.ucrReceiverDOY.strNcFilePath = "" - Me.ucrReceiverDOY.TabIndex = 5 + Me.ucrReceiverDOY.TabIndex = 8 Me.ucrReceiverDOY.ucrSelector = Nothing ' 'lblYear ' Me.lblYear.AutoSize = True Me.lblYear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblYear.Location = New System.Drawing.Point(12, 48) + Me.lblYear.Location = New System.Drawing.Point(18, 72) + Me.lblYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblYear.Name = "lblYear" - Me.lblYear.Size = New System.Drawing.Size(32, 13) + Me.lblYear.Size = New System.Drawing.Size(47, 20) Me.lblYear.TabIndex = 2 Me.lblYear.Text = "Year:" ' @@ -339,11 +353,11 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverDate.AutoSize = True Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(12, 26) + Me.ucrReceiverDate.Location = New System.Drawing.Point(18, 39) Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDate.Name = "ucrReceiverDate" Me.ucrReceiverDate.Selector = Nothing - Me.ucrReceiverDate.Size = New System.Drawing.Size(98, 20) + Me.ucrReceiverDate.Size = New System.Drawing.Size(147, 30) Me.ucrReceiverDate.strNcFilePath = "" Me.ucrReceiverDate.TabIndex = 1 Me.ucrReceiverDate.ucrSelector = Nothing @@ -352,55 +366,58 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMonth.AutoSize = True Me.ucrReceiverMonth.frmParent = Me - Me.ucrReceiverMonth.Location = New System.Drawing.Point(12, 98) + Me.ucrReceiverMonth.Location = New System.Drawing.Point(18, 147) Me.ucrReceiverMonth.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMonth.Name = "ucrReceiverMonth" Me.ucrReceiverMonth.Selector = Nothing - Me.ucrReceiverMonth.Size = New System.Drawing.Size(98, 20) + Me.ucrReceiverMonth.Size = New System.Drawing.Size(147, 30) Me.ucrReceiverMonth.strNcFilePath = "" - Me.ucrReceiverMonth.TabIndex = 3 + Me.ucrReceiverMonth.TabIndex = 4 Me.ucrReceiverMonth.ucrSelector = Nothing ' 'ucrReceiverDay ' Me.ucrReceiverDay.AutoSize = True Me.ucrReceiverDay.frmParent = Me - Me.ucrReceiverDay.Location = New System.Drawing.Point(12, 133) + Me.ucrReceiverDay.Location = New System.Drawing.Point(18, 200) Me.ucrReceiverDay.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDay.Name = "ucrReceiverDay" Me.ucrReceiverDay.Selector = Nothing - Me.ucrReceiverDay.Size = New System.Drawing.Size(98, 20) + Me.ucrReceiverDay.Size = New System.Drawing.Size(147, 30) Me.ucrReceiverDay.strNcFilePath = "" - Me.ucrReceiverDay.TabIndex = 4 + Me.ucrReceiverDay.TabIndex = 6 Me.ucrReceiverDay.ucrSelector = Nothing ' 'lblDay ' Me.lblDay.AutoSize = True Me.lblDay.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDay.Location = New System.Drawing.Point(12, 120) + Me.lblDay.Location = New System.Drawing.Point(18, 180) + Me.lblDay.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDay.Name = "lblDay" - Me.lblDay.Size = New System.Drawing.Size(29, 13) - Me.lblDay.TabIndex = 6 + Me.lblDay.Size = New System.Drawing.Size(41, 20) + Me.lblDay.TabIndex = 5 Me.lblDay.Text = "Day:" ' 'Label1 ' Me.Label1.AutoSize = True Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(9, 135) + Me.Label1.Location = New System.Drawing.Point(14, 202) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(57, 13) - Me.Label1.TabIndex = 6 + Me.Label1.Size = New System.Drawing.Size(84, 20) + Me.Label1.TabIndex = 7 Me.Label1.Text = "Longitude:" ' 'Label2 ' Me.Label2.AutoSize = True Me.Label2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label2.Location = New System.Drawing.Point(9, 97) + Me.Label2.Location = New System.Drawing.Point(14, 146) + Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(48, 13) + Me.Label2.Size = New System.Drawing.Size(71, 20) Me.Label2.TabIndex = 4 Me.Label2.Text = "Latitude:" ' @@ -408,19 +425,21 @@ Partial Class DlgDefineClimaticData ' Me.Label3.AutoSize = True Me.Label3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label3.Location = New System.Drawing.Point(9, 176) + Me.Label3.Location = New System.Drawing.Point(14, 264) + Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(45, 13) - Me.Label3.TabIndex = 2 + Me.Label3.Size = New System.Drawing.Size(67, 20) + Me.Label3.TabIndex = 9 Me.Label3.Text = "Altitude:" ' 'Label4 ' Me.Label4.AutoSize = True Me.Label4.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label4.Location = New System.Drawing.Point(9, 20) + Me.Label4.Location = New System.Drawing.Point(14, 30) + Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(38, 13) + Me.Label4.Size = New System.Drawing.Size(55, 20) Me.Label4.TabIndex = 0 Me.Label4.Text = "Name:" ' @@ -436,10 +455,12 @@ Partial Class DlgDefineClimaticData Me.grpMeta.Controls.Add(Me.ucrReceiverLonMeta) Me.grpMeta.Controls.Add(Me.ucrReceiverLatMeta) Me.grpMeta.Controls.Add(Me.ucrReceiverAltMeta) - Me.grpMeta.Location = New System.Drawing.Point(242, 211) + Me.grpMeta.Location = New System.Drawing.Point(363, 316) + Me.grpMeta.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpMeta.Name = "grpMeta" - Me.grpMeta.Size = New System.Drawing.Size(112, 216) - Me.grpMeta.TabIndex = 22 + Me.grpMeta.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpMeta.Size = New System.Drawing.Size(168, 324) + Me.grpMeta.TabIndex = 5 Me.grpMeta.TabStop = False Me.grpMeta.Tag = "" Me.grpMeta.Text = "Station" @@ -448,84 +469,86 @@ Partial Class DlgDefineClimaticData ' Me.lblDiscritMeta.AutoSize = True Me.lblDiscritMeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDiscritMeta.Location = New System.Drawing.Point(9, 58) + Me.lblDiscritMeta.Location = New System.Drawing.Point(14, 87) + Me.lblDiscritMeta.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDiscritMeta.Name = "lblDiscritMeta" - Me.lblDiscritMeta.Size = New System.Drawing.Size(40, 13) - Me.lblDiscritMeta.TabIndex = 12 + Me.lblDiscritMeta.Size = New System.Drawing.Size(59, 20) + Me.lblDiscritMeta.TabIndex = 2 Me.lblDiscritMeta.Text = "district:" ' 'ucrReceiverDiscritMeta ' Me.ucrReceiverDiscritMeta.AutoSize = True Me.ucrReceiverDiscritMeta.frmParent = Me - Me.ucrReceiverDiscritMeta.Location = New System.Drawing.Point(11, 73) + Me.ucrReceiverDiscritMeta.Location = New System.Drawing.Point(16, 110) Me.ucrReceiverDiscritMeta.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDiscritMeta.Name = "ucrReceiverDiscritMeta" Me.ucrReceiverDiscritMeta.Selector = Nothing - Me.ucrReceiverDiscritMeta.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverDiscritMeta.Size = New System.Drawing.Size(140, 30) Me.ucrReceiverDiscritMeta.strNcFilePath = "" - Me.ucrReceiverDiscritMeta.TabIndex = 13 + Me.ucrReceiverDiscritMeta.TabIndex = 3 Me.ucrReceiverDiscritMeta.ucrSelector = Nothing ' 'ucrReceiverStationMeta ' Me.ucrReceiverStationMeta.AutoSize = True Me.ucrReceiverStationMeta.frmParent = Me - Me.ucrReceiverStationMeta.Location = New System.Drawing.Point(11, 33) + Me.ucrReceiverStationMeta.Location = New System.Drawing.Point(16, 50) Me.ucrReceiverStationMeta.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStationMeta.Name = "ucrReceiverStationMeta" Me.ucrReceiverStationMeta.Selector = Nothing - Me.ucrReceiverStationMeta.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverStationMeta.Size = New System.Drawing.Size(140, 30) Me.ucrReceiverStationMeta.strNcFilePath = "" - Me.ucrReceiverStationMeta.TabIndex = 8 + Me.ucrReceiverStationMeta.TabIndex = 1 Me.ucrReceiverStationMeta.ucrSelector = Nothing ' 'ucrReceiverLonMeta ' Me.ucrReceiverLonMeta.AutoSize = True Me.ucrReceiverLonMeta.frmParent = Me - Me.ucrReceiverLonMeta.Location = New System.Drawing.Point(9, 150) + Me.ucrReceiverLonMeta.Location = New System.Drawing.Point(14, 225) Me.ucrReceiverLonMeta.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverLonMeta.Name = "ucrReceiverLonMeta" Me.ucrReceiverLonMeta.Selector = Nothing - Me.ucrReceiverLonMeta.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverLonMeta.Size = New System.Drawing.Size(140, 30) Me.ucrReceiverLonMeta.strNcFilePath = "" - Me.ucrReceiverLonMeta.TabIndex = 10 + Me.ucrReceiverLonMeta.TabIndex = 8 Me.ucrReceiverLonMeta.ucrSelector = Nothing ' 'ucrReceiverLatMeta ' Me.ucrReceiverLatMeta.AutoSize = True Me.ucrReceiverLatMeta.frmParent = Me - Me.ucrReceiverLatMeta.Location = New System.Drawing.Point(9, 112) + Me.ucrReceiverLatMeta.Location = New System.Drawing.Point(14, 168) Me.ucrReceiverLatMeta.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverLatMeta.Name = "ucrReceiverLatMeta" Me.ucrReceiverLatMeta.Selector = Nothing - Me.ucrReceiverLatMeta.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverLatMeta.Size = New System.Drawing.Size(140, 30) Me.ucrReceiverLatMeta.strNcFilePath = "" - Me.ucrReceiverLatMeta.TabIndex = 9 + Me.ucrReceiverLatMeta.TabIndex = 5 Me.ucrReceiverLatMeta.ucrSelector = Nothing ' 'ucrReceiverAltMeta ' Me.ucrReceiverAltMeta.AutoSize = True Me.ucrReceiverAltMeta.frmParent = Me - Me.ucrReceiverAltMeta.Location = New System.Drawing.Point(9, 191) + Me.ucrReceiverAltMeta.Location = New System.Drawing.Point(14, 286) Me.ucrReceiverAltMeta.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverAltMeta.Name = "ucrReceiverAltMeta" Me.ucrReceiverAltMeta.Selector = Nothing - Me.ucrReceiverAltMeta.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverAltMeta.Size = New System.Drawing.Size(140, 30) Me.ucrReceiverAltMeta.strNcFilePath = "" - Me.ucrReceiverAltMeta.TabIndex = 11 + Me.ucrReceiverAltMeta.TabIndex = 9 Me.ucrReceiverAltMeta.ucrSelector = Nothing ' 'lblRain ' Me.lblRain.AutoSize = True Me.lblRain.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRain.Location = New System.Drawing.Point(15, 15) + Me.lblRain.Location = New System.Drawing.Point(22, 22) + Me.lblRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRain.Name = "lblRain" - Me.lblRain.Size = New System.Drawing.Size(32, 13) + Me.lblRain.Size = New System.Drawing.Size(46, 20) Me.lblRain.TabIndex = 0 Me.lblRain.Text = "Rain:" ' @@ -551,10 +574,12 @@ Partial Class DlgDefineClimaticData Me.grpElements.Controls.Add(Me.ucrReceiverMinTemp) Me.grpElements.Controls.Add(Me.lblWindSpeed) Me.grpElements.Controls.Add(Me.lblWindDirection) - Me.grpElements.Location = New System.Drawing.Point(374, 12) + Me.grpElements.Location = New System.Drawing.Point(561, 18) + Me.grpElements.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpElements.Name = "grpElements" - Me.grpElements.Size = New System.Drawing.Size(151, 395) - Me.grpElements.TabIndex = 16 + Me.grpElements.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpElements.Size = New System.Drawing.Size(226, 592) + Me.grpElements.TabIndex = 6 Me.grpElements.TabStop = False Me.grpElements.Text = "Elements" ' @@ -562,11 +587,11 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMaxRH.AutoSize = True Me.ucrReceiverMaxRH.frmParent = Me - Me.ucrReceiverMaxRH.Location = New System.Drawing.Point(18, 366) + Me.ucrReceiverMaxRH.Location = New System.Drawing.Point(27, 549) Me.ucrReceiverMaxRH.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxRH.Name = "ucrReceiverMaxRH" Me.ucrReceiverMaxRH.Selector = Nothing - Me.ucrReceiverMaxRH.Size = New System.Drawing.Size(116, 20) + Me.ucrReceiverMaxRH.Size = New System.Drawing.Size(174, 30) Me.ucrReceiverMaxRH.strNcFilePath = "" Me.ucrReceiverMaxRH.TabIndex = 19 Me.ucrReceiverMaxRH.ucrSelector = Nothing @@ -575,9 +600,10 @@ Partial Class DlgDefineClimaticData ' Me.lblMaxRH.AutoSize = True Me.lblMaxRH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxRH.Location = New System.Drawing.Point(15, 351) + Me.lblMaxRH.Location = New System.Drawing.Point(22, 526) + Me.lblMaxRH.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMaxRH.Name = "lblMaxRH" - Me.lblMaxRH.Size = New System.Drawing.Size(90, 13) + Me.lblMaxRH.Size = New System.Drawing.Size(136, 20) Me.lblMaxRH.TabIndex = 18 Me.lblMaxRH.Text = "Maximum RH (%):" ' @@ -585,22 +611,23 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMinRH.AutoSize = True Me.ucrReceiverMinRH.frmParent = Me - Me.ucrReceiverMinRH.Location = New System.Drawing.Point(18, 330) + Me.ucrReceiverMinRH.Location = New System.Drawing.Point(27, 495) Me.ucrReceiverMinRH.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinRH.Name = "ucrReceiverMinRH" Me.ucrReceiverMinRH.Selector = Nothing - Me.ucrReceiverMinRH.Size = New System.Drawing.Size(116, 20) + Me.ucrReceiverMinRH.Size = New System.Drawing.Size(174, 30) Me.ucrReceiverMinRH.strNcFilePath = "" - Me.ucrReceiverMinRH.TabIndex = 18 + Me.ucrReceiverMinRH.TabIndex = 17 Me.ucrReceiverMinRH.ucrSelector = Nothing ' 'lblMinimumRH ' Me.lblMinimumRH.AutoSize = True Me.lblMinimumRH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMinimumRH.Location = New System.Drawing.Point(15, 315) + Me.lblMinimumRH.Location = New System.Drawing.Point(22, 472) + Me.lblMinimumRH.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMinimumRH.Name = "lblMinimumRH" - Me.lblMinimumRH.Size = New System.Drawing.Size(87, 13) + Me.lblMinimumRH.Size = New System.Drawing.Size(132, 20) Me.lblMinimumRH.TabIndex = 16 Me.lblMinimumRH.Text = "Minimum RH (%):" ' @@ -608,87 +635,88 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverWindDirection.AutoSize = True Me.ucrReceiverWindDirection.frmParent = Me - Me.ucrReceiverWindDirection.Location = New System.Drawing.Point(18, 177) + Me.ucrReceiverWindDirection.Location = New System.Drawing.Point(27, 266) Me.ucrReceiverWindDirection.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverWindDirection.Name = "ucrReceiverWindDirection" Me.ucrReceiverWindDirection.Selector = Nothing - Me.ucrReceiverWindDirection.Size = New System.Drawing.Size(111, 20) + Me.ucrReceiverWindDirection.Size = New System.Drawing.Size(166, 30) Me.ucrReceiverWindDirection.strNcFilePath = "" - Me.ucrReceiverWindDirection.TabIndex = 14 + Me.ucrReceiverWindDirection.TabIndex = 9 Me.ucrReceiverWindDirection.ucrSelector = Nothing ' 'ucrReceiverRain ' Me.ucrReceiverRain.AutoSize = True Me.ucrReceiverRain.frmParent = Me - Me.ucrReceiverRain.Location = New System.Drawing.Point(18, 30) + Me.ucrReceiverRain.Location = New System.Drawing.Point(27, 45) Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRain.Name = "ucrReceiverRain" Me.ucrReceiverRain.Selector = Nothing - Me.ucrReceiverRain.Size = New System.Drawing.Size(111, 20) + Me.ucrReceiverRain.Size = New System.Drawing.Size(166, 30) Me.ucrReceiverRain.strNcFilePath = "" - Me.ucrReceiverRain.TabIndex = 10 + Me.ucrReceiverRain.TabIndex = 1 Me.ucrReceiverRain.ucrSelector = Nothing ' 'ucrReceiverSunshine ' Me.ucrReceiverSunshine.AutoSize = True Me.ucrReceiverSunshine.frmParent = Me - Me.ucrReceiverSunshine.Location = New System.Drawing.Point(18, 215) + Me.ucrReceiverSunshine.Location = New System.Drawing.Point(27, 322) Me.ucrReceiverSunshine.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSunshine.Name = "ucrReceiverSunshine" Me.ucrReceiverSunshine.Selector = Nothing - Me.ucrReceiverSunshine.Size = New System.Drawing.Size(116, 20) + Me.ucrReceiverSunshine.Size = New System.Drawing.Size(174, 30) Me.ucrReceiverSunshine.strNcFilePath = "" - Me.ucrReceiverSunshine.TabIndex = 15 + Me.ucrReceiverSunshine.TabIndex = 11 Me.ucrReceiverSunshine.ucrSelector = Nothing ' 'ucrReceiverRadiation ' Me.ucrReceiverRadiation.AutoSize = True Me.ucrReceiverRadiation.frmParent = Me - Me.ucrReceiverRadiation.Location = New System.Drawing.Point(18, 254) + Me.ucrReceiverRadiation.Location = New System.Drawing.Point(27, 381) Me.ucrReceiverRadiation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRadiation.Name = "ucrReceiverRadiation" Me.ucrReceiverRadiation.Selector = Nothing - Me.ucrReceiverRadiation.Size = New System.Drawing.Size(116, 20) + Me.ucrReceiverRadiation.Size = New System.Drawing.Size(174, 30) Me.ucrReceiverRadiation.strNcFilePath = "" - Me.ucrReceiverRadiation.TabIndex = 16 + Me.ucrReceiverRadiation.TabIndex = 13 Me.ucrReceiverRadiation.ucrSelector = Nothing ' 'ucrReceiverMaxTemp ' Me.ucrReceiverMaxTemp.AutoSize = True Me.ucrReceiverMaxTemp.frmParent = Me - Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(18, 103) + Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(27, 154) Me.ucrReceiverMaxTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxTemp.Name = "ucrReceiverMaxTemp" Me.ucrReceiverMaxTemp.Selector = Nothing - Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(111, 20) + Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(166, 30) Me.ucrReceiverMaxTemp.strNcFilePath = "" - Me.ucrReceiverMaxTemp.TabIndex = 12 + Me.ucrReceiverMaxTemp.TabIndex = 5 Me.ucrReceiverMaxTemp.ucrSelector = Nothing ' 'ucrReceiverCloudCover ' Me.ucrReceiverCloudCover.AutoSize = True Me.ucrReceiverCloudCover.frmParent = Me - Me.ucrReceiverCloudCover.Location = New System.Drawing.Point(18, 292) + Me.ucrReceiverCloudCover.Location = New System.Drawing.Point(27, 438) Me.ucrReceiverCloudCover.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverCloudCover.Name = "ucrReceiverCloudCover" Me.ucrReceiverCloudCover.Selector = Nothing - Me.ucrReceiverCloudCover.Size = New System.Drawing.Size(116, 20) + Me.ucrReceiverCloudCover.Size = New System.Drawing.Size(174, 30) Me.ucrReceiverCloudCover.strNcFilePath = "" - Me.ucrReceiverCloudCover.TabIndex = 17 + Me.ucrReceiverCloudCover.TabIndex = 15 Me.ucrReceiverCloudCover.ucrSelector = Nothing ' 'lblMaxTemp ' Me.lblMaxTemp.AutoSize = True Me.lblMaxTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxTemp.Location = New System.Drawing.Point(15, 88) + Me.lblMaxTemp.Location = New System.Drawing.Point(22, 132) + Me.lblMaxTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMaxTemp.Name = "lblMaxTemp" - Me.lblMaxTemp.Size = New System.Drawing.Size(117, 13) + Me.lblMaxTemp.Size = New System.Drawing.Size(175, 20) Me.lblMaxTemp.TabIndex = 4 Me.lblMaxTemp.Text = "Maximum Temperature:" ' @@ -696,9 +724,10 @@ Partial Class DlgDefineClimaticData ' Me.lblCloudCover.AutoSize = True Me.lblCloudCover.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCloudCover.Location = New System.Drawing.Point(15, 277) + Me.lblCloudCover.Location = New System.Drawing.Point(22, 416) + Me.lblCloudCover.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCloudCover.Name = "lblCloudCover" - Me.lblCloudCover.Size = New System.Drawing.Size(68, 13) + Me.lblCloudCover.Size = New System.Drawing.Size(99, 20) Me.lblCloudCover.TabIndex = 14 Me.lblCloudCover.Text = "Cloud Cover:" ' @@ -706,9 +735,10 @@ Partial Class DlgDefineClimaticData ' Me.lblMinTemp.AutoSize = True Me.lblMinTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMinTemp.Location = New System.Drawing.Point(15, 51) + Me.lblMinTemp.Location = New System.Drawing.Point(22, 76) + Me.lblMinTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMinTemp.Name = "lblMinTemp" - Me.lblMinTemp.Size = New System.Drawing.Size(114, 13) + Me.lblMinTemp.Size = New System.Drawing.Size(171, 20) Me.lblMinTemp.TabIndex = 2 Me.lblMinTemp.Text = "Minimum Temperature:" ' @@ -716,9 +746,10 @@ Partial Class DlgDefineClimaticData ' Me.lblRadiation.AutoSize = True Me.lblRadiation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRadiation.Location = New System.Drawing.Point(15, 239) + Me.lblRadiation.Location = New System.Drawing.Point(22, 358) + Me.lblRadiation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRadiation.Name = "lblRadiation" - Me.lblRadiation.Size = New System.Drawing.Size(55, 13) + Me.lblRadiation.Size = New System.Drawing.Size(81, 20) Me.lblRadiation.TabIndex = 12 Me.lblRadiation.Text = "Radiation:" ' @@ -726,22 +757,23 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverWindSpeed.AutoSize = True Me.ucrReceiverWindSpeed.frmParent = Me - Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(18, 140) + Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(27, 210) Me.ucrReceiverWindSpeed.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverWindSpeed.Name = "ucrReceiverWindSpeed" Me.ucrReceiverWindSpeed.Selector = Nothing - Me.ucrReceiverWindSpeed.Size = New System.Drawing.Size(111, 20) + Me.ucrReceiverWindSpeed.Size = New System.Drawing.Size(166, 30) Me.ucrReceiverWindSpeed.strNcFilePath = "" - Me.ucrReceiverWindSpeed.TabIndex = 13 + Me.ucrReceiverWindSpeed.TabIndex = 7 Me.ucrReceiverWindSpeed.ucrSelector = Nothing ' 'lblSunshine ' Me.lblSunshine.AutoSize = True Me.lblSunshine.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSunshine.Location = New System.Drawing.Point(15, 199) + Me.lblSunshine.Location = New System.Drawing.Point(22, 298) + Me.lblSunshine.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSunshine.Name = "lblSunshine" - Me.lblSunshine.Size = New System.Drawing.Size(85, 13) + Me.lblSunshine.Size = New System.Drawing.Size(127, 20) Me.lblSunshine.TabIndex = 10 Me.lblSunshine.Text = "Sunshine Hours:" ' @@ -749,22 +781,23 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMinTemp.AutoSize = True Me.ucrReceiverMinTemp.frmParent = Me - Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(18, 66) + Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(27, 99) Me.ucrReceiverMinTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinTemp.Name = "ucrReceiverMinTemp" Me.ucrReceiverMinTemp.Selector = Nothing - Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(111, 20) + Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(166, 30) Me.ucrReceiverMinTemp.strNcFilePath = "" - Me.ucrReceiverMinTemp.TabIndex = 11 + Me.ucrReceiverMinTemp.TabIndex = 3 Me.ucrReceiverMinTemp.ucrSelector = Nothing ' 'lblWindSpeed ' Me.lblWindSpeed.AutoSize = True Me.lblWindSpeed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblWindSpeed.Location = New System.Drawing.Point(15, 125) + Me.lblWindSpeed.Location = New System.Drawing.Point(22, 188) + Me.lblWindSpeed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblWindSpeed.Name = "lblWindSpeed" - Me.lblWindSpeed.Size = New System.Drawing.Size(69, 13) + Me.lblWindSpeed.Size = New System.Drawing.Size(100, 20) Me.lblWindSpeed.TabIndex = 6 Me.lblWindSpeed.Text = "Wind Speed:" ' @@ -772,9 +805,10 @@ Partial Class DlgDefineClimaticData ' Me.lblWindDirection.AutoSize = True Me.lblWindDirection.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblWindDirection.Location = New System.Drawing.Point(15, 162) + Me.lblWindDirection.Location = New System.Drawing.Point(22, 243) + Me.lblWindDirection.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblWindDirection.Name = "lblWindDirection" - Me.lblWindDirection.Size = New System.Drawing.Size(80, 13) + Me.lblWindDirection.Size = New System.Drawing.Size(116, 20) Me.lblWindDirection.TabIndex = 8 Me.lblWindDirection.Text = "Wind Direction:" ' @@ -782,11 +816,11 @@ Partial Class DlgDefineClimaticData ' Me.ucrChkLinkedMetaData.AutoSize = True Me.ucrChkLinkedMetaData.Checked = False - Me.ucrChkLinkedMetaData.Location = New System.Drawing.Point(16, 204) - Me.ucrChkLinkedMetaData.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkLinkedMetaData.Location = New System.Drawing.Point(24, 306) + Me.ucrChkLinkedMetaData.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkLinkedMetaData.Name = "ucrChkLinkedMetaData" - Me.ucrChkLinkedMetaData.Size = New System.Drawing.Size(195, 23) - Me.ucrChkLinkedMetaData.TabIndex = 21 + Me.ucrChkLinkedMetaData.Size = New System.Drawing.Size(292, 34) + Me.ucrChkLinkedMetaData.TabIndex = 7 ' 'ucrSelectorLinkedDataFrame ' @@ -794,11 +828,11 @@ Partial Class DlgDefineClimaticData Me.ucrSelectorLinkedDataFrame.bDropUnusedFilterLevels = False Me.ucrSelectorLinkedDataFrame.bShowHiddenColumns = False Me.ucrSelectorLinkedDataFrame.bUseCurrentFilter = True - Me.ucrSelectorLinkedDataFrame.Location = New System.Drawing.Point(16, 224) + Me.ucrSelectorLinkedDataFrame.Location = New System.Drawing.Point(24, 336) Me.ucrSelectorLinkedDataFrame.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorLinkedDataFrame.Name = "ucrSelectorLinkedDataFrame" - Me.ucrSelectorLinkedDataFrame.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorLinkedDataFrame.TabIndex = 20 + Me.ucrSelectorLinkedDataFrame.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorLinkedDataFrame.TabIndex = 8 ' 'ucrInputCheckInput ' @@ -806,11 +840,11 @@ Partial Class DlgDefineClimaticData Me.ucrInputCheckInput.AutoSize = True Me.ucrInputCheckInput.IsMultiline = False Me.ucrInputCheckInput.IsReadOnly = False - Me.ucrInputCheckInput.Location = New System.Drawing.Point(147, 439) - Me.ucrInputCheckInput.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputCheckInput.Location = New System.Drawing.Point(220, 658) + Me.ucrInputCheckInput.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) Me.ucrInputCheckInput.Name = "ucrInputCheckInput" - Me.ucrInputCheckInput.Size = New System.Drawing.Size(253, 21) - Me.ucrInputCheckInput.TabIndex = 18 + Me.ucrInputCheckInput.Size = New System.Drawing.Size(380, 32) + Me.ucrInputCheckInput.TabIndex = 10 ' 'ucrSelectorDefineClimaticData ' @@ -818,39 +852,40 @@ Partial Class DlgDefineClimaticData Me.ucrSelectorDefineClimaticData.bDropUnusedFilterLevels = False Me.ucrSelectorDefineClimaticData.bShowHiddenColumns = False Me.ucrSelectorDefineClimaticData.bUseCurrentFilter = True - Me.ucrSelectorDefineClimaticData.Location = New System.Drawing.Point(16, 9) + Me.ucrSelectorDefineClimaticData.Location = New System.Drawing.Point(24, 14) Me.ucrSelectorDefineClimaticData.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorDefineClimaticData.Name = "ucrSelectorDefineClimaticData" - Me.ucrSelectorDefineClimaticData.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorDefineClimaticData.TabIndex = 13 + Me.ucrSelectorDefineClimaticData.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorDefineClimaticData.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(6, 476) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBase.Location = New System.Drawing.Point(9, 714) + 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.TabIndex = 19 + Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.TabIndex = 11 ' 'DlgDefineClimaticData ' - 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.AutoSize = True - Me.ClientSize = New System.Drawing.Size(533, 531) + Me.ClientSize = New System.Drawing.Size(800, 796) Me.Controls.Add(Me.ucrChkLinkedMetaData) Me.Controls.Add(Me.ucrSelectorLinkedDataFrame) Me.Controls.Add(Me.ucrInputCheckInput) Me.Controls.Add(Me.cmdCheckUnique) Me.Controls.Add(Me.ucrSelectorDefineClimaticData) - Me.Controls.Add(Me.grpStation) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.grpDateTime) Me.Controls.Add(Me.grpElements) Me.Controls.Add(Me.grpMeta) + Me.Controls.Add(Me.grpStation) 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 = "DlgDefineClimaticData" From 32a1d279a79345823fe9708491ae658b5e01a6f8 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 25 Nov 2024 17:29:21 +0300 Subject: [PATCH 07/50] changes to the code --- instat/dlgLinePlot.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index 81389c9c75..bbaa250744 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -536,7 +536,6 @@ Public Class dlgLinePlot clsGeomLineFunction.SetPackageName("ggplot2") clsGeomLineFunction.SetRCommand("geom_line") - clsGeomLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34)) clsGeomLineFunction.AddParameter("size", "0.8") clsAesLinerangeFunction.SetRCommand("aes") From 6d5b4a0e9e1cc9b2b2002b0fb8ccd2817de28739 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 26 Nov 2024 11:36:47 +0300 Subject: [PATCH 08/50] using metadata to autofill receivers --- instat/DlgDefineClimaticData.vb | 45 +++++++++++++++---- instat/static/InstatObject/R/data_object_R6.R | 6 +++ .../static/InstatObject/R/instat_object_R6.R | 4 ++ 3 files changed, 46 insertions(+), 9 deletions(-) diff --git a/instat/DlgDefineClimaticData.vb b/instat/DlgDefineClimaticData.vb index 3b88a7c821..4432857dd3 100644 --- a/instat/DlgDefineClimaticData.vb +++ b/instat/DlgDefineClimaticData.vb @@ -55,18 +55,18 @@ Public Class DlgDefineClimaticData Dim kvpLongitude As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("lon", {"lon", "lont", "longitude"}.ToList()) Dim kvpLatitude As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("lat", {"lat", "latitude"}.ToList()) Dim kvpCloudCover As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("cloud_cover", {"cloud", "cldtot"}.ToList()) - Dim kvpTempMax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"tmax", "tx", "tempmax", "tmp_max", "tmpmax", "max"}.ToList()) - Dim kvpTempMin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"tmin", "tn", "tempmin", "tmp_min", "tmpmin", "min"}.ToList()) + Dim kvpTempMax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"temp_max", "tmax", "tx", "tempmax", "tmp_max", "tmpmax"}.ToList()) + Dim kvpTempMin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"temp_min", "tmin", "tn", "tempmin", "tmp_min", "tmpmin"}.ToList()) Dim kvpRadiation As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("radiation", {"radiation", "rad", "radgls", "radsky", "radres", "radnaw", "raddwn", "radup", "raddsl"}.ToList()) - Dim kvpSunshineHours As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("sunshine_hours", {"sunshine", "sunh", "sunhrs", "sun"}.ToList()) - Dim kvpWindDirection As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("wind_direction", {"winddirection", "pkgstd"}.ToList()) - Dim kvpWindSpeed As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("wind_speed", {"windspeed", "wndspd", "pkgust", "pkgstd", "wndmil"}.ToList()) + Dim kvpSunshineHours As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("sunshine_hours", {"sunshine_hours", "sunshine", "sunh", "sunhrs", "sun"}.ToList()) + Dim kvpWindDirection As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("wind_direction", {"wind_direction", "winddirection", "pkgstd"}.ToList()) + Dim kvpWindSpeed As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("wind_speed", {"wind_speed", "windspeed", "wndspd", "pkgust", "pkgstd", "wndmil"}.ToList()) Dim kvpYear As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("year", {"year"}.ToList()) Dim kvpMonth As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("month", {"month"}.ToList()) Dim kvpDay As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("day", {"day"}.ToList()) Dim kvpDOY As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("doy", {"doy", "doy_366"}.ToList()) - Dim kvpMinRH As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("hum_min", {"minhum", "hmin", "hn", "rhmin"}.ToList()) - Dim kvpMaxRH As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("hum_max", {"maxhum", "hmax", "hx", "rhmax"}.ToList()) + Dim kvpMinRH As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("hum_min", {"hum_min", "minhum", "hmin", "hn", "rhmin"}.ToList()) + Dim kvpMaxRH As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("hum_max", {"hum_max", "maxhum", "hmax", "hx", "rhmax"}.ToList()) lstRecognisedTypes.AddRange({kvpRain, kvpDistrict, kvpCloudCover, kvpTempMax, kvpTempMin, kvpRadiation, kvpSunshineHours, kvpStation, kvpAltitude, kvpLatitude, kvpLongitude, kvpWindDirection, kvpWindSpeed, kvpYear, kvpMonth, kvpDay, kvpDOY, kvpDate, kvpMinRH, kvpMaxRH}) @@ -237,8 +237,9 @@ Public Class DlgDefineClimaticData If lstRecognisedValues.Count > 0 Then For Each lviTempVariable As ListViewItem In ucrSelectorDefineClimaticData.lstAvailableVariable.Items + Dim strClimaticType As String = GetClimaticTypeFromRCommand(lviTempVariable.Text) For Each strValue As String In lstRecognisedValues - If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]|_", String.Empty).Contains(strValue) Then + If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]|_", String.Empty).Contains(strValue) OrElse (strClimaticType IsNot Nothing AndAlso strClimaticType.Contains(strValue)) Then ucrTempReceiver.Add(lviTempVariable.Text, ucrSelectorDefineClimaticData.ucrAvailableDataFrames.cboAvailableDataFrames.Text) bFound = True Exit For @@ -270,8 +271,9 @@ Public Class DlgDefineClimaticData If lstRecognisedValues.Count > 0 Then For Each lviTempVariable As ListViewItem In ucrSelectorLinkedDataFrame.lstAvailableVariable.Items + Dim strClimaticType As String = GetClimaticTypeFromRCommand(lviTempVariable.Text) For Each strValue As String In lstRecognisedValues - If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]|_", String.Empty).Contains(strValue) Then + If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]|_", String.Empty).Contains(strValue) OrElse (strClimaticType IsNot Nothing AndAlso strClimaticType.Contains(strValue)) Then ucrTempReceiver.Add(lviTempVariable.Text, ucrSelectorLinkedDataFrame.ucrAvailableDataFrames.cboAvailableDataFrames.Text) bFound = True Exit For @@ -290,6 +292,31 @@ Public Class DlgDefineClimaticData End If End Sub + Private Function GetClimaticTypeFromRCommand(strName As String) As String + Try + Dim clsGetClimaticTypeFunction As New RFunction + + clsGetClimaticTypeFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_column_climatic_type") + clsGetClimaticTypeFunction.AddParameter("attr_name", Chr(34) & "Climatic_Type" & Chr(34)) + clsGetClimaticTypeFunction.AddParameter("col_name", Chr(34) & strName & Chr(34)) + clsGetClimaticTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorLinkedDataFrame.strCurrentDataFrame & Chr(34)) + + Dim result As SymbolicExpression + result = frmMain.clsRLink.RunInternalScriptGetValue(clsGetClimaticTypeFunction.ToScript()) + + ' Check if result is Nothing or has no values before trying to access + If result IsNot Nothing AndAlso result.Type <> Internals.SymbolicExpressionType.Null Then + Dim strClimaticType As String = result.AsCharacter(0) + If Not String.IsNullOrEmpty(strClimaticType) Then + Return strClimaticType + End If + End If + Catch ex As Exception + MsgBox(ex.Message) + End Try + Return String.Empty + End Function + Private Function GetRecognisedValues(strVariable As String) As List(Of String) Dim lstValues As New List(Of String) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 394c50eff4..19460ed5ce 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4575,6 +4575,12 @@ DataSheet$set("public", "save_data_entry_data", function(new_data, rows_changed, } }) +DataSheet$set("public", "get_column_climatic_type", function(col_name, attr_name) { + if (!is.null(private$data[[col_name]]) && !is.null(attr(private$data[[col_name]], attr_name))) { + return(attr(private$data[[col_name]], attr_name)) + } +}) + DataSheet$set("public", "add_flag_fields", function(col_names) { curr_data <- self$get_columns_from_data(col_names, force_as_data_frame = TRUE) for (i in colnames(curr_data)) { diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 5270526bc5..e5f5189c8e 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -2990,6 +2990,10 @@ DataBook$set("public", "import_from_cds", function(user, dataset, elements, star if (is_win) close(pb) }) +DataBook$set("public", "get_column_climatic_type", function(data_name, col_name, attr_name){ + self$get_data_objects(data_name)$get_column_climatic_type(col_name = col_name, attr_name =attr_name) +}) + DataBook$set("public", "add_flag_fields", function(data_name, col_names, key_column_names) { if (!self$has_key(data_name)) { self$add_key(data_name, key_column_names) From a48762a2bd054ecf88e209a68a5fa94354277950 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 26 Nov 2024 11:57:17 +0100 Subject: [PATCH 09/50] Fixed Station autofill issue --- instat/dlgInfill.vb | 73 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 69 insertions(+), 4 deletions(-) diff --git a/instat/dlgInfill.vb b/instat/dlgInfill.vb index c2fa50583e..3f4fdee62a 100644 --- a/instat/dlgInfill.vb +++ b/instat/dlgInfill.vb @@ -15,6 +15,7 @@ ' along with this program. If not, see . Imports instat.Translations +Imports System.Text.RegularExpressions Public Class dlgInfill Public enumFilldateMode As String = FilldateMode.Prepare Public Enum FilldateMode @@ -22,9 +23,13 @@ Public Class dlgInfill Climatic End Enum + Private isFilling As Boolean = False Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsDefaultFunction As New RFunction + Private lstStationReceivers As New List(Of ucrReceiverMultiple) + Dim lstRecognisedTypes As New List(Of KeyValuePair(Of String, List(Of String))) + Private Sub dlgInfill_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -37,12 +42,19 @@ Public Class dlgInfill SetHelpOptions() bReset = False autoTranslate(Me) + AutoFillStation() End Sub Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 497 ucrBase.clsRsyntax.iCallType = 2 + + Dim kvpStation As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("station", {"station", "station.", "id", "name"}.ToList()) + + lstStationReceivers.AddRange({ucrReceiverFactors}) + + lstRecognisedTypes.AddRange({kvpStation}) 'Set receiver ucrReceiverDate.Selector = ucrInfillSelector ucrReceiverDate.SetDataType("Date") @@ -55,6 +67,7 @@ Public Class dlgInfill ucrReceiverFactors.SetIncludedDataTypes({"factor"}) ucrReceiverFactors.Selector = ucrInfillSelector ucrReceiverFactors.strSelectorHeading = "Factors" + ucrReceiverFactors.Tag = "station" ucrReceiverFactors.SetParameter(New RParameter("factors", 5)) ucrReceiverFactors.SetParameterIsString() @@ -118,6 +131,7 @@ Public Class dlgInfill If bReset Then SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset) End If + AutoFillStation() End Sub Private Sub TestOkEnabled() @@ -151,17 +165,68 @@ Public Class dlgInfill End Sub Private Sub AutoFillStation() - If ucrInfillSelector.CurrentReceiver IsNot Nothing Then - ucrInfillSelector.CurrentReceiver.SetMeAsReceiver() + If isFilling Then + Exit Sub End If - ucrReceiverFactors.AddItemsWithMetadataProperty(ucrInfillSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + isFilling = True + + ' Temporarily remove the event handler + RemoveHandler ucrInfillSelector.ControlValueChanged, AddressOf AutoFillStation + + Dim lstRecognisedValues As List(Of String) + Dim ucrCurrentReceiver As ucrReceiver + Dim bFound As Boolean = False + + ucrCurrentReceiver = ucrInfillSelector.CurrentReceiver + + For Each ucrTempReceiver As ucrReceiver In lstStationReceivers + ucrTempReceiver.SetMeAsReceiver() + lstRecognisedValues = GetRecognisedValues(ucrTempReceiver.Tag) + + If lstRecognisedValues.Count > 0 Then + For Each lviTempVariable As ListViewItem In ucrInfillSelector.lstAvailableVariable.Items + For Each strValue As String In lstRecognisedValues + If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]", String.Empty).Equals(strValue) Then + ucrTempReceiver.Add(lviTempVariable.Text, ucrInfillSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + bFound = True + Exit For + End If + Next + If bFound Then + bFound = False + Exit For + End If + Next + End If + Next + + If ucrCurrentReceiver IsNot Nothing Then + ucrCurrentReceiver.SetMeAsReceiver() + End If + + ' Re-enable the event handler + AddHandler ucrInfillSelector.ControlValueChanged, AddressOf AutoFillStation + + isFilling = False End Sub + Private Function GetRecognisedValues(strVariable As String) As List(Of String) + Dim lstValues As New List(Of String) + + For Each kvpTemp As KeyValuePair(Of String, List(Of String)) In lstRecognisedTypes + If kvpTemp.Key = strVariable Then + lstValues = kvpTemp.Value + Exit For + End If + Next + Return lstValues + End Function + Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDate.ControlContentsChanged TestOkEnabled() End Sub - Private Sub ucrInfillSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInfillSelector.ControlValueChanged + Private Sub ucrInfillSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInfillSelector.ControlValueChanged, ucrReceiverFactors.ControlValueChanged AutoFillStation() End Sub End Class From 6928710c82197c8408701bac7fa725a478831bce Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 27 Nov 2024 11:41:12 +0100 Subject: [PATCH 10/50] Implementated Output Naming System for One Variable Graph --- instat/dlgOneVariableGraph.vb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/instat/dlgOneVariableGraph.vb b/instat/dlgOneVariableGraph.vb index cfe8199758..cb97f8d3a1 100644 --- a/instat/dlgOneVariableGraph.vb +++ b/instat/dlgOneVariableGraph.vb @@ -169,4 +169,9 @@ Public Class dlgOneVariableGraph Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSelectorOneVarGraph.ControlContentsChanged, ucrReceiverOneVarGraph.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged TestOkEnabled() End Sub + + Private Sub ucrSelectorOneVarGraph_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorOneVarGraph.ControlValueChanged + Dim clsGetDataFrameFunction As RFunction = ucrSelectorOneVarGraph.ucrAvailableDataFrames.clsCurrDataFrame.Clone + clsOneVarGraph.AddParameter("data", clsRFunctionParameter:=clsGetDataFrameFunction, iPosition:=0) + End Sub End Class \ No newline at end of file From 526d44ab9dbddc7bcb5968db44712373c4e6ebdd Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 28 Nov 2024 10:28:45 +0100 Subject: [PATCH 11/50] Change made --- instat/dlgClimograph.Designer.vb | 46 ++++++- instat/dlgClimograph.vb | 204 +++++++++++++++++++++++++++++-- 2 files changed, 241 insertions(+), 9 deletions(-) diff --git a/instat/dlgClimograph.Designer.vb b/instat/dlgClimograph.Designer.vb index 1e7a8f5428..676d3502be 100644 --- a/instat/dlgClimograph.Designer.vb +++ b/instat/dlgClimograph.Designer.vb @@ -80,6 +80,9 @@ Partial Class dlgClimograph Me.ucrSave = New instat.ucrSave() Me.ucrReceiverMonth = New instat.ucrReceiverSingle() Me.ucrSelectorClimograph = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrInputFacetBar = New instat.ucrInputComboBox() + Me.ucrReceiverFacetBar = New instat.ucrReceiverSingle() + Me.lblFacetBar = New System.Windows.Forms.Label() Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' @@ -264,7 +267,7 @@ Partial Class dlgClimograph ' Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemBarchartOptions, Me.toolStripMenuItemTmaxLineOptions, Me.toolStripMenuItemTminLineOptions}) Me.contextMenuStripOptions.Name = "contextMenuStripOk" - Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 114) + Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 92) ' 'toolStripMenuItemPlotOptions ' @@ -699,11 +702,49 @@ Partial Class dlgClimograph Me.ucrSelectorClimograph.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorClimograph.TabIndex = 59 ' + 'ucrInputFacetBar + ' + Me.ucrInputFacetBar.AddQuotesIfUnrecognised = True + Me.ucrInputFacetBar.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputFacetBar.GetSetSelectedIndex = -1 + Me.ucrInputFacetBar.IsReadOnly = False + Me.ucrInputFacetBar.Location = New System.Drawing.Point(379, 68) + Me.ucrInputFacetBar.Name = "ucrInputFacetBar" + Me.ucrInputFacetBar.Size = New System.Drawing.Size(86, 21) + Me.ucrInputFacetBar.TabIndex = 142 + ' + 'ucrReceiverFacetBar + ' + Me.ucrReceiverFacetBar.AutoSize = True + Me.ucrReceiverFacetBar.frmParent = Me + Me.ucrReceiverFacetBar.Location = New System.Drawing.Point(267, 68) + Me.ucrReceiverFacetBar.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverFacetBar.Name = "ucrReceiverFacetBar" + Me.ucrReceiverFacetBar.Selector = Nothing + Me.ucrReceiverFacetBar.Size = New System.Drawing.Size(109, 26) + Me.ucrReceiverFacetBar.strNcFilePath = "" + Me.ucrReceiverFacetBar.TabIndex = 141 + Me.ucrReceiverFacetBar.ucrSelector = Nothing + ' + 'lblFacetBar + ' + Me.lblFacetBar.AutoSize = True + Me.lblFacetBar.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBar.Location = New System.Drawing.Point(267, 53) + Me.lblFacetBar.Name = "lblFacetBar" + Me.lblFacetBar.Size = New System.Drawing.Size(52, 13) + Me.lblFacetBar.TabIndex = 140 + Me.lblFacetBar.Tag = "" + Me.lblFacetBar.Text = "Facet By:" + ' 'dlgClimograph ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(472, 578) + Me.Controls.Add(Me.ucrInputFacetBar) + Me.Controls.Add(Me.ucrReceiverFacetBar) + Me.Controls.Add(Me.lblFacetBar) Me.Controls.Add(Me.ucrReceiverRainBar) Me.Controls.Add(Me.lblRainBar) Me.Controls.Add(Me.ucrReceiverElement1Bar) @@ -825,4 +866,7 @@ Partial Class dlgClimograph Friend WithEvents lblElement2Bar As Label Friend WithEvents ucrReceiverMonthBar As ucrReceiverSingle Friend WithEvents lblMonthBar As Label + Friend WithEvents ucrInputFacetBar As ucrInputComboBox + Friend WithEvents ucrReceiverFacetBar As ucrReceiverSingle + Friend WithEvents lblFacetBar As Label End Class diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 7b7da02428..9a1d0f6c02 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -31,6 +31,10 @@ Public Class dlgClimograph Private ReadOnly strFacetRow1 As String = "Facet Row" Private ReadOnly strFacetCol1 As String = "Facet Column" Private ReadOnly strNone1 As String = "None" + Private ReadOnly strFacetWrap2 As String = "Facet Wrap" + Private ReadOnly strFacetRow2 As String = "Facet Row" + Private ReadOnly strFacetCol2 As String = "Facet Column" + Private ReadOnly strNone2 As String = "None" Private clsFacetFunction As New RFunction Private clsGroupByFunction As New RFunction Private clsGeomBarFunction As New RFunction @@ -42,6 +46,8 @@ Public Class dlgClimograph Private clsAesLineStar1Function As New RFunction Private clsFacetFunction1 As New RFunction Private clsGroupByFunction1 As New RFunction + Private clsFacetFunction2 As New RFunction + Private clsGroupByFunction2 As New RFunction Private bResetSubdialog As Boolean = True Private bResetLineLayerSubdialog As Boolean = True Private clsCoordPolarFunction As New RFunction @@ -99,6 +105,9 @@ Public Class dlgClimograph Private clsFacetRowOp1 As New ROperator Private clsFacetColOp1 As New ROperator Private clsPipeOperator1 As New ROperator + Private clsFacetRowOp2 As New ROperator + Private clsFacetColOp2 As New ROperator + Private clsPipeOperator2 As New ROperator Private clsFacetOperator As New ROperator Private clsFacetRowOp As New ROperator Private clsFacetColOp As New ROperator @@ -106,7 +115,9 @@ Public Class dlgClimograph Private bUpdateComboOptions As Boolean = True Private bUpdatingParameters As Boolean = False Private bUpdateComboOptions1 As Boolean = True + Private bUpdateComboOptions2 As Boolean = True Private bUpdatingParameters1 As Boolean = False + Private bUpdatingParameters2 As Boolean = False Private strTemBar As String = "Tem" Private strRainBar As String = "Rain" Private clsPlus1Operator, clsPlus2Operator, clsPlus3Operator, clsPlus5Operator As New ROperator @@ -286,9 +297,20 @@ Public Class dlgClimograph ucrReceiverFacet.SetParameterIsString() ucrReceiverFacet.SetValuesToIgnore({"."}) + ucrReceiverFacetBar.SetParameter(New RParameter("var1")) + ucrReceiverFacetBar.Selector = ucrSelectorClimograph + ucrReceiverFacetBar.SetClimaticType("station") + ucrReceiverFacetBar.bAutoFill = True + ucrReceiverFacetBar.bWithQuotes = False + ucrReceiverFacetBar.SetParameterIsString() + ucrReceiverFacetBar.SetValuesToIgnore({"."}) + ucrInputFacet.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) ucrInputFacet.SetDropDownStyleAsNonEditable() + ucrInputFacetBar.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputFacetBar.SetDropDownStyleAsNonEditable() + ucrReceiverAbsolute.SetParameter(New RParameter("ta_min", 6)) ucrReceiverAbsolute.SetParameterIsString() ucrReceiverAbsolute.Selector = ucrSelectorClimograph @@ -299,7 +321,8 @@ Public Class dlgClimograph ucrPnlClimograph.AddToLinkedControls({ucr1stFactorReceiver, ucrReceiverAbsolute, ucrReceiverMintemp, ucrReceiverMonth, ucrReceiverMaxtem, ucrReceiverRain, ucrInputStation}, {rdoWalterLieth}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlClimograph.AddToLinkedControls({ucrChkColour, ucrChkTile, ucrChkLegend, ucrReceiverElement2, ucrReceiverElement1, ucrReceiverMonthC, ucrReceiverRainC, ucrChkRibbon, ucrChkText}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlClimograph.AddToLinkedControls({ucrReceiverElement2Bar, ucrReceiverElement1Bar, ucrReceiverMonthBar, ucrReceiverRainBar}, {rdoClimateBars}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrInputFacet}, {rdoClimograph, rdoClimateBars}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrInputFacet}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacetBar, ucrInputFacetBar}, {rdoClimateBars}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColour.AddRadioButton(rdoViridis) ucrPnlColour.AddRadioButton(rdoPalette) @@ -421,6 +444,7 @@ Public Class dlgClimograph clsRggplotFunction = New RFunction clsBarAesFunction = New RFunction clsFacetFunction1 = New RFunction + clsFacetFunction2 = New RFunction clsSecondaryAxisFunction = New RFunction clsSecondaryAxis1Function = New RFunction clsSecondaryAxis2Function = New RFunction @@ -448,6 +472,7 @@ Public Class dlgClimograph clsFacetColOp1 = New ROperator clsPipeOperator1 = New ROperator clsGroupByFunction1 = New RFunction + clsGroupByFunction2 = New RFunction clsMaxFunction = New RFunction clsMax1Function = New RFunction clsVectorFunction = New RFunction @@ -508,6 +533,9 @@ Public Class dlgClimograph ucrInputFacet.SetName(strFacetWrap) ucrInputFacet.bUpdateRCodeFromControl = True + ucrInputFacetBar.SetName(strFacetWrap) + ucrInputFacetBar.bUpdateRCodeFromControl = True + clsDummyFunction.AddParameter("checked", "Climograph", iPosition:=0) clsDummyFunction.AddParameter("Check", "viridis", iPosition:=1) @@ -531,6 +559,22 @@ Public Class dlgClimograph clsGroupByFunction1.SetPackageName("dplyr") clsGroupByFunction1.SetRCommand("group_by") + clsFacetFunction2.SetPackageName("ggplot2") + clsFacetRowOp2.SetOperation("+") + clsFacetRowOp2.bBrackets = False + clsFacetColOp2.SetOperation("+") + clsFacetColOp2.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction2.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator2.SetOperation("%>%") + SetPipeAssignTo2() + + clsGroupByFunction2.SetPackageName("dplyr") + clsGroupByFunction2.SetRCommand("group_by") + clsPipeOperator.SetOperation("%>%") SetPipeAssignTo() @@ -1086,6 +1130,55 @@ Public Class dlgClimograph bUpdatingParameters1 = False End Sub + Private Sub ucrInputFacetBar_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputFacetBar.ControlValueChanged + If Not bUpdateComboOptions2 Then + Exit Sub + End If + Dim strChangedText As String = ucrChangedControl.GetText() + If strChangedText <> strNone Then + If Not strChangedText = strFacetCol2 AndAlso Not strChangedText = strFacetRow2 AndAlso + Not ucrInputFacetBar.Equals(ucrChangedControl) AndAlso ucrInputFacetBar.GetText() = strChangedText Then + bUpdateComboOptions2 = False + ucrInputFacetBar.SetName(strNone2) + bUpdateComboOptions2 = True + End If + If (strChangedText = strFacetWrap2 AndAlso ucrInputFacetBar.GetText = strFacetRow2) OrElse (strChangedText = strFacetRow2 AndAlso + ucrInputFacetBar.GetText = strFacetWrap2) OrElse (strChangedText = strFacetWrap2 AndAlso + ucrInputFacetBar.GetText = strFacetCol2) OrElse (strChangedText = strFacetCol2 AndAlso ucrInputFacetBar.GetText = strFacetWrap2) Then + ucrInputFacetBar.SetName(strNone2) + End If + End If + UpdateParameters2() + AddRemoveFacets2() + AddRemoveGroupBy2() + AddRemoveTemBars() + End Sub + + Private Sub UpdateParameters2() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp2.RemoveParameterByName("col" & ucrInputFacetBar.Name) + clsFacetRowOp2.RemoveParameterByName("row" & ucrInputFacetBar.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters2 = True + ucrReceiverFacetBar.SetRCode(Nothing) + Select Case ucrInputFacetBar.GetText() + Case strFacetWrap2 + ucrReceiverFacetBar.ChangeParameterName("var1") + ucrReceiverFacetBar.SetRCode(clsFacetVariablesOperator) + Case strFacetCol2 + ucrReceiverFacetBar.ChangeParameterName("col" & ucrInputFacetBar.Name) + ucrReceiverFacetBar.SetRCode(clsFacetColOp2) + Case strFacetRow2 + ucrReceiverFacetBar.ChangeParameterName("row" & ucrInputFacetBar.Name) + ucrReceiverFacetBar.SetRCode(clsFacetRowOp2) + End Select + If Not clsRFacetFunction.ContainsParameter("x") Then + clsRFacetFunction.AddParameter("x", Chr(34) & Chr(34)) + End If + bUpdatingParameters2 = False + End Sub + Private Sub AddRemoveFacets1() Dim bWrap As Boolean = False Dim bCol As Boolean = False @@ -1132,6 +1225,52 @@ Public Class dlgClimograph End If End Sub + Private Sub AddRemoveFacets2() + Dim bWrap As Boolean = False + Dim bCol As Boolean = False + Dim bRow As Boolean = False + + If bUpdatingParameters2 Then + Exit Sub + End If + + clsBaseOperator.RemoveParameterByName("facets") + If Not ucrReceiverFacetBar.IsEmpty Then + Select Case ucrInputFacetBar.GetText() + Case strFacetWrap2 + bWrap = True + Case strFacetCol2 + bCol = True + Case strFacetRow2 + bRow = True + End Select + End If + + If bWrap OrElse bRow OrElse bCol Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction2) + End If + If bWrap Then + clsFacetFunction2.SetRCommand("facet_wrap") + End If + If bRow OrElse bCol Then + clsFacetFunction2.SetRCommand("facet_grid") + End If + If bRow Then + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp2, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp2, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + Private Sub AddRemoveFacetClimograph() If rdoClimograph.Checked Then If Not ucrReceiverFacet.IsEmpty Then @@ -1145,12 +1284,19 @@ Public Class dlgClimograph clsBaseOperator.RemoveParameterByName("facets") End If End Sub + Private Sub ucrReceiverFacet_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFacet.ControlValueChanged AddRemoveFacetClimograph() AddRemoveFacets1() AddRemoveGroupBy1() End Sub + Private Sub ucrReceiverFacetBar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFacetBar.ControlValueChanged + AddRemoveFacetClimograph() + AddRemoveFacets2() + AddRemoveGroupBy2() + End Sub + Private Sub GetParameterValue1(clsOperator As ROperator) Dim i As Integer = 0 For Each clsTempParam As RParameter In clsOperator.clsParameters @@ -1195,6 +1341,50 @@ Public Class dlgClimograph End If End Sub + Private Sub GetParameterValue2(clsOperator As ROperator) + Dim i As Integer = 0 + For Each clsTempParam As RParameter In clsOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction2.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End Sub + + Private Sub AddRemoveGroupBy2() + If clsPipeOperator2.ContainsParameter("mutate") Then + clsGroupByFunction2.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + Select Case ucrInputFacetBar.GetText() + Case strFacetWrap2 + GetParameterValue2(clsFacetVariablesOperator) + Case strFacetCol2 + GetParameterValue2(clsFacetColOp2) + Case strFacetRow2 + GetParameterValue2(clsFacetRowOp2) + End Select + End If + + If clsGroupByFunction2.iParameterCount > 0 Then + clsPipeOperator2.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction2, iPosition:=1) + Else + clsPipeOperator2.RemoveParameterByName("group_by") + End If + Else + clsPipeOperator2.RemoveParameterByName("group_by") + End If + + SetPipeAssignTo2() + End Sub + + Private Sub SetPipeAssignTo2() + If ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator2.clsParameters.Count > 1 Then + clsPipeOperator2.SetAssignTo(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator2.RemoveAssignTo() + End If + End Sub + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged If Not bUpdateComboOptions Then Exit Sub @@ -1423,10 +1613,6 @@ Public Class dlgClimograph SetPipeAssignTo() End Sub - Private Sub ucrInputFacet_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputFacet.ControlValueChanged - - End Sub - Private Sub SetPipeAssignTo() If ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then clsPipeOperator.SetAssignTo(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) @@ -1745,7 +1931,8 @@ Public Class dlgClimograph clsBaseOperator.RemoveParameterByName("scale_y_continuous") clsBaseOperator.RemoveParameterByName("facets") clsBaseOperator.RemoveParameterByName("facets1") - If Not ucrReceiverFacet.IsEmpty Then + If Not ucrReceiverFacetBar.IsEmpty Then + 'Tem Functions clsAesRainGgplotFunction.AddParameter("x", ucrReceiverMonthBar.GetVariableNames(False), iPosition:=0) clsAesRainGgplotFunction.AddParameter("y", ucrReceiverRainBar.GetVariableNames(False), iPosition:=1) clsRainGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) @@ -1756,7 +1943,7 @@ Public Class dlgClimograph clsRainBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) clsPlus10Operator.AddParameter("left", clsRFunctionParameter:=clsLabsRainFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus10Operator.AddParameter("right", clsRFunctionParameter:=clsFacetFunction1, iPosition:=1, bIncludeArgumentName:=False) + clsPlus10Operator.AddParameter("right", clsRFunctionParameter:=clsFacetFunction2, iPosition:=1, bIncludeArgumentName:=False) clsPlus3Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) clsPlus3Operator.AddParameter("right", clsROperatorParameter:=clsPlus10Operator, iPosition:=1, bIncludeArgumentName:=False) clsPlus2Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarFunction, iPosition:=0, bIncludeArgumentName:=False) @@ -1764,6 +1951,7 @@ Public Class dlgClimograph clsPlus1Operator.AddParameter("left", clsRFunctionParameter:=clsRainGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) clsPlus1Operator.AddParameter("right", clsROperatorParameter:=clsPlus2Operator, iPosition:=1, bIncludeArgumentName:=False) + 'Tem Functions clsAesTemGgplotFunction.AddParameter("x", ucrReceiverMonthBar.GetVariableNames(False), iPosition:=0) clsTemGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) clsTemGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTemGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) @@ -1785,7 +1973,7 @@ Public Class dlgClimograph clsTminBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) clsPlus11Operator.AddParameter("left", clsRFunctionParameter:=clsLabsTempFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus11Operator.AddParameter("right", clsRFunctionParameter:=clsFacetFunction1, iPosition:=1, bIncludeArgumentName:=False) + clsPlus11Operator.AddParameter("right", clsRFunctionParameter:=clsFacetFunction2, iPosition:=1, bIncludeArgumentName:=False) clsPlus9Operator.AddParameter("left", clsRFunctionParameter:=clsTminBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) clsPlus9Operator.AddParameter("right", clsROperatorParameter:=clsPlus11Operator, iPosition:=1, bIncludeArgumentName:=False) clsPlus8Operator.AddParameter("left", clsRFunctionParameter:=clsTmaxBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) From 6cdce0e87460a2bdf96d27cf821fc11930b6a9ee Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Fri, 29 Nov 2024 14:46:02 +0300 Subject: [PATCH 12/50] changes --- instat/clsInstatOptions.vb | 17 +++++++++++++++++ instat/clsInstatOptionsDefaults.vb | 1 + instat/dlgOptions.Designer.vb | 29 +++++++++++++++++++++++++++++ instat/dlgOptions.vb | 7 +++++-- 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/instat/clsInstatOptions.vb b/instat/clsInstatOptions.vb index 548562707c..4ef7f357b3 100644 --- a/instat/clsInstatOptions.vb +++ b/instat/clsInstatOptions.vb @@ -30,6 +30,7 @@ Imports RDotNet Public bIncludeRDefaultParameters As Nullable(Of Boolean) Public iPreviewRows As Nullable(Of Integer) Public iMaxRows As Nullable(Of Integer) + Public iMaxWidth As Nullable(Of Integer) Public iMaxCols As Nullable(Of Integer) Public iUndoColLimit As Nullable(Of Integer) Public iUndoRowLimit As Nullable(Of Integer) @@ -78,6 +79,7 @@ Imports RDotNet clrEditor = clsInstatOptionsDefaults.DEFAULTclrEditor iPreviewRows = clsInstatOptionsDefaults.DEFAULTiPreviewRows iMaxRows = clsInstatOptionsDefaults.DEFAULTiMaxRows + iMaxWidth = clsInstatOptionsDefaults.DEFAULTiMaxWidth iMaxCols = clsInstatOptionsDefaults.DEFAULTiMaxCols iUndoColLimit = clsInstatOptionsDefaults.DEFAULTiUndoColLimit iUndoRowLimit = clsInstatOptionsDefaults.DEFAULTiUndoRowLimit @@ -145,6 +147,12 @@ Imports RDotNet SetMaxRows(clsInstatOptionsDefaults.DEFAULTiMaxRows) End If + If iMaxWidth.HasValue Then + SetMaxWidth(iMaxWidth) + Else + SetMaxWidth(clsInstatOptionsDefaults.DEFAULTiMaxWidth) + End If + If iMaxCols.HasValue Then SetMaxCols(iMaxCols) Else @@ -348,6 +356,11 @@ Imports RDotNet clsOptionsFunction.AddParameter("dplyr.summarise.inform", "FALSE") End If + strROption = GetROption("width") + If strROption Is Nothing OrElse strROption <> iMaxWidth.ToString Then + clsOptionsFunction.AddParameter("width", iMaxWidth) + End If + 'add "R.commands.displayed.in.the.output.window" as options parameter of its been changed If frmMain.mnuShowRCommand.Checked Then clsOptionsFunction.AddParameter("R.commands.displayed.in.the.output.window", "TRUE") @@ -394,6 +407,10 @@ Imports RDotNet frmMain.UpdateAllGrids() End Sub + Public Sub SetMaxWidth(iNewMaxWidth As Integer) + iMaxWidth = iNewMaxWidth + 'frmMain.UpdateAllGrids() + End Sub Public Sub SetMaxCols(iCols As Integer) iMaxCols = iCols frmMain.UpdateAllGrids() diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index 8a4ee9b62c..a4ab65e6ad 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -57,5 +57,6 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTstrClimsoftPort As String = "3308" Public Shared ReadOnly DEFAULTstrClimsoftUsername As String = "root" Public Shared ReadOnly DEFAULTiMaxOutputsHeight As Integer = 500 + Public Shared ReadOnly DEFAULTiMaxWidth As Integer = 80 Public Shared ReadOnly DEFAULTbRemindLaterOption As Boolean = False End Class diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index 53fdd6c58d..54a9edc109 100644 --- a/instat/dlgOptions.Designer.vb +++ b/instat/dlgOptions.Designer.vb @@ -135,6 +135,8 @@ Partial Class dlgOptions Me.ucrInputDatabaseName = New instat.ucrInputTextBox() Me.tbpWebsite = New System.Windows.Forms.TabPage() Me.ucrChkReminder = New instat.ucrCheck() + Me.ucrNudWidth = New instat.ucrNud() + Me.lblWidth = New System.Windows.Forms.Label() CType(Me.spltControls, System.ComponentModel.ISupportInitialize).BeginInit() Me.spltControls.Panel1.SuspendLayout() Me.spltControls.Panel2.SuspendLayout() @@ -440,6 +442,8 @@ Partial Class dlgOptions ' 'tbpOutputWindow ' + Me.tbpOutputWindow.Controls.Add(Me.lblWidth) + Me.tbpOutputWindow.Controls.Add(Me.ucrNudWidth) Me.tbpOutputWindow.Controls.Add(Me.ucrNudMaxOutputsHeight) Me.tbpOutputWindow.Controls.Add(Me.ucrChkMaxOutputsHeight) Me.tbpOutputWindow.Controls.Add(Me.ucrChkShowRCommandsinOutputWindow) @@ -1260,6 +1264,29 @@ Partial Class dlgOptions Me.ucrChkReminder.Size = New System.Drawing.Size(620, 51) Me.ucrChkReminder.TabIndex = 2 ' + 'ucrNudWidth + ' + Me.ucrNudWidth.AutoSize = True + Me.ucrNudWidth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWidth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudWidth.Location = New System.Drawing.Point(759, 277) + Me.ucrNudWidth.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudWidth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudWidth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWidth.Name = "ucrNudWidth" + Me.ucrNudWidth.Size = New System.Drawing.Size(75, 30) + Me.ucrNudWidth.TabIndex = 30 + Me.ucrNudWidth.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblWidth + ' + Me.lblWidth.AutoSize = True + Me.lblWidth.Location = New System.Drawing.Point(543, 281) + Me.lblWidth.Name = "lblWidth" + Me.lblWidth.Size = New System.Drawing.Size(127, 20) + Me.lblWidth.TabIndex = 31 + Me.lblWidth.Text = "Width to Display:" + ' 'dlgOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) @@ -1410,4 +1437,6 @@ Partial Class dlgOptions Friend WithEvents ucrNudRowUndoLimit As ucrNud Friend WithEvents Label4 As Label Friend WithEvents ucrChkTurnOffUndo As ucrCheck + Friend WithEvents lblWidth As Label + Friend WithEvents ucrNudWidth As ucrNud End Class diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index f1c25588dc..7e049aa79d 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -75,6 +75,7 @@ Public Class dlgOptions SetView() ucrNudDigits.SetMinMax(0, 22) + ucrNudWidth.SetMinMax(0, Integer.MaxValue) ucrChkIncludeCommentsbyDefault.SetText("Include Comments by Default") ucrChkViewStructuredMenu.SetText("Show Structured Menu") ucrChkViewClimaticMenu.SetText("Show Climatic Menu") @@ -130,6 +131,7 @@ Public Class dlgOptions ucrChkViewClimaticMenu.Checked = frmMain.clsInstatOptions.bShowClimaticMenu ucrChkShowRCommandsinOutputWindow.Checked = frmMain.clsInstatOptions.bCommandsinOutput ucrNudDigits.Value = frmMain.clsInstatOptions.iDigits + ucrNudWidth.Value = frmMain.clsInstatOptions.iMaxWidth ucrChkShowSignifStars.Checked = frmMain.clsInstatOptions.bShowSignifStars ucrChkShowDataonGrid.Checked = frmMain.clsInstatOptions.bChangeDataFrame ucrChkShowWaitDialog.Checked = frmMain.clsInstatOptions.bShowWaitDialog @@ -197,6 +199,7 @@ Public Class dlgOptions frmMain.clsInstatOptions.SetShowClimaticMenu(ucrChkViewClimaticMenu.Checked) frmMain.clsInstatOptions.SetCommandInOutpt(ucrChkShowRCommandsinOutputWindow.Checked) frmMain.clsInstatOptions.SetDigits(ucrNudDigits.Value) + frmMain.clsInstatOptions.SetMaxWidth(ucrNudWidth.Value) frmMain.clsInstatOptions.SetSignifStars(ucrChkShowSignifStars.Checked) frmMain.clsInstatOptions.SetChangeDataFrame(ucrChkShowDataonGrid.Checked) frmMain.clsInstatOptions.SetShowWaitDialog(ucrChkShowWaitDialog.Checked) @@ -375,7 +378,7 @@ Public Class dlgOptions End Sub - Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkTurnOffUndo.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged + Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrNudWidth.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkTurnOffUndo.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged ApplyEnabled(True) End Sub @@ -443,7 +446,7 @@ Public Class dlgOptions ApplyEnabled(True) End Sub - Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWaitSeconds.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrNudMaxCols.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged, ucrChkTurnOffUndo.ControlValueChanged + Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWaitSeconds.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrNudWidth.ControlValueChanged, ucrNudMaxCols.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged, ucrChkTurnOffUndo.ControlValueChanged End Sub From 0fd5a5d61bbcd2ec5b4c0e9734507bba19e01fe7 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Fri, 29 Nov 2024 16:04:38 +0100 Subject: [PATCH 13/50] minor change made --- instat/dlgInfill.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/dlgInfill.vb b/instat/dlgInfill.vb index 3f4fdee62a..02d4a44ac1 100644 --- a/instat/dlgInfill.vb +++ b/instat/dlgInfill.vb @@ -42,7 +42,6 @@ Public Class dlgInfill SetHelpOptions() bReset = False autoTranslate(Me) - AutoFillStation() End Sub Private Sub InitialiseDialog() From 98e8c12847509fc4286932d6444493f9ca62abdb Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 2 Dec 2024 10:23:47 +0300 Subject: [PATCH 14/50] changes to the code --- instat/dlgDescribeTwoVariable.Designer.vb | 2 +- instat/dlgDescribeTwoVariable.vb | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index 5eb45c48ae..63a73b2d76 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -574,7 +574,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrReceiverSkimrGroupByFactor.Selector = Nothing Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSkimrGroupByFactor.strNcFilePath = "" - Me.ucrReceiverSkimrGroupByFactor.TabIndex = 2 + Me.ucrReceiverSkimrGroupByFactor.TabIndex = 8 Me.ucrReceiverSkimrGroupByFactor.ucrSelector = Nothing ' 'ucrChkDisplayMargins diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 0da50e2892..acf4564b56 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -539,7 +539,6 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.AddAdditionalRCode(clsGroupByPipeOperator4, iAdditionalPairNo:=2) ucrChkOmitMissing.SetRCode(clsSummaryTableFunction, bReset) - ucrReceiverFirstVars.SetRCode(clsDummyFunction, bReset) ucrReceiverSecondTwoVariableFactor.SetRCode(clsDummyFunction, bReset) ucrSelectorDescribeTwoVar.SetRCode(clsRCorrelationFunction, bReset) ucrReceiverSkimrGroupByFactor.SetRCode(clsGroupByFunction, bReset) @@ -558,6 +557,9 @@ Public Class dlgDescribeTwoVariable ucrReceiverThreeVariableThirdVariable.SetRCode(clsSummaryTableCombineFactorsFunction, bReset) ucrChkDisplayMargins.SetRCode(clsCombineFrequencyParametersFunction, bReset) ucrSaveTable.SetRCode(clsGroupByPipeOperator, bReset) + If bReset Then + ucrReceiverFirstVars.SetRCode(clsDummyFunction, bReset) + End If bRcodeSet = True FillListView() @@ -1436,8 +1438,11 @@ Public Class dlgDescribeTwoVariable Else ucrReceiverFirstVars.SetMeAsReceiver() End If + ElseIf rdoSkim.Checked Then + ucrReceiverFirstVars.SetMeAsReceiver() Else ucrReceiverFirstVars.SetMeAsReceiver() + End If If rdoORow.Checked OrElse rdoOCell.Checked Then If ucrChkDisplayMargins.Checked Then From 297c7eeead9f55c123e322013960694d9e1794be Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 2 Dec 2024 12:15:35 +0300 Subject: [PATCH 15/50] improved the display of shapefile data --- instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index d2b1a9cf27..f34f873bb3 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -87,8 +87,12 @@ Public Class ucrDataViewReoGrid Dim strData As String = dataFrame.DisplayedData(i, j) If strData IsNot Nothing AndAlso grdData.CurrentWorksheet.ColumnHeaders.Item(j).Text.Contains("(LT)") Then strData = GetTransformedLTColumnContents(strData) + ElseIf strData IsNot Nothing AndAlso grdData.CurrentWorksheet.ColumnHeaders.Item(j).Text.Contains("(G)") Then + strData = "MULTIPOLYGON" + grdData.CurrentWorksheet.GetCell(row:=i, col:=j).IsReadOnly = True End If grdData.CurrentWorksheet(row:=i, col:=j) = strData + Next grdData.CurrentWorksheet.RowHeaders.Item(i).Text = strRowNames(i) grdData.CurrentWorksheet.RowHeaders(i).TextColor = textColour From d876dba842b2db33e01b3d01ed4675ef3c8e2547 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 2 Dec 2024 10:56:45 +0100 Subject: [PATCH 16/50] minor change made --- instat/dlgClimograph.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 9a1d0f6c02..40b3a74d3f 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -291,7 +291,7 @@ Public Class dlgClimograph ucrReceiverFacet.SetParameter(New RParameter("var1")) ucrReceiverFacet.Selector = ucrSelectorClimograph - ucrReceiverFacet.SetClimaticType("year") + ucrReceiverFacet.SetClimaticType("station") ucrReceiverFacet.bAutoFill = True ucrReceiverFacet.bWithQuotes = False ucrReceiverFacet.SetParameterIsString() @@ -1500,7 +1500,7 @@ Public Class dlgClimograph Dim currentReceiver As ucrReceiver = ucrSelectorClimograph.CurrentReceiver If currentReceiver IsNot Nothing Then - ucrReceiverFacet.AddItemsWithMetadataProperty(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"year_label"}) + ucrReceiverFacet.AddItemsWithMetadataProperty(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) currentReceiver.SetMeAsReceiver() AddRemoveGroupBy1() End If From 739ad1b0ef997550d1a0f5eae0405215331a0c4b Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 2 Dec 2024 13:03:22 +0100 Subject: [PATCH 17/50] Fixes bug with the order=anyclass parameter when a factor is not selected --- instat/dlgParallelCoordinatePlot.vb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/instat/dlgParallelCoordinatePlot.vb b/instat/dlgParallelCoordinatePlot.vb index ecd4be35ee..56c726e2b8 100644 --- a/instat/dlgParallelCoordinatePlot.vb +++ b/instat/dlgParallelCoordinatePlot.vb @@ -180,7 +180,7 @@ Public Class dlgParallelCoordinatePlot clsGGParCoordFunc.SetRCommand("ggparcoord") clsGGParCoordFunc.AddParameter("columns", clsRFunctionParameter:=clsMatchFunction, iPosition:=1) clsGGParCoordFunc.AddParameter("missing", Chr(34) & "exclude" & Chr(34), iPosition:=6) - clsGGParCoordFunc.AddParameter("order", Chr(34) & "anyClass" & Chr(34), iPosition:=7) + 'clsGGParCoordFunc.AddParameter("order", Chr(34) & "anyClass" & Chr(34), iPosition:=7) clsGGParCoordFunc.AddParameter("centerObsID", "1", iPosition:=8) clsBaseOperator.SetOperation("+") @@ -444,4 +444,11 @@ Public Class dlgParallelCoordinatePlot TestOkEnabled() End Sub + Private Sub ucrReceiverFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFactor.ControlValueChanged + If Not ucrReceiverFactor.IsEmpty Then + clsGGParCoordFunc.AddParameter("order", Chr(34) & "anyClass" & Chr(34), iPosition:=7) + Else + clsGGParCoordFunc.RemoveParameterByName("order") + End If + End Sub End Class \ No newline at end of file From 8248ffd5311ca01385f1890663d2ecda67454e6a Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 2 Dec 2024 15:46:56 +0300 Subject: [PATCH 18/50] Added a tooltip for short view of the original data --- .../DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index f34f873bb3..9649d91e61 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -39,6 +39,8 @@ Public Class ucrDataViewReoGrid Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved + Private toolTip1 As New ToolTip() + Public Sub AddColumns(visiblePage As clsDataFramePage) Implements IDataViewGrid.AddColumns Dim workSheetColumnHeader As ColumnHeader Dim variableTextColour As Color @@ -90,9 +92,11 @@ Public Class ucrDataViewReoGrid ElseIf strData IsNot Nothing AndAlso grdData.CurrentWorksheet.ColumnHeaders.Item(j).Text.Contains("(G)") Then strData = "MULTIPOLYGON" grdData.CurrentWorksheet.GetCell(row:=i, col:=j).IsReadOnly = True + End If grdData.CurrentWorksheet(row:=i, col:=j) = strData + Next grdData.CurrentWorksheet.RowHeaders.Item(i).Text = strRowNames(i) grdData.CurrentWorksheet.RowHeaders(i).TextColor = textColour @@ -103,6 +107,13 @@ Public Class ucrDataViewReoGrid End If Next + + AddHandler grdData.CurrentWorksheet.CellMouseDown, Sub(sender As Object, e As unvell.ReoGrid.Events.CellMouseEventArgs) + If e.Cell IsNot Nothing AndAlso grdData.CurrentWorksheet.ColumnHeaders.Item(e.Cell.Column).Text.Contains("(G)") Then + toolTip1.SetToolTip(grdData, ShortenString(dataFrame.DisplayedData(e.Cell.Row, e.Cell.Column))) + End If + End Sub + If dataFrame.clsFilterOrColumnSelection.bFilterApplied Then grdData.CurrentWorksheet.ScrollToCell("A1") ' will always set the scrollbar at the top. End If @@ -115,6 +126,15 @@ Public Class ucrDataViewReoGrid grdData.CurrentWorksheet.RowHeaderWidth = TextRenderer.MeasureText(strLongestRowHeaderText, Me.Font).Width End Sub + Private Function ShortenString(strText As String) As String + Dim maxLength As Integer = 50 + If strText.Length > maxLength Then + ' Trim the string to the specified length and add ellipsis + Return strText.Substring(0, maxLength) & "..." + End If + Return strText + End Function + ''' ''' Transforms contents of LT column(s) that have structured R-like data into a more readable and user-friendly format that is consistent with R Viewer. ''' For example, content like list(Birmingham = list(IATA = c("BHM", NA, NA, NA), Hartford = list(IATA = "BDL", ICAO = "KBDL")) From 21ca025230a5a43ea7f5771f93734f9cad8417a1 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Mon, 2 Dec 2024 16:17:57 +0000 Subject: [PATCH 19/50] Adding option to rename labels --- instat/static/InstatObject/R/data_object_R6.R | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 2bea3ede08..31bc20285a 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -1011,6 +1011,25 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne self$data_changed <- TRUE self$variables_metadata_changed <- TRUE } + } else if (type == "rename_labels"){ + # to rename column labels. Here, instead of renaming a column name, we're giving new values in a column. + curr_metadata <- self$get_variables_metadata() + curr_col_names <- names(curr_data) + + new_metadata <- curr_metadata |> + dplyr::mutate( + dplyr::across( + {{ .cols }}, + ~ .fn(., ...) + ) + ) + if(self$column_selection_applied()) self$remove_current_column_selection() + new_label_names <- new_metadata[!("Name" %in% curr_col_names)]$label + for (i in seq_along(new_label_names)) { + self$append_to_variables_metadata(curr_col_names[i], property = "label", new_val = new_label_names[i]) + } + self$data_changed <- TRUE + self$variables_metadata_changed <- TRUE } }) From 8afb746d0ffdd666830f39cf5cb670a71ff782dc Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 3 Dec 2024 07:09:08 +0300 Subject: [PATCH 20/50] improve the renaming of geometry column --- instat/static/InstatObject/R/data_object_R6.R | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 2bea3ede08..183480a69d 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -956,7 +956,12 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne } if(self$column_selection_applied()) self$remove_current_column_selection() # Need to use private$data here because changing names of data field - names(private$data)[names(curr_data) == curr_col_name] <- new_col_name + names(private$data)[names(private$data) == curr_col_name] <- new_col_name + + if(any(c("sfc", "sfc_MULTIPOLYGON") %in% class(private$data[[curr_col_name]]))){ + # Update the geometry column reference + sf::st_geometry(private$data) <- new_col_name + } self$append_to_variables_metadata(new_col_name, name_label, new_col_name) # TODO decide if we need to do these 2 lines self$append_to_changes(list(Renamed_col, curr_col_name, new_col_name)) @@ -977,6 +982,10 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne if(any(duplicated(curr_col_names))) stop("Cannot rename columns. Column names must be unique.") if(self$column_selection_applied()) self$remove_current_column_selection() names(private$data)[cols_changed_index] <- new_col_names + if(any(c("sfc", "sfc_MULTIPOLYGON") %in% class(private$dataprivate$data)[cols_changed_index])){ + # Update the geometry column reference + sf::st_geometry(private$data) <- new_col_names + } for (i in seq_along(cols_changed_index)) { self$append_to_variables_metadata(new_col_names[i], name_label, new_col_names[i]) } @@ -995,16 +1004,22 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne } else if (type == "rename_with") { if (missing(.fn)) stop(.fn, "is missing with no default.") curr_col_names <- names(curr_data) + current_geom_col <- attr(private$data, "sf_column") private$data <- curr_data |> dplyr::rename_with( .fn = .fn, .cols = {{ .cols }}, ... ) + if(self$column_selection_applied()) self$remove_current_column_selection() new_col_names <- names(private$data) if (!all(new_col_names %in% curr_col_names)) { new_col_names <- new_col_names[!(new_col_names %in% curr_col_names)] + if(any(c("sfc", "sfc_MULTIPOLYGON") %in% class(private$data[[current_geom_col]]))){ + # Update the geometry column reference + sf::st_geometry(private$data) <- new_col_names + } for (i in seq_along(new_col_names)) { self$append_to_variables_metadata(new_col_names[i], name_label, new_col_names[i]) } From 8474fc796f6078133e9aca55399d728fb3f20ec5 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 3 Dec 2024 07:52:52 +0300 Subject: [PATCH 21/50] formatting the geomtry data --- .../DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 9649d91e61..3a9e4d1982 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -90,13 +90,10 @@ Public Class ucrDataViewReoGrid If strData IsNot Nothing AndAlso grdData.CurrentWorksheet.ColumnHeaders.Item(j).Text.Contains("(LT)") Then strData = GetTransformedLTColumnContents(strData) ElseIf strData IsNot Nothing AndAlso grdData.CurrentWorksheet.ColumnHeaders.Item(j).Text.Contains("(G)") Then - strData = "MULTIPOLYGON" + strData = ShortenString(strData) grdData.CurrentWorksheet.GetCell(row:=i, col:=j).IsReadOnly = True - End If grdData.CurrentWorksheet(row:=i, col:=j) = strData - - Next grdData.CurrentWorksheet.RowHeaders.Item(i).Text = strRowNames(i) grdData.CurrentWorksheet.RowHeaders(i).TextColor = textColour @@ -108,12 +105,6 @@ Public Class ucrDataViewReoGrid Next - AddHandler grdData.CurrentWorksheet.CellMouseDown, Sub(sender As Object, e As unvell.ReoGrid.Events.CellMouseEventArgs) - If e.Cell IsNot Nothing AndAlso grdData.CurrentWorksheet.ColumnHeaders.Item(e.Cell.Column).Text.Contains("(G)") Then - toolTip1.SetToolTip(grdData, ShortenString(dataFrame.DisplayedData(e.Cell.Row, e.Cell.Column))) - End If - End Sub - If dataFrame.clsFilterOrColumnSelection.bFilterApplied Then grdData.CurrentWorksheet.ScrollToCell("A1") ' will always set the scrollbar at the top. End If @@ -127,7 +118,7 @@ Public Class ucrDataViewReoGrid End Sub Private Function ShortenString(strText As String) As String - Dim maxLength As Integer = 50 + Dim maxLength As Integer = 30 If strText.Length > maxLength Then ' Trim the string to the specified length and add ellipsis Return strText.Substring(0, maxLength) & "..." From 59080be9adbbeb5e6ed7ee1b6942957fa33510c0 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 3 Dec 2024 07:58:40 +0300 Subject: [PATCH 22/50] minor change --- instat/static/InstatObject/R/data_object_R6.R | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 183480a69d..8016ff6f7e 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -957,7 +957,6 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne if(self$column_selection_applied()) self$remove_current_column_selection() # Need to use private$data here because changing names of data field names(private$data)[names(private$data) == curr_col_name] <- new_col_name - if(any(c("sfc", "sfc_MULTIPOLYGON") %in% class(private$data[[curr_col_name]]))){ # Update the geometry column reference sf::st_geometry(private$data) <- new_col_name From e66bac1666afc0e2efe8b45f54f38fcac8b94bb9 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 3 Dec 2024 09:49:13 +0300 Subject: [PATCH 23/50] bug fixes --- instat/static/InstatObject/R/data_object_R6.R | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 8016ff6f7e..bf80b3f16f 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -956,11 +956,12 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne } if(self$column_selection_applied()) self$remove_current_column_selection() # Need to use private$data here because changing names of data field - names(private$data)[names(private$data) == curr_col_name] <- new_col_name if(any(c("sfc", "sfc_MULTIPOLYGON") %in% class(private$data[[curr_col_name]]))){ # Update the geometry column reference sf::st_geometry(private$data) <- new_col_name } + names(private$data)[names(private$data) == curr_col_name] <- new_col_name + self$append_to_variables_metadata(new_col_name, name_label, new_col_name) # TODO decide if we need to do these 2 lines self$append_to_changes(list(Renamed_col, curr_col_name, new_col_name)) @@ -980,11 +981,12 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne curr_col_names[cols_changed_index] <- new_col_names if(any(duplicated(curr_col_names))) stop("Cannot rename columns. Column names must be unique.") if(self$column_selection_applied()) self$remove_current_column_selection() - names(private$data)[cols_changed_index] <- new_col_names if(any(c("sfc", "sfc_MULTIPOLYGON") %in% class(private$dataprivate$data)[cols_changed_index])){ # Update the geometry column reference sf::st_geometry(private$data) <- new_col_names } + names(private$data)[cols_changed_index] <- new_col_names + for (i in seq_along(cols_changed_index)) { self$append_to_variables_metadata(new_col_names[i], name_label, new_col_names[i]) } @@ -1015,10 +1017,6 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne new_col_names <- names(private$data) if (!all(new_col_names %in% curr_col_names)) { new_col_names <- new_col_names[!(new_col_names %in% curr_col_names)] - if(any(c("sfc", "sfc_MULTIPOLYGON") %in% class(private$data[[current_geom_col]]))){ - # Update the geometry column reference - sf::st_geometry(private$data) <- new_col_names - } for (i in seq_along(new_col_names)) { self$append_to_variables_metadata(new_col_names[i], name_label, new_col_names[i]) } From 34c55bb2c1db7f725aee6b99b6adfdc871032257 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 3 Dec 2024 16:53:33 +0100 Subject: [PATCH 24/50] Change made --- instat/dlgClimograph.vb | 60 +++++------------------------------------ 1 file changed, 7 insertions(+), 53 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 40b3a74d3f..c03070d7e3 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -978,7 +978,7 @@ Public Class dlgClimograph Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeForControls(True) - UpdateParameters() + UpdateParametersForStation() TestOKEnabled() End Sub @@ -1100,12 +1100,12 @@ Public Class dlgClimograph ucrInputFacet.SetName(strNone1) End If End If - UpdateParameters1() + UpdateParametersForStationClimograph() AddRemoveFacets1() AddRemoveGroupBy1() End Sub - Private Sub UpdateParameters1() + Private Sub UpdateParametersForStationClimograph() clsFacetVariablesOperator.RemoveParameterByName("var1") clsFacetColOp1.RemoveParameterByName("col" & ucrInputFacet.Name) clsFacetRowOp1.RemoveParameterByName("row" & ucrInputFacet.Name) @@ -1148,13 +1148,13 @@ Public Class dlgClimograph ucrInputFacetBar.SetName(strNone2) End If End If - UpdateParameters2() + UpdateParametersForFacetBar() AddRemoveFacets2() AddRemoveGroupBy2() AddRemoveTemBars() End Sub - Private Sub UpdateParameters2() + Private Sub UpdateParametersForFacetBar() clsFacetVariablesOperator.RemoveParameterByName("var1") clsFacetColOp2.RemoveParameterByName("col" & ucrInputFacetBar.Name) clsFacetRowOp2.RemoveParameterByName("row" & ucrInputFacetBar.Name) @@ -1403,12 +1403,12 @@ Public Class dlgClimograph ucrInputStation.SetName(strNone) End If End If - UpdateParameters() + UpdateParametersForStation() AddRemoveFacets() AddRemoveGroupBy() End Sub - Private Sub UpdateParameters() + Private Sub UpdateParametersForStation() clsFacetOperator.RemoveParameterByName("var1") clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) @@ -1532,52 +1532,6 @@ Public Class dlgClimograph AutoFillReceivers(lstTminminReceivers) End Sub - Private Sub AutoFillRainReceivers() - If isFilling Then - Exit Sub - End If - isFilling = True - - ' Temporarily remove the event handler - RemoveHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillRainReceivers - - Dim lstRecognisedValues As List(Of String) - Dim ucrCurrentReceiver As ucrReceiver - Dim bFound As Boolean = False - - ucrCurrentReceiver = ucrSelectorClimograph.CurrentReceiver - - For Each ucrTempReceiver As ucrReceiver In lstRainReceivers - ucrTempReceiver.SetMeAsReceiver() - lstRecognisedValues = GetRecognisedValues(ucrTempReceiver.Tag) - - If lstRecognisedValues.Count > 0 Then - For Each lviTempVariable As ListViewItem In ucrSelectorClimograph.lstAvailableVariable.Items - For Each strValue As String In lstRecognisedValues - If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]", String.Empty).Equals(strValue) Then - ucrTempReceiver.Add(lviTempVariable.Text, ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) - bFound = True - Exit For - End If - Next - If bFound Then - bFound = False - Exit For - End If - Next - End If - Next - - If ucrCurrentReceiver IsNot Nothing Then - ucrCurrentReceiver.SetMeAsReceiver() - End If - - ' Re-enable the event handler - AddHandler ucrSelectorClimograph.ControlValueChanged, AddressOf AutoFillRainReceivers - - isFilling = False - End Sub - Private Sub GetParameterValue(clsOperator As ROperator) Dim i As Integer = 0 For Each clsTempParam As RParameter In clsOperator.clsParameters From 1d34edd6c805c37379661c7403282df8d205bc44 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 4 Dec 2024 09:54:01 +0300 Subject: [PATCH 25/50] changes to the code --- instat/dlgName.Designer.vb | 32 +++++++++++++++++++++++++++----- instat/dlgName.vb | 22 ++++++++++++++++++---- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/instat/dlgName.Designer.vb b/instat/dlgName.Designer.vb index 343d0eee9b..222e51d490 100644 --- a/instat/dlgName.Designer.vb +++ b/instat/dlgName.Designer.vb @@ -71,6 +71,7 @@ Partial Class dlgName Me.ucrPnlOptions = New instat.UcrPanel() Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() Me.ucrPnlSelectData = New instat.UcrPanel() + Me.rdoLabels = New System.Windows.Forms.RadioButton() Me.grpOptions.SuspendLayout() Me.SuspendLayout() ' @@ -109,7 +110,7 @@ Partial Class dlgName Me.rdoMultiple.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoMultiple.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoMultiple.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoMultiple.Location = New System.Drawing.Point(218, 10) + Me.rdoMultiple.Location = New System.Drawing.Point(178, 10) Me.rdoMultiple.Name = "rdoMultiple" Me.rdoMultiple.Size = New System.Drawing.Size(110, 28) Me.rdoMultiple.TabIndex = 2 @@ -128,7 +129,7 @@ Partial Class dlgName Me.rdoSingle.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSingle.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSingle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSingle.Location = New System.Drawing.Point(108, 10) + Me.rdoSingle.Location = New System.Drawing.Point(70, 10) Me.rdoSingle.Name = "rdoSingle" Me.rdoSingle.Size = New System.Drawing.Size(110, 28) Me.rdoSingle.TabIndex = 1 @@ -312,7 +313,7 @@ Partial Class dlgName Me.rdoRenameWith.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoRenameWith.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoRenameWith.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRenameWith.Location = New System.Drawing.Point(328, 10) + Me.rdoRenameWith.Location = New System.Drawing.Point(286, 10) Me.rdoRenameWith.Name = "rdoRenameWith" Me.rdoRenameWith.Size = New System.Drawing.Size(110, 28) Me.rdoRenameWith.TabIndex = 13 @@ -429,9 +430,9 @@ Partial Class dlgName 'ucrPnlOptions ' Me.ucrPnlOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlOptions.Location = New System.Drawing.Point(97, 2) + Me.ucrPnlOptions.Location = New System.Drawing.Point(62, 2) Me.ucrPnlOptions.Name = "ucrPnlOptions" - Me.ucrPnlOptions.Size = New System.Drawing.Size(355, 44) + Me.ucrPnlOptions.Size = New System.Drawing.Size(448, 44) Me.ucrPnlOptions.TabIndex = 0 ' 'ucrReceiverColumns @@ -455,12 +456,32 @@ Partial Class dlgName Me.ucrPnlSelectData.Size = New System.Drawing.Size(315, 51) Me.ucrPnlSelectData.TabIndex = 19 ' + 'rdoLabels + ' + Me.rdoLabels.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoLabels.BackColor = System.Drawing.SystemColors.Control + Me.rdoLabels.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoLabels.FlatAppearance.BorderSize = 2 + Me.rdoLabels.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoLabels.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoLabels.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoLabels.Location = New System.Drawing.Point(394, 10) + Me.rdoLabels.Name = "rdoLabels" + Me.rdoLabels.Size = New System.Drawing.Size(110, 28) + Me.rdoLabels.TabIndex = 22 + Me.rdoLabels.TabStop = True + Me.rdoLabels.Tag = "" + Me.rdoLabels.Text = "Labels With" + Me.rdoLabels.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoLabels.UseVisualStyleBackColor = False + ' 'dlgName ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(545, 540) + Me.Controls.Add(Me.rdoLabels) Me.Controls.Add(Me.grdRenameColumns) Me.Controls.Add(Me.ucrChkIncludeVariable) Me.Controls.Add(Me.rdoRenameWith) @@ -527,4 +548,5 @@ Partial Class dlgName Friend WithEvents rdoSelectedColumn As RadioButton Friend WithEvents rdoWholeDataFrame As RadioButton Friend WithEvents ucrPnlSelectData As UcrPanel + Friend WithEvents rdoLabels As RadioButton End Class diff --git a/instat/dlgName.vb b/instat/dlgName.vb index b108de0f7e..b345413a36 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -83,6 +83,7 @@ Public Class dlgName ucrPnlOptions.AddRadioButton(rdoSingle, Chr(34) & "single" & Chr(34)) ucrPnlOptions.AddRadioButton(rdoMultiple, Chr(34) & "multiple" & Chr(34)) ucrPnlOptions.AddRadioButton(rdoRenameWith, Chr(34) & "rename_with" & Chr(34)) + ucrPnlOptions.AddRadioButton(rdoLabels, Chr(34) & "labels_with" & Chr(34)) ucrPnlOptions.SetRDefault(Chr(34) & "single" & Chr(34)) ucrNudAbbreviate.SetParameter(New RParameter("minlength", 10)) @@ -142,7 +143,7 @@ Public Class dlgName ucrPnlOptions.AddToLinkedControls({ucrReceiverName, ucrInputNewName, ucrInputVariableLabel}, {rdoSingle}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls(ucrChkIncludeVariable, {rdoMultiple}, bNewLinkedHideIfParameterMissing:=True) - ucrPnlOptions.AddToLinkedControls({ucrPnlCase, ucrPnlSelectData}, {rdoRenameWith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls({ucrPnlCase, ucrPnlSelectData}, {rdoRenameWith, rdoLabels}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlCase.AddToLinkedControls(ucrInputCase, {rdoMakeCleanNames}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Snake") ucrPnlCase.AddToLinkedControls(ucrNudAbbreviate, {rdoAbbreviate}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="8") ucrPnlCase.AddToLinkedControls(ucrInputReplace, {rdoReplace}, bNewLinkedHideIfParameterMissing:=True) @@ -569,7 +570,7 @@ Public Class dlgName Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged, ucrPnlCase.ControlValueChanged, ucrPnlSelectData.ControlValueChanged, ucrInputCase.ControlValueChanged, ucrNudAbbreviate.ControlValueChanged, ucrReceiverColumns.ControlValueChanged If rdoSingle.Checked Then ucrReceiverName.SetMeAsReceiver() - ElseIf rdoRenameWith.Checked Then + ElseIf rdoRenameWith.Checked OrElse rdoLabels.Checked Then ucrInputBy.Visible = rdoWholeDataFrame.Checked AndAlso rdoReplace.Checked ucrInputEdit.Visible = ucrInputBy.Visible ucrInputReplace.Visible = ucrInputBy.Visible @@ -584,12 +585,14 @@ Public Class dlgName End If End If ucrSelectVariables.lstAvailableVariable.Visible = rdoSingle.Checked OrElse (rdoRenameWith.Checked AndAlso rdoSelectedColumn.Checked) + ucrSelectVariables.lstAvailableVariable.Visible = rdoSingle.Checked OrElse (rdoLabels.Checked AndAlso rdoSelectedColumn.Checked) ucrSelectVariables.btnAdd.Visible = ucrSelectVariables.lstAvailableVariable.Visible ucrSelectVariables.btnDataOptions.Visible = ucrSelectVariables.lstAvailableVariable.Visible UpdateGrid() RemoveParameters() DialogueSize() RemovePattern() + AddTypeParm() End Sub Private Sub DialogueSize() @@ -660,8 +663,7 @@ Public Class dlgName Private Sub RemovePattern() If rdoWholeDataFrame.Checked Then - If rdoRenameWith.Checked AndAlso rdoReplace.Checked Then - clsDefaultRFunction.AddParameter("type", Chr(34) & "rename_with" & Chr(34), iPosition:=1) + If (rdoRenameWith.Checked OrElse rdoLabels.Checked) AndAlso rdoReplace.Checked Then clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) clsDefaultRFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText() & Chr(34), iPosition:=4) clsDefaultRFunction.RemoveParameterByName("label") @@ -687,7 +689,19 @@ Public Class dlgName End If End Sub + Private Sub AddTypeParm() + If rdoLabels.Checked Then + clsDefaultRFunction.AddParameter("type", Chr(34) & "rename_labels" & Chr(34), iPosition:=1) + + ElseIf rdoRenameWith.Checked Then + clsDefaultRFunction.AddParameter("type", Chr(34) & "rename_with" & Chr(34), iPosition:=1) + Else + + End If + End Sub + Private Sub ucrInputEdit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputEdit.ControlValueChanged, ucrInputBy.ControlValueChanged, ucrInputReplace.ControlValueChanged RemovePattern() + AddTypeParm() End Sub End Class From 8e3f2ae80cf1a854fa4f7543e31d37a912af96cc Mon Sep 17 00:00:00 2001 From: lilyclements Date: Wed, 4 Dec 2024 11:23:29 +0000 Subject: [PATCH 26/50] Update data_object_R6.R --- instat/static/InstatObject/R/data_object_R6.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 31bc20285a..66b9678ae4 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -1019,7 +1019,7 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne new_metadata <- curr_metadata |> dplyr::mutate( dplyr::across( - {{ .cols }}, + Name, ~ .fn(., ...) ) ) From 622805ac157c5dfb73c0275b2f1e2dc883a507f9 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Wed, 4 Dec 2024 11:36:52 +0000 Subject: [PATCH 27/50] Update data_object_R6.R --- instat/static/InstatObject/R/data_object_R6.R | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 66b9678ae4..9d148f4e61 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -1014,16 +1014,20 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne } else if (type == "rename_labels"){ # to rename column labels. Here, instead of renaming a column name, we're giving new values in a column. curr_metadata <- self$get_variables_metadata() - curr_col_names <- names(curr_data) - + curr_col_names <- names(curr_data %>% dplyr::select(.cols)) + + # create a new data frame containing the changes - but only apply to those that we actually plan to change for efficiency. new_metadata <- curr_metadata |> + dplyr::filter(Name %in% curr_col_names) %>% dplyr::mutate( dplyr::across( - Name, + label, ~ .fn(., ...) ) ) + if(self$column_selection_applied()) self$remove_current_column_selection() + # apply the changes new_label_names <- new_metadata[!("Name" %in% curr_col_names)]$label for (i in seq_along(new_label_names)) { self$append_to_variables_metadata(curr_col_names[i], property = "label", new_val = new_label_names[i]) From f4c86e9a5e2bc4cae5fe0f91d492e99deb24f2a6 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 4 Dec 2024 14:41:13 +0300 Subject: [PATCH 28/50] changes --- instat/dlgName.vb | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/instat/dlgName.vb b/instat/dlgName.vb index b345413a36..179e8a74dd 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -80,11 +80,17 @@ Public Class dlgName ucrInputVariableLabel.SetParameter(New RParameter("label", 3)) ucrPnlOptions.SetParameter(New RParameter("type", 4)) - ucrPnlOptions.AddRadioButton(rdoSingle, Chr(34) & "single" & Chr(34)) - ucrPnlOptions.AddRadioButton(rdoMultiple, Chr(34) & "multiple" & Chr(34)) - ucrPnlOptions.AddRadioButton(rdoRenameWith, Chr(34) & "rename_with" & Chr(34)) - ucrPnlOptions.AddRadioButton(rdoLabels, Chr(34) & "labels_with" & Chr(34)) - ucrPnlOptions.SetRDefault(Chr(34) & "single" & Chr(34)) + ucrPnlOptions.AddRadioButton(rdoSingle) + ucrPnlOptions.AddRadioButton(rdoMultiple) + ucrPnlOptions.AddRadioButton(rdoRenameWith) + ucrPnlOptions.AddRadioButton(rdoLabels) + ucrPnlOptions.AddParameterValuesCondition(rdoSingle, "name", "single") + ucrPnlOptions.AddParameterValuesCondition(rdoMultiple, "name", "multiple") + ucrPnlOptions.AddParameterValuesCondition(rdoRenameWith, "name", "rename") + ucrPnlOptions.AddParameterValuesCondition(rdoLabels, "name", "labels") + + + 'ucrPnlOptions.SetRDefault(Chr(34) & "single" & Chr(34)) ucrNudAbbreviate.SetParameter(New RParameter("minlength", 10)) ucrNudAbbreviate.SetMinMax(Integer.MinValue, Integer.MaxValue) @@ -183,6 +189,7 @@ Public Class dlgName clsDummyFunction.AddParameter("checked", "FALSE", iPosition:=0) clsDummyFunction.AddParameter("checked", "whole", iPosition:=1) + clsDummyFunction.AddParameter("name", "single", iPosition:=2) clsDefaultRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$rename_column_in_data") clsDefaultRFunction.AddParameter("type", Chr(34) & "single" & Chr(34), iPosition:=4) @@ -223,12 +230,12 @@ Public Class dlgName ucrPnlCase.SetRCode(clsDefaultRFunction, bReset) ucrInputReplace.SetRCode(clsDefaultRFunction, bReset) ucrChkIncludeVariable.SetRCode(clsDummyFunction, bReset) + ucrPnlSelectData.SetRCode(clsDummyFunction, bReset) + ucrPnlOptions.SetRCode(clsDummyFunction, bReset) End If ucrInputCase.SetRCode(clsDefaultRFunction, bReset) ucrNudAbbreviate.SetRCode(clsDefaultRFunction, bReset) - ucrPnlOptions.SetRCode(clsDefaultRFunction, bReset) ucrInputBy.SetRCode(clsDefaultRFunction, bReset) - ucrPnlSelectData.SetRCode(clsDummyFunction, bReset) End Sub Private Sub TestOKEnabled() @@ -584,8 +591,13 @@ Public Class dlgName End If End If End If - ucrSelectVariables.lstAvailableVariable.Visible = rdoSingle.Checked OrElse (rdoRenameWith.Checked AndAlso rdoSelectedColumn.Checked) - ucrSelectVariables.lstAvailableVariable.Visible = rdoSingle.Checked OrElse (rdoLabels.Checked AndAlso rdoSelectedColumn.Checked) + + ucrSelectVariables.lstAvailableVariable.Visible = rdoSingle.Checked OrElse + (rdoRenameWith.Checked AndAlso rdoSelectedColumn.Checked) OrElse + (rdoLabels.Checked AndAlso rdoSelectedColumn.Checked) + + 'ucrSelectVariables.lstAvailableVariable.Visible = rdoSingle.Checked OrElse (rdoRenameWith.Checked AndAlso rdoSelectedColumn.Checked) + 'ucrSelectVariables.lstAvailableVariable.Visible = rdoSingle.Checked OrElse (rdoLabels.Checked AndAlso rdoSelectedColumn.Checked) ucrSelectVariables.btnAdd.Visible = ucrSelectVariables.lstAvailableVariable.Visible ucrSelectVariables.btnDataOptions.Visible = ucrSelectVariables.lstAvailableVariable.Visible UpdateGrid() From 088d3c1b3d3edda34c37448814a84c744aec165f Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 4 Dec 2024 16:09:40 +0300 Subject: [PATCH 29/50] changes to the code --- instat/dlgName.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instat/dlgName.vb b/instat/dlgName.vb index 179e8a74dd..e7f0049245 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -189,7 +189,8 @@ Public Class dlgName clsDummyFunction.AddParameter("checked", "FALSE", iPosition:=0) clsDummyFunction.AddParameter("checked", "whole", iPosition:=1) - clsDummyFunction.AddParameter("name", "single", iPosition:=2) + clsDummyFunction.AddParameter("name", "single", iPosition:=1) + clsDefaultRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$rename_column_in_data") clsDefaultRFunction.AddParameter("type", Chr(34) & "single" & Chr(34), iPosition:=4) From fc4a9ad115b5473acd046f0f73ccf52272c3cfc4 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Fri, 6 Dec 2024 10:55:41 +0300 Subject: [PATCH 30/50] changes to the code --- instat/dlgName.vb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/instat/dlgName.vb b/instat/dlgName.vb index e7f0049245..acaf499757 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -597,8 +597,6 @@ Public Class dlgName (rdoRenameWith.Checked AndAlso rdoSelectedColumn.Checked) OrElse (rdoLabels.Checked AndAlso rdoSelectedColumn.Checked) - 'ucrSelectVariables.lstAvailableVariable.Visible = rdoSingle.Checked OrElse (rdoRenameWith.Checked AndAlso rdoSelectedColumn.Checked) - 'ucrSelectVariables.lstAvailableVariable.Visible = rdoSingle.Checked OrElse (rdoLabels.Checked AndAlso rdoSelectedColumn.Checked) ucrSelectVariables.btnAdd.Visible = ucrSelectVariables.lstAvailableVariable.Visible ucrSelectVariables.btnDataOptions.Visible = ucrSelectVariables.lstAvailableVariable.Visible UpdateGrid() @@ -708,8 +706,13 @@ Public Class dlgName ElseIf rdoRenameWith.Checked Then clsDefaultRFunction.AddParameter("type", Chr(34) & "rename_with" & Chr(34), iPosition:=1) - Else + ElseIf rdoMultiple.Checked Then + clsDefaultRFunction.AddParameter("type", Chr(34) & "multiple" & Chr(34), iPosition:=1) + + ElseIf rdoSingle.Checked Then + + clsDefaultRFunction.AddParameter("type", Chr(34) & "single" & Chr(34), iPosition:=1) End If End Sub From 492e7afcdcf3c07a172a98a4af5204190327da40 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 9 Dec 2024 09:11:50 +0300 Subject: [PATCH 31/50] removed unnecessary code --- instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 3 --- instat/static/InstatObject/R/data_object_R6.R | 2 -- 2 files changed, 5 deletions(-) diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 3a9e4d1982..eab83192d5 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -39,8 +39,6 @@ Public Class ucrDataViewReoGrid Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved - Private toolTip1 As New ToolTip() - Public Sub AddColumns(visiblePage As clsDataFramePage) Implements IDataViewGrid.AddColumns Dim workSheetColumnHeader As ColumnHeader Dim variableTextColour As Color @@ -104,7 +102,6 @@ Public Class ucrDataViewReoGrid End If Next - If dataFrame.clsFilterOrColumnSelection.bFilterApplied Then grdData.CurrentWorksheet.ScrollToCell("A1") ' will always set the scrollbar at the top. End If diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index bf80b3f16f..6d665f59ec 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -1005,9 +1005,7 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne } else if (type == "rename_with") { if (missing(.fn)) stop(.fn, "is missing with no default.") curr_col_names <- names(curr_data) - current_geom_col <- attr(private$data, "sf_column") private$data <- curr_data |> - dplyr::rename_with( .fn = .fn, .cols = {{ .cols }}, ... From eeca0acf7117f6b81dc3da3d10bcf0ce720408c5 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 9 Dec 2024 10:18:07 +0100 Subject: [PATCH 32/50] Update One Variable Summarise and changing the Format options to Table Options. --- instat/dlgOneVariableSummarise.Designer.vb | 42 +++++++++++----------- instat/dlgOneVariableSummarise.vb | 16 +++------ 2 files changed, 27 insertions(+), 31 deletions(-) diff --git a/instat/dlgOneVariableSummarise.Designer.vb b/instat/dlgOneVariableSummarise.Designer.vb index 69e5965877..6554ebb703 100644 --- a/instat/dlgOneVariableSummarise.Designer.vb +++ b/instat/dlgOneVariableSummarise.Designer.vb @@ -48,7 +48,7 @@ Partial Class dlgOneVariableSummarise Me.rdoVariable = New System.Windows.Forms.RadioButton() Me.rdoSummary = New System.Windows.Forms.RadioButton() Me.grpColumns = New System.Windows.Forms.GroupBox() - Me.cmdFormatTable = New System.Windows.Forms.Button() + Me.ucrPnlColumnFactor = New instat.UcrPanel() Me.ucrReorderSummary = New instat.ucrReorder() Me.ucrSaveSummary = New instat.ucrSave() Me.ucrPnlSummaries = New instat.UcrPanel() @@ -57,9 +57,9 @@ Partial Class dlgOneVariableSummarise Me.ucrSelectorOneVarSummarise = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverOneVarSummarise = New instat.ucrReceiverMultiple() Me.ucrBase = New instat.ucrButtons() - Me.ucrPnlColumnFactor = New instat.UcrPanel() Me.ucrChkDisplayMissing = New instat.ucrCheck() Me.ucrInputDisplayMissing = New instat.ucrInputComboBox() + Me.cmdTableOptions = New System.Windows.Forms.Button() Me.grpColumns.SuspendLayout() Me.SuspendLayout() ' @@ -203,15 +203,13 @@ Partial Class dlgOneVariableSummarise Me.grpColumns.TabStop = False Me.grpColumns.Text = "Columns:" ' - 'cmdFormatTable + 'ucrPnlColumnFactor ' - Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFormatTable.Location = New System.Drawing.Point(317, 393) - Me.cmdFormatTable.Name = "cmdFormatTable" - Me.cmdFormatTable.Size = New System.Drawing.Size(104, 23) - Me.cmdFormatTable.TabIndex = 37 - Me.cmdFormatTable.Text = "Format Table..." - Me.cmdFormatTable.UseVisualStyleBackColor = True + Me.ucrPnlColumnFactor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlColumnFactor.Location = New System.Drawing.Point(6, 12) + Me.ucrPnlColumnFactor.Name = "ucrPnlColumnFactor" + Me.ucrPnlColumnFactor.Size = New System.Drawing.Size(137, 65) + Me.ucrPnlColumnFactor.TabIndex = 29 ' 'ucrReorderSummary ' @@ -296,14 +294,6 @@ Partial Class dlgOneVariableSummarise Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 11 ' - 'ucrPnlColumnFactor - ' - Me.ucrPnlColumnFactor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlColumnFactor.Location = New System.Drawing.Point(6, 12) - Me.ucrPnlColumnFactor.Name = "ucrPnlColumnFactor" - Me.ucrPnlColumnFactor.Size = New System.Drawing.Size(137, 65) - Me.ucrPnlColumnFactor.TabIndex = 29 - ' 'ucrChkDisplayMissing ' Me.ucrChkDisplayMissing.AutoSize = True @@ -325,13 +315,25 @@ Partial Class dlgOneVariableSummarise Me.ucrInputDisplayMissing.Size = New System.Drawing.Size(74, 21) Me.ucrInputDisplayMissing.TabIndex = 35 ' + 'cmdTableOptions + ' + Me.cmdTableOptions.AutoSize = True + Me.cmdTableOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdTableOptions.Location = New System.Drawing.Point(302, 393) + Me.cmdTableOptions.Name = "cmdTableOptions" + Me.cmdTableOptions.Size = New System.Drawing.Size(114, 23) + Me.cmdTableOptions.TabIndex = 38 + Me.cmdTableOptions.Tag = "Format Table" + Me.cmdTableOptions.Text = "Table Options..." + Me.cmdTableOptions.UseVisualStyleBackColor = True + ' 'dlgOneVariableSummarise ' 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(470, 495) - Me.Controls.Add(Me.cmdFormatTable) + Me.Controls.Add(Me.cmdTableOptions) Me.Controls.Add(Me.ucrReorderSummary) Me.Controls.Add(Me.ucrSaveSummary) Me.Controls.Add(Me.cmdMissingOptions) @@ -386,5 +388,5 @@ Partial Class dlgOneVariableSummarise Friend WithEvents ucrChkDisplayMissing As ucrCheck Friend WithEvents grpColumns As GroupBox Friend WithEvents ucrReorderSummary As ucrReorder - Friend WithEvents cmdFormatTable As Button + Friend WithEvents cmdTableOptions As Button End Class \ No newline at end of file diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb index c973af6015..56a6de3949 100644 --- a/instat/dlgOneVariableSummarise.vb +++ b/instat/dlgOneVariableSummarise.vb @@ -234,6 +234,7 @@ Public Class dlgOneVariableSummarise clsGtFunction.SetPackageName("gt") clsGtFunction.SetRCommand("gt") + clsPipeOperator.AddParameter(strParameterName:="gt", clsRFunctionParameter:=clsGtFunction, iPosition:=2, bIncludeArgumentName:=False) clsSummaryOperator.SetOperation("%>%") clsSummaryOperator.AddParameter("tableFun", clsRFunctionParameter:=clsSummaryTableFunction, iPosition:=0) @@ -399,7 +400,7 @@ Public Class dlgOneVariableSummarise ucrSaveSummary.SetCheckBoxText("Store Summary") End If cmdSummaries.Visible = rdoCustomised.Checked - cmdFormatTable.Visible = rdoCustomised.Checked + cmdTableOptions.Visible = rdoCustomised.Checked End Sub Private Sub FillListView() @@ -432,16 +433,9 @@ Public Class dlgOneVariableSummarise Next End Sub - Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Handles cmdFormatTable.Click - sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, - clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, - clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, - clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, - clsNewMutableOperator:=clsSummaryOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, - clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction, - clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog) - - sdgFormatSummaryTables.ShowDialog() + Private Sub cmdTableOptions_Click(sender As Object, e As EventArgs) Handles cmdTableOptions.Click + sdgTableOptions.Setup(ucrSelectorOneVarSummarise.strCurrentDataFrame, clsPipeOperator) + sdgTableOptions.ShowDialog(Me) bResetFormatSubdialog = False End Sub From 0ead47296ff522802b32e4fee42259fa30aa19a1 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 9 Dec 2024 11:28:42 +0100 Subject: [PATCH 33/50] Hided Model, Structured, experiments, and Procuremen menus --- instat/frmMain.Designer.vb | 5 +++-- instat/frmMain.vb | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 1ace18cf46..97c28d30c0 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -1057,6 +1057,7 @@ Partial Class frmMain Me.mnuModel.Size = New System.Drawing.Size(53, 22) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" + Me.mnuModel.Visible = False ' 'mnuModelProbabilityDistributions ' @@ -3215,7 +3216,7 @@ Partial Class frmMain ' Me.mnuDataViewWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataViewWindow.Name = "mnuDataViewWindow" - Me.mnuDataViewWindow.Size = New System.Drawing.Size(180, 22) + Me.mnuDataViewWindow.Size = New System.Drawing.Size(148, 22) Me.mnuDataViewWindow.Text = "Data View" ' 'mnuRDataViewerWindow @@ -3223,7 +3224,7 @@ Partial Class frmMain Me.mnuRDataViewerWindow.Enabled = False Me.mnuRDataViewerWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuRDataViewerWindow.Name = "mnuRDataViewerWindow" - Me.mnuRDataViewerWindow.Size = New System.Drawing.Size(180, 22) + Me.mnuRDataViewerWindow.Size = New System.Drawing.Size(148, 22) Me.mnuRDataViewerWindow.Text = "R-Data Viewer" ' 'mnuTbOutput diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d5c70d0953..0f2e0c86ff 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1863,11 +1863,13 @@ Public Class frmMain Public Sub SetShowProcurementMenu(bNewShowProcurementMenu As Boolean) mnuProcurement.Visible = bNewShowProcurementMenu mnuViewProcurementMenu.Checked = bNewShowProcurementMenu + mnuProcurement.Visible = False End Sub Public Sub SetShowStructuredMenu(bNewShowStructuredMenu As Boolean) mnuStructured.Visible = bNewShowStructuredMenu mnuViewStructuredMenu.Checked = bNewShowStructuredMenu + mnuStructured.Visible = False End Sub Public Sub SetShowClimaticMenu(bNewShowClimaticMenu As Boolean) mnuClimatic.Visible = bNewShowClimaticMenu @@ -1877,6 +1879,7 @@ Public Class frmMain Public Sub SetShowOptionsByContextMenu(bNewShowOptionsByContextMenu As Boolean) mnuOptionsByContext.Visible = bNewShowOptionsByContextMenu mnuViewOptionsByContextMenu.Checked = bNewShowOptionsByContextMenu + mnuOptionsByContext.Visible = False End Sub Private Sub mnuViewStructuredMenu_Click(sender As Object, e As EventArgs) Handles mnuViewStructuredMenu.Click From c69acbcbb46dc883c8d9fc6393a261ffbf14fd49 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 10 Dec 2024 14:24:41 +0100 Subject: [PATCH 34/50] Change made --- instat/frmMain.Designer.vb | 1 - instat/frmMain.vb | 11 ++++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 97c28d30c0..e9119897dc 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -1057,7 +1057,6 @@ Partial Class frmMain Me.mnuModel.Size = New System.Drawing.Size(53, 22) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" - Me.mnuModel.Visible = False ' 'mnuModelProbabilityDistributions ' diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 0f2e0c86ff..4f9beeceec 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -227,6 +227,7 @@ Public Class frmMain '------------------------------------- SetAppVersionNumber() isMaximised = True 'Need to get the windowstate when the application is loaded + SetHideMenus() End Sub Private Sub CheckForUpdates() @@ -595,6 +596,13 @@ Public Class frmMain My.Application.Info.Version.Build.ToString() End Sub + Public Sub SetHideMenus() + mnuViewProcurementMenu.Checked = False + mnuProcurement.Visible = False + mnuViewOptionsByContextMenu.Checked = False + mnuOptionsByContext.Visible = False + End Sub + Private Sub SetMainMenusEnabled(bEnabled As Boolean) mnuFile.Enabled = bEnabled mnuEdit.Enabled = bEnabled @@ -1863,13 +1871,11 @@ Public Class frmMain Public Sub SetShowProcurementMenu(bNewShowProcurementMenu As Boolean) mnuProcurement.Visible = bNewShowProcurementMenu mnuViewProcurementMenu.Checked = bNewShowProcurementMenu - mnuProcurement.Visible = False End Sub Public Sub SetShowStructuredMenu(bNewShowStructuredMenu As Boolean) mnuStructured.Visible = bNewShowStructuredMenu mnuViewStructuredMenu.Checked = bNewShowStructuredMenu - mnuStructured.Visible = False End Sub Public Sub SetShowClimaticMenu(bNewShowClimaticMenu As Boolean) mnuClimatic.Visible = bNewShowClimaticMenu @@ -1879,7 +1885,6 @@ Public Class frmMain Public Sub SetShowOptionsByContextMenu(bNewShowOptionsByContextMenu As Boolean) mnuOptionsByContext.Visible = bNewShowOptionsByContextMenu mnuViewOptionsByContextMenu.Checked = bNewShowOptionsByContextMenu - mnuOptionsByContext.Visible = False End Sub Private Sub mnuViewStructuredMenu_Click(sender As Object, e As EventArgs) Handles mnuViewStructuredMenu.Click From 4f091a211674edd24f59db1494217daf3e67424e Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 11 Dec 2024 11:58:02 +0300 Subject: [PATCH 35/50] changes to the code --- instat/dlgName.Designer.vb | 24 +++++++++++++ instat/dlgName.vb | 72 +++++++++++++++++++++++++++----------- 2 files changed, 76 insertions(+), 20 deletions(-) diff --git a/instat/dlgName.Designer.vb b/instat/dlgName.Designer.vb index 222e51d490..cf7070ee6c 100644 --- a/instat/dlgName.Designer.vb +++ b/instat/dlgName.Designer.vb @@ -72,6 +72,8 @@ Partial Class dlgName Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() Me.ucrPnlSelectData = New instat.UcrPanel() Me.rdoLabels = New System.Windows.Forms.RadioButton() + Me.cmdAddkeyboard = New System.Windows.Forms.Button() + Me.ucrChkIncludeRegularExpressions = New instat.ucrCheck() Me.grpOptions.SuspendLayout() Me.SuspendLayout() ' @@ -475,6 +477,24 @@ Partial Class dlgName Me.rdoLabels.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoLabels.UseVisualStyleBackColor = False ' + 'cmdAddkeyboard + ' + Me.cmdAddkeyboard.Location = New System.Drawing.Point(315, 315) + Me.cmdAddkeyboard.Name = "cmdAddkeyboard" + Me.cmdAddkeyboard.Size = New System.Drawing.Size(100, 23) + Me.cmdAddkeyboard.TabIndex = 35 + Me.cmdAddkeyboard.Text = "Add Keyboard" + Me.cmdAddkeyboard.UseVisualStyleBackColor = True + ' + 'ucrChkIncludeRegularExpressions + ' + Me.ucrChkIncludeRegularExpressions.AutoSize = True + Me.ucrChkIncludeRegularExpressions.Checked = False + Me.ucrChkIncludeRegularExpressions.Location = New System.Drawing.Point(71, 316) + Me.ucrChkIncludeRegularExpressions.Name = "ucrChkIncludeRegularExpressions" + Me.ucrChkIncludeRegularExpressions.Size = New System.Drawing.Size(239, 23) + Me.ucrChkIncludeRegularExpressions.TabIndex = 34 + ' 'dlgName ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -502,6 +522,8 @@ Partial Class dlgName Me.Controls.Add(Me.rdoSelectedColumn) Me.Controls.Add(Me.rdoWholeDataFrame) Me.Controls.Add(Me.ucrPnlSelectData) + Me.Controls.Add(Me.cmdAddkeyboard) + Me.Controls.Add(Me.ucrChkIncludeRegularExpressions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -549,4 +571,6 @@ Partial Class dlgName Friend WithEvents rdoWholeDataFrame As RadioButton Friend WithEvents ucrPnlSelectData As UcrPanel Friend WithEvents rdoLabels As RadioButton + Friend WithEvents cmdAddkeyboard As Button + Friend WithEvents ucrChkIncludeRegularExpressions As ucrCheck End Class diff --git a/instat/dlgName.vb b/instat/dlgName.vb index acaf499757..883ffc38a8 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -30,7 +30,7 @@ Public Class dlgName Private clsNewColNameDataframeFunction As New RFunction Private clsNewLabelDataframeFunction As New RFunction Private clsDummyFunction As New RFunction - Private clsStartwithFunction, clsEndswithFunction, clsMatchesFunction, clsContainsFunction As New RFunction + Private clsStartwithFunction, clsRegexFunction, clsEndswithFunction, clsMatchesFunction, clsContainsFunction As New RFunction Private WithEvents grdCurrentWorkSheet As Worksheet Private dctRowsNewNameChanged As New Dictionary(Of Integer, String) Private dctRowsNewLabelChanged As New Dictionary(Of Integer, String) @@ -147,12 +147,17 @@ Public Class dlgName ucrInputReplace.SetParameter(New RParameter("pattern", 2)) ucrInputReplace.SetLinkedDisplayControl(lblReplace) + ucrChkIncludeRegularExpressions.SetText("Include Regular Expressions") + + ucrChkIncludeRegularExpressions.SetParameter(New RParameter("check", 0)) + ucrChkIncludeRegularExpressions.SetValuesCheckedAndUnchecked(True, False) + ucrPnlOptions.AddToLinkedControls({ucrReceiverName, ucrInputNewName, ucrInputVariableLabel}, {rdoSingle}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls(ucrChkIncludeVariable, {rdoMultiple}, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrPnlCase, ucrPnlSelectData}, {rdoRenameWith, rdoLabels}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlCase.AddToLinkedControls(ucrInputCase, {rdoMakeCleanNames}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Snake") ucrPnlCase.AddToLinkedControls(ucrNudAbbreviate, {rdoAbbreviate}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="8") - ucrPnlCase.AddToLinkedControls(ucrInputReplace, {rdoReplace}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlCase.AddToLinkedControls({ucrInputReplace, ucrChkIncludeRegularExpressions}, {rdoReplace}, bNewLinkedHideIfParameterMissing:=True) ucrPnlCase.AddToLinkedControls(ucrInputBy, {rdoReplace}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") ucrPnlCase.AddToLinkedControls(ucrInputEdit, {rdoReplace}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Starts With") ucrPnlSelectData.AddToLinkedControls(ucrReceiverColumns, {rdoSelectedColumn}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -178,6 +183,7 @@ Public Class dlgName clsEndswithFunction = New RFunction clsMatchesFunction = New RFunction clsContainsFunction = New RFunction + clsRegexFunction = New RFunction ucrSelectVariables.Reset() dctRowsNewNameChanged.Clear() @@ -189,8 +195,8 @@ Public Class dlgName clsDummyFunction.AddParameter("checked", "FALSE", iPosition:=0) clsDummyFunction.AddParameter("checked", "whole", iPosition:=1) - clsDummyFunction.AddParameter("name", "single", iPosition:=1) - + clsDummyFunction.AddParameter("name", "single", iPosition:=2) + clsDummyFunction.AddParameter("check", False, iPosition:=3) clsDefaultRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$rename_column_in_data") clsDefaultRFunction.AddParameter("type", Chr(34) & "single" & Chr(34), iPosition:=4) @@ -214,6 +220,12 @@ Public Class dlgName clsStartwithFunction.SetRCommand("starts_with") clsStartwithFunction.AddParameter("match", Chr(34) & ucrInputReplace.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=0) + clsRegexFunction.SetPackageName("stringr") + clsRegexFunction.SetRCommand("regex") + clsRegexFunction.AddParameter("ignore_case", "FALSE", bIncludeArgumentName:=False, iPosition:=3) + clsRegexFunction.AddParameter("multiline", "FALSE", iPosition:=4) + clsRegexFunction.AddParameter("comments", "FALSE", iPosition:=5) + ucrBase.clsRsyntax.SetBaseRFunction(clsDefaultRFunction) End Sub @@ -227,6 +239,7 @@ Public Class dlgName ucrReceiverName.SetRCode(clsDefaultRFunction, bReset) ucrInputNewName.SetRCode(clsDefaultRFunction, bReset) ucrInputVariableLabel.SetRCode(clsDefaultRFunction, bReset) + ucrChkIncludeRegularExpressions.SetRCode(clsDummyFunction, bReset) If bReset Then ucrPnlCase.SetRCode(clsDefaultRFunction, bReset) ucrInputReplace.SetRCode(clsDefaultRFunction, bReset) @@ -641,10 +654,6 @@ Public Class dlgName MakeLabelColumnVisible() End Sub - Private Sub cmdAddkeyboard_Click(sender As Object, e As EventArgs) - sdgConstructRegexExpression.ShowDialog() - End Sub - Private Sub ucrSelectVariables_DataFrameChanged() Handles ucrSelectVariables.DataFrameChanged RemoveLabelsParams() UpdateGrid() @@ -673,23 +682,34 @@ Public Class dlgName End Sub Private Sub RemovePattern() + cmdAddkeyboard.Visible = False + If rdoWholeDataFrame.Checked Then If (rdoRenameWith.Checked OrElse rdoLabels.Checked) AndAlso rdoReplace.Checked Then - clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) - clsDefaultRFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText() & Chr(34), iPosition:=4) clsDefaultRFunction.RemoveParameterByName("label") clsDefaultRFunction.AddParameter("replacement", Chr(34) & ucrInputBy.GetText() & Chr(34), iPosition:=5) - Select Case ucrInputEdit.GetText - Case "Starts With" - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsStartwithFunction, iPosition:=3) - Case "Ends With" - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsEndswithFunction, iPosition:=3) - Case "Matches" - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsMatchesFunction, iPosition:=3) - Case "Contains" - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsContainsFunction, iPosition:=3) - End Select + If ucrChkIncludeRegularExpressions.Checked Then + cmdAddkeyboard.Visible = True + clsDefaultRFunction.RemoveParameterByName(".cols") + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace_all", iPosition:=2) + clsRegexFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1) + clsDefaultRFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=4) + Else + clsDefaultRFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText() & Chr(34), iPosition:=4) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) + cmdAddkeyboard.Visible = False + Select Case ucrInputEdit.GetText + Case "Starts With" + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsStartwithFunction, iPosition:=3) + Case "Ends With" + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsEndswithFunction, iPosition:=3) + Case "Matches" + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsMatchesFunction, iPosition:=3) + Case "Contains" + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsContainsFunction, iPosition:=3) + End Select + End If Else clsDefaultRFunction.RemoveParameterByName("pattern") clsDefaultRFunction.RemoveParameterByName("replacement") @@ -697,7 +717,9 @@ Public Class dlgName End If Else clsDefaultRFunction.AddParameter(".cols", ucrReceiverColumns.GetVariableNames, iPosition:=3) + clsDefaultRFunction.RemoveParameterByName("pattern") End If + End Sub Private Sub AddTypeParm() @@ -720,4 +742,14 @@ Public Class dlgName RemovePattern() AddTypeParm() End Sub + + Private Sub cmdAddkeyboard_Click(sender As Object, e As EventArgs) Handles cmdAddkeyboard.Click + sdgConstructRegexExpression.ShowDialog() + ucrInputReplace.SetName(sdgConstructRegexExpression.ucrReceiverForRegex.GetText()) + End Sub + + Private Sub ucrChkIncludeRegularExpressions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeRegularExpressions.ControlValueChanged + RemovePattern() + cmdAddkeyboard.Visible = If(ucrChkIncludeRegularExpressions.Checked, True, False) + End Sub End Class From 8db6d3c8b24e3ad090350ba1d5d1c1b0c5261783 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 11 Dec 2024 12:29:14 +0300 Subject: [PATCH 36/50] changes --- instat/dlgName.vb | 3 --- 1 file changed, 3 deletions(-) diff --git a/instat/dlgName.vb b/instat/dlgName.vb index 883ffc38a8..d419668a2a 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -89,9 +89,6 @@ Public Class dlgName ucrPnlOptions.AddParameterValuesCondition(rdoRenameWith, "name", "rename") ucrPnlOptions.AddParameterValuesCondition(rdoLabels, "name", "labels") - - 'ucrPnlOptions.SetRDefault(Chr(34) & "single" & Chr(34)) - ucrNudAbbreviate.SetParameter(New RParameter("minlength", 10)) ucrNudAbbreviate.SetMinMax(Integer.MinValue, Integer.MaxValue) From 43aaadb4af0726a146545d4c6be92b3271888d8d Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 12 Dec 2024 09:04:09 +0100 Subject: [PATCH 37/50] minor change made --- instat/frmMain.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 4f9beeceec..bb91d80a05 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -596,7 +596,7 @@ Public Class frmMain My.Application.Info.Version.Build.ToString() End Sub - Public Sub SetHideMenus() + Private Sub SetHideMenus() mnuViewProcurementMenu.Checked = False mnuProcurement.Visible = False mnuViewOptionsByContextMenu.Checked = False From 5337369223dcb36bcd1b38b934eb8ad6274d9134 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 12 Dec 2024 11:54:03 +0300 Subject: [PATCH 38/50] changes --- instat/dlgName.vb | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/instat/dlgName.vb b/instat/dlgName.vb index d419668a2a..ee1154a7ae 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -135,6 +135,8 @@ Public Class dlgName dctReplace.Add("Ends With", Chr(34) & "ends_with" & Chr(34)) dctReplace.Add("Matches", Chr(34) & "matches" & Chr(34)) dctReplace.Add("Contains", Chr(34) & "contains" & Chr(34)) + dctReplace.Add("Matches All", Chr(34) & "contains" & Chr(34)) + dctReplace.Add("Contains All", Chr(34) & "contains" & Chr(34)) ucrInputEdit.SetDropDownStyleAsNonEditable() ucrInputEdit.SetItems(dctReplace) @@ -154,11 +156,13 @@ Public Class dlgName ucrPnlOptions.AddToLinkedControls({ucrPnlCase, ucrPnlSelectData}, {rdoRenameWith, rdoLabels}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlCase.AddToLinkedControls(ucrInputCase, {rdoMakeCleanNames}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Snake") ucrPnlCase.AddToLinkedControls(ucrNudAbbreviate, {rdoAbbreviate}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="8") - ucrPnlCase.AddToLinkedControls({ucrInputReplace, ucrChkIncludeRegularExpressions}, {rdoReplace}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlCase.AddToLinkedControls(ucrInputReplace, {rdoReplace}, bNewLinkedHideIfParameterMissing:=True) ucrPnlCase.AddToLinkedControls(ucrInputBy, {rdoReplace}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") ucrPnlCase.AddToLinkedControls(ucrInputEdit, {rdoReplace}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Starts With") ucrPnlSelectData.AddToLinkedControls(ucrReceiverColumns, {rdoSelectedColumn}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrInputReplace.AddToLinkedControls(ucrChkIncludeRegularExpressions, {"Matches All", "Matches"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrReceiverName.SetLinkedDisplayControl(lblCurrentName) ucrInputNewName.SetLinkedDisplayControl(lblName) ucrInputVariableLabel.SetLinkedDisplayControl(lblVariableLabel) @@ -694,17 +698,26 @@ Public Class dlgName clsDefaultRFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=4) Else clsDefaultRFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText() & Chr(34), iPosition:=4) - clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) cmdAddkeyboard.Visible = False Select Case ucrInputEdit.GetText Case "Starts With" clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsStartwithFunction, iPosition:=3) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) Case "Ends With" clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsEndswithFunction, iPosition:=3) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) Case "Matches" clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsMatchesFunction, iPosition:=3) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) Case "Contains" clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsContainsFunction, iPosition:=3) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) + Case "Matches All" + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsMatchesFunction, iPosition:=3) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace_all", iPosition:=2) + Case "Contains All" + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsContainsFunction, iPosition:=3) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace_all", iPosition:=2) End Select End If Else @@ -719,6 +732,22 @@ Public Class dlgName End Sub + Private Sub AddRegexPar() + + If ucrChkIncludeRegularExpressions.Checked Then + Select Case ucrInputEdit.GetText + Case "Contains All" + + Case "Contains" + + Case Else + End Select + Else + + End If + + End Sub + Private Sub AddTypeParm() If rdoLabels.Checked Then clsDefaultRFunction.AddParameter("type", Chr(34) & "rename_labels" & Chr(34), iPosition:=1) From b4e0b0bf5825aec692fc09e5a0f0e71006395ab1 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 12 Dec 2024 10:08:44 +0100 Subject: [PATCH 39/50] minor change made --- instat/frmMain.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index bb91d80a05..e20a724234 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -596,11 +596,13 @@ Public Class frmMain My.Application.Info.Version.Build.ToString() End Sub - Private Sub SetHideMenus() + Public Sub SetHideMenus() mnuViewProcurementMenu.Checked = False mnuProcurement.Visible = False mnuViewOptionsByContextMenu.Checked = False mnuOptionsByContext.Visible = False + mnuViewStructuredMenu.Checked = False + mnuStructured.Visible = False End Sub Private Sub SetMainMenusEnabled(bEnabled As Boolean) From 9009932f837a9f71333e734b9450703fc1149e42 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:18:08 +0100 Subject: [PATCH 40/50] Code changes to the tables function --- instat/dlgOneVariableSummarise.vb | 97 +++++++++---------------------- 1 file changed, 27 insertions(+), 70 deletions(-) diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb index 56a6de3949..b8f7d0138d 100644 --- a/instat/dlgOneVariableSummarise.vb +++ b/instat/dlgOneVariableSummarise.vb @@ -31,11 +31,9 @@ Public Class dlgOneVariableSummarise clsConcFunction, clsSummaryTableFunction, clsDummyFunction, clsSkimrFunction, clsPivotWiderFunction As New RFunction - Private clsTableTitleFunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsFootnoteTitleLocationFunction, - clsFootnoteSubtitleLocationFunction, clsTabFootnoteSubtitleFunction, clsFootnoteCellFunction, clsFootnoteCellBodyFunction, - clsSecondFootnoteCellFunction, clsSecondFootnoteCellBodyFunction, clsTabStyleFunction, clsTabStyleCellTextFunction, - clsTabStylePxFunction, clsTabStyleCellTitleFunction, clsThemesTabOptionsFunction, clsgtExtraThemesFunction As New RFunction Private clsPipeOperator, clsJoiningPipeOperator As New ROperator + Private clsGetGtTableFunction, clsSaveGtRFunction As New RFunction + Private clsGtTableROperator, clsBaseOperator As New ROperator Private clsSummaryOperator As New ROperator Private bResetSubdialog As Boolean = False Private bResetFormatSubdialog As Boolean = False @@ -136,81 +134,35 @@ Public Class dlgOneVariableSummarise clsSummaryOperator = New ROperator clsPivotWiderFunction = New RFunction - clsTableTitleFunction = New RFunction - clsTabFootnoteTitleFunction = New RFunction - clsTableSourcenoteFunction = New RFunction - clsFootnoteTitleLocationFunction = New RFunction - clsFootnoteSubtitleLocationFunction = New RFunction + clsPipeOperator = New ROperator - clsTabFootnoteSubtitleFunction = New RFunction - clsFootnoteCellBodyFunction = New RFunction - clsSecondFootnoteCellBodyFunction = New RFunction - clsFootnoteCellFunction = New RFunction - clsSecondFootnoteCellFunction = New RFunction - clsTabStyleFunction = New RFunction - clsTabStyleCellTextFunction = New RFunction - clsTabStylePxFunction = New RFunction - clsTabStyleCellTitleFunction = New RFunction - clsJoiningPipeOperator = New ROperator - clsThemesTabOptionsFunction = New RFunction - clsgtExtraThemesFunction = New RFunction + + clsGtTableROperator = New ROperator + clsBaseOperator = New ROperator + clsGetGtTableFunction = New RFunction + clsSaveGtRFunction = New RFunction ucrSelectorOneVarSummarise.Reset() clsPipeOperator.SetOperation("%>%") clsPipeOperator.bBrackets = False - clsThemesTabOptionsFunction.SetPackageName("gt") - clsThemesTabOptionsFunction.SetRCommand("tab_options") - - clsgtExtraThemesFunction.SetPackageName("gtExtras") - - clsTabStyleFunction.SetRCommand("tab_style") - clsTabStyleFunction.SetPackageName("gt") - clsTabStyleFunction.AddParameter("style", clsRFunctionParameter:=clsTabStyleCellTextFunction, iPosition:=0) - clsTabStyleFunction.AddParameter("location", clsRFunctionParameter:=clsTabStyleCellTitleFunction, iPosition:=1) - - clsTabStyleCellTitleFunction.SetPackageName("gt") - clsTabStyleCellTitleFunction.SetRCommand("cells_title") - clsTabStyleCellTitleFunction.AddParameter("groups", Chr(34) & "title" & Chr(34), iPosition:=0) - - clsTabStyleCellTextFunction.SetPackageName("gt") - clsTabStyleCellTextFunction.SetRCommand("cell_text") - clsTabStyleCellTextFunction.AddParameter("size", clsRFunctionParameter:=clsTabStylePxFunction, iPosition:=0) - - clsTabStylePxFunction.SetPackageName("gt") - clsTabStylePxFunction.SetRCommand("px") - clsTabStylePxFunction.AddParameter("size", "18", bIncludeArgumentName:=False, iPosition:=0) - - clsTableTitleFunction.SetPackageName("gt") - clsTableTitleFunction.SetRCommand("tab_header") - - clsTabFootnoteTitleFunction.SetPackageName("gt") - clsTabFootnoteTitleFunction.SetRCommand("tab_footnote") - - clsTabFootnoteSubtitleFunction.SetPackageName("gt") - clsTabFootnoteSubtitleFunction.SetRCommand("tab_footnote") - - clsFootnoteCellFunction.SetPackageName("gt") - clsFootnoteCellFunction.SetRCommand("tab_footnote") - - clsSecondFootnoteCellFunction.SetPackageName("gt") - clsSecondFootnoteCellFunction.SetRCommand("tab_footnote") + clsGetGtTableFunction.SetPackageName("gt") + clsGetGtTableFunction.SetRCommand("gt") - clsFootnoteTitleLocationFunction.SetPackageName("gt") - clsFootnoteTitleLocationFunction.SetRCommand("cells_title") - clsFootnoteSubtitleLocationFunction.SetPackageName("gt") - clsFootnoteSubtitleLocationFunction.SetRCommand("cells_title") + clsBaseOperator.SetOperation("%>%") + clsBaseOperator.bBrackets = False + clsBaseOperator.AddParameter(strParameterName:="gt_tbl_operator", clsROperatorParameter:=clsGtTableROperator, iPosition:=0, bIncludeArgumentName:=False) + clsBaseOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + strRObjectFormatToAssignTo:=RObjectFormat.Html, + strRDataFrameNameToAddObjectTo:=ucrSelectorOneVarSummarise.strCurrentDataFrame, + strObjectName:="last_table") - clsTableSourcenoteFunction.SetPackageName("gt") - clsTableSourcenoteFunction.SetRCommand("tab_source_note") + ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) - clsFootnoteCellBodyFunction.SetPackageName("gt") - clsFootnoteCellBodyFunction.SetRCommand("cells_body") - clsSecondFootnoteCellBodyFunction.SetPackageName("gt") - clsSecondFootnoteCellBodyFunction.SetRCommand("cells_body") clsSkimrFunction.SetPackageName("skimr") clsSkimrFunction.SetRCommand("skim_without_charts") @@ -234,14 +186,17 @@ Public Class dlgOneVariableSummarise clsGtFunction.SetPackageName("gt") clsGtFunction.SetRCommand("gt") - clsPipeOperator.AddParameter(strParameterName:="gt", clsRFunctionParameter:=clsGtFunction, iPosition:=2, bIncludeArgumentName:=False) + clsGtTableROperator.SetOperation("%>%") + clsGtTableROperator.bBrackets = False + clsGtTableROperator.AddParameter("tableFun", clsRFunctionParameter:=clsSummaryTableFunction, iPosition:=0) + clsGtTableROperator.AddParameter(strParameterName:="gt_tbl", clsRFunctionParameter:=clsGtFunction, iPosition:=1, bIncludeArgumentName:=False) clsSummaryOperator.SetOperation("%>%") clsSummaryOperator.AddParameter("tableFun", clsRFunctionParameter:=clsSummaryTableFunction, iPosition:=0) clsSummaryOperator.AddParameter("gttbl", clsRFunctionParameter:=clsGtFunction, iPosition:=2) clsJoiningPipeOperator.SetOperation("%>%") - clsJoiningPipeOperator.AddParameter("mutable", clsROperatorParameter:=clsSummaryOperator, iPosition:=0) + clsJoiningPipeOperator.AddParameter("mutable", clsROperatorParameter:=clsGtTableROperator, iPosition:=0) clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, strRObjectFormatToAssignTo:=RObjectFormat.Html, @@ -286,6 +241,8 @@ Public Class dlgOneVariableSummarise ucrSelectorOneVarSummarise.SetRCode(clsSummaryTableFunction, bReset) ucrInputDisplayMissing.SetRCode(clsSummaryTableFunction, bReset) ucrSaveSummary.SetRCode(clsSkimrFunction, bReset) + ucrSelectorOneVarSummarise.SetRCode(clsGetGtTableFunction, bReset) + ucrReceiverOneVarSummarise.SetRCode(clsGetGtTableFunction, bReset) If bReset Then ucrChkDisplayMissing.SetRCode(clsDummyFunction, bReset) @@ -434,7 +391,7 @@ Public Class dlgOneVariableSummarise End Sub Private Sub cmdTableOptions_Click(sender As Object, e As EventArgs) Handles cmdTableOptions.Click - sdgTableOptions.Setup(ucrSelectorOneVarSummarise.strCurrentDataFrame, clsPipeOperator) + sdgTableOptions.Setup(ucrSelectorOneVarSummarise.strCurrentDataFrame, clsGtTableROperator) sdgTableOptions.ShowDialog(Me) bResetFormatSubdialog = False End Sub From e25034813d840c1458670e801c691d1c4827ee18 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:22:18 +0100 Subject: [PATCH 41/50] Removing unwanted code --- instat/dlgOneVariableSummarise.vb | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb index b8f7d0138d..6887cde8cf 100644 --- a/instat/dlgOneVariableSummarise.vb +++ b/instat/dlgOneVariableSummarise.vb @@ -32,8 +32,8 @@ Public Class dlgOneVariableSummarise clsSkimrFunction, clsPivotWiderFunction As New RFunction Private clsPipeOperator, clsJoiningPipeOperator As New ROperator - Private clsGetGtTableFunction, clsSaveGtRFunction As New RFunction - Private clsGtTableROperator, clsBaseOperator As New ROperator + Private clsGetGtTableFunction As New RFunction + Private clsGtTableROperator As New ROperator Private clsSummaryOperator As New ROperator Private bResetSubdialog As Boolean = False Private bResetFormatSubdialog As Boolean = False @@ -138,9 +138,7 @@ Public Class dlgOneVariableSummarise clsPipeOperator = New ROperator clsGtTableROperator = New ROperator - clsBaseOperator = New ROperator clsGetGtTableFunction = New RFunction - clsSaveGtRFunction = New RFunction ucrSelectorOneVarSummarise.Reset() @@ -150,20 +148,6 @@ Public Class dlgOneVariableSummarise clsGetGtTableFunction.SetPackageName("gt") clsGetGtTableFunction.SetRCommand("gt") - - clsBaseOperator.SetOperation("%>%") - clsBaseOperator.bBrackets = False - clsBaseOperator.AddParameter(strParameterName:="gt_tbl_operator", clsROperatorParameter:=clsGtTableROperator, iPosition:=0, bIncludeArgumentName:=False) - clsBaseOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", - strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, - strRObjectFormatToAssignTo:=RObjectFormat.Html, - strRDataFrameNameToAddObjectTo:=ucrSelectorOneVarSummarise.strCurrentDataFrame, - strObjectName:="last_table") - - ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) - - - clsSkimrFunction.SetPackageName("skimr") clsSkimrFunction.SetRCommand("skim_without_charts") clsSkimrFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorOneVarSummarise.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) From db934a05299f53bcd57a24ddb8ab6feebb81a268 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 12 Dec 2024 13:22:21 +0300 Subject: [PATCH 42/50] changes to the code --- instat/dlgName.vb | 112 ++++++++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 49 deletions(-) diff --git a/instat/dlgName.vb b/instat/dlgName.vb index ee1154a7ae..4840ee3f02 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -161,8 +161,6 @@ Public Class dlgName ucrPnlCase.AddToLinkedControls(ucrInputEdit, {rdoReplace}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Starts With") ucrPnlSelectData.AddToLinkedControls(ucrReceiverColumns, {rdoSelectedColumn}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrInputReplace.AddToLinkedControls(ucrChkIncludeRegularExpressions, {"Matches All", "Matches"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrReceiverName.SetLinkedDisplayControl(lblCurrentName) ucrInputNewName.SetLinkedDisplayControl(lblName) ucrInputVariableLabel.SetLinkedDisplayControl(lblVariableLabel) @@ -618,6 +616,8 @@ Public Class dlgName DialogueSize() RemovePattern() AddTypeParm() + AddRegexPar() + SetRegexControlVisibility() End Sub Private Sub DialogueSize() @@ -683,69 +683,64 @@ Public Class dlgName End Sub Private Sub RemovePattern() - cmdAddkeyboard.Visible = False - If rdoWholeDataFrame.Checked Then If (rdoRenameWith.Checked OrElse rdoLabels.Checked) AndAlso rdoReplace.Checked Then clsDefaultRFunction.RemoveParameterByName("label") clsDefaultRFunction.AddParameter("replacement", Chr(34) & ucrInputBy.GetText() & Chr(34), iPosition:=5) - If ucrChkIncludeRegularExpressions.Checked Then - cmdAddkeyboard.Visible = True - clsDefaultRFunction.RemoveParameterByName(".cols") - clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace_all", iPosition:=2) - clsRegexFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1) - clsDefaultRFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=4) - Else - clsDefaultRFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText() & Chr(34), iPosition:=4) - cmdAddkeyboard.Visible = False - Select Case ucrInputEdit.GetText - Case "Starts With" - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsStartwithFunction, iPosition:=3) - clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) - Case "Ends With" - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsEndswithFunction, iPosition:=3) - clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) - Case "Matches" - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsMatchesFunction, iPosition:=3) - clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) - Case "Contains" - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsContainsFunction, iPosition:=3) - clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) - Case "Matches All" - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsMatchesFunction, iPosition:=3) - clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace_all", iPosition:=2) - Case "Contains All" - clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsContainsFunction, iPosition:=3) - clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace_all", iPosition:=2) - End Select - End If + Select Case ucrInputEdit.GetText + Case "Starts With" + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsStartwithFunction, iPosition:=3) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) + Case "Ends With" + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsEndswithFunction, iPosition:=3) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) + Case "Matches" + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsMatchesFunction, iPosition:=3) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) + Case "Contains" + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsContainsFunction, iPosition:=3) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace", iPosition:=2) + Case "Matches All" + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsMatchesFunction, iPosition:=3) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace_all", iPosition:=2) + Case "Contains All" + clsDefaultRFunction.AddParameter(".cols", clsRFunctionParameter:=clsContainsFunction, iPosition:=3) + clsDefaultRFunction.AddParameter(".fn", "stringr::str_replace_all", iPosition:=2) + End Select Else - clsDefaultRFunction.RemoveParameterByName("pattern") clsDefaultRFunction.RemoveParameterByName("replacement") clsDefaultRFunction.RemoveParameterByName(".cols") End If Else clsDefaultRFunction.AddParameter(".cols", ucrReceiverColumns.GetVariableNames, iPosition:=3) - clsDefaultRFunction.RemoveParameterByName("pattern") End If - End Sub Private Sub AddRegexPar() - - If ucrChkIncludeRegularExpressions.Checked Then - Select Case ucrInputEdit.GetText - Case "Contains All" - - Case "Contains" - - Case Else - End Select + If rdoWholeDataFrame.Checked Then + If (rdoRenameWith.Checked OrElse rdoLabels.Checked) AndAlso rdoReplace.Checked Then + If ucrChkIncludeRegularExpressions.Checked Then + Select Case ucrInputEdit.GetText + Case "Matches All" + clsRegexFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1) + clsDefaultRFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=4) + Case "Matches" + cmdAddkeyboard.Visible = True + clsRegexFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1) + clsDefaultRFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=4) + Case Else + clsDefaultRFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText() & Chr(34), iPosition:=4) + End Select + Else + clsDefaultRFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText() & Chr(34), iPosition:=4) + End If + Else + clsDefaultRFunction.RemoveParameterByName("pattern") + End If Else - + clsDefaultRFunction.RemoveParameterByName("pattern") End If - End Sub Private Sub AddTypeParm() @@ -767,6 +762,8 @@ Public Class dlgName Private Sub ucrInputEdit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputEdit.ControlValueChanged, ucrInputBy.ControlValueChanged, ucrInputReplace.ControlValueChanged RemovePattern() AddTypeParm() + AddRegexPar() + SetRegexControlVisibility() End Sub Private Sub cmdAddkeyboard_Click(sender As Object, e As EventArgs) Handles cmdAddkeyboard.Click @@ -776,6 +773,23 @@ Public Class dlgName Private Sub ucrChkIncludeRegularExpressions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeRegularExpressions.ControlValueChanged RemovePattern() - cmdAddkeyboard.Visible = If(ucrChkIncludeRegularExpressions.Checked, True, False) + AddRegexPar() + SetRegexControlVisibility() + End Sub + + Private Sub SetRegexControlVisibility() + ucrChkIncludeRegularExpressions.Visible = False + cmdAddkeyboard.Visible = False + + If rdoWholeDataFrame.Checked Then + If (rdoRenameWith.Checked OrElse rdoLabels.Checked) AndAlso rdoReplace.Checked Then + Select Case ucrInputEdit.GetText + Case "Matches All", "Matches" + cmdAddkeyboard.Visible = If(ucrChkIncludeRegularExpressions.Checked, True, False) + ucrChkIncludeRegularExpressions.Visible = True + End Select + End If + End If End Sub + End Class From 42e161e05d9a2137fe418110b76f9a4d742bbc62 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 12 Dec 2024 12:43:29 +0100 Subject: [PATCH 43/50] Code Changes --- instat/dlgOneVariableSummarise.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb index 6887cde8cf..b9a22455bc 100644 --- a/instat/dlgOneVariableSummarise.vb +++ b/instat/dlgOneVariableSummarise.vb @@ -383,10 +383,10 @@ Public Class dlgOneVariableSummarise Private Sub Display_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlColumnFactor.ControlValueChanged 'If bRCodeSet Then If rdoNoColumnFactor.Checked Then - clsSummaryOperator.RemoveParameterByName("col_factor") + clsGtTableROperator.RemoveParameterByName("col_factor") clsDummyFunction.AddParameter("factor_cols", "NoColFactor", iPosition:=1) Else - clsSummaryOperator.AddParameter("col_factor", clsRFunctionParameter:=clsPivotWiderFunction, iPosition:=1) + clsGtTableROperator.AddParameter("col_factor", clsRFunctionParameter:=clsPivotWiderFunction, iPosition:=1) If rdoSummary.Checked Then clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) clsPivotWiderFunction.AddParameter("names_from", "summary", iPosition:=0) From fc270fda419ed0922fb36d94f47dc3b889a2acb8 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 12 Dec 2024 12:51:01 +0100 Subject: [PATCH 44/50] Code Change --- instat/dlgOneVariableSummarise.vb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb index b9a22455bc..d91b5a62f9 100644 --- a/instat/dlgOneVariableSummarise.vb +++ b/instat/dlgOneVariableSummarise.vb @@ -34,7 +34,6 @@ Public Class dlgOneVariableSummarise Private clsPipeOperator, clsJoiningPipeOperator As New ROperator Private clsGetGtTableFunction As New RFunction Private clsGtTableROperator As New ROperator - Private clsSummaryOperator As New ROperator Private bResetSubdialog As Boolean = False Private bResetFormatSubdialog As Boolean = False Public strDefaultDataFrame As String = "" @@ -131,10 +130,8 @@ Public Class dlgOneVariableSummarise clsGtFunction = New RFunction clsDummyFunction = New RFunction clsSkimrFunction = New RFunction - clsSummaryOperator = New ROperator clsPivotWiderFunction = New RFunction - clsPipeOperator = New ROperator clsGtTableROperator = New ROperator @@ -175,10 +172,6 @@ Public Class dlgOneVariableSummarise clsGtTableROperator.AddParameter("tableFun", clsRFunctionParameter:=clsSummaryTableFunction, iPosition:=0) clsGtTableROperator.AddParameter(strParameterName:="gt_tbl", clsRFunctionParameter:=clsGtFunction, iPosition:=1, bIncludeArgumentName:=False) - clsSummaryOperator.SetOperation("%>%") - clsSummaryOperator.AddParameter("tableFun", clsRFunctionParameter:=clsSummaryTableFunction, iPosition:=0) - clsSummaryOperator.AddParameter("gttbl", clsRFunctionParameter:=clsGtFunction, iPosition:=2) - clsJoiningPipeOperator.SetOperation("%>%") clsJoiningPipeOperator.AddParameter("mutable", clsROperatorParameter:=clsGtTableROperator, iPosition:=0) clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", From b745f6d74cdf653f929b98f9126d6ded315cbdda Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 12 Dec 2024 13:23:24 +0100 Subject: [PATCH 45/50] minor change --- instat/frmMain.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index e20a724234..6b37bf3c29 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -596,7 +596,7 @@ Public Class frmMain My.Application.Info.Version.Build.ToString() End Sub - Public Sub SetHideMenus() + Private Sub SetHideMenus() mnuViewProcurementMenu.Checked = False mnuProcurement.Visible = False mnuViewOptionsByContextMenu.Checked = False From f9405dfc771e574aff289bfae46b3f3b2d8dbb88 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 12 Dec 2024 16:58:18 +0300 Subject: [PATCH 46/50] changes to the code --- instat/dlgName.vb | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/instat/dlgName.vb b/instat/dlgName.vb index 4840ee3f02..6d8c83a4ac 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -30,6 +30,7 @@ Public Class dlgName Private clsNewColNameDataframeFunction As New RFunction Private clsNewLabelDataframeFunction As New RFunction Private clsDummyFunction As New RFunction + Private clsFixedFunction As New RFunction Private clsStartwithFunction, clsRegexFunction, clsEndswithFunction, clsMatchesFunction, clsContainsFunction As New RFunction Private WithEvents grdCurrentWorkSheet As Worksheet Private dctRowsNewNameChanged As New Dictionary(Of Integer, String) @@ -183,6 +184,7 @@ Public Class dlgName clsMatchesFunction = New RFunction clsContainsFunction = New RFunction clsRegexFunction = New RFunction + clsFixedFunction = New RFunction ucrSelectVariables.Reset() dctRowsNewNameChanged.Clear() @@ -219,6 +221,9 @@ Public Class dlgName clsStartwithFunction.SetRCommand("starts_with") clsStartwithFunction.AddParameter("match", Chr(34) & ucrInputReplace.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=0) + clsFixedFunction.SetPackageName("stringr") + clsFixedFunction.SetRCommand("fixed") + clsRegexFunction.SetPackageName("stringr") clsRegexFunction.SetRCommand("regex") clsRegexFunction.AddParameter("ignore_case", "FALSE", bIncludeArgumentName:=False, iPosition:=3) @@ -682,6 +687,10 @@ Public Class dlgName End If End Sub + Private Function IsRegexApplicable() As Boolean + Return (ucrInputEdit.GetText = "Matches All" OrElse ucrInputEdit.GetText = "Matches") + End Function + Private Sub RemovePattern() If rdoWholeDataFrame.Checked Then If (rdoRenameWith.Checked OrElse rdoLabels.Checked) AndAlso rdoReplace.Checked Then @@ -718,25 +727,19 @@ Public Class dlgName End Sub Private Sub AddRegexPar() - If rdoWholeDataFrame.Checked Then - If (rdoRenameWith.Checked OrElse rdoLabels.Checked) AndAlso rdoReplace.Checked Then - If ucrChkIncludeRegularExpressions.Checked Then - Select Case ucrInputEdit.GetText - Case "Matches All" - clsRegexFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1) - clsDefaultRFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=4) - Case "Matches" - cmdAddkeyboard.Visible = True - clsRegexFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1) - clsDefaultRFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=4) - Case Else - clsDefaultRFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText() & Chr(34), iPosition:=4) - End Select - Else - clsDefaultRFunction.AddParameter("pattern", Chr(34) & ucrInputReplace.GetText() & Chr(34), iPosition:=4) - End If + If rdoWholeDataFrame.Checked AndAlso (rdoRenameWith.Checked OrElse rdoLabels.Checked) AndAlso rdoReplace.Checked Then + Dim patternValue As String = Chr(34) & ucrInputReplace.GetText & Chr(34) + If ucrChkIncludeRegularExpressions.Checked AndAlso IsRegexApplicable() Then + clsRegexFunction.AddParameter("pattern", patternValue, bIncludeArgumentName:=False, iPosition:=1) + clsDefaultRFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=4) Else - clsDefaultRFunction.RemoveParameterByName("pattern") + Select Case ucrInputEdit.GetText + Case "Contains", "Contains All" + clsFixedFunction.AddParameter("pattern", patternValue, bIncludeArgumentName:=False, iPosition:=1) + clsDefaultRFunction.AddParameter("pattern", clsRFunctionParameter:=clsFixedFunction, bIncludeArgumentName:=False, iPosition:=4) + Case Else + clsDefaultRFunction.AddParameter("pattern", patternValue, iPosition:=4) + End Select End If Else clsDefaultRFunction.RemoveParameterByName("pattern") From 309931d1fa9039184a811f0e10655eb25547f216 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Fri, 13 Dec 2024 10:15:48 +0300 Subject: [PATCH 47/50] changes to the code --- instat/dlgName.vb | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/instat/dlgName.vb b/instat/dlgName.vb index 6d8c83a4ac..0be8141d4a 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -620,8 +620,8 @@ Public Class dlgName RemoveParameters() DialogueSize() RemovePattern() - AddTypeParm() - AddRegexPar() + ConfigureTypeParameter() + ConfigurePatternParameter() SetRegexControlVisibility() End Sub @@ -687,10 +687,6 @@ Public Class dlgName End If End Sub - Private Function IsRegexApplicable() As Boolean - Return (ucrInputEdit.GetText = "Matches All" OrElse ucrInputEdit.GetText = "Matches") - End Function - Private Sub RemovePattern() If rdoWholeDataFrame.Checked Then If (rdoRenameWith.Checked OrElse rdoLabels.Checked) AndAlso rdoReplace.Checked Then @@ -726,10 +722,11 @@ Public Class dlgName End If End Sub - Private Sub AddRegexPar() + Private Sub ConfigurePatternParameter() If rdoWholeDataFrame.Checked AndAlso (rdoRenameWith.Checked OrElse rdoLabels.Checked) AndAlso rdoReplace.Checked Then Dim patternValue As String = Chr(34) & ucrInputReplace.GetText & Chr(34) - If ucrChkIncludeRegularExpressions.Checked AndAlso IsRegexApplicable() Then + If ucrChkIncludeRegularExpressions.Checked AndAlso (ucrInputEdit.GetText = "Matches All" OrElse ucrInputEdit.GetText = "Matches") Then + clsRegexFunction.AddParameter("pattern", patternValue, bIncludeArgumentName:=False, iPosition:=1) clsDefaultRFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=4) Else @@ -746,7 +743,7 @@ Public Class dlgName End If End Sub - Private Sub AddTypeParm() + Private Sub ConfigureTypeParameter() If rdoLabels.Checked Then clsDefaultRFunction.AddParameter("type", Chr(34) & "rename_labels" & Chr(34), iPosition:=1) @@ -764,8 +761,8 @@ Public Class dlgName Private Sub ucrInputEdit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputEdit.ControlValueChanged, ucrInputBy.ControlValueChanged, ucrInputReplace.ControlValueChanged RemovePattern() - AddTypeParm() - AddRegexPar() + ConfigureTypeParameter() + ConfigurePatternParameter() SetRegexControlVisibility() End Sub @@ -776,7 +773,7 @@ Public Class dlgName Private Sub ucrChkIncludeRegularExpressions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeRegularExpressions.ControlValueChanged RemovePattern() - AddRegexPar() + ConfigurePatternParameter() SetRegexControlVisibility() End Sub @@ -784,15 +781,13 @@ Public Class dlgName ucrChkIncludeRegularExpressions.Visible = False cmdAddkeyboard.Visible = False - If rdoWholeDataFrame.Checked Then - If (rdoRenameWith.Checked OrElse rdoLabels.Checked) AndAlso rdoReplace.Checked Then - Select Case ucrInputEdit.GetText - Case "Matches All", "Matches" - cmdAddkeyboard.Visible = If(ucrChkIncludeRegularExpressions.Checked, True, False) - ucrChkIncludeRegularExpressions.Visible = True - End Select - End If + If rdoWholeDataFrame.Checked AndAlso + (rdoRenameWith.Checked OrElse rdoLabels.Checked) AndAlso + rdoReplace.Checked AndAlso + (ucrInputEdit.GetText = "Matches All" OrElse ucrInputEdit.GetText = "Matches") Then + + ucrChkIncludeRegularExpressions.Visible = True + cmdAddkeyboard.Visible = ucrChkIncludeRegularExpressions.Checked End If End Sub - End Class From 79c9c6e22ebafd560cc8ec8992cc17d1820f2eb3 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 16 Dec 2024 11:08:16 +0300 Subject: [PATCH 48/50] improved the message and version number --- instat/frmMain.vb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d5c70d0953..3c76985f7d 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -247,6 +247,10 @@ Public Class frmMain myProcess.StartInfo.FileName = "https://r-instat.org/" myProcess.Start() End If + Else + ' Current version is up to date, show a message + MessageBox.Show("You are using the latest version of R-Instat (" & strCurrVersion & ").", "R-Instat is Up to Date", + MessageBoxButtons.OK, MessageBoxIcon.Information) End If Catch ex As Exception MsgBox("Network issues or website not accessible") From 67b3f2623d52201fff28ead4cb502d861e2f00c3 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 17 Dec 2024 11:10:49 +0300 Subject: [PATCH 49/50] added the message for internet issue --- instat/frmMain.vb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 3c76985f7d..0ec317e328 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -252,8 +252,17 @@ Public Class frmMain MessageBox.Show("You are using the latest version of R-Instat (" & strCurrVersion & ").", "R-Instat is Up to Date", MessageBoxButtons.OK, MessageBoxIcon.Information) End If + Catch ex As WebException + ' Handle specific network-related exceptions + MessageBox.Show("It seems you are not connected to the internet or the website is unreachable. Please check your connection and try again.", "Network Error", + MessageBoxButtons.OK, MessageBoxIcon.Error) Catch ex As Exception - MsgBox("Network issues or website not accessible") + ' Handle other exceptions + MessageBox.Show("An unexpected error occurred: " & ex.Message, "Error", + MessageBoxButtons.OK, MessageBoxIcon.Error) + Finally + ' Dispose of the web client to release resources + webClient.Dispose() End Try End Sub From 36547d11e3b26ba323a60b3c333916ef125d1451 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 17 Dec 2024 11:26:33 +0300 Subject: [PATCH 50/50] improved menu titles with (Online) --- instat/frmMain.Designer.vb | 1379 ++++++++++---------- instat/frmMain.resx | 4 +- instat/frmMain.vb | 2 +- instat/translations/rInstatTranslations.db | Bin 8306688 -> 8306688 bytes 4 files changed, 696 insertions(+), 689 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 1ace18cf46..001fd93e97 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -187,7 +187,7 @@ Partial Class frmMain Me.mnuHelpGlossary = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpLicence = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator29 = New System.Windows.Forms.ToolStripSeparator() - Me.RInstatResourcesSiteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuHelpResourcesSite = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpPackagesDocumentation = New System.Windows.Forms.ToolStripMenuItem() Me.OpenFile = New System.Windows.Forms.OpenFileDialog() Me.ToolStripSeparator16 = New System.Windows.Forms.ToolStripSeparator() @@ -735,7 +735,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseTable, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" - Me.mnuDescribe.Size = New System.Drawing.Size(64, 22) + Me.mnuDescribe.Size = New System.Drawing.Size(96, 29) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -743,25 +743,25 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' 'mnuDescribeOneVariableVisualiseData ' Me.mnuDescribeOneVariableVisualiseData.Name = "mnuDescribeOneVariableVisualiseData" - Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableVisualiseData.Text = "Visualise Data..." ' 'ToolStripSeparator72 ' Me.ToolStripSeparator72.Name = "ToolStripSeparator72" - Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator72.Size = New System.Drawing.Size(232, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..." Me.mnuDescribeOneVariableSummarise.Text = "Summarise..." Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised" @@ -769,26 +769,26 @@ Partial Class frmMain 'mnuDescribeOneVariableGraph ' Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph" - Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableGraph.Tag = "Graph..." Me.mnuDescribeOneVariableGraph.Text = "Graph..." ' 'ToolStripSeparator33 ' Me.ToolStripSeparator33.Name = "ToolStripSeparator33" - Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator33.Size = New System.Drawing.Size(232, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableFrequencies.Text = "Frequencies..." Me.mnuDescribeOneVariableFrequencies.ToolTipText = "Table or Graph. Also Stem and Leaf Plots" ' 'mnuDescribeOneVariableRatingData ' Me.mnuDescribeOneVariableRatingData.Name = "mnuDescribeOneVariableRatingData" - Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -796,26 +796,26 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoThreeVariablesPivotTable ' Me.mnuDescribeTwoThreeVariablesPivotTable.Name = "mnuDescribeTwoThreeVariablesPivotTable" - Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator36 ' Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(203, 6) + Me.ToolStripSeparator36.Size = New System.Drawing.Size(305, 6) ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables" @@ -823,19 +823,19 @@ Partial Class frmMain 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(305, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' @@ -843,14 +843,14 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Name = "mnuDescribeTwoThreeVariablesTwoWayFrequencies" - Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Text = "Two-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.ToolTipText = "Table or Graph" ' 'mnuDescribeTwoThreeVariablesThreeWayFrequencies ' Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Name = "mnuDescribeTwoThreeVariablesThreeWayFrequencies" - Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Text = "Three-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.ToolTipText = "Table or Graph" ' @@ -858,14 +858,14 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator38, Me.mnuDescribeGeneral, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' 'mnuDescribeSpecificBarPieChart ' Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart" - Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificBarPieChart.Tag = "Bar_Chart" Me.mnuDescribeSpecificBarPieChart.Text = "Bar Chart..." Me.mnuDescribeSpecificBarPieChart.ToolTipText = "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds" @@ -873,7 +873,7 @@ Partial Class frmMain 'mnuDescribeSpecificBoxplotJitterViolinPlot ' Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot" - Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Tag = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Text = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.ToolTipText = "Boxplot (including Tufte), Jitter and Violin Plots" @@ -881,7 +881,7 @@ Partial Class frmMain 'mnuDescribeSpecificHistogramDensityFrequencyPlot ' Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot" - Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Tag = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Text = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.ToolTipText = "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons" @@ -889,7 +889,7 @@ Partial Class frmMain 'mnuDescribeSpecificPointPlot ' Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot" - Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..." Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..." Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot" @@ -897,7 +897,7 @@ Partial Class frmMain 'mnuDescribeSpecificLineSmoothPlot ' Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot" - Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificLineSmoothPlot.Tag = "Line_Plot..." Me.mnuDescribeSpecificLineSmoothPlot.Text = "Line Plot..." Me.mnuDescribeSpecificLineSmoothPlot.ToolTipText = "Line Plots, Smoothed Plots, Dumbbell and Slope Plots" @@ -905,23 +905,23 @@ Partial Class frmMain 'ToolStripSeparator38 ' Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator38.Size = New System.Drawing.Size(309, 6) ' 'mnuDescribeGeneral ' Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeGeneral.Text = "General..." ' 'ToolStripSeparator26 ' Me.ToolStripSeparator26.Name = "ToolStripSeparator26" - Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator26.Size = New System.Drawing.Size(309, 6) ' 'mnuDescribeSpecificMapPlot ' Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot" - Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..." Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map" ' @@ -929,7 +929,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificDotPlot.Enabled = False Me.mnuDescribeSpecificDotPlot.Name = "mnuDescribeSpecificDotPlot" - Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificDotPlot.Tag = "Dotplot..." Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False @@ -937,28 +937,28 @@ Partial Class frmMain 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" - Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificMosaic.Text = "Mosaic Plot..." Me.mnuDescribeSpecificMosaic.ToolTipText = "Mosaic Plot" ' 'mnuDescribeSpecificCummulativeDistribution ' Me.mnuDescribeSpecificCummulativeDistribution.Name = "mnuDescribeSpecificCummulativeDistribution" - Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificCummulativeDistribution.Text = "Cumulative Distribution..." Me.mnuDescribeSpecificCummulativeDistribution.ToolTipText = "Cumulative Graph and Exceedance Graph" ' 'mnuDescribeSpecificParallelCoordinatePlot ' Me.mnuDescribeSpecificParallelCoordinatePlot.Name = "mnuDescribeSpecificParallelCoordinatePlot" - Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSummaries, Me.mnuDescribePresentation}) Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" @@ -966,95 +966,95 @@ Partial Class frmMain 'mnuDescribeSummaries ' Me.mnuDescribeSummaries.Name = "mnuDescribeSummaries" - Me.mnuDescribeSummaries.Size = New System.Drawing.Size(149, 22) + Me.mnuDescribeSummaries.Size = New System.Drawing.Size(224, 34) Me.mnuDescribeSummaries.Text = "Summaries..." ' 'mnuDescribePresentation ' Me.mnuDescribePresentation.Name = "mnuDescribePresentation" - Me.mnuDescribePresentation.Size = New System.Drawing.Size(149, 22) + Me.mnuDescribePresentation.Size = New System.Drawing.Size(224, 34) Me.mnuDescribePresentation.Text = "Presentation..." ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(175, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(268, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations ' Me.mnuDescribeMultivariateCorrelations.Name = "mnuDescribeMultivariateCorrelations" - Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateCorrelations.Text = "Correlations..." Me.mnuDescribeMultivariateCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' 'mnuDescribeMultivariateprincipalComponents ' Me.mnuDescribeMultivariateprincipalComponents.Name = "mnuDescribeMultivariateprincipalComponents" - Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateprincipalComponents.Text = "Principal Components..." ' 'mnuDescribeMultivariateCanonicalCorrelations ' Me.mnuDescribeMultivariateCanonicalCorrelations.Name = "mnuDescribeMultivariateCanonicalCorrelations" - Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuDescribeMultivariateClusterAnalysis ' Me.mnuDescribeMultivariateClusterAnalysis.Name = "mnuDescribeMultivariateClusterAnalysis" - Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateClusterAnalysis.Text = "Cluster Analysis..." Me.mnuDescribeMultivariateClusterAnalysis.ToolTipText = "Partitioning or Hierarchical" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(175, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(268, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(178, 22) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel ' Me.mnuModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributions, Me.ToolStripSeparator3, Me.mnuModelFitModel, Me.mnuModelCompareModels, Me.mnuModelUseModel, Me.mnuModelOtherOneVariable, Me.mnuModelOtherTwoVariables, Me.mnuModelOtherThreeVariables, Me.mnuModelOtherGeneral}) Me.mnuModel.Name = "mnuModel" - Me.mnuModel.Size = New System.Drawing.Size(53, 22) + Me.mnuModel.Size = New System.Drawing.Size(79, 29) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1062,168 +1062,168 @@ Partial Class frmMain ' Me.mnuModelProbabilityDistributions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributionsShowModel, Me.mnuModelProbabilityDistributionsCompareModels, Me.mnuModelProbabilityDistributionsRandomSamplesUseModel}) Me.mnuModelProbabilityDistributions.Name = "mnuModelProbabilityDistributions" - Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(201, 22) + Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(305, 34) Me.mnuModelProbabilityDistributions.Tag = "Probability_Distributions" Me.mnuModelProbabilityDistributions.Text = "Probability Distributions" ' 'mnuModelProbabilityDistributionsShowModel ' Me.mnuModelProbabilityDistributionsShowModel.Name = "mnuModelProbabilityDistributionsShowModel" - Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsShowModel.Text = "Show Model..." ' 'mnuModelProbabilityDistributionsCompareModels ' Me.mnuModelProbabilityDistributionsCompareModels.Enabled = False Me.mnuModelProbabilityDistributionsCompareModels.Name = "mnuModelProbabilityDistributionsCompareModels" - Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsCompareModels.Tag = "Show_Models..." Me.mnuModelProbabilityDistributionsCompareModels.Text = "Compare Models..." ' 'mnuModelProbabilityDistributionsRandomSamplesUseModel ' Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Name = "mnuModelProbabilityDistributionsRandomSamplesUseModel" - Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..." Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples ..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(302, 6) ' 'mnuModelFitModel ' Me.mnuModelFitModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelFitModelOneVariable, Me.mnuModelFitModelTwoVariables, Me.mnuModelFitModelThreeVariables, Me.mnuModelFitModelFourVariables, Me.ToolStripSeparator24, Me.mnuModelFitModelGeneral, Me.mnuModelFitModelMachineLearning, Me.ToolStripSeparator57, Me.mnuModelFitModelHypothesisTestsKeyboard, Me.mnuModelFitModelModelKeyboard}) Me.mnuModelFitModel.Name = "mnuModelFitModel" - Me.mnuModelFitModel.Size = New System.Drawing.Size(201, 22) + Me.mnuModelFitModel.Size = New System.Drawing.Size(305, 34) Me.mnuModelFitModel.Tag = "Fit_Model..." Me.mnuModelFitModel.Text = "Fit Model" ' 'mnuModelFitModelOneVariable ' Me.mnuModelFitModelOneVariable.Name = "mnuModelFitModelOneVariable" - Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelOneVariable.Text = "One Variable..." ' 'mnuModelFitModelTwoVariables ' Me.mnuModelFitModelTwoVariables.Name = "mnuModelFitModelTwoVariables" - Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelTwoVariables.Text = "Two Variables..." ' 'mnuModelFitModelThreeVariables ' Me.mnuModelFitModelThreeVariables.Name = "mnuModelFitModelThreeVariables" - Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelThreeVariables.Text = "Three Variables..." ' 'mnuModelFitModelFourVariables ' Me.mnuModelFitModelFourVariables.Name = "mnuModelFitModelFourVariables" - Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelFourVariables.Text = "Four Variables..." ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(344, 6) ' 'mnuModelFitModelGeneral ' Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral" - Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelGeneral.Text = "General..." ' 'mnuModelFitModelMachineLearning ' Me.mnuModelFitModelMachineLearning.Enabled = False Me.mnuModelFitModelMachineLearning.Name = "mnuModelFitModelMachineLearning" - Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelMachineLearning.Text = "Machine Learning (Caret)..." Me.mnuModelFitModelMachineLearning.Visible = False ' 'ToolStripSeparator57 ' Me.ToolStripSeparator57.Name = "ToolStripSeparator57" - Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6) + Me.ToolStripSeparator57.Size = New System.Drawing.Size(344, 6) ' 'mnuModelFitModelHypothesisTestsKeyboard ' Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard" - Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelHypothesisTestsKeyboard.Text = "Hypothesis Tests Keyboards..." ' 'mnuModelFitModelModelKeyboard ' Me.mnuModelFitModelModelKeyboard.Name = "mnuModelFitModelModelKeyboard" - Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelModelKeyboard.Text = "Fit Model Keyboards..." ' 'mnuModelCompareModels ' Me.mnuModelCompareModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelCompareModelsOneVariable}) Me.mnuModelCompareModels.Name = "mnuModelCompareModels" - Me.mnuModelCompareModels.Size = New System.Drawing.Size(201, 22) + Me.mnuModelCompareModels.Size = New System.Drawing.Size(305, 34) Me.mnuModelCompareModels.Text = "Compare Models" ' 'mnuModelCompareModelsOneVariable ' Me.mnuModelCompareModelsOneVariable.Name = "mnuModelCompareModelsOneVariable" - Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuModelCompareModelsOneVariable.Text = "One Variable..." ' 'mnuModelUseModel ' Me.mnuModelUseModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelUseModelOneVariable, Me.mnuModelUseModelTwoVariables, Me.ToolStripSeparator59, Me.mnuModelUseModelGlance, Me.mnuModelUseModelTidy, Me.mnuModelUseModelAugment, Me.ToolStripSeparator58, Me.mnuModelUseModelUseModelKeyboard}) Me.mnuModelUseModel.Name = "mnuModelUseModel" - Me.mnuModelUseModel.Size = New System.Drawing.Size(201, 22) + Me.mnuModelUseModel.Size = New System.Drawing.Size(305, 34) Me.mnuModelUseModel.Text = "Use Model" ' 'mnuModelUseModelOneVariable ' Me.mnuModelUseModelOneVariable.Name = "mnuModelUseModelOneVariable" - Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelOneVariable.Text = "One Variable..." ' 'mnuModelUseModelTwoVariables ' Me.mnuModelUseModelTwoVariables.Name = "mnuModelUseModelTwoVariables" - Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelTwoVariables.Text = "Two Variables..." ' 'ToolStripSeparator59 ' Me.ToolStripSeparator59.Name = "ToolStripSeparator59" - Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator59.Size = New System.Drawing.Size(297, 6) ' 'mnuModelUseModelGlance ' Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance" - Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelGlance.Text = "Glance..." ' 'mnuModelUseModelTidy ' Me.mnuModelUseModelTidy.Name = "mnuModelUseModelTidy" - Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelTidy.Text = "Tidy..." ' 'mnuModelUseModelAugment ' Me.mnuModelUseModelAugment.Name = "mnuModelUseModelAugment" - Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelAugment.Text = "Augment..." ' 'ToolStripSeparator58 ' Me.ToolStripSeparator58.Name = "ToolStripSeparator58" - Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator58.Size = New System.Drawing.Size(297, 6) ' 'mnuModelUseModelUseModelKeyboard ' Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard" - Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..." ' 'mnuModelOtherOneVariable @@ -1231,7 +1231,7 @@ Partial Class frmMain Me.mnuModelOtherOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherOneVariableExactResults, Me.mnuModelOtherOneVariableSampleSummaryData, Me.mnuModelOtherOneVariableNonParametric, Me.mnuModelOtherOneVariableGoodnessofFit}) Me.mnuModelOtherOneVariable.Enabled = False Me.mnuModelOtherOneVariable.Name = "mnuModelOtherOneVariable" - Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)" Me.mnuModelOtherOneVariable.Text = "Other (One Variable)" Me.mnuModelOtherOneVariable.Visible = False @@ -1239,7 +1239,7 @@ Partial Class frmMain 'mnuModelOtherOneVariableExactResults ' Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults" - Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1247,7 +1247,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1255,7 +1255,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1263,7 +1263,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -1272,7 +1272,7 @@ Partial Class frmMain Me.mnuModelOtherTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherTwoVariablesTwoSamples, Me.mnuModelOtherTwoVariablesSummaryData, Me.mnuModelOtherTwoVariablesSimpleRegression, Me.mnuModelOtherTwoVariablesOneWayANOVA, Me.mnuModelOtherTwoVariablesNonParametricTwoSamples, Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA}) Me.mnuModelOtherTwoVariables.Enabled = False Me.mnuModelOtherTwoVariables.Name = "mnuModelOtherTwoVariables" - Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" Me.mnuModelOtherTwoVariables.Visible = False @@ -1281,7 +1281,7 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples" - Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..." Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..." ' @@ -1289,21 +1289,21 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData" - Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherTwoVariablesSummaryData.Text = "Summary Data..." ' 'mnuModelOtherTwoVariablesSimpleRegression ' Me.mnuModelOtherTwoVariablesSimpleRegression.Name = "mnuModelOtherTwoVariablesSimpleRegression" - Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesSimpleRegression.Tag = "Simple_Regression..." Me.mnuModelOtherTwoVariablesSimpleRegression.Text = "Simple Regression..." ' 'mnuModelOtherTwoVariablesOneWayANOVA ' Me.mnuModelOtherTwoVariablesOneWayANOVA.Name = "mnuModelOtherTwoVariablesOneWayANOVA" - Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..." ' @@ -1311,14 +1311,14 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples" - Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Tag = "Non_Parameteric_Two_Samples..." Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Text = "Non Parametric Two Samples..." ' 'mnuModelOtherTwoVariablesNonParametricOneWayANOVA ' Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Name = "mnuModelOtherTwoVariablesNonParametricOneWayANOVA" - Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Tag = "Non_Parameteric_One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Text = "Non Parameteric One Way ANOVA..." ' @@ -1327,7 +1327,7 @@ Partial Class frmMain Me.mnuModelOtherThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherThreeVariablesSimpleWithGroups, Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA, Me.mnuModelOtherThreeVariablesChisquareTest}) Me.mnuModelOtherThreeVariables.Enabled = False Me.mnuModelOtherThreeVariables.Name = "mnuModelOtherThreeVariables" - Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" Me.mnuModelOtherThreeVariables.Visible = False @@ -1336,21 +1336,21 @@ Partial Class frmMain ' Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups" - Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesSimpleWithGroups.Tag = "Simple_with_groups..." Me.mnuModelOtherThreeVariablesSimpleWithGroups.Text = "Simple With Groups..." ' 'mnuModelOtherThreeVariablesNonParametricTwoWayANOVA ' Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Name = "mnuModelOtherThreeVariablesNonParametricTwoWayANOVA" - Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Tag = "Non_Parametric_Two_Way_ANOVA..." Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Text = "Non Parametric Two Way ANOVA..." ' 'mnuModelOtherThreeVariablesChisquareTest ' Me.mnuModelOtherThreeVariablesChisquareTest.Name = "mnuModelOtherThreeVariablesChisquareTest" - Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test" Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..." ' @@ -1359,7 +1359,7 @@ Partial Class frmMain Me.mnuModelOtherGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherGeneralANOVAGeneral, Me.mnuModelOtherGeneralRegression, Me.mnuModelOtherGeneralLogLinear}) Me.mnuModelOtherGeneral.Enabled = False Me.mnuModelOtherGeneral.Name = "mnuModelOtherGeneral" - Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" Me.mnuModelOtherGeneral.Visible = False @@ -1368,7 +1368,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral" - Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..." Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..." ' @@ -1376,7 +1376,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralRegression.Enabled = False Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression" - Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralRegression.Tag = "Regression..." Me.mnuModelOtherGeneralRegression.Text = "Regression..." ' @@ -1384,7 +1384,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralLogLinear.Enabled = False Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear" - Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' @@ -1392,7 +1392,7 @@ Partial Class frmMain ' Me.mnuClimaticExamine.Enabled = False Me.mnuClimaticExamine.Name = "mnuClimaticExamine" - Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticExamine.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticExamine.Tag = "Examine" Me.mnuClimaticExamine.Text = "Examine..." Me.mnuClimaticExamine.Visible = False @@ -1401,7 +1401,7 @@ Partial Class frmMain ' Me.mnuClimaticProcess.Enabled = False Me.mnuClimaticProcess.Name = "mnuClimaticProcess" - Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticProcess.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticProcess.Tag = "Process" Me.mnuClimaticProcess.Text = "Process..." Me.mnuClimaticProcess.Visible = False @@ -1410,7 +1410,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticEvaporationSite, Me.mnuClimaticEvaporationPenman}) Me.mnuClimaticEvaporation.Name = "mnuClimaticEvaporation" - Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticEvaporation.Tag = "Evaporation" Me.mnuClimaticEvaporation.Text = "Evaporation" Me.mnuClimaticEvaporation.Visible = False @@ -1419,7 +1419,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationSite.Enabled = False Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite" - Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22) + Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(189, 34) Me.mnuClimaticEvaporationSite.Tag = "Site" Me.mnuClimaticEvaporationSite.Text = "Site..." ' @@ -1427,7 +1427,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationPenman.Enabled = False Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman" - Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22) + Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(189, 34) Me.mnuClimaticEvaporationPenman.Tag = "Penman" Me.mnuClimaticEvaporationPenman.Text = "Penman..." ' @@ -1435,7 +1435,7 @@ Partial Class frmMain ' Me.mnuClimaticCrop.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCropCropCoefficients, Me.mnuClimaticCropWaterSatisfactionIndex}) Me.mnuClimaticCrop.Name = "mnuClimaticCrop" - Me.mnuClimaticCrop.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCrop.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCrop.Tag = "Crop" Me.mnuClimaticCrop.Text = "Crop" Me.mnuClimaticCrop.Visible = False @@ -1444,21 +1444,21 @@ Partial Class frmMain ' Me.mnuClimaticCropCropCoefficients.Enabled = False Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients" - Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticCropCropCoefficients.Text = "Crop Coefficients..." ' 'mnuClimaticCropWaterSatisfactionIndex ' Me.mnuClimaticCropWaterSatisfactionIndex.Enabled = False Me.mnuClimaticCropWaterSatisfactionIndex.Name = "mnuClimaticCropWaterSatisfactionIndex" - Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticCropWaterSatisfactionIndex.Text = "Water Satisfaction Index..." ' 'mnuClimaticHeatSum ' Me.mnuClimaticHeatSum.Enabled = False Me.mnuClimaticHeatSum.Name = "mnuClimaticHeatSum" - Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticHeatSum.Tag = "Heat_Sum" Me.mnuClimaticHeatSum.Text = "Heat Sum..." Me.mnuClimaticHeatSum.Visible = False @@ -1467,7 +1467,7 @@ Partial Class frmMain ' Me.mnuView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuViewDataView, Me.mnuViewOutput, Me.mnuViewLogScript, Me.mnuViewColumnMetadata, Me.mnuViewDataFrameMetadata, Me.mnuViewStructuredMenu, Me.ToolStripSeparator22, Me.mnuViewClimaticMenu, Me.mnuViewProcurementMenu, Me.mnuViewOptionsByContextMenu, Me.ToolStripSeparator39, Me.mnuViewResetToDefaultLayout, Me.mnuViewSwapDataAndMetadata, Me.mnuViewSwapDataAndScript}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(44, 22) + Me.mnuView.Size = New System.Drawing.Size(65, 29) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1475,7 +1475,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(213, 22) + Me.mnuViewDataView.Size = New System.Drawing.Size(326, 34) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1483,21 +1483,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(213, 22) + Me.mnuViewOutput.Size = New System.Drawing.Size(326, 34) Me.mnuViewOutput.Text = "Output" ' 'mnuViewLogScript ' Me.mnuViewLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewLogScript.Name = "mnuViewLogScript" - Me.mnuViewLogScript.Size = New System.Drawing.Size(213, 22) + Me.mnuViewLogScript.Size = New System.Drawing.Size(326, 34) Me.mnuViewLogScript.Text = "Log/Script" ' 'mnuViewColumnMetadata ' Me.mnuViewColumnMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewColumnMetadata.Name = "mnuViewColumnMetadata" - Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1505,7 +1505,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1513,19 +1513,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(210, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(323, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1533,7 +1533,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1541,232 +1541,232 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(210, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(323, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(213, 22) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(326, 34) Me.mnuViewResetToDefaultLayout.Text = "Reset to Default Layout" ' 'mnuViewSwapDataAndMetadata ' Me.mnuViewSwapDataAndMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndMetadata.Name = "mnuViewSwapDataAndMetadata" - Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuViewSwapDataAndScript ' Me.mnuViewSwapDataAndScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript" - Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22) + Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(326, 34) Me.mnuViewSwapDataAndScript.Text = "Swap Data and Log/Script" ' 'mnuHelp ' - Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.mnuHelpData, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.ToolStripSeparator81, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.RInstatResourcesSiteToolStripMenuItem, Me.mnuHelpPackagesDocumentation}) + Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.mnuHelpData, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.ToolStripSeparator81, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.mnuHelpResourcesSite, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(44, 22) + Me.mnuHelp.Size = New System.Drawing.Size(65, 29) Me.mnuHelp.Tag = "Help" Me.mnuHelp.Text = "Help" ' 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(360, 34) Me.mnuHelpHelpIntroduction.Text = "Introduction..." ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpFAQ.Size = New System.Drawing.Size(360, 34) Me.mnuHelpFAQ.Text = "FAQ..." ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(360, 34) Me.mnuHelpGetingStarted.Text = "Getting Started..." ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpData.Size = New System.Drawing.Size(360, 34) Me.mnuHelpData.Text = "Data..." ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(357, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpWindows.Size = New System.Drawing.Size(360, 34) Me.mnuHelpWindows.Text = "Windows..." ' 'ToolStripSeparator81 ' Me.ToolStripSeparator81.Name = "ToolStripSeparator81" - Me.ToolStripSeparator81.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator81.Size = New System.Drawing.Size(357, 6) ' 'mnuHelpMenus ' Me.mnuHelpMenus.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenusAndDialogsToolStripMenuItem, Me.ToolStripSeparator82, Me.FileToolStripMenuItem, Me.EditToolStripMenuItem, Me.PrepareToolStripMenuItem, Me.DescribeToolStripMenuItem, Me.ModelToolStripMenuItem, Me.ToolStripSeparator83, Me.StructuredToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.ProcurementToolStripMenuItem, Me.ExperimentsToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.ViewToolStripMenuItem}) Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpMenus.Size = New System.Drawing.Size(360, 34) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'MenusAndDialogsToolStripMenuItem ' Me.MenusAndDialogsToolStripMenuItem.Name = "MenusAndDialogsToolStripMenuItem" - Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.MenusAndDialogsToolStripMenuItem.Text = "Menus and Dialogs..." ' 'ToolStripSeparator82 ' Me.ToolStripSeparator82.Name = "ToolStripSeparator82" - Me.ToolStripSeparator82.Size = New System.Drawing.Size(181, 6) + Me.ToolStripSeparator82.Size = New System.Drawing.Size(276, 6) ' 'FileToolStripMenuItem ' Me.FileToolStripMenuItem.Name = "FileToolStripMenuItem" - Me.FileToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.FileToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.FileToolStripMenuItem.Text = "File..." ' 'EditToolStripMenuItem ' Me.EditToolStripMenuItem.Name = "EditToolStripMenuItem" - Me.EditToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.EditToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.EditToolStripMenuItem.Text = "Edit..." ' 'PrepareToolStripMenuItem ' Me.PrepareToolStripMenuItem.Name = "PrepareToolStripMenuItem" - Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.PrepareToolStripMenuItem.Text = "Prepare..." ' 'DescribeToolStripMenuItem ' Me.DescribeToolStripMenuItem.Name = "DescribeToolStripMenuItem" - Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.DescribeToolStripMenuItem.Text = "Describe..." ' 'ModelToolStripMenuItem ' Me.ModelToolStripMenuItem.Name = "ModelToolStripMenuItem" - Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ModelToolStripMenuItem.Text = "Model..." ' 'ToolStripSeparator83 ' Me.ToolStripSeparator83.Name = "ToolStripSeparator83" - Me.ToolStripSeparator83.Size = New System.Drawing.Size(181, 6) + Me.ToolStripSeparator83.Size = New System.Drawing.Size(276, 6) ' 'StructuredToolStripMenuItem ' Me.StructuredToolStripMenuItem.Name = "StructuredToolStripMenuItem" - Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.StructuredToolStripMenuItem.Text = "Structured..." ' 'ClimaticToolStripMenuItem ' Me.ClimaticToolStripMenuItem.Name = "ClimaticToolStripMenuItem" - Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ClimaticToolStripMenuItem.Text = "Climatic..." ' 'ProcurementToolStripMenuItem ' Me.ProcurementToolStripMenuItem.Name = "ProcurementToolStripMenuItem" - Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ProcurementToolStripMenuItem.Text = "Procurement..." ' 'ExperimentsToolStripMenuItem ' Me.ExperimentsToolStripMenuItem.Name = "ExperimentsToolStripMenuItem" - Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ExperimentsToolStripMenuItem.Text = "Experiments..." ' 'ToolsToolStripMenuItem ' Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" - Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ToolsToolStripMenuItem.Text = "Tools..." ' 'ViewToolStripMenuItem ' Me.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem" - Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ViewToolStripMenuItem.Text = "View..." ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(360, 34) Me.mnuHelpAboutR.Text = "About R..." Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(360, 34) Me.mnuHelpLearningStatistics.Text = "Learning Statistics..." Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpRPackages.Size = New System.Drawing.Size(360, 34) Me.mnuHelpRPackages.Text = "R Packages..." ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpGlossary.Size = New System.Drawing.Size(360, 34) Me.mnuHelpGlossary.Text = "Glossary..." ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpLicence.Size = New System.Drawing.Size(360, 34) Me.mnuHelpLicence.Tag = "Licence..." Me.mnuHelpLicence.Text = "Licence..." ' 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(357, 6) ' - 'RInstatResourcesSiteToolStripMenuItem + 'mnuHelpResourcesSite ' - Me.RInstatResourcesSiteToolStripMenuItem.Name = "RInstatResourcesSiteToolStripMenuItem" - Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(230, 22) - Me.RInstatResourcesSiteToolStripMenuItem.Text = "R-Instat Resources Site" + Me.mnuHelpResourcesSite.Name = "mnuHelpResourcesSite" + Me.mnuHelpResourcesSite.Size = New System.Drawing.Size(360, 34) + Me.mnuHelpResourcesSite.Text = "R-Instat Resources Site (Online)" ' 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(360, 34) Me.mnuHelpPackagesDocumentation.Text = "R-Packages Documentation..." ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(322, 6) ' 'mnuClimatic ' Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuExamineEditData, Me.mnuClimaticTidyandExamine, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods}) Me.mnuClimatic.Name = "mnuClimatic" - Me.mnuClimatic.Size = New System.Drawing.Size(63, 22) + Me.mnuClimatic.Size = New System.Drawing.Size(90, 29) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' @@ -1774,288 +1774,288 @@ Partial Class frmMain ' Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip, Me.mnuClimaticFileExportToClimpact, Me.mnuClimaticFileExportToGoogleBucketsToolStrip}) Me.mnuClimaticFile.Name = "mnuClimaticFile" - Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticFile.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticFile.Text = "File" ' 'mnuClimaticFileImportSST ' Me.mnuClimaticFileImportSST.Name = "mnuClimaticFileImportSST" - Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportSST.Text = "Import SST..." ' 'mnuClimaticFileImportfromIRIDataLibrary ' Me.mnuClimaticFileImportfromIRIDataLibrary.Name = "mnuClimaticFileImportfromIRIDataLibrary" - Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromIRIDataLibrary.Text = "Import from IRI Data Library..." ' 'mnuClimaticFileImportfromClimateDataStore ' Me.mnuClimaticFileImportfromClimateDataStore.Name = "mnuClimaticFileImportfromClimateDataStore" - Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromClimateDataStore.Text = "Import from CDS (Climate Data Store)..." ' 'mnuClimaticFileImportandTidyNetCDF ' Me.mnuClimaticFileImportandTidyNetCDF.Name = "mnuClimaticFileImportandTidyNetCDF" - Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportandTidyNetCDF.Text = "Import and Tidy NetCDF..." ' 'mnuClimaticFileImportandTidyShapefile ' Me.mnuClimaticFileImportandTidyShapefile.Name = "mnuClimaticFileImportandTidyShapefile" - Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportandTidyShapefile.Text = "Import and Tidy Shapefile..." ' 'mnuClimateFileImportfromClimSoft ' Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft" - Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(282, 22) + Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(426, 34) Me.mnuClimateFileImportfromClimSoft.Text = "Import from Climsoft..." ' 'mnuClimaticFileImportfromCliData ' Me.mnuClimaticFileImportfromCliData.Enabled = False Me.mnuClimaticFileImportfromCliData.Name = "mnuClimaticFileImportfromCliData" - Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..." Me.mnuClimaticFileImportfromCliData.Visible = False ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(423, 6) ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" - Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToClimsoft.Text = "Export to Climsoft..." ' 'mnuClimaticFileExportToCPT ' Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" - Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." ' 'mnuExportToWWRToolStrip ' Me.mnuExportToWWRToolStrip.Name = "mnuExportToWWRToolStrip" - Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) + Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(426, 34) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' 'mnuClimaticFileExportToClimpact ' Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact" - Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..." ' 'mnuClimaticFileExportToGoogleBucketsToolStrip ' Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Name = "mnuClimaticFileExportToGoogleBucketsToolStrip" - Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Text = "Export to Google Buckets..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(322, 6) ' 'mnuExamineEditData ' Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticExamineEditDataVisualiseData, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator27, Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns}) Me.mnuExamineEditData.Name = "mnuExamineEditData" - Me.mnuExamineEditData.Size = New System.Drawing.Size(212, 22) + Me.mnuExamineEditData.Size = New System.Drawing.Size(325, 34) Me.mnuExamineEditData.Text = "Examine/Edit Data" ' 'mnuClimaticExamineEditDataVisualiseData ' Me.mnuClimaticExamineEditDataVisualiseData.Name = "mnuClimaticExamineEditDataVisualiseData" - Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(215, 22) + Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(324, 34) Me.mnuClimaticExamineEditDataVisualiseData.Text = "Visualise Data..." ' 'mnuExamineEditDataPivotTable ' Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" - Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(321, 6) ' 'mnuExamineEditDataOneVariableSummarise ' Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" - Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuExamineEditDataOneVariableGraph ' Me.mnuExamineEditDataOneVariableGraph.Name = "mnuExamineEditDataOneVariableGraph" - Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuExamineEditDataOneVariableFrequencies ' Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies" - Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'ToolStripSeparator78 ' Me.ToolStripSeparator78.Name = "ToolStripSeparator78" - Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator78.Size = New System.Drawing.Size(321, 6) ' 'mnuExamineEditDataSetupForDataEditing ' Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" - Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataSetupForDataEditing.Text = "Setup for Data Editing..." ' 'mnuExamineEditDataDailyDataEditing ' Me.mnuExamineEditDataDailyDataEditing.Name = "mnuExamineEditDataDailyDataEditing" - Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..." ' 'mnuExamineEditDataCompareColumns ' Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns" - Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." ' 'mnuClimaticTidyandExamine ' Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineTidyDailyData, Me.ToolStripSeparator71, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.mnuClimaticTidyandExamineNonNumericCases, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText, Me.ToolStripSeparator80, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyDataKey}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" - Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticTidyandExamine.Text = "Tidy Data" ' 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator80.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineMerge.Text = "Add (Merge) Columns..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' 'mnuClimaticDates ' Me.mnuClimaticDates.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDatesGenerateDates, Me.mnuClimaticDatesMakeDate, Me.mnuClimaticDatesInfillMissingDates, Me.mnuClimaticDatesUseDate, Me.mnuClimaticDatesMakeTime, Me.mnuClimaticDatesUseTime}) Me.mnuClimaticDates.Name = "mnuClimaticDates" - Me.mnuClimaticDates.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDates.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDates.Text = "Dates" ' 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -2063,175 +2063,175 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' 'mnuClimaticDefineClimaticData ' Me.mnuClimaticDefineClimaticData.Name = "mnuClimaticDefineClimaticData" - Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDefineClimaticData.Text = "Define Climatic Data..." ' 'mnuClimaticCheckData ' Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations, Me.mnuClimaticCheckDataDistances}) Me.mnuClimaticCheckData.Name = "mnuClimaticCheckData" - Me.mnuClimaticCheckData.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCheckData.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCheckData.Text = "Check Data" ' 'mnuClimaticCheckDataInventory ' Me.mnuClimaticCheckDataInventory.Name = "mnuClimaticCheckDataInventory" - Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataInventory.Text = "Inventory..." ' 'mnuClimaticCheckDataDisplayDaily ' Me.mnuClimaticCheckDataDisplayDaily.Name = "mnuClimaticCheckDataDisplayDaily" - Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataDisplayDaily.Text = "Display Daily..." ' 'ToolStripSeparator65 ' Me.ToolStripSeparator65.Name = "ToolStripSeparator65" - Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator65.Size = New System.Drawing.Size(310, 6) ' 'mnuClimaticCheckDataFillMissingValues ' Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues" - Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataFillMissingValues.Text = "Fill Missing Values..." ' 'mnuClimaticCheckDataBoxplot ' Me.mnuClimaticCheckDataBoxplot.Name = "mnuClimaticCheckDataBoxplot" - Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataBoxplot.Text = "Boxplot..." ' 'mnuClimaticCheckDataQCTemperatures ' Me.mnuClimaticCheckDataQCTemperatures.Name = "mnuClimaticCheckDataQCTemperatures" - Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataQCTemperatures.Text = "QC Temperatures..." ' 'mnuClimaticCheckDataQCRainfall ' Me.mnuClimaticCheckDataQCRainfall.Name = "mnuClimaticCheckDataQCRainfall" - Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataQCRainfall.Text = "QC Rainfall..." ' 'ToolStripSeparator70 ' Me.ToolStripSeparator70.Name = "ToolStripSeparator70" - Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator70.Size = New System.Drawing.Size(310, 6) ' 'mnuClimaticCheckDataHomogenization ' Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization" - Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataHomogenization.Text = "Homogenization..." ' 'mnuClimaticCheckDataCheckStationLocations ' Me.mnuClimaticCheckDataCheckStationLocations.Name = "mnuClimaticCheckDataCheckStationLocations" - Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticCheckDataDistances ' Me.mnuClimaticCheckDataDistances.Name = "mnuClimaticCheckDataDistances" - Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataDistances.Text = "Distances..." ' 'mnuClimaticPrepare ' Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareClimdex, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) Me.mnuClimaticPrepare.Name = "mnuClimaticPrepare" - Me.mnuClimaticPrepare.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticPrepare.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticPrepare.Tag = "Prepare" Me.mnuClimaticPrepare.Text = "Prepare" ' 'mnuCimaticPrepareTransform ' Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" - Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) + Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(281, 34) Me.mnuCimaticPrepareTransform.Text = "Transform..." ' 'mnuClimaticPrepareConversions ' Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions" - Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareConversions.Text = "Conversions..." ' 'ToolStripSeparator37 ' Me.ToolStripSeparator37.Name = "ToolStripSeparator37" - Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator37.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareClimaticSummaries ' Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." ' 'mnuClimaticPrepareStartoftheRains ' Me.mnuClimaticPrepareStartoftheRains.Name = "mnuClimaticPrepareStartoftheRains" - Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareStartoftheRains.Text = "Start of the Rains..." ' 'mnuClimaticPrepareEndOfRains ' Me.mnuClimaticPrepareEndOfRains.Name = "mnuClimaticPrepareEndOfRains" - Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareEndOfRains.Text = "End of Rains..." ' 'mnuClimaticPrepareLengthOfSeason ' Me.mnuClimaticPrepareLengthOfSeason.Name = "mnuClimaticPrepareLengthOfSeason" - Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareLengthOfSeason.Text = "Length of Season..." ' 'mnuClimaticPrepareSpells ' Me.mnuClimaticPrepareSpells.Name = "mnuClimaticPrepareSpells" - Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareSpells.Text = "Spells..." ' 'mnuClimaticPrepareExtremes ' Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" - Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareExtremes.Text = "Extremes..." ' 'ToolStripSeparator64 ' Me.ToolStripSeparator64.Name = "ToolStripSeparator64" - Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator64.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareClimdex ' Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex" - Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareClimdex.Text = "Climdex..." ' 'ToolStripSeparator51 ' Me.ToolStripSeparator51.Name = "ToolStripSeparator51" - Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator51.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareEvapotranspiration ' Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration" - Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareEvapotranspiration.Text = "Evapotranspiration..." ' 'mnuClimaticPrepareSummary ' Me.mnuClimaticPrepareSummary.Enabled = False Me.mnuClimaticPrepareSummary.Name = "mnuClimaticPrepareSummary" - Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareSummary.Text = "Summary..." Me.mnuClimaticPrepareSummary.Visible = False ' @@ -2239,7 +2239,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareNewWorksheet.Enabled = False Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet" - Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet" Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..." Me.mnuClimaticPrepareNewWorksheet.Visible = False @@ -2248,7 +2248,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareImportDailyData.Enabled = False Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData" - Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareImportDailyData.Tag = "Import_daily_data" Me.mnuClimaticPrepareImportDailyData.Text = "Import daily Data..." Me.mnuClimaticPrepareImportDailyData.Visible = False @@ -2257,7 +2257,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareMakeFactor.Enabled = False Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor" - Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor" Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..." Me.mnuClimaticPrepareMakeFactor.Visible = False @@ -2266,7 +2266,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareShiftDailyData.Enabled = False Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData" - Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareShiftDailyData.Tag = "Shift_Daily_data" Me.mnuClimaticPrepareShiftDailyData.Text = "Shift Daily Data..." Me.mnuClimaticPrepareShiftDailyData.Visible = False @@ -2275,7 +2275,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareUnstackDailyData.Enabled = False Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData" - Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareUnstackDailyData.Tag = "Unstack_Daily_data" Me.mnuClimaticPrepareUnstackDailyData.Text = "Unstack Daily Data..." Me.mnuClimaticPrepareUnstackDailyData.Visible = False @@ -2284,7 +2284,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareStackDailyData.Enabled = False Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData" - Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareStackDailyData.Tag = "Stack_Daily_data" Me.mnuClimaticPrepareStackDailyData.Text = "Stack Daily data..." Me.mnuClimaticPrepareStackDailyData.Visible = False @@ -2292,361 +2292,361 @@ Partial Class frmMain 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" - Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator30.Size = New System.Drawing.Size(322, 6) ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" - Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDescribe.Text = "Describe" ' 'mnuClimaticDescribeSummarise23Variables ' Me.mnuClimaticDescribeSummarise23Variables.Name = "mnuClimaticDescribeSummarise23Variables" - Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSummarise23Variables.Text = "Summarise 2/3 Variables..." ' 'mnuClimaticDescribeGraph23Variables ' Me.mnuClimaticDescribeGraph23Variables.Name = "mnuClimaticDescribeGraph23Variables" - Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeGraph23Variables.Text = "Graph 2/3 Variables..." ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(318, 6) ' 'mnuClimaticDescribeSPISPEI ' Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI" - Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSPISPEI.Text = "SPI/SPEI..." ' 'mnuClimaticDescribeClimograph ' Me.mnuClimaticDescribeClimograph.Name = "mnuClimaticDescribeClimograph" - Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeClimograph.Text = "Climograph..." ' 'mnuClimaticDescribeTrendGraph ' Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph" - Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..." ' 'mnuClimaticDescribeSeasonalGraph ' Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" - Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." ' 'mnuClimaticDescribeIDF ' Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF" - Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeIDF.Text = "IDF..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(318, 6) ' 'mnuClimaticDescribeWindRose ' Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose" - Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeWindPollutionRose ' Me.mnuClimaticDescribeWindPollutionRose.Name = "mnuClimaticDescribeWindPollutionRose" - Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuClimaticDescribeOtherRosePlots ' Me.mnuClimaticDescribeOtherRosePlots.Name = "mnuClimaticDescribeOtherRosePlots" - Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeOtherRosePlots.Text = "Other Rose Plots..." ' 'mnuClimaticNCMP ' Me.mnuClimaticNCMP.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticNCMPIndices, Me.mnuClimaticNCMPVariogram, Me.mnuClimaticNCMPRegionAverage, Me.mnuClimaticNCMPTrendGraphs, Me.mnuClimaticNCMPCountRecords, Me.mnuClimaticNCMPSummary}) Me.mnuClimaticNCMP.Name = "mnuClimaticNCMP" - Me.mnuClimaticNCMP.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticNCMP.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticNCMP.Text = "NCMP" ' 'mnuClimaticNCMPIndices ' Me.mnuClimaticNCMPIndices.Name = "mnuClimaticNCMPIndices" - Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPIndices.Text = "Indices..." ' 'mnuClimaticNCMPVariogram ' Me.mnuClimaticNCMPVariogram.Name = "mnuClimaticNCMPVariogram" - Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPVariogram.Text = "Variogram..." ' 'mnuClimaticNCMPRegionAverage ' Me.mnuClimaticNCMPRegionAverage.Name = "mnuClimaticNCMPRegionAverage" - Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPRegionAverage.Text = "Region Average..." ' 'mnuClimaticNCMPTrendGraphs ' Me.mnuClimaticNCMPTrendGraphs.Name = "mnuClimaticNCMPTrendGraphs" - Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPTrendGraphs.Text = "Trend Graphs..." ' 'mnuClimaticNCMPCountRecords ' Me.mnuClimaticNCMPCountRecords.Name = "mnuClimaticNCMPCountRecords" - Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPCountRecords.Text = "Count Records..." ' 'mnuClimaticNCMPSummary ' Me.mnuClimaticNCMPSummary.Name = "mnuClimaticNCMPSummary" - Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPSummary.Text = "Summary..." ' 'mnuClimaticPICSA ' Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGrap, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" - Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticPICSA.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticPICSA.Text = "PICSA" ' 'mnuClimaticPICSARainfallGraph ' Me.mnuClimaticPICSARainfallGraph.Name = "mnuClimaticPICSARainfallGraph" - Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSARainfallGraph.Text = "Rainfall Graph..." ' 'mnuClimaticPICSATemperatureGraph ' Me.mnuClimaticPICSATemperatureGraph.Name = "mnuClimaticPICSATemperatureGraph" - Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' 'mnuClimaticPICSAGeneralGrap ' Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap" - Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..." ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" - Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6) + Me.ToolStripSeparator73.Size = New System.Drawing.Size(361, 6) ' 'mnuClimaticPICSACumExeedenceGraph ' Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph" - Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSACumExeedenceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticPICSACrops ' Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops" - Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSACrops.Text = "Crops..." ' 'mnuCMSAF ' Me.mnuCMSAF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCMSAFPlotRegion, Me.mnuClimaticCMSAFExporttoCMSAFRToolbox}) Me.mnuCMSAF.Name = "mnuCMSAF" - Me.mnuCMSAF.Size = New System.Drawing.Size(212, 22) + Me.mnuCMSAF.Size = New System.Drawing.Size(325, 34) Me.mnuCMSAF.Text = "CM SAF" ' 'mnuClimaticCMSAFPlotRegion ' Me.mnuClimaticCMSAFPlotRegion.Name = "mnuClimaticCMSAFPlotRegion" - Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(231, 22) + Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(351, 34) Me.mnuClimaticCMSAFPlotRegion.Text = "Plot Region..." ' 'mnuClimaticCMSAFExporttoCMSAFRToolbox ' Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Name = "mnuClimaticCMSAFExporttoCMSAFRToolbox" - Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(231, 22) + Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(351, 34) Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Text = "Export to CM SAF R Toolbox..." ' 'mnuClimaticCompare ' Me.mnuClimaticCompare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCompareCalculation, Me.mnuClimaticCompareSummary, Me.ToolStripSeparator66, Me.mnuClimaticCompareCorrelations, Me.mnuClimaticCompareScatterplot, Me.mnuClimaticCompareTimeSeriesPlot, Me.mnuClimaticCompareSeasonalPlot, Me.mnuClimaticCompareDensityPlot, Me.mnuClimaticCompareConditionalQuantiles, Me.mnuClimaticCompareTaylorDiagram}) Me.mnuClimaticCompare.Name = "mnuClimaticCompare" - Me.mnuClimaticCompare.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCompare.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCompare.Text = "Compare" ' 'mnuClimaticCompareCalculation ' Me.mnuClimaticCompareCalculation.Name = "mnuClimaticCompareCalculation" - Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareCalculation.Text = "Calculation..." ' 'mnuClimaticCompareSummary ' Me.mnuClimaticCompareSummary.Name = "mnuClimaticCompareSummary" - Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareSummary.Text = "Summary..." ' 'ToolStripSeparator66 ' Me.ToolStripSeparator66.Name = "ToolStripSeparator66" - Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6) + Me.ToolStripSeparator66.Size = New System.Drawing.Size(293, 6) ' 'mnuClimaticCompareCorrelations ' Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations" - Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareCorrelations.Text = "Correlations..." ' 'mnuClimaticCompareScatterplot ' Me.mnuClimaticCompareScatterplot.Name = "mnuClimaticCompareScatterplot" - Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareScatterplot.Text = "Scatterplot..." ' 'mnuClimaticCompareTimeSeriesPlot ' Me.mnuClimaticCompareTimeSeriesPlot.Name = "mnuClimaticCompareTimeSeriesPlot" - Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareTimeSeriesPlot.Text = "Time Series Plot..." ' 'mnuClimaticCompareSeasonalPlot ' Me.mnuClimaticCompareSeasonalPlot.Name = "mnuClimaticCompareSeasonalPlot" - Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareSeasonalPlot.Text = "Seasonal Plot..." ' 'mnuClimaticCompareDensityPlot ' Me.mnuClimaticCompareDensityPlot.Name = "mnuClimaticCompareDensityPlot" - Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareDensityPlot.Text = "Density Plot..." ' 'mnuClimaticCompareConditionalQuantiles ' Me.mnuClimaticCompareConditionalQuantiles.Name = "mnuClimaticCompareConditionalQuantiles" - Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareConditionalQuantiles.Text = "Conditional Quantiles..." ' 'mnuClimaticCompareTaylorDiagram ' Me.mnuClimaticCompareTaylorDiagram.Name = "mnuClimaticCompareTaylorDiagram" - Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareTaylorDiagram.Text = "Taylor Diagram..." ' 'mnuClimaticMapping ' Me.mnuClimaticMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticMappingMap, Me.mnuClimaticMappingCheckStationLocations}) Me.mnuClimaticMapping.Name = "mnuClimaticMapping" - Me.mnuClimaticMapping.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticMapping.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticMapping.Text = "Mapping" ' 'mnuClimaticMappingMap ' Me.mnuClimaticMappingMap.Name = "mnuClimaticMappingMap" - Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticMappingMap.Text = "Map..." ' 'mnuClimaticMappingCheckStationLocations ' Me.mnuClimaticMappingCheckStationLocations.Name = "mnuClimaticMappingCheckStationLocations" - Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticMappingCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticModel ' Me.mnuClimaticModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelCircular, Me.mnuClimaticModelMarkovModelling}) Me.mnuClimaticModel.Name = "mnuClimaticModel" - Me.mnuClimaticModel.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticModel.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticModel.Text = "Model" ' 'mnuClimaticModelsExtremes ' Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" - Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelsExtremes.Text = "Extremes..." ' 'mnuClimaticModelCircular ' Me.mnuClimaticModelCircular.Enabled = False Me.mnuClimaticModelCircular.Name = "mnuClimaticModelCircular" - Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelCircular.Text = "Circular..." Me.mnuClimaticModelCircular.Visible = False ' 'mnuClimaticModelMarkovModelling ' Me.mnuClimaticModelMarkovModelling.Name = "mnuClimaticModelMarkovModelling" - Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelMarkovModelling.Tag = "Markov_Modelling" Me.mnuClimaticModelMarkovModelling.Text = "Markov Modelling..." ' 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(322, 6) ' 'mnuClimaticSCF ' Me.mnuClimaticSCF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticSCFSupportOpenSST, Me.mnuClimaticSCFSupportExporttoCPT, Me.ToolStripSeparator32, Me.mnuClimaticSCFSupportCorrelations, Me.mnuClimaticSCFSupportPrincipalComponents, Me.mnuClimaticSCFSupportCanonicalCorrelations, Me.mnuClimaticSCFSupportCumulativeExceedanceGraph}) Me.mnuClimaticSCF.Name = "mnuClimaticSCF" - Me.mnuClimaticSCF.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticSCF.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticSCF.Text = "Seasonal Forecast Support" ' 'mnuClimaticSCFSupportOpenSST ' Me.mnuClimaticSCFSupportOpenSST.Name = "mnuClimaticSCFSupportOpenSST" - Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportOpenSST.Text = "Open SST..." ' 'mnuClimaticSCFSupportExporttoCPT ' Me.mnuClimaticSCFSupportExporttoCPT.Name = "mnuClimaticSCFSupportExporttoCPT" - Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportExporttoCPT.Tag = "Export_to_CPT" Me.mnuClimaticSCFSupportExporttoCPT.Text = "Export to CPT..." ' 'ToolStripSeparator32 ' Me.ToolStripSeparator32.Name = "ToolStripSeparator32" - Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6) + Me.ToolStripSeparator32.Size = New System.Drawing.Size(361, 6) ' 'mnuClimaticSCFSupportCorrelations ' Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations" - Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCorrelations.Text = "Correlations..." ' 'mnuClimaticSCFSupportPrincipalComponents ' Me.mnuClimaticSCFSupportPrincipalComponents.Name = "mnuClimaticSCFSupportPrincipalComponents" - Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportPrincipalComponents.Text = "Principal Components..." ' 'mnuClimaticSCFSupportCanonicalCorrelations ' Me.mnuClimaticSCFSupportCanonicalCorrelations.Name = "mnuClimaticSCFSupportCanonicalCorrelations" - Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuClimaticSCFSupportCumulativeExceedanceGraph ' Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Name = "mnuClimaticSCFSupportCumulativeExceedanceGraph" - Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticClimateMethods ' Me.mnuClimaticClimateMethods.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulation, Me.mnuClimaticClimateMethodsGraphics, Me.mnuClimaticClimateMethodsModel, Me.mnuClimaticClimateMethodsAdditional, Me.mnuClimateMethodsCreateClimateObject}) Me.mnuClimaticClimateMethods.Name = "mnuClimaticClimateMethods" - Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods" Me.mnuClimaticClimateMethods.Text = "Climate Methods" Me.mnuClimaticClimateMethods.Visible = False @@ -2655,7 +2655,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulationStartOfRain, Me.mnuClimaticClimateMethodsDataManipulationEndOfRain, Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth, Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular, Me.mnuClimaticClimateMethodsDataManipulationDayMonth, Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily, Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear, Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal, Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength, Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA, Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents, Me.mnuClimaticClimateMethodsDataManipulationMissingData, Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable, Me.mnuClimateMethodsDataManipulationMonthlySummaries, Me.mnuClimateMethodsDataManipulationOutputForCD}) Me.mnuClimaticClimateMethodsDataManipulation.Name = "mnuClimaticClimateMethodsDataManipulation" - Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation" Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation" ' @@ -2663,7 +2663,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain" - Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..." ' @@ -2671,7 +2671,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain" - Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..." ' @@ -2679,7 +2679,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month" Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..." ' @@ -2687,7 +2687,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular" - Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular" Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..." ' @@ -2695,7 +2695,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month" Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..." ' @@ -2703,7 +2703,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily" Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..." ' @@ -2711,7 +2711,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year" Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..." ' @@ -2719,7 +2719,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal" - Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total" Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..." ' @@ -2727,7 +2727,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength" - Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length" Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..." ' @@ -2735,7 +2735,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA" - Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA" Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..." ' @@ -2743,7 +2743,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents" - Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events" Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..." ' @@ -2751,7 +2751,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData" - Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data" Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..." ' @@ -2759,7 +2759,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable" - Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table" Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..." ' @@ -2767,7 +2767,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries" - Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22) + Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(342, 34) Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries" Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..." ' @@ -2775,7 +2775,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD" - Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22) + Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(342, 34) Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT" Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..." ' @@ -2783,7 +2783,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphics.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot, Me.mnuClimaticClimateMethodsGraphicsCliplot, Me.mnuClimaticClimateMethodsGraphicsMissingValues, Me.mnuClimaticClimateMethodsGraphicsHistogram, Me.mnuClimaticClimateMethodsGraphicsCumExceedance, Me.mnuClimaticClimateMethodsGraphicsBoxplot, Me.mnuClimaticClimateMethodsGraphicsInventory, Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall, Me.mnuClimaticClimateMethodsGraphicsRainCount, Me.mnuClimaticClimateMethodsGraphicsTimeseries, Me.mnuClimaticClimateMethodsGraphicsWindrose, Me.mnuClimateMethodsGraphicsMultipleLines, Me.mnuClmateMethodThreeSummaries}) Me.mnuClimaticClimateMethodsGraphics.Name = "mnuClimaticClimateMethodsGraphics" - Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics" Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics" ' @@ -2791,7 +2791,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot" - Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot" Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..." ' @@ -2799,7 +2799,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot" - Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot" Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..." ' @@ -2807,7 +2807,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues" - Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values" Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..." ' @@ -2815,7 +2815,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram" - Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram" Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..." ' @@ -2823,7 +2823,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance" - Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence" Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..." ' @@ -2831,7 +2831,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot" - Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot" Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..." ' @@ -2839,7 +2839,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory" - Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory" Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..." ' @@ -2847,7 +2847,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall" - Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall" Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..." ' @@ -2855,7 +2855,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount" - Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count" Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..." ' @@ -2863,7 +2863,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries" - Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries" Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..." ' @@ -2871,7 +2871,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose" - Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose" Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..." ' @@ -2879,7 +2879,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines" - Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22) + Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(325, 34) Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines" Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..." ' @@ -2887,7 +2887,7 @@ Partial Class frmMain ' Me.mnuClmateMethodThreeSummaries.Enabled = False Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries" - Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22) + Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(325, 34) Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries" Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..." ' @@ -2895,7 +2895,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsModel.Enabled = False Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel" - Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsModel.Tag = "Model" Me.mnuClimaticClimateMethodsModel.Text = "Model..." ' @@ -2903,7 +2903,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditional.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsAdditionalOutputForCPT, Me.mnuClimaticClimateMethodsAdditionalRainsStatistics, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain, Me.mnuClimaticClimateMethodsAdditionalWaterBalance}) Me.mnuClimaticClimateMethodsAdditional.Name = "mnuClimaticClimateMethodsAdditional" - Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional" Me.mnuClimaticClimateMethodsAdditional.Text = "Additional" ' @@ -2911,7 +2911,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT" - Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT" Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..." ' @@ -2919,7 +2919,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics" - Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics" Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..." ' @@ -2927,7 +2927,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..." ' @@ -2935,7 +2935,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..." ' @@ -2943,7 +2943,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance" - Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance" Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..." ' @@ -2951,7 +2951,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsCreateClimateObject.Enabled = False Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject" - Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22) + Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(297, 34) Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' @@ -2959,7 +2959,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(241, 22) + Me.mnuFileSave.Size = New System.Drawing.Size(365, 34) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2967,32 +2967,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(241, 22) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(365, 34) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' 'mnuFileSaveAsDataAs ' Me.mnuFileSaveAsDataAs.Name = "mnuFileSaveAsDataAs" - Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsDataAs.Text = "Save Data As..." ' 'mnuFileSaveAsOutputAs ' Me.mnuFileSaveAsOutputAs.Name = "mnuFileSaveAsOutputAs" - Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsOutputAs.Text = "Save Output As..." ' 'mnuFileSaveAsLogAs ' Me.mnuFileSaveAsLogAs.Name = "mnuFileSaveAsLogAs" - Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsLogAs.Text = "Save Log As..." ' 'mnuFileSaveAsScriptAs ' Me.mnuFileSaveAsScriptAs.Name = "mnuFileSaveAsScriptAs" - Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsScriptAs.Text = "Save Script As..." ' 'mnuFilePrint @@ -3000,7 +3000,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(241, 22) + Me.mnuFilePrint.Size = New System.Drawing.Size(365, 34) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -3009,7 +3009,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(241, 22) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(365, 34) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -3017,12 +3017,12 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(238, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(362, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(241, 22) + Me.mnuFIleExit.Size = New System.Drawing.Size(365, 34) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' @@ -3030,7 +3030,7 @@ Partial Class frmMain ' Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuUndo, Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(39, 22) + Me.mnuEdit.Size = New System.Drawing.Size(58, 29) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' @@ -3038,14 +3038,14 @@ Partial Class frmMain ' Me.mnuUndo.Name = "mnuUndo" Me.mnuUndo.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Z), System.Windows.Forms.Keys) - Me.mnuUndo.Size = New System.Drawing.Size(167, 22) + Me.mnuUndo.Size = New System.Drawing.Size(253, 34) Me.mnuUndo.Text = "Undo" ' 'mnuEditFind ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(253, 34) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -3053,7 +3053,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(253, 34) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -3061,27 +3061,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(253, 34) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(253, 34) Me.mnuEditPasteNew.Text = "Paste New..." ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(253, 34) Me.mnuEditWordwrap.Text = "Wordwrap..." ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(253, 34) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -3089,17 +3089,18 @@ Partial Class frmMain ' Me.stsStrip.ImageScalingSize = New System.Drawing.Size(24, 24) Me.stsStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstatus}) - Me.stsStrip.Location = New System.Drawing.Point(0, 460) + Me.stsStrip.Location = New System.Drawing.Point(0, 691) Me.stsStrip.Name = "stsStrip" + Me.stsStrip.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0) Me.stsStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional - Me.stsStrip.Size = New System.Drawing.Size(834, 22) + Me.stsStrip.Size = New System.Drawing.Size(1251, 32) Me.stsStrip.TabIndex = 8 Me.stsStrip.Text = "Status" ' 'tstatus ' Me.tstatus.Name = "tstatus" - Me.tstatus.Size = New System.Drawing.Size(119, 17) + Me.tstatus.Size = New System.Drawing.Size(182, 25) Me.tstatus.Text = "No worksheet loaded" ' 'Tool_strip @@ -3108,12 +3109,12 @@ Partial Class frmMain Me.Tool_strip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.Tool_strip.ImageScalingSize = New System.Drawing.Size(30, 30) Me.Tool_strip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTbOpen, Me.mnuTbOpenFromLibrary, Me.mnuTbSave, Me.toolStripSeparator, Me.mnuTbLast10Dialogs, Me.separator2, Me.mnuTbDataView, Me.mnuTbOutput, Me.ToolStripSeparator74, Me.mnuLastGraph, Me.ToolStripSeparator75, Me.mnuTbLogScript, Me.mnuMetadata, Me.ToolStripSeparator76, Me.mnuTbResetLayout, Me.separator3, Me.mnuTbHelp, Me.ToolStripSeparator77, Me.mnuTbLan, Me.separator1}) - Me.Tool_strip.Location = New System.Drawing.Point(0, 24) + Me.Tool_strip.Location = New System.Drawing.Point(0, 33) Me.Tool_strip.Name = "Tool_strip" - Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) + Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0) Me.Tool_strip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional Me.Tool_strip.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.Tool_strip.Size = New System.Drawing.Size(834, 37) + Me.Tool_strip.Size = New System.Drawing.Size(1251, 39) Me.Tool_strip.TabIndex = 7 Me.Tool_strip.Text = "Tool" ' @@ -3125,7 +3126,7 @@ Partial Class frmMain Me.mnuTbOpen.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpen.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpen.Name = "mnuTbOpen" - Me.mnuTbOpen.Size = New System.Drawing.Size(53, 34) + Me.mnuTbOpen.Size = New System.Drawing.Size(53, 36) Me.mnuTbOpen.Text = "&Open" Me.mnuTbOpen.ToolTipText = "Import" ' @@ -3136,7 +3137,7 @@ Partial Class frmMain Me.mnuTbOpenFromLibrary.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpenFromLibrary.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpenFromLibrary.Name = "mnuTbOpenFromLibrary" - Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 34) + Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 36) Me.mnuTbOpenFromLibrary.ToolTipText = "Import From Library" ' 'mnuTbSave @@ -3148,40 +3149,40 @@ Partial Class frmMain Me.mnuTbSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbSave.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbSave.Name = "mnuTbSave" - Me.mnuTbSave.Size = New System.Drawing.Size(53, 34) + Me.mnuTbSave.Size = New System.Drawing.Size(53, 36) Me.mnuTbSave.Text = "&Save" ' 'mnuSaveData ' Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveData.Name = "mnuSaveData" - Me.mnuSaveData.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveData.Size = New System.Drawing.Size(213, 34) Me.mnuSaveData.Text = "Save Data" ' 'mnuSaveOutput ' Me.mnuSaveOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveOutput.Name = "mnuSaveOutput" - Me.mnuSaveOutput.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveOutput.Size = New System.Drawing.Size(213, 34) Me.mnuSaveOutput.Text = "Save Output" ' 'mnuSaveScript ' Me.mnuSaveScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveScript.Name = "mnuSaveScript" - Me.mnuSaveScript.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveScript.Size = New System.Drawing.Size(213, 34) Me.mnuSaveScript.Text = "Save Script" ' 'mnuSaveLog ' Me.mnuSaveLog.Name = "mnuSaveLog" - Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveLog.Size = New System.Drawing.Size(213, 34) Me.mnuSaveLog.Text = "Save Log" ' 'toolStripSeparator ' Me.toolStripSeparator.Name = "toolStripSeparator" - Me.toolStripSeparator.Size = New System.Drawing.Size(6, 37) + Me.toolStripSeparator.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLast10Dialogs ' @@ -3197,7 +3198,7 @@ Partial Class frmMain 'separator2 ' Me.separator2.Name = "separator2" - Me.separator2.Size = New System.Drawing.Size(6, 37) + Me.separator2.Size = New System.Drawing.Size(6, 39) ' 'mnuTbDataView ' @@ -3208,14 +3209,14 @@ 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(53, 34) + Me.mnuTbDataView.Size = New System.Drawing.Size(53, 36) Me.mnuTbDataView.ToolTipText = "Toggle Data view open and closed" ' 'mnuDataViewWindow ' Me.mnuDataViewWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataViewWindow.Name = "mnuDataViewWindow" - Me.mnuDataViewWindow.Size = New System.Drawing.Size(180, 22) + Me.mnuDataViewWindow.Size = New System.Drawing.Size(226, 34) Me.mnuDataViewWindow.Text = "Data View" ' 'mnuRDataViewerWindow @@ -3223,7 +3224,7 @@ Partial Class frmMain Me.mnuRDataViewerWindow.Enabled = False Me.mnuRDataViewerWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuRDataViewerWindow.Name = "mnuRDataViewerWindow" - Me.mnuRDataViewerWindow.Size = New System.Drawing.Size(180, 22) + Me.mnuRDataViewerWindow.Size = New System.Drawing.Size(226, 34) Me.mnuRDataViewerWindow.Text = "R-Data Viewer" ' 'mnuTbOutput @@ -3235,34 +3236,34 @@ Partial Class frmMain Me.mnuTbOutput.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOutput.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOutput.Name = "mnuTbOutput" - Me.mnuTbOutput.Size = New System.Drawing.Size(53, 34) + Me.mnuTbOutput.Size = New System.Drawing.Size(53, 36) Me.mnuTbOutput.ToolTipText = "Toggle Output window open and closed" ' 'mnuOutputWindow ' Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuOutputWindow.Name = "mnuOutputWindow" - Me.mnuOutputWindow.Size = New System.Drawing.Size(178, 22) + Me.mnuOutputWindow.Size = New System.Drawing.Size(271, 34) Me.mnuOutputWindow.Text = "Show Output" ' 'mnuShowRCommand ' Me.mnuShowRCommand.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuShowRCommand.Name = "mnuShowRCommand" - Me.mnuShowRCommand.Size = New System.Drawing.Size(178, 22) + Me.mnuShowRCommand.Size = New System.Drawing.Size(271, 34) Me.mnuShowRCommand.Text = "Show R Commands" ' 'mnuIncludeComments ' Me.mnuIncludeComments.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuIncludeComments.Name = "mnuIncludeComments" - Me.mnuIncludeComments.Size = New System.Drawing.Size(178, 22) + Me.mnuIncludeComments.Size = New System.Drawing.Size(271, 34) Me.mnuIncludeComments.Text = "Show Comments" ' 'ToolStripSeparator74 ' Me.ToolStripSeparator74.Name = "ToolStripSeparator74" - Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 39) ' 'mnuLastGraph ' @@ -3279,25 +3280,25 @@ Partial Class frmMain 'mnuNormalViewer ' Me.mnuNormalViewer.Name = "mnuNormalViewer" - Me.mnuNormalViewer.Size = New System.Drawing.Size(128, 22) + Me.mnuNormalViewer.Size = New System.Drawing.Size(194, 34) Me.mnuNormalViewer.Text = "Viewer..." ' 'mnuploty ' Me.mnuploty.Name = "mnuploty" - Me.mnuploty.Size = New System.Drawing.Size(128, 22) + Me.mnuploty.Size = New System.Drawing.Size(194, 34) Me.mnuploty.Text = "Plotly..." ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" - Me.mnuRViewer.Size = New System.Drawing.Size(128, 22) + Me.mnuRViewer.Size = New System.Drawing.Size(194, 34) Me.mnuRViewer.Text = "R Viewer..." ' 'ToolStripSeparator75 ' Me.ToolStripSeparator75.Name = "ToolStripSeparator75" - Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLogScript ' @@ -3315,14 +3316,14 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(210, 22) + Me.mnuLogScript.Size = New System.Drawing.Size(321, 34) Me.mnuLogScript.Text = "Log/Script" ' 'mnuSwapDataLogScript ' Me.mnuSwapDataLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataLogScript.Name = "mnuSwapDataLogScript" - Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(210, 22) + Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(321, 34) Me.mnuSwapDataLogScript.Text = "Swap Data and Log/Script" ' 'mnuMetadata @@ -3341,27 +3342,27 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnMetadat.Size = New System.Drawing.Size(326, 34) Me.mnuColumnMetadat.Text = " Column Metadata..." ' 'mnuDataFrameMetadat ' Me.mnuDataFrameMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataFrameMetadat.Name = "mnuDataFrameMetadat" - Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(214, 22) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(326, 34) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' 'mnuSwapDataMetadata ' Me.mnuSwapDataMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataMetadata.Name = "mnuSwapDataMetadata" - Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(214, 22) + Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuSwapDataMetadata.Text = "Swap Data and Metadata..." ' 'ToolStripSeparator76 ' Me.ToolStripSeparator76.Name = "ToolStripSeparator76" - Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 39) ' 'mnuTbResetLayout ' @@ -3370,13 +3371,13 @@ Partial Class frmMain Me.mnuTbResetLayout.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbResetLayout.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbResetLayout.Name = "mnuTbResetLayout" - Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 34) + Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 36) Me.mnuTbResetLayout.ToolTipText = "Reset to Default Layout" ' 'separator3 ' Me.separator3.Name = "separator3" - Me.separator3.Size = New System.Drawing.Size(6, 37) + Me.separator3.Size = New System.Drawing.Size(6, 39) ' 'mnuTbHelp ' @@ -3394,32 +3395,32 @@ Partial Class frmMain ' Me.mnuToolBarHelp.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuToolBarHelp.Name = "mnuToolBarHelp" - Me.mnuToolBarHelp.Size = New System.Drawing.Size(173, 22) + Me.mnuToolBarHelp.Size = New System.Drawing.Size(264, 34) Me.mnuToolBarHelp.Text = "Toolbar Help" ' 'mnuDataWindowHelp ' Me.mnuDataWindowHelp.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataWindowHelp.Name = "mnuDataWindowHelp" - Me.mnuDataWindowHelp.Size = New System.Drawing.Size(173, 22) + Me.mnuDataWindowHelp.Size = New System.Drawing.Size(264, 34) Me.mnuDataWindowHelp.Text = "Data Window Help" ' 'mnuOutputHelp ' Me.mnuOutputHelp.Name = "mnuOutputHelp" - Me.mnuOutputHelp.Size = New System.Drawing.Size(173, 22) + Me.mnuOutputHelp.Size = New System.Drawing.Size(264, 34) Me.mnuOutputHelp.Text = "Output Help" ' 'mnuLogScriptHelp ' Me.mnuLogScriptHelp.Name = "mnuLogScriptHelp" - Me.mnuLogScriptHelp.Size = New System.Drawing.Size(173, 22) + Me.mnuLogScriptHelp.Size = New System.Drawing.Size(264, 34) Me.mnuLogScriptHelp.Text = "Log Script Help" ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" - Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLan ' @@ -3428,28 +3429,29 @@ Partial Class frmMain Me.mnuTbLan.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbLan.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbLan.Name = "mnuTbLan" - Me.mnuTbLan.Size = New System.Drawing.Size(34, 34) + Me.mnuTbLan.Size = New System.Drawing.Size(34, 36) Me.mnuTbLan.ToolTipText = "Changes the menu language to English, and from English" ' 'separator1 ' Me.separator1.Name = "separator1" - Me.separator1.Size = New System.Drawing.Size(6, 37) + Me.separator1.Size = New System.Drawing.Size(6, 39) ' 'mnuBar ' Me.mnuBar.AllowMerge = False Me.mnuBar.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.mnuBar.GripMargin = New System.Windows.Forms.Padding(2, 2, 0, 2) Me.mnuBar.ImageScalingSize = New System.Drawing.Size(24, 24) Me.mnuBar.ImeMode = System.Windows.Forms.ImeMode.[On] Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuPrepare, Me.mnuDescribe, Me.mnuModel, Me.mnuStructured, Me.mnuClimatic, Me.mnuProcurement, Me.mnuOptionsByContext, Me.mnuTools, Me.mnuView, Me.mnuHelp}) Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" - Me.mnuBar.Padding = New System.Windows.Forms.Padding(4, 1, 0, 1) + Me.mnuBar.Padding = New System.Windows.Forms.Padding(6, 2, 0, 2) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True - Me.mnuBar.Size = New System.Drawing.Size(834, 24) + Me.mnuBar.Size = New System.Drawing.Size(1251, 33) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' @@ -3457,7 +3459,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.mnuImportFromOpenAppBuilder, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" - Me.mnuFile.Size = New System.Drawing.Size(37, 22) + Me.mnuFile.Size = New System.Drawing.Size(54, 29) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3465,7 +3467,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(241, 22) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(365, 34) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3473,33 +3475,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(241, 22) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(362, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3507,7 +3509,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3515,88 +3517,88 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuImportFromOpenAppBuilder ' Me.mnuImportFromOpenAppBuilder.Name = "mnuImportFromOpenAppBuilder" - Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(241, 22) + Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(365, 34) Me.mnuImportFromOpenAppBuilder.Text = "Import From OpenAppBuilder..." ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(241, 22) + Me.mnuFileConvert.Size = New System.Drawing.Size(365, 34) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(238, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(362, 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(241, 22) + Me.mnuFileExport.Size = New System.Drawing.Size(365, 34) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet ' Me.mnuFileExportExportDataSet.Name = "mnuFileExportExportDataSet" - Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportDataSet.Text = "Export Dataset..." ' 'mnuFileExportExportRObjectsToolStripMenuItem ' Me.mnuFileExportExportRObjectsToolStripMenuItem.Name = "mnuFileExportExportRObjectsToolStripMenuItem" - Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportRObjectsToolStripMenuItem.Text = "Export R Objects..." ' 'mnuFileExportExportRWorkspace ' Me.mnuFileExportExportRWorkspace.Name = "mnuFileExportExportRWorkspace" - Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportRWorkspace.Text = "Export R Workspace..." ' 'mnuFileExportExportGraphAsImage ' Me.mnuFileExportExportGraphAsImage.Name = "mnuFileExportExportGraphAsImage" - Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportGraphAsImage.Text = "Export Graph As Image..." ' 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(241, 22) + Me.mnuFileCloseData.Size = New System.Drawing.Size(365, 34) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(362, 6) ' 'mnuPrepare ' Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.ToolStripSeparator79, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) Me.mnuPrepare.Name = "mnuPrepare" - Me.mnuPrepare.Size = New System.Drawing.Size(59, 22) + Me.mnuPrepare.Size = New System.Drawing.Size(88, 29) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -3604,105 +3606,105 @@ Partial Class frmMain ' Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' 'mnuPrepareDataFrameViewData ' Me.mnuPrepareDataFrameViewData.Name = "mnuPrepareDataFrameViewData" - Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameViewData.Tag = "View_Data..." Me.mnuPrepareDataFrameViewData.Text = "View Data..." ' 'mnuPrepareDataFrameRenameColumn ' Me.mnuPrepareDataFrameRenameColumn.Name = "mnuPrepareDataFrameRenameColumn" - Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameRenameColumn.Tag = "Rename_Column..." Me.mnuPrepareDataFrameRenameColumn.Text = "Rename Columns..." ' 'mnuPrepareDataFrameDuplicateColumn ' Me.mnuPrepareDataFrameDuplicateColumn.Name = "mnuPrepareDataFrameDuplicateColumn" - Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameDuplicateColumn.Text = "Duplicate Column..." ' 'mnuPrepareDataFrameRowNumbersNames ' Me.mnuPrepareDataFrameRowNumbersNames.Name = "mnuPrepareDataFrameRowNumbersNames" - Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameRowNumbersNames.Tag = "Row_Numbers/Names..." Me.mnuPrepareDataFrameRowNumbersNames.Text = "Row Numbers/Names..." ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(298, 6) ' 'mnuPrepareDataFrameSort ' Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort" - Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' 'mnuPrepareDataFrameFilterRows ' Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" - Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" - Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' Me.mnuPrepareDataFrameReplaceValues.Name = "mnuPrepareDataFrameReplaceValues" - Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameReplaceValues.Tag = "Replace_Values..." Me.mnuPrepareDataFrameReplaceValues.Text = "Replace Values..." ' 'mnuPrepareDataFrameConvertColumns ' Me.mnuPrepareDataFrameConvertColumns.Name = "mnuPrepareDataFrameConvertColumns" - Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameConvertColumns.Tag = "Convert_Columns..." Me.mnuPrepareDataFrameConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(298, 6) ' 'mnuPrepareDataFrameReorderColumns ' Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns" - Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameReorderColumns.Tag = "Reorder_Columns..." Me.mnuPrepareDataFrameReorderColumns.Text = "Reorder Columns..." ' 'mnuPrepareDataFrameAddMergeColumns ' Me.mnuPrepareDataFrameAddMergeColumns.Name = "mnuPrepareDataFrameAddMergeColumns" - Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameAddMergeColumns.Text = "Add (Merge) Columns..." ' 'mnuPrepareDataFrameInsertColumnsRows ' Me.mnuPrepareDataFrameInsertColumnsRows.Name = "mnuPrepareDataFrameInsertColumnsRows" - Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameInsertColumnsRows.Tag = "Insert_Columns/Rows..." Me.mnuPrepareDataFrameInsertColumnsRows.Text = "Insert Columns/Rows..." ' 'mnuPrepareDataFrameDeleteColumnsRows ' Me.mnuPrepareDataFrameDeleteColumnsRows.Name = "mnuPrepareDataFrameDeleteColumnsRows" - Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..." Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..." ' @@ -3710,7 +3712,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameProtectColumn.Enabled = False Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn" - Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameProtectColumn.Tag = "..." Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False @@ -3719,7 +3721,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns" - Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..." Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..." Me.mnuPrepareDataFrameFreezeColumns.Visible = False @@ -3727,7 +3729,7 @@ Partial Class frmMain 'mnuPrepareDataframeColourByProperty ' Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty" - Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..." ' 'mnuPrepareCheckData @@ -3735,107 +3737,107 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn}) Me.mnuPrepareCheckData.Name = "mnuPrepareCheckData" - Me.mnuPrepareCheckData.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData ' Me.mnuPrepareCheckDataVisualiseData.Name = "mnuPrepareCheckDataVisualiseData" - Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..." ' 'mnuPrepareCheckDataPivotTable ' Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable" - Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator50 ' Me.ToolStripSeparator50.Name = "ToolStripSeparator50" - Me.ToolStripSeparator50.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator50.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataDuplicates ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" - Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' Me.mnuPrepareCheckDataCompareColumns.Name = "mnuPrepareCheckDataCompareColumns" - Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataCompareColumns.Text = "Compare Columns..." ' 'mnuPrepareCheckDataNonNumericCases ' Me.mnuPrepareCheckDataNonNumericCases.Name = "mnuPrepareCheckDataNonNumericCases" - Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator49 ' Me.ToolStripSeparator49.Name = "ToolStripSeparator49" - Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator49.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataBoxplot ' Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot" - Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataBoxplot.Text = "Boxplot..." ' 'mnuPrepareCheckDataOneVariableSummarise ' Me.mnuPrepareCheckDataOneVariableSummarise.Name = "mnuPrepareCheckDataOneVariableSummarise" - Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuPrepareCheckDataOneVariableGraph ' Me.mnuPrepareCheckDataOneVariableGraph.Name = "mnuPrepareCheckDataOneVariableGraph" - Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuPrepareCheckDataOneWayFrequencies ' Me.mnuPrepareCheckDataOneWayFrequencies.Name = "mnuPrepareCheckDataOneWayFrequencies" - Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..." ' 'mnuPrepareCheckDataViewDeleteLabels ' Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels" - Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..." ' 'ToolStripSeparator41 ' Me.ToolStripSeparator41.Name = "ToolStripSeparator41" - Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator41.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataExportOpenRefine ' Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine" - Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataExportOpenRefine.Text = "Export To OpenRefine..." ' 'mnuPrepareCheckDataImportOpenRefine ' Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" - Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' Me.ToolStripSeparator40.Name = "ToolStripSeparator40" - Me.ToolStripSeparator40.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator40.Size = New System.Drawing.Size(367, 6) ' 'mnuPreparePrepareToShareJitter ' Me.mnuPreparePrepareToShareJitter.Enabled = False Me.mnuPreparePrepareToShareJitter.Name = "mnuPreparePrepareToShareJitter" - Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22) + Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(370, 34) Me.mnuPreparePrepareToShareJitter.Text = "Jitter..." Me.mnuPreparePrepareToShareJitter.Visible = False ' @@ -3843,95 +3845,95 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage" - Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Text = "Prepare to Share (sdc package)..." Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Visible = False ' 'mnuPrepareCheckDataAnonymiseIDColumn ' Me.mnuPrepareCheckDataAnonymiseIDColumn.Name = "mnuPrepareCheckDataAnonymiseIDColumn" - Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataAnonymiseIDColumn.Text = "Anonymise ID Column..." ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Calculator..." ' 'ToolStripSeparator79 ' Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator79.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareColumnCalculate ' Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows}) Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate" - Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' 'mnuPrepareColumnNumericRegularSequence ' Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence" - Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRegularSequence.Tag = "Regular_Sequence..." Me.mnuPrepareColumnNumericRegularSequence.Text = "Regular Sequence..." ' 'mnuPrepareColumnNumericEnter ' Me.mnuPrepareColumnNumericEnter.Name = "mnuPrepareColumnNumericEnter" - Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericEnter.Text = "Enter..." ' 'ToolStripSeparator25 ' Me.ToolStripSeparator25.Name = "ToolStripSeparator25" - Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(301, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRowSummaries.Text = "Row Summaries..." ' 'mnuPrepareColumnNumericTransform ' Me.mnuPrepareColumnNumericTransform.Name = "mnuPrepareColumnNumericTransform" - Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericTransform.Tag = "Rank..." Me.mnuPrepareColumnNumericTransform.Text = "Transform..." ' 'mnuPrepareColumnNumericPolynomials ' Me.mnuPrepareColumnNumericPolynomials.Name = "mnuPrepareColumnNumericPolynomials" - Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericPolynomials.Tag = "Polynomials..." Me.mnuPrepareColumnNumericPolynomials.Text = "Polynomials..." ' 'ToolStripSeparator56 ' Me.ToolStripSeparator56.Name = "ToolStripSeparator56" - Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(301, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRandomSamples.Tag = "Random_Samples..." Me.mnuPrepareColumnNumericRandomSamples.Text = "Random Samples..." ' 'mnuPrepareColumnNumericPermuteRows ' Me.mnuPrepareColumnNumericPermuteRows.Name = "mnuPrepareColumnNumericPermuteRows" - Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' @@ -3939,105 +3941,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(169, 22) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' 'mnuPrepareColumnFactorConvertToFactor ' Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor" - Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor" Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..." ' 'mnuPrepareColumnFactorRecodeNumeric ' Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric" - Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..." Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..." ' 'mnuPrepareColumnFactorCountInFactor ' Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor" - Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorRecodeFactor ' Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor" - Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..." Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..." ' 'mnuPrepareColumnFactorCombineFactors ' Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors" - Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..." Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..." ' 'mnuPrepareColumnFactorDummyVariables ' Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables" - Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..." Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..." ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorLevelsLabels ' Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels" - Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..." Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..." ' 'mnuPrepareColumnFactorReorderLevels ' Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels" - Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..." Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..." ' 'mnuPrepareColumnFactorReferenceLevel ' Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel" - Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..." Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..." ' 'mnuPrepareColumnFactorUnusedLevels ' Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels" - Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..." Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..." ' 'mnuPrepareColumnFactorContrasts ' Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts" - Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..." Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..." ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorFactorDataFrame ' Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame" - Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame" Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..." ' @@ -4045,42 +4047,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(169, 22) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' 'mnuPrepareColumnTextFindReplace ' Me.mnuPrepareColumnTextFindReplace.Name = "mnuPrepareColumnTextFindReplace" - Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextFindReplace.Tag = "Find/Replace..." Me.mnuPrepareColumnTextFindReplace.Text = "Find/Replace..." ' 'mnuPrepareColumnTextSearch ' Me.mnuPrepareColumnTextSearch.Name = "mnuPrepareColumnTextSearch" - Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextSearch.Text = "Search..." Me.mnuPrepareColumnTextSearch.Visible = False ' 'mnuPrepareColumnTextTransform ' Me.mnuPrepareColumnTextTransform.Name = "mnuPrepareColumnTextTransform" - Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextTransform.Tag = "Transform..." Me.mnuPrepareColumnTextTransform.Text = "Transform..." ' 'mnuPrepareColumnTextSplit ' Me.mnuPrepareColumnTextSplit.Name = "mnuPrepareColumnTextSplit" - Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextSplit.Tag = "Split..." Me.mnuPrepareColumnTextSplit.Text = "Split..." ' 'mnuPrepareColumnTextCombine ' Me.mnuPrepareColumnTextCombine.Name = "mnuPrepareColumnTextCombine" - Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextCombine.Tag = "Combine..." Me.mnuPrepareColumnTextCombine.Text = "Combine..." ' @@ -4088,7 +4090,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnTextMatch.Enabled = False Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch" - Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextMatch.Tag = "Match..." Me.mnuPrepareColumnTextMatch.Text = "Match..." Me.mnuPrepareColumnTextMatch.Visible = False @@ -4096,7 +4098,7 @@ Partial Class frmMain 'mnuPrepareColumnTextDistance ' Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance" - Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextDistance.Tag = "Distance..." Me.mnuPrepareColumnTextDistance.Text = "Distance..." ' @@ -4104,38 +4106,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(169, 22) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate ' Me.mnuPrepareColumnDateGenerateDate.Name = "mnuPrepareColumnDateGenerateDate" - Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateGenerateDate.Text = "Generate Dates..." ' 'mnuPrepareColumnDateMakeDate ' Me.mnuPrepareColumnDateMakeDate.Name = "mnuPrepareColumnDateMakeDate" - Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateMakeDate.Text = "Make Date..." ' 'mnuPrepareColumnDateInfillMissingDates ' Me.mnuPrepareColumnDateInfillMissingDates.Name = "mnuPrepareColumnDateInfillMissingDates" - Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuPrepareColumnDateUseDate ' Me.mnuPrepareColumnDateUseDate.Name = "mnuPrepareColumnDateUseDate" - Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateUseDate.Text = "Use Date..." ' 'mnuPrepareColumnDateMakeTime ' Me.mnuPrepareColumnDateMakeTime.Enabled = False Me.mnuPrepareColumnDateMakeTime.Name = "mnuPrepareColumnDateMakeTime" - Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..." Me.mnuPrepareColumnDateMakeTime.Visible = False ' @@ -4143,7 +4145,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDateUseTime.Enabled = False Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" - Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateUseTime.Text = "Use Time..." Me.mnuPrepareColumnDateUseTime.Visible = False ' @@ -4151,169 +4153,169 @@ Partial Class frmMain ' Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" - Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(263, 34) Me.mnuPrepareColumnDefineConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator55 ' Me.ToolStripSeparator55.Name = "ToolStripSeparator55" - Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(260, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(263, 34) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareDataReshape ' Me.mnuPrepareDataReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnReshapeColumnSummaries, Me.mnuPrepareColumnReshapeGeneralSummaries, Me.ToolStripSeparator10, Me.mnuPrepareColumnReshapeStack, Me.mnuPrepareColumnReshapeUnstack, Me.mnuPrepareColumnReshapeMerge, Me.ToolStripSeparator11, Me.mnuPrepareAppendDataFrame, Me.mnuPrepareColumnReshapeSubset, Me.mnuPrepareColumnReshapeRandomSubset, Me.mnuPrepareColumnReshapeTranspose, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" - Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' 'mnuPrepareColumnReshapeColumnSummaries ' Me.mnuPrepareColumnReshapeColumnSummaries.Name = "mnuPrepareColumnReshapeColumnSummaries" - Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeColumnSummaries.Tag = "Column_Summaries..." Me.mnuPrepareColumnReshapeColumnSummaries.Text = "Column Summaries..." ' 'mnuPrepareColumnReshapeGeneralSummaries ' Me.mnuPrepareColumnReshapeGeneralSummaries.Name = "mnuPrepareColumnReshapeGeneralSummaries" - Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeGeneralSummaries.Text = "General Summaries..." ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(292, 6) ' 'mnuPrepareColumnReshapeStack ' Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack" - Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeStack.Tag = "Stack..." Me.mnuPrepareColumnReshapeStack.Text = "Stack (Pivot Longer)..." ' 'mnuPrepareColumnReshapeUnstack ' Me.mnuPrepareColumnReshapeUnstack.Name = "mnuPrepareColumnReshapeUnstack" - Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeUnstack.Tag = "Unstack..." Me.mnuPrepareColumnReshapeUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuPrepareColumnReshapeMerge ' Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge" - Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..." Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..." ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(292, 6) ' 'mnuPrepareAppendDataFrame ' Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame" - Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareAppendDataFrame.Text = "Append (Bind Rows)..." ' 'mnuPrepareColumnReshapeSubset ' Me.mnuPrepareColumnReshapeSubset.Name = "mnuPrepareColumnReshapeSubset" - Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeSubset.Tag = "Subset..." Me.mnuPrepareColumnReshapeSubset.Text = "Subset..." ' 'mnuPrepareColumnReshapeRandomSubset ' Me.mnuPrepareColumnReshapeRandomSubset.Name = "mnuPrepareColumnReshapeRandomSubset" - Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeRandomSubset.Tag = "Random_Subset..." Me.mnuPrepareColumnReshapeRandomSubset.Text = "Random Subset..." ' 'mnuPrepareColumnReshapeTranspose ' Me.mnuPrepareColumnReshapeTranspose.Name = "mnuPrepareColumnReshapeTranspose" - Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeTranspose.Tag = "Transpose..." Me.mnuPrepareColumnReshapeTranspose.Text = "Transpose..." ' 'mnuPrepareDataReshapeScaleOrDistance ' Me.mnuPrepareDataReshapeScaleOrDistance.Name = "mnuPrepareDataReshapeScaleOrDistance" - Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..." ' 'mnuPrepareDataReshapeRandomSplit ' Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" - Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareKeysAndLinks ' Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment}) Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks" - Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey ' Me.mnuPrepareKeysAndLinksAddKey.Name = "mnuPrepareKeysAndLinksAddKey" - Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddKey.Text = "Add Key..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKey ' Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Name = "mnuPrepareKeysAndLinksViewAndRemoveKey" - Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Text = "View and Remove Keys..." ' 'mnuPrepareKeysAndLinksAddLink ' Me.mnuPrepareKeysAndLinksAddLink.Name = "mnuPrepareKeysAndLinksAddLink" - Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddLink.Text = "Add Link..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKeys ' Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Name = "mnuPrepareKeysAndLinksViewAndRemoveKeys" - Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Text = "View and Remove Links..." ' 'mnuPrepareKeysAndLinksAddComment ' Me.mnuPrepareKeysAndLinksAddComment.Name = "mnuPrepareKeysAndLinksAddComment" - Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddComment.Text = "Add Comment..." ' 'mnuPrepareDataBook ' Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata}) Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook" - Me.mnuPrepareDataBook.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4321,7 +4323,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata" - Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDataFrameMetadata.Tag = "Data_Frame_Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Text = "Data Frame Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Visible = False @@ -4329,46 +4331,46 @@ Partial Class frmMain 'mnuPrepareDataObjectRenameDataFrame ' Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame" - Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectRenameDataFrame.Tag = "ReName_Data_Frame..." Me.mnuPrepareDataObjectRenameDataFrame.Text = "Rename Data Frame..." ' 'mnuPrepareDataObjectReorderDataFrames ' Me.mnuPrepareDataObjectReorderDataFrames.Name = "mnuPrepareDataObjectReorderDataFrames" - Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectReorderDataFrames.Tag = "Reorder_Data_Frames..." Me.mnuPrepareDataObjectReorderDataFrames.Text = "Reorder Data Frames..." ' 'mnuPrepareDataObjectCopyDataFrame ' Me.mnuPrepareDataObjectCopyDataFrame.Name = "mnuPrepareDataObjectCopyDataFrame" - Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectCopyDataFrame.Tag = "Copy_Data_Frame..." Me.mnuPrepareDataObjectCopyDataFrame.Text = "Copy Data Frame..." ' 'mnuPrepareDataObjectDeleteDataFrame ' Me.mnuPrepareDataObjectDeleteDataFrame.Name = "mnuPrepareDataObjectDeleteDataFrame" - Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDeleteDataFrame.Tag = "Delete_Data_Frame..." Me.mnuPrepareDataObjectDeleteDataFrame.Text = "Delete Data Frames..." ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(315, 6) ' 'mnuPrepareDataObjectHideDataframes ' Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes" - Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectHideDataframes.Text = "Hide/Show Data Frames..." ' 'mnuPrepareDataObjectMetadata ' Me.mnuPrepareDataObjectMetadata.Name = "mnuPrepareDataObjectMetadata" - Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..." Me.mnuPrepareDataObjectMetadata.Text = "Metadata..." ' @@ -4376,7 +4378,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectRenameMetadata.Enabled = False Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata" - Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Visible = False @@ -4385,7 +4387,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectReorderMetadata.Enabled = False Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata" - Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Visible = False @@ -4394,7 +4396,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata" - Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Visible = False @@ -4403,35 +4405,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(169, 22) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' 'mnuPrepareRObjectsView ' Me.mnuPrepareRObjectsView.Name = "mnuPrepareRObjectsView" - Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsView.Tag = "View..." Me.mnuPrepareRObjectsView.Text = "View..." ' 'mnuPrepareRObjectsRename ' Me.mnuPrepareRObjectsRename.Name = "mnuPrepareRObjectsRename" - Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsRename.Tag = "Rename..." Me.mnuPrepareRObjectsRename.Text = "Rename..." ' 'mnuPrepareRObjectsReorder ' Me.mnuPrepareRObjectsReorder.Name = "mnuPrepareRObjectsReorder" - Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsReorder.Tag = "Reorder" Me.mnuPrepareRObjectsReorder.Text = "Reorder..." ' 'mnuPrepareRObjectsDelete ' Me.mnuPrepareRObjectsDelete.Name = "mnuPrepareRObjectsDelete" - Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsDelete.Tag = "Delete..." Me.mnuPrepareRObjectsDelete.Text = "Delete..." ' @@ -4439,78 +4441,78 @@ Partial Class frmMain ' Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext, Me.mnuStructuredSurvey}) Me.mnuStructured.Name = "mnuStructured" - Me.mnuStructured.Size = New System.Drawing.Size(74, 22) + Me.mnuStructured.Size = New System.Drawing.Size(109, 29) Me.mnuStructured.Text = "Structured" ' 'mnuStructuredCircular ' Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine, Me.mnuStructuredCircularCalculator, Me.mnuStructuredCircularSummaries, Me.ToolStripSeparator46, Me.mnuStructuredCircularDensityPlot, Me.ToolStripSeparator67, Me.mnuStructuredCircularWindRose, Me.mnuStructuredCircularWindPollutionRose, Me.mnuStructuredCircularOtherRosePlots, Me.ToolStripSeparator68, Me.mnuStructuredCircularCirclize}) Me.mnuStructuredCircular.Name = "mnuStructuredCircular" - Me.mnuStructuredCircular.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredCircular.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredCircular.Text = "Circular" ' 'mnuStructuredCircularDefine ' Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" - Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularDefine.Text = "Define..." ' 'mnuStructuredCircularCalculator ' Me.mnuStructuredCircularCalculator.Name = "mnuStructuredCircularCalculator" - Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularCalculator.Text = "Calculator..." ' 'mnuStructuredCircularSummaries ' Me.mnuStructuredCircularSummaries.Name = "mnuStructuredCircularSummaries" - Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularSummaries.Text = "Summaries..." ' 'ToolStripSeparator46 ' Me.ToolStripSeparator46.Name = "ToolStripSeparator46" - Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator46.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularDensityPlot ' Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot" - Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularDensityPlot.Text = "Circular Plots..." ' 'ToolStripSeparator67 ' Me.ToolStripSeparator67.Name = "ToolStripSeparator67" - Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator67.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularWindRose ' Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose" - Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularWindRose.Text = "Wind Rose..." ' 'mnuStructuredCircularWindPollutionRose ' Me.mnuStructuredCircularWindPollutionRose.Name = "mnuStructuredCircularWindPollutionRose" - Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuStructuredCircularOtherRosePlots ' Me.mnuStructuredCircularOtherRosePlots.Name = "mnuStructuredCircularOtherRosePlots" - Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularOtherRosePlots.Text = "Other Rose Plots..." ' 'ToolStripSeparator68 ' Me.ToolStripSeparator68.Name = "ToolStripSeparator68" - Me.ToolStripSeparator68.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator68.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularCirclize ' Me.mnuStructuredCircularCirclize.Enabled = False Me.mnuStructuredCircularCirclize.Name = "mnuStructuredCircularCirclize" - Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularCirclize.Text = "Circlize..." Me.mnuStructuredCircularCirclize.Visible = False ' @@ -4518,126 +4520,126 @@ Partial Class frmMain ' Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" - Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredLow_Flow.Text = "Low_Flow" Me.mnuStructuredLow_Flow.Visible = False ' 'mnuStructuredLow_FlowDefine ' Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" - Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(117, 22) + Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(177, 34) Me.mnuStructuredLow_FlowDefine.Text = "Define..." ' 'mnuStructuredSurvival ' Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" - Me.mnuStructuredSurvival.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredSurvival.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredSurvival.Text = "Survival" ' 'mnuStructuredSurvivalDefine ' Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" - Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(117, 22) + Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(177, 34) Me.mnuStructuredSurvivalDefine.Text = "Define..." ' 'mnuStructuredTimeSeries ' Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" - Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredTimeSeries.Text = "Time Series" Me.mnuStructuredTimeSeries.Visible = False ' 'mnuStructuredTimeSeriesDefine ' Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" - Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesDefine.Text = "Define..." ' 'ToolStripSeparator60 ' Me.ToolStripSeparator60.Name = "ToolStripSeparator60" - Me.ToolStripSeparator60.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator60.Size = New System.Drawing.Size(179, 6) ' 'mnuStructuredTimeSeriesDescribe ' Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" - Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesDescribe.Text = "Describe" ' 'mnuStructuredTimeSeriesDescribeOneVariable ' Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" - Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesDescribeOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesDescribeGeneral ' Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" - Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesDescribeGeneral.Text = "General..." ' 'ToolStripSeparator61 ' Me.ToolStripSeparator61.Name = "ToolStripSeparator61" - Me.ToolStripSeparator61.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator61.Size = New System.Drawing.Size(179, 6) ' 'mnuStructuredTimeSeriesModel ' Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" - Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesModel.Text = "Model" ' 'mnuStructuredTimeSeriesModelOneVariable ' Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesModelOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesModelGeneral ' Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesModelGeneral.Text = "General..." ' 'ToolStripSeparator62 ' Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator62.Size = New System.Drawing.Size(179, 6) ' 'ToolStripSeparator63 ' Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6) + Me.ToolStripSeparator63.Size = New System.Drawing.Size(278, 6) ' 'mnuStructuredClimatic ' Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - Me.mnuStructuredClimatic.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredClimatic.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredClimatic.Text = "Climatic..." Me.mnuStructuredClimatic.Visible = False ' 'mnuStructuredProcurement ' Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - Me.mnuStructuredProcurement.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredProcurement.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredProcurement.Text = "Procurement..." Me.mnuStructuredProcurement.Visible = False ' 'mnuStructuredOptionByContext ' Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredOptionByContext.Text = "Options by Context..." Me.mnuStructuredOptionByContext.Visible = False ' 'mnuStructuredSurvey ' Me.mnuStructuredSurvey.Name = "mnuStructuredSurvey" - Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredSurvey.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredSurvey.Text = "Survey" Me.mnuStructuredSurvey.Visible = False ' @@ -4645,424 +4647,424 @@ Partial Class frmMain ' Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI}) Me.mnuProcurement.Name = "mnuProcurement" - Me.mnuProcurement.Size = New System.Drawing.Size(88, 22) + Me.mnuProcurement.Size = New System.Drawing.Size(129, 29) Me.mnuProcurement.Text = "Procurement" ' 'mnuProcurementOpenFromLibrary ' Me.mnuProcurementOpenFromLibrary.Name = "mnuProcurementOpenFromLibrary" - Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementOpenFromLibrary.Text = "Open From Library..." ' 'mnuProcurementDefineData ' Me.mnuProcurementDefineData.Name = "mnuProcurementDefineData" - Me.mnuProcurementDefineData.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDefineData.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDefineData.Text = "Define Procurement Data..." ' 'mnuProcurementPrepare ' Me.mnuProcurementPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementPrepareFilterByCountry, Me.ToolStripSeparator42, Me.mnuProcurementPrepareDefineContractValueCategories, Me.mnuProcurementPrepareRecodeNumericIntoQuantiles, Me.mnuProcurementPrepareSetFactorReferenceLevel, Me.mnuProcurementPrepareUseAwardDate, Me.ToolStripSeparator43, Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther, Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther, Me.mnuProcurementPrepareMergeAdditionalData}) Me.mnuProcurementPrepare.Name = "mnuProcurementPrepare" - Me.mnuProcurementPrepare.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementPrepare.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementPrepare.Text = "Prepare" ' 'mnuProcurementPrepareFilterByCountry ' Me.mnuProcurementPrepareFilterByCountry.Name = "mnuProcurementPrepareFilterByCountry" - Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareFilterByCountry.Text = "Filter by Country (or other)..." ' 'ToolStripSeparator42 ' Me.ToolStripSeparator42.Name = "ToolStripSeparator42" - Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6) + Me.ToolStripSeparator42.Size = New System.Drawing.Size(536, 6) ' 'mnuProcurementPrepareDefineContractValueCategories ' Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories" - Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareDefineContractValueCategories.Text = "Define Contract Value Categories..." ' 'mnuProcurementPrepareRecodeNumericIntoQuantiles ' Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Name = "mnuProcurementPrepareRecodeNumericIntoQuantiles" - Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Text = "Recode Numeric into Quantiles..." ' 'mnuProcurementPrepareSetFactorReferenceLevel ' Me.mnuProcurementPrepareSetFactorReferenceLevel.Name = "mnuProcurementPrepareSetFactorReferenceLevel" - Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSetFactorReferenceLevel.Text = "Set Factor Reference Level..." ' 'mnuProcurementPrepareUseAwardDate ' Me.mnuProcurementPrepareUseAwardDate.Name = "mnuProcurementPrepareUseAwardDate" - Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareUseAwardDate.Text = "Use Award Date (or other)..." ' 'ToolStripSeparator43 ' Me.ToolStripSeparator43.Name = "ToolStripSeparator43" - Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6) + Me.ToolStripSeparator43.Size = New System.Drawing.Size(536, 6) ' 'mnuProcurementPrepareSummariseRedFlagsByCountryorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Text = "Summarise Red Flags by Country (or other)..." ' 'mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Text = "Summarise Red Flags by Country and Year (or other)..." ' 'mnuProcurementPrepareMergeAdditionalData ' Me.mnuProcurementPrepareMergeAdditionalData.Name = "mnuProcurementPrepareMergeAdditionalData" - Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuProcurementDescribe ' Me.mnuProcurementDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeOneVariableSummarise, Me.mnuProcurementDescribeOneVariableGraph, Me.ToolStripSeparator44, Me.mnuProcurementDescribeCategorical, Me.mnuProcurementDescribeNumeric}) Me.mnuProcurementDescribe.Name = "mnuProcurementDescribe" - Me.mnuProcurementDescribe.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDescribe.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDescribe.Text = "Describe" ' 'mnuProcurementDescribeOneVariableSummarise ' Me.mnuProcurementDescribeOneVariableSummarise.Name = "mnuProcurementDescribeOneVariableSummarise" - Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuProcurementDescribeOneVariableGraph ' Me.mnuProcurementDescribeOneVariableGraph.Name = "mnuProcurementDescribeOneVariableGraph" - Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeOneVariableGraph.Text = "One Variable Graph..." ' 'ToolStripSeparator44 ' Me.ToolStripSeparator44.Name = "ToolStripSeparator44" - Me.ToolStripSeparator44.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator44.Size = New System.Drawing.Size(316, 6) ' 'mnuProcurementDescribeCategorical ' Me.mnuProcurementDescribeCategorical.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeCategoricalOneVarFreq, Me.mnuProcurementDescribeCategoricalTwoVarFreq, Me.ToolStripSeparator52, Me.mnuProcurementDescribeCategoricalBarCharts, Me.mnuProcurementDescribeCategoricalMosaic, Me.mnuProcurementDescribeCategoricalTreemap, Me.DisplayTopNToolStripMenuItem}) Me.mnuProcurementDescribeCategorical.Name = "mnuProcurementDescribeCategorical" - Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeCategorical.Text = "Categorical" ' 'mnuProcurementDescribeCategoricalOneVarFreq ' Me.mnuProcurementDescribeCategoricalOneVarFreq.Name = "mnuProcurementDescribeCategoricalOneVarFreq" - Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalOneVarFreq.Text = "One Variable Frequencies..." ' 'mnuProcurementDescribeCategoricalTwoVarFreq ' Me.mnuProcurementDescribeCategoricalTwoVarFreq.Name = "mnuProcurementDescribeCategoricalTwoVarFreq" - Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalTwoVarFreq.Text = "Two Variable Frequencies by Sector (or other)..." ' 'ToolStripSeparator52 ' Me.ToolStripSeparator52.Name = "ToolStripSeparator52" - Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6) + Me.ToolStripSeparator52.Size = New System.Drawing.Size(479, 6) ' 'mnuProcurementDescribeCategoricalBarCharts ' Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts" - Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalBarCharts.Text = "Bar Chart..." ' 'mnuProcurementDescribeCategoricalMosaic ' Me.mnuProcurementDescribeCategoricalMosaic.Name = "mnuProcurementDescribeCategoricalMosaic" - Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalMosaic.Text = "Mosaic Plot..." ' 'mnuProcurementDescribeCategoricalTreemap ' Me.mnuProcurementDescribeCategoricalTreemap.Name = "mnuProcurementDescribeCategoricalTreemap" - Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalTreemap.Text = "Treemap..." ' 'DisplayTopNToolStripMenuItem ' Me.DisplayTopNToolStripMenuItem.Name = "DisplayTopNToolStripMenuItem" - Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(319, 22) + Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(482, 34) Me.DisplayTopNToolStripMenuItem.Text = "Display Top N..." ' 'mnuProcurementDescribeNumeric ' Me.mnuProcurementDescribeNumeric.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeNumericBoxplot, Me.HistogramToolStripMenuItem, Me.ToolStripSeparator53, Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers}) Me.mnuProcurementDescribeNumeric.Name = "mnuProcurementDescribeNumeric" - Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeNumeric.Text = "Numeric" ' 'mnuProcurementDescribeNumericBoxplot ' Me.mnuProcurementDescribeNumericBoxplot.Name = "mnuProcurementDescribeNumericBoxplot" - Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(258, 22) + Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(389, 34) Me.mnuProcurementDescribeNumericBoxplot.Text = "Boxplot..." ' 'HistogramToolStripMenuItem ' Me.HistogramToolStripMenuItem.Name = "HistogramToolStripMenuItem" - Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(258, 22) + Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(389, 34) Me.HistogramToolStripMenuItem.Text = "Histogram..." ' 'ToolStripSeparator53 ' Me.ToolStripSeparator53.Name = "ToolStripSeparator53" - Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6) + Me.ToolStripSeparator53.Size = New System.Drawing.Size(386, 6) ' 'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers ' Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers" - Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(258, 22) + Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(389, 34) Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Text = "Correlations (Red Flags or others)..." ' 'mnuProcurementMapping ' Me.mnuProcurementMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementMappingMapCountryValues}) Me.mnuProcurementMapping.Name = "mnuProcurementMapping" - Me.mnuProcurementMapping.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementMapping.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementMapping.Text = "Mapping" ' 'mnuProcurementMappingMapCountryValues ' Me.mnuProcurementMappingMapCountryValues.Name = "mnuProcurementMappingMapCountryValues" - Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(189, 22) + Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(285, 34) Me.mnuProcurementMappingMapCountryValues.Text = "Map Country Values..." ' 'mnuProcurementModel ' Me.mnuProcurementModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementModelDefineCorruption, Me.mnuProcurementModelFitModelToolStripMenuItem}) Me.mnuProcurementModel.Name = "mnuProcurementModel" - Me.mnuProcurementModel.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementModel.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementModel.Text = "Model" ' 'mnuProcurementModelDefineCorruption ' Me.mnuProcurementModelDefineCorruption.Name = "mnuProcurementModelDefineCorruption" - Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(233, 22) + Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(351, 34) Me.mnuProcurementModelDefineCorruption.Text = "Define Corruption Indicators..." ' 'mnuProcurementModelFitModelToolStripMenuItem ' Me.mnuProcurementModelFitModelToolStripMenuItem.Name = "mnuProcurementModelFitModelToolStripMenuItem" - Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(233, 22) + Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(351, 34) Me.mnuProcurementModelFitModelToolStripMenuItem.Text = "Fit Model..." ' 'ToolStripSeparator45 ' Me.ToolStripSeparator45.Name = "ToolStripSeparator45" - Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6) + Me.ToolStripSeparator45.Size = New System.Drawing.Size(324, 6) ' 'mnuProcurementDefineRedFlags ' Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags" - Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDefineRedFlags.Text = "Define Red Flag Variables..." ' 'mnuProcurementUseCRI ' Me.mnuProcurementUseCRI.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementCTFVCalculateCRI, Me.mnuProcurementUseCRISummariseCRIbyCountry}) Me.mnuProcurementUseCRI.Name = "mnuProcurementUseCRI" - Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementUseCRI.Text = "Corruption Risk Index (CRI)" ' 'mnuProcurementCTFVCalculateCRI ' Me.mnuProcurementCTFVCalculateCRI.Name = "mnuProcurementCTFVCalculateCRI" - Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(278, 22) + Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(418, 34) Me.mnuProcurementCTFVCalculateCRI.Text = "Define Corruption Risk Index (CRI)..." ' 'mnuProcurementUseCRISummariseCRIbyCountry ' Me.mnuProcurementUseCRISummariseCRIbyCountry.Name = "mnuProcurementUseCRISummariseCRIbyCountry" - Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(278, 22) + Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(418, 34) Me.mnuProcurementUseCRISummariseCRIbyCountry.Text = "Summarise CRI by Country (or other)..." ' 'mnuOptionsByContext ' Me.mnuOptionsByContext.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckData, Me.mnuOptionsByContextDefine, Me.mnuOptionsByContextPrepare, Me.mnuOptionsByContextDescribe, Me.mnuOptionsByContextModel, Me.mnuOptionsByContextCropModel}) Me.mnuOptionsByContext.Name = "mnuOptionsByContext" - Me.mnuOptionsByContext.Size = New System.Drawing.Size(84, 22) + Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 29) Me.mnuOptionsByContext.Text = "Experiments" ' 'mnuOptionsByContextCheckData ' Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" - Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows ' Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" - Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' Me.mnuOptionsByContextCheckDataCompareColumns.Name = "mnuOptionsByContextCheckDataCompareColumns" - Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataCompareColumns.Text = "Compare Columns..." ' 'ToolStripSeparator47 ' Me.ToolStripSeparator47.Name = "ToolStripSeparator47" - Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator47.Size = New System.Drawing.Size(321, 6) ' 'mnuOptionsByContextCheckDataOneVariableSummarise ' Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise" - Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuOptionsByContextCheckDataOneVariableGraph ' Me.mnuOptionsByContextCheckDataOneVariableGraph.Name = "mnuOptionsByContextCheckDataOneVariableGraph" - Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuOptionsByContextCheckDataOneVariableFrequencies ' Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Name = "mnuOptionsByContextCheckDataOneVariableFrequencies" - Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'mnuOptionsByContextDefine ' Me.mnuOptionsByContextDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDefineOnStation, Me.mnuOptionsByContextDefineOnFarm}) Me.mnuOptionsByContextDefine.Name = "mnuOptionsByContextDefine" - Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation ' Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" - Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(147, 22) + Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(222, 34) Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..." ' 'mnuOptionsByContextDefineOnFarm ' Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm" - Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(147, 22) + Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(222, 34) Me.mnuOptionsByContextDefineOnFarm.Text = "On - Farm..." ' 'mnuOptionsByContextPrepare ' Me.mnuOptionsByContextPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions, Me.ToolStripSeparator48, Me.mnuOptionsByContextMergeAdditionalData, Me.mnuOptionsByContextPrepareStack, Me.mnuOptionsByContextPrepareUnstack}) Me.mnuOptionsByContextPrepare.Name = "mnuOptionsByContextPrepare" - Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions ' Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Name = "mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions" - Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Text = "Calculate Difference Between Options..." ' 'ToolStripSeparator48 ' Me.ToolStripSeparator48.Name = "ToolStripSeparator48" - Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6) + Me.ToolStripSeparator48.Size = New System.Drawing.Size(418, 6) ' 'mnuOptionsByContextMergeAdditionalData ' Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData" - Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuOptionsByContextPrepareStack ' Me.mnuOptionsByContextPrepareStack.Name = "mnuOptionsByContextPrepareStack" - Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareStack.Text = "Stack (Pivot Longer)..." ' 'mnuOptionsByContextPrepareUnstack ' Me.mnuOptionsByContextPrepareUnstack.Name = "mnuOptionsByContextPrepareUnstack" - Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuOptionsByContextDescribe ' Me.mnuOptionsByContextDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDescribeCompareTwoTreatments, Me.mnuOptionsByContextDescribeCompareMultipleTreatments, Me.mnuOptionsByContextDescribeBoxplot}) Me.mnuOptionsByContextDescribe.Name = "mnuOptionsByContextDescribe" - Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments ' Me.mnuOptionsByContextDescribeCompareTwoTreatments.Name = "mnuOptionsByContextDescribeCompareTwoTreatments" - Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeCompareTwoTreatments.Text = "Compare Two Options..." ' 'mnuOptionsByContextDescribeCompareMultipleTreatments ' Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Enabled = False Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Name = "mnuOptionsByContextDescribeCompareMultipleTreatments" - Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Text = "Compare Multiple Options..." ' 'mnuOptionsByContextDescribeBoxplot ' Me.mnuOptionsByContextDescribeBoxplot.Name = "mnuOptionsByContextDescribeBoxplot" - Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeBoxplot.Text = "Boxplot..." ' 'mnuOptionsByContextModel ' Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel}) Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel" - Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel ' Me.mnuOptionsByContextModelFitModel.Name = "mnuOptionsByContextModelFitModel" - Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(265, 34) Me.mnuOptionsByContextModelFitModel.Text = "Fit Model..." ' 'mnuOptionsByContextGeneralFitModel ' Me.mnuOptionsByContextGeneralFitModel.Name = "mnuOptionsByContextGeneralFitModel" - Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(265, 34) Me.mnuOptionsByContextGeneralFitModel.Text = "General Fit Model..." ' 'mnuOptionsByContextCropModel ' Me.mnuOptionsByContextCropModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCropModelApsimxExamples}) Me.mnuOptionsByContextCropModel.Name = "mnuOptionsByContextCropModel" - Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextCropModel.Text = "Crop Model" ' 'mnuOptionsByContextCropModelApsimxExamples ' Me.mnuOptionsByContextCropModelApsimxExamples.Name = "mnuOptionsByContextCropModelApsimxExamples" - Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(264, 34) Me.mnuOptionsByContextCropModelApsimxExamples.Text = "Apsimx Examples..." ' 'mnuTools ' Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsRestoreBackup, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" - Me.mnuTools.Size = New System.Drawing.Size(46, 22) + Me.mnuTools.Size = New System.Drawing.Size(69, 29) Me.mnuTools.Text = "Tools" ' 'mnuToolsRunRCode ' Me.mnuToolsRunRCode.Enabled = False Me.mnuToolsRunRCode.Name = "mnuToolsRunRCode" - Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRunRCode.Size = New System.Drawing.Size(326, 34) Me.mnuToolsRunRCode.Tag = "Run_R_Code..." Me.mnuToolsRunRCode.Text = "Run R Code..." ' @@ -5070,54 +5072,54 @@ Partial Class frmMain ' Me.mnuToolsRestartR.Enabled = False Me.mnuToolsRestartR.Name = "mnuToolsRestartR" - Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRestartR.Size = New System.Drawing.Size(326, 34) Me.mnuToolsRestartR.Tag = "Restart_R" Me.mnuToolsRestartR.Text = "Restart R" ' 'mnuToolsCheckForUpdates ' Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates" - Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(198, 22) - Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates..." - Me.mnuToolsCheckForUpdates.Text = "Check for Updates..." + Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(326, 34) + Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates (Online)" + Me.mnuToolsCheckForUpdates.Text = "Check for Updates (Online)" ' 'mnuToolsClearOutputWindow ' Me.mnuToolsClearOutputWindow.Name = "mnuToolsClearOutputWindow" - Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(326, 34) Me.mnuToolsClearOutputWindow.Tag = "Clear_Output_Window..." Me.mnuToolsClearOutputWindow.Text = "Clear Output Window..." ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(195, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(323, 6) ' 'mnuToolsSaveCurrentOptions ' Me.mnuToolsSaveCurrentOptions.Enabled = False Me.mnuToolsSaveCurrentOptions.Name = "mnuToolsSaveCurrentOptions" - Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(326, 34) Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' 'mnuToolsRestoreBackup ' Me.mnuToolsRestoreBackup.Name = "mnuToolsRestoreBackup" - Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(326, 34) Me.mnuToolsRestoreBackup.Tag = "Load_Options..." Me.mnuToolsRestoreBackup.Text = "Restore Backup..." ' 'mnuToolsInstallRPackage ' Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage" - Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(198, 22) - Me.mnuToolsInstallRPackage.Text = "Install R Package..." + Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(326, 34) + Me.mnuToolsInstallRPackage.Text = "Install R Package... (Online)" ' 'mnuToolsOptions ' Me.mnuToolsOptions.Name = "mnuToolsOptions" - Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsOptions.Size = New System.Drawing.Size(326, 34) Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' @@ -5131,7 +5133,8 @@ Partial Class frmMain ' Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill - Me.splOverall.Location = New System.Drawing.Point(0, 61) + Me.splOverall.Location = New System.Drawing.Point(0, 72) + Me.splOverall.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -5144,9 +5147,9 @@ Partial Class frmMain ' Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) - Me.splOverall.Size = New System.Drawing.Size(834, 399) - Me.splOverall.SplitterDistance = 159 - Me.splOverall.SplitterWidth = 5 + Me.splOverall.Size = New System.Drawing.Size(1251, 619) + Me.splOverall.SplitterDistance = 246 + Me.splOverall.SplitterWidth = 8 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -5154,6 +5157,7 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) + Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -5165,9 +5169,9 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - Me.splExtraWindows.Size = New System.Drawing.Size(834, 159) - Me.splExtraWindows.SplitterDistance = 252 - Me.splExtraWindows.SplitterWidth = 5 + Me.splExtraWindows.Size = New System.Drawing.Size(1251, 246) + Me.splExtraWindows.SplitterDistance = 378 + Me.splExtraWindows.SplitterWidth = 8 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -5175,6 +5179,7 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) + Me.splMetadata.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -5185,9 +5190,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(252, 159) - Me.splMetadata.SplitterDistance = 68 - Me.splMetadata.SplitterWidth = 5 + Me.splMetadata.Size = New System.Drawing.Size(378, 246) + Me.splMetadata.SplitterDistance = 102 + Me.splMetadata.SplitterWidth = 8 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -5197,9 +5202,9 @@ Partial Class frmMain Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrColumnMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(68, 159) + Me.ucrColumnMeta.Size = New System.Drawing.Size(102, 246) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5208,9 +5213,9 @@ Partial Class frmMain Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataFrameMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 159) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(268, 246) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5219,9 +5224,9 @@ Partial Class frmMain Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrScriptWindow.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) - Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(577, 159) + Me.ucrScriptWindow.Size = New System.Drawing.Size(865, 246) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5231,6 +5236,7 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) + Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5242,9 +5248,9 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - Me.splDataOutput.Size = New System.Drawing.Size(834, 235) - Me.splDataOutput.SplitterDistance = 382 - Me.splDataOutput.SplitterWidth = 5 + Me.splDataOutput.Size = New System.Drawing.Size(1251, 365) + Me.splDataOutput.SplitterDistance = 573 + Me.splDataOutput.SplitterWidth = 8 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5254,9 +5260,9 @@ Partial Class frmMain Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) - Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(382, 235) + Me.ucrDataViewer.Size = New System.Drawing.Size(573, 365) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5266,9 +5272,9 @@ Partial Class frmMain Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrOutput.Location = New System.Drawing.Point(0, 0) - Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrOutput.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(447, 235) + Me.ucrOutput.Size = New System.Drawing.Size(670, 365) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5308,9 +5314,9 @@ Partial Class frmMain ' 'frmMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(834, 482) + Me.ClientSize = New System.Drawing.Size(1251, 723) Me.Controls.Add(Me.splOverall) Me.Controls.Add(Me.stsStrip) Me.Controls.Add(Me.Tool_strip) @@ -5318,6 +5324,7 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.Name = "frmMain" Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized @@ -6024,7 +6031,7 @@ Partial Class frmMain Friend WithEvents ViewToolStripMenuItem As ToolStripMenuItem Friend WithEvents mnuSwapDataLogScript As ToolStripMenuItem Friend WithEvents mnuSwapDataMetadata As ToolStripMenuItem - Friend WithEvents RInstatResourcesSiteToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuHelpResourcesSite As ToolStripMenuItem Friend WithEvents mnuImportFromOpenAppBuilder As ToolStripMenuItem Friend WithEvents ToolStripSeparator15 As ToolStripSeparator Friend WithEvents mnuClimaticCheckDataDistances As ToolStripMenuItem diff --git a/instat/frmMain.resx b/instat/frmMain.resx index c73bcdce42..e679779467 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S @@ -162,7 +162,7 @@ iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 UExQ92oSqkVXopsuEsymXbRYCkVtgkJtVfpY+Eh1YaWWdiOJWdgWbWmlG000kTxujMnp+cY5ZnLyu7nn NXPPuZkPPpLce+b7nd/3hXtn5p6ZW8VyBIs8vICRhxcw8vACRh5ewMjDCxh5eAEjDy9gGIU3OjrKmpub WXV1NauqqsppSPgHH+GnCbTDe/bsGauvrycnk9OM8PPp06exw+rQCm9kZITV1dWRE8hpR/g6PDwcO60G diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 0ec317e328..7fdf47625e 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2914,7 +2914,7 @@ Public Class frmMain UpdateLayout() End Sub - Private Sub RInstatResourcesSiteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RInstatResourcesSiteToolStripMenuItem.Click + Private Sub RInstatResourcesSiteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuHelpResourcesSite.Click Process.Start("https://ecampus.r-instat.org/course/view.php?id=14") End Sub diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 03eb772e1dc8c3ad774252d3c95c0b3e06fe9c99..992781e4402c3fa43a65e3a5a18b934c6253e179 100644 GIT binary patch delta 1002 zcmaLVNlX)A6bJCm(oScl(?SKcwA6wiRG`Qv6{y%E0wQ(+1Q*Z>Maxo_7OEnl#H9xV zm1r^tOfb=l21t}cjb3Wv&2Zu11&IxMFycWIE{2%+Cnk6?9DaGp_mcO2$@@Z~O)3QU zwM1}QS0xQfO!l!Coy&<@iA16$`+UQ-p56hM$KO9Z)Zy_rdIKK&%q^!n>{Js#0tGZk zK?V%Sfdww=RP&4Tl$wi)OpMPUV$s|f|B$P%oS4{R#8g@YvB*Sjl1A9RODWC-%q=FvyfdSGW9ri;8WWoW+f^0CtLCAqz$b+qY z^5GB^Kp_-CF_ggJsBx)u_2u}2MDm3&5alR3n9VxI63`P0@U zrgEL2wdFP9;FP&AVf#!K-^TH36*osLdQloNCo2B6)@@?JZF6dLHDsO?#3xf`OIQ;z z!x1Qha;S)EB9?Ur)lBw?Ox#jRq8^P~{L#g@6Qa2o9304KPh5t^VG&Oi&a!dW;6=ivghK|5T8OW=mf&;gy` tfiAcLSHTP2&;z~D2R`VB0T_fK@IwHGVFZG34X(ot7=@eB$+a>6>K`HgnH&HB delta 850 zcmW;GNk~)y0LJlo@6F7cH*emId+DgCYT|^0tMDURhar> zS_)MqU7lByh1Y?!dG&!+|BxD9YAGHXk1@I$o%+v^%)CI!TlJM781(KsW12r@QH2c} z>~J6ip$J1bA`povY`{iDBL+^yA`bD`gw04mB9f2{7q(z4wjl+n*pBrd>BvAPc3>y6 zunXD9L2e*rF>iV1_ME}7;23dKI!h{E>b8nXP;UNKLY zo6IiL7t<3{n<>?}YMe557&D|F(le=Bip&y!i7&-|F;Dm{%nE}-q2aG#PH*%HNrB8E z_p~PGt_ntHVUGT^-xIGd`P>ou$GdKiocs0m|Gc)IBZu6f{-`lG@=<_7><&bYdA?Ul zHR7l)2R(UuQP9&Xv;<~?o>@V6Tn+QXh0(_;3AsPj22u%E85VG%eaCLbmA(y(2XAS Y!izri;~EBV9fP=mn}N}lTfNKw0C?G70RR91