From d2379bbb095a5ec07d8ee72653bfdbaf0f8248bc Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 22 Jun 2023 11:15:48 +0100 Subject: [PATCH 01/48] minor Change --- instat/dlgEvapotranspiration.vb | 134 ++++++++++++++++++++++---------- 1 file changed, 92 insertions(+), 42 deletions(-) diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index f6aacfe15fd..d46f3469d35 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -18,22 +18,25 @@ Imports instat.Translations Public Class dlgEvapotranspiration Private bFirstload As Boolean = True Private bReset As Boolean = True - Private bResetSubdialog As Boolean = False + Private bResetSubdialog As Boolean = True Private iBasicHeight As Integer Private iBaseMaxY As Integer Private iSaveMaxY As Integer - Private iEvapOptions As Integer - Private clsETPenmanMonteith, clsHargreavesSamani, clsDataFunctionPM, clsDataFunctionHS, clsDataFunction, clsReadInputs, clsVector, clsMissingDataVector, clsVarnamesVectorPM, clsVarnamesVectorHS, clsLibraryEvap As New RFunction + Private iEvapOptions, iHSConstants, iLocation As Integer + Private iHSMissingOptions As Integer + Private clsETPenmanMonteith, clsHargreavesSamani, clsListFunction, clsDataFunctionPM, clsDataFunctionHS, clsReadInputs, clsVector, clsMissingDataVector, clsVarnamesVectorPM, clsVarnamesVectorHS, clsLibraryEvap As New RFunction Private clsDayFunc, clsMonthFunc, clsYearFunc As New RFunction - Private clsBaseOperator, clsDailyOperatorHS As New ROperator - Private bRcodeSet As Boolean = True + Private clsBaseOperator As New ROperator - Private Sub dlgdlgEvapotranspiration_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Private Sub dlgEvapotranspiration_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then iBasicHeight = Me.Height iBaseMaxY = ucrBase.Location.Y iSaveMaxY = ucrNewColName.Location.Y iEvapOptions = cmdEvapOptions.Location.Y + iHSMissingOptions = cmdHSMissingOptions.Location.Y + iHSConstants = cmdHSConstants.Location.Y + iLocation = cmdLocation.Location.Y InitialiseDialog() bFirstload = False End If @@ -49,12 +52,10 @@ Public Class dlgEvapotranspiration Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 565 - ucrBase.clsRsyntax.iCallType = 2 Dim dctInputCrops As New Dictionary(Of String, String) Dim dctInputTimeStep As New Dictionary(Of String, String) Dim dctInputSolar As New Dictionary(Of String, String) - Dim dctInputMissingMethod As New Dictionary(Of String, String) ucrReceiverDate.Selector = ucrSelectorEvapotranspiration ucrReceiverTmax.Selector = ucrSelectorEvapotranspiration @@ -102,7 +103,6 @@ Public Class dlgEvapotranspiration ucrInputTimeStep.SetDropDownStyleAsNonEditable() ucrInputSolar.SetParameter(New RParameter("solar", 3)) - ucrInputSolar.SetRDefault(Chr(34) & "sunshine hours" & Chr(34)) dctInputSolar.Add("sunshine hours", Chr(34) & "sunshine hours" & Chr(34)) dctInputSolar.Add("cloud", Chr(34) & "cloud" & Chr(34)) dctInputSolar.Add("radiation", Chr(34) & "radiation" & Chr(34)) @@ -121,15 +121,6 @@ Public Class dlgEvapotranspiration ucrChkWind.SetValuesCheckedAndUnchecked(Chr(34) & "yes" & Chr(34), Chr(34) & "no" & Chr(34)) ucrChkWind.SetRDefault(Chr(34) & "yes" & Chr(34)) - ' Missing Options - ucrInputMissingMethod.SetParameter(New RParameter("missing_method", 8)) - dctInputMissingMethod.Add("monthly average", Chr(34) & "monthly average" & Chr(34)) - dctInputMissingMethod.Add("seasonal average", Chr(34) & "seasonal average" & Chr(34)) - dctInputMissingMethod.Add("DoY average", Chr(34) & "DoY average" & Chr(34)) - dctInputMissingMethod.Add("neighbouring average", Chr(34) & "neighbouring average" & Chr(34)) - ucrInputMissingMethod.SetItems(dctInputMissingMethod) - ucrInputMissingMethod.SetDropDownStyleAsNonEditable() - 'panel setting ucrPnlMethod.AddRadioButton(rdoPenmanMonteith) ucrPnlMethod.AddRadioButton(rdoHargreavesSamani) @@ -144,14 +135,12 @@ Public Class dlgEvapotranspiration ucrPnlMethod.AddToLinkedControls(ucrReceiverRadiation, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlMethod.AddToLinkedControls(ucrChkWind, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlMethod.AddToLinkedControls(ucrInputSolar, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlMethod.AddToLinkedControls(ucrInputMissingMethod, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="monthly average") ucrReceiverRadiation.SetLinkedDisplayControl(lblRadiation) ucrReceiverHumidityMax.SetLinkedDisplayControl(lblHumidityMax) ucrReceiverHumidityMin.SetLinkedDisplayControl(lblHumidityMin) ucrInputTimeStep.SetLinkedDisplayControl(lblTimeStep) ucrInputSolar.SetLinkedDisplayControl(lblSolar) - ucrInputMissingMethod.SetLinkedDisplayControl(lblMissingMethod) ucrInputCrop.SetLinkedDisplayControl(lblCrop) 'ucrSave Column @@ -168,20 +157,18 @@ Public Class dlgEvapotranspiration clsDataFunctionPM = New RFunction clsDataFunctionHS = New RFunction clsBaseOperator = New ROperator - clsDailyOperatorHS = New ROperator clsReadInputs = New RFunction clsDayFunc = New RFunction clsMonthFunc = New RFunction clsYearFunc = New RFunction clsLibraryEvap = New RFunction + clsListFunction = New RFunction ucrSelectorEvapotranspiration.Reset() ucrReceiverHumidityMax.SetMeAsReceiver() ucrNewColName.Reset() - clsLibraryEvap.SetRCommand("library") - clsLibraryEvap.AddParameter("Evapotranspiration", "Evapotranspiration", bIncludeArgumentName:=False) - ucrBase.clsRsyntax.AddToBeforeCodes(clsLibraryEvap, iPosition:=0) + bResetSubdialog = True clsDataFunctionPM.SetRCommand("data.frame") clsDataFunctionPM.AddParameter("Year", clsRFunctionParameter:=clsYearFunc) @@ -193,22 +180,18 @@ Public Class dlgEvapotranspiration clsDataFunctionHS.AddParameter("Month", clsRFunctionParameter:=clsMonthFunc) clsDataFunctionHS.AddParameter("Day", clsRFunctionParameter:=clsDayFunc) - clsDayFunc.SetRCommand("day") clsDayFunc.SetPackageName("lubridate") + clsDayFunc.SetRCommand("day") - clsMonthFunc.SetRCommand("month") clsMonthFunc.SetPackageName("lubridate") + clsMonthFunc.SetRCommand("month") clsYearFunc.SetRCommand("year") clsYearFunc.SetPackageName("lubridate") - clsDataFunction.SetRCommand("data") - clsDataFunction.AddParameter("constants", Chr(34) & "constants" & Chr(34), bIncludeArgumentName:=False) - ucrBase.clsRsyntax.AddToBeforeCodes(clsDataFunction, iPosition:=1) - clsReadInputs.SetPackageName("Evapotranspiration") clsReadInputs.SetRCommand("ReadInputs") - clsReadInputs.AddParameter("constants", "constants", iPosition:=2, bIncludeArgumentName:=False) + clsReadInputs.AddParameter("constants", "constants", iPosition:=2) clsReadInputs.AddParameter("stopmissing", clsRFunctionParameter:=clsMissingDataVector, iPosition:=3) clsReadInputs.AddParameter("timestep", Chr(34) & "daily" & Chr(34), iPosition:=4) clsReadInputs.AddParameter("interp_missing_days", "FALSE", iPosition:=5) @@ -217,6 +200,7 @@ Public Class dlgEvapotranspiration clsReadInputs.AddParameter("abnormal_method", "NULL", iPosition:=9) clsReadInputs.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorPM, iPosition:=0) clsReadInputs.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionPM, iPosition:=1) + clsReadInputs.AddParameter("missing_method", Chr(34) & "monthly average" & Chr(34), iPosition:=8) clsReadInputs.SetAssignTo("temp_data") clsVarnamesVectorPM.SetRCommand("c") @@ -224,7 +208,7 @@ Public Class dlgEvapotranspiration clsVarnamesVectorPM.AddParameter("Tmin", Chr(34) & "Tmin" & Chr(34), bIncludeArgumentName:=False) clsVarnamesVectorPM.AddParameter("RHmax", Chr(34) & "RHmax" & Chr(34), bIncludeArgumentName:=False) clsVarnamesVectorPM.AddParameter("RHmin", Chr(34) & "RHmin" & Chr(34), bIncludeArgumentName:=False) - + clsVarnamesVectorPM.AddParameter("lon", 0, iPosition:=3) clsVarnamesVectorHS.SetRCommand("c") clsVarnamesVectorHS.AddParameter("Tmax", Chr(34) & "Tmax" & Chr(34), bIncludeArgumentName:=False) @@ -237,31 +221,48 @@ Public Class dlgEvapotranspiration clsVector.SetRCommand("c") + clsListFunction.ClearParameters() + clsListFunction.SetRCommand("list") + clsListFunction.AddParameter("Elev", 0, iPosition:=0) + clsListFunction.AddParameter("lambda", 2.54, iPosition:=1) + clsListFunction.AddParameter("lat_rad", 0, iPosition:=2) + clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5) + clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) + clsListFunction.AddParameter("z", 2, iPosition:=4) + clsListFunction.AddParameter("G", 0, iPosition:=6) + clsListFunction.AddParameter("as", 0.25, iPosition:=7) + clsListFunction.AddParameter("bs", 0.5, iPosition:=8) + clsListFunction.SetAssignTo("constants") + clsETPenmanMonteith.SetPackageName("Evapotranspiration") clsETPenmanMonteith.SetRCommand("ET.PenmanMonteith") clsETPenmanMonteith.AddParameter("data", clsRFunctionParameter:=clsReadInputs, iPosition:=0) - clsETPenmanMonteith.AddParameter("constants", "constants", iPosition:=1, bIncludeArgumentName:=False) + clsETPenmanMonteith.AddParameter("constants", "constants", iPosition:=1) clsETPenmanMonteith.AddParameter("ts", Chr(34) & "daily" & Chr(34), iPosition:=2) - clsETPenmanMonteith.AddParameter("message", Chr(34) & "yes" & Chr(34), iPosition:=3) - clsETPenmanMonteith.AddParameter("crops", Chr(34) & "short" & Chr(34), iPosition:=4) - clsETPenmanMonteith.AddParameter("save.csv", Chr(34) & "no" & Chr(34), iPosition:=5) + clsETPenmanMonteith.AddParameter("solar", Chr(34) & "sunshine hours" & Chr(34), iPosition:=3) + clsETPenmanMonteith.AddParameter("message", Chr(34) & "yes" & Chr(34), iPosition:=4) + clsETPenmanMonteith.AddParameter("crops", Chr(34) & "short" & Chr(34), iPosition:=5) + clsETPenmanMonteith.AddParameter("save.csv", Chr(34) & "no" & Chr(34), iPosition:=6) clsETPenmanMonteith.SetAssignTo("Penman_Monteith") clsHargreavesSamani.SetPackageName("Evapotranspiration") clsHargreavesSamani.SetRCommand("ET.HargreavesSamani") clsHargreavesSamani.AddParameter("data", clsRFunctionParameter:=clsReadInputs, iPosition:=0) - clsHargreavesSamani.AddParameter("constants", "constants", iPosition:=1, bIncludeArgumentName:=False) + clsHargreavesSamani.AddParameter("constants", "constants", iPosition:=1) clsHargreavesSamani.AddParameter("ts", Chr(34) & "daily" & Chr(34), iPosition:=2) clsHargreavesSamani.AddParameter("message", Chr(34) & "yes" & Chr(34), iPosition:=3) clsHargreavesSamani.AddParameter("save.csv", Chr(34) & "no" & Chr(34), iPosition:=4) clsHargreavesSamani.SetAssignTo("Hargreaves_Samani") clsBaseOperator.SetOperation("$") + clsBaseOperator.bSpaceAroundOperation = False clsBaseOperator.AddParameter("ET.PenmanMonteith", clsRFunctionParameter:=clsETPenmanMonteith, iPosition:=0) clsBaseOperator.AddParameter("ET.Daily", strParameterValue:="ET.Daily", iPosition:=1) + ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrNewColName.GetText, strTempDataframe:=ucrSelectorEvapotranspiration.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrNewColName.GetText) ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) + ucrBase.clsRsyntax.AddToBeforeCodes(clsListFunction, iPosition:=1) End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -271,7 +272,6 @@ Public Class dlgEvapotranspiration ucrReceiverTmin.AddAdditionalCodeParameterPair(clsDataFunctionHS, New RParameter("Tmin", 4), iAdditionalPairNo:=1) ucrInputTimeStep.AddAdditionalCodeParameterPair(clsHargreavesSamani, New RParameter("ts", 2), iAdditionalPairNo:=1) - ucrPnlMethod.SetRCode(clsBaseOperator, bReset) ucrReceiverDate.SetRCode(clsDayFunc, bReset) ucrReceiverTmax.SetRCode(clsDataFunctionPM, bReset) ucrReceiverTmin.SetRCode(clsDataFunctionPM, bReset) @@ -279,16 +279,20 @@ Public Class dlgEvapotranspiration ucrReceiverHumidityMin.SetRCode(clsDataFunctionPM, bReset) ucrReceiverWindSpeed.SetRCode(clsDataFunctionPM, bReset) ucrInputTimeStep.SetRCode(clsETPenmanMonteith, bReset) - ucrInputSolar.SetRCode(clsETPenmanMonteith, bReset) ucrInputCrop.SetRCode(clsETPenmanMonteith, bReset) ucrChkWind.SetRCode(clsETPenmanMonteith, bReset) ucrNewColName.SetRCode(clsBaseOperator, bReset) - ucrInputMissingMethod.SetRCode(clsReadInputs, bReset) + ucrPnlMethod.SetRCode(clsBaseOperator, bReset) + If bReset Then + ucrInputSolar.SetRCode(clsETPenmanMonteith, bReset) + End If End Sub Private Sub TestOKEnabled() If rdoPenmanMonteith.Checked Then - If ucrNewColName.IsComplete AndAlso Not ucrReceiverDate.IsEmpty() AndAlso Not ucrReceiverTmax.IsEmpty() AndAlso Not ucrReceiverTmin.IsEmpty() AndAlso Not ucrReceiverHumidityMax.IsEmpty() AndAlso Not ucrReceiverHumidityMin.IsEmpty() AndAlso Not ucrReceiverRadiation.IsEmpty() AndAlso Not ucrInputTimeStep.IsEmpty Then + If ucrNewColName.IsComplete AndAlso Not ucrReceiverDate.IsEmpty() AndAlso Not ucrReceiverTmax.IsEmpty() AndAlso Not ucrReceiverTmin.IsEmpty() AndAlso + Not ucrReceiverHumidityMax.IsEmpty() AndAlso Not ucrReceiverHumidityMin.IsEmpty() AndAlso + Not ucrReceiverRadiation.IsEmpty() AndAlso Not ucrInputTimeStep.IsEmpty Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -317,18 +321,48 @@ Public Class dlgEvapotranspiration sdgMissingOptionsEvapotranspiration.ShowDialog() End Sub + Private Sub cmdHSMissingOptions_Click(sender As Object, e As EventArgs) Handles cmdHSMissingOptions.Click + sdgHSMissingOptions.SetRFunction(clsReadInputs, clsMissingDataVector, bResetSubdialog) + bResetSubdialog = False + sdgHSMissingOptions.ShowDialog() + End Sub + + Private Sub cmdPMConstants_Click(sender As Object, e As EventArgs) Handles cmdPMConstants.Click + sdgPMConstants.SetRFunction(clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) + sdgPMConstants.ShowDialog() + bResetSubdialog = False + TestOKEnabled() + End Sub + + Private Sub cmdHSConstants_Click(sender As Object, e As EventArgs) Handles cmdHSConstants.Click + sdgHSConstants.SetRFunction(clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) + sdgHSConstants.ShowDialog() + bResetSubdialog = False + TestOKEnabled() + End Sub + + Private Sub cmdLocation_Click(sender As Object, e As EventArgs) Handles cmdLocation.Click + sdgLocation.SetRFunction(clsNewVarnamesVectorHS:=clsVarnamesVectorHS, clsNewVarnamesVectorPM:=clsVarnamesVectorPM, clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) + sdgLocation.ShowDialog() + bResetSubdialog = False + TestOKEnabled() + End Sub + Private Sub DialogSize() If rdoPenmanMonteith.Checked Then Me.Size = New System.Drawing.Size(Me.Width, iBasicHeight) ucrBase.Location = New Point(ucrBase.Location.X, iBaseMaxY) ucrNewColName.Location = New Point(ucrNewColName.Location.X, iSaveMaxY) cmdEvapOptions.Location = New Point(cmdEvapOptions.Location.X, iEvapOptions) + cmdLocation.Location = New Point(cmdLocation.Location.X, iLocation) ElseIf rdoHargreavesSamani.Checked Then ucrReceiverDate.SetMeAsReceiver() Me.Size = New System.Drawing.Size(Me.Width, iBasicHeight * 0.9) ucrBase.Location = New Point(ucrBase.Location.X, iBaseMaxY / 1.15) ucrNewColName.Location = New Point(ucrNewColName.Location.X, iSaveMaxY / 1.183) - cmdEvapOptions.Location = New Point(cmdEvapOptions.Location.X, iEvapOptions / 1.187) + cmdHSMissingOptions.Location = New Point(cmdHSMissingOptions.Location.X, iHSMissingOptions / 1.187) + cmdHSConstants.Location = New Point(cmdHSConstants.Location.X, iHSConstants / 1.187) + cmdLocation.Location = New Point(cmdLocation.Location.X, iLocation / 1.187) End If End Sub @@ -345,6 +379,7 @@ Public Class dlgEvapotranspiration Private Sub ucrPnlMethod_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlMethod.ControlValueChanged Method() DialogSize() + EnableDesableSubDialog() If rdoPenmanMonteith.Checked Then clsBaseOperator.AddParameter("ET.PenmanMonteith", clsRFunctionParameter:=clsETPenmanMonteith, iPosition:=0) Else @@ -357,6 +392,20 @@ Public Class dlgEvapotranspiration End If End Sub + Private Sub EnableDesableSubDialog() + If rdoPenmanMonteith.Checked Then + cmdEvapOptions.Visible = True + cmdPMConstants.Visible = True + cmdHSMissingOptions.Visible = False + cmdHSConstants.Visible = False + Else + cmdEvapOptions.Visible = False + cmdPMConstants.Visible = False + cmdHSMissingOptions.Visible = True + cmdHSConstants.Visible = True + End If + End Sub + Private Sub ucrReceiverWindSpeed_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverWindSpeed.ControlValueChanged, ucrChkWind.ControlValueChanged If ucrChkWind.Checked AndAlso Not ucrReceiverWindSpeed.IsEmpty Then clsVarnamesVectorPM.AddParameter("u2", Chr(34) & "u2" & Chr(34), bIncludeArgumentName:=False) @@ -369,6 +418,7 @@ Public Class dlgEvapotranspiration Private Sub ucrInputSolar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSolar.ControlValueChanged, ucrReceiverRadiation.ControlValueChanged Select Case ucrInputSolar.GetText Case "sunshine hours" + clsETPenmanMonteith.AddParameter("solar", Chr(34) & "sunshine hours" & Chr(34), iPosition:=3) ucrReceiverRadiation.SetClimaticType("sunshine_hours") ucrReceiverRadiation.bAutoFill = True clsVarnamesVectorPM.AddParameter("n", Chr(34) & "n" & Chr(34), bIncludeArgumentName:=False) From 547db2df3e124f0d7b430df1a43085f1bcc0efb6 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 22 Jun 2023 11:21:08 +0100 Subject: [PATCH 02/48] minor change --- instat/dlgEvapotranspiration.Designer.vb | 418 ++++++++++++----------- instat/dlgEvapotranspiration.vb | 19 +- 2 files changed, 229 insertions(+), 208 deletions(-) diff --git a/instat/dlgEvapotranspiration.Designer.vb b/instat/dlgEvapotranspiration.Designer.vb index 144623d8381..725a9a16f90 100644 --- a/instat/dlgEvapotranspiration.Designer.vb +++ b/instat/dlgEvapotranspiration.Designer.vb @@ -22,126 +22,111 @@ Partial Class dlgEvapotranspiration 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.lblTmax = New System.Windows.Forms.Label() - Me.lblTmin = New System.Windows.Forms.Label() - Me.lblHumidityMax = New System.Windows.Forms.Label() - Me.lblHumidityMin = New System.Windows.Forms.Label() - Me.lblTimeStep = New System.Windows.Forms.Label() - Me.lblCrop = New System.Windows.Forms.Label() - Me.lblDate = New System.Windows.Forms.Label() - Me.lblMissingMethod = New System.Windows.Forms.Label() - Me.lblSolar = New System.Windows.Forms.Label() - Me.lblRadiation = New System.Windows.Forms.Label() + Me.cmdHSConstants = New System.Windows.Forms.Button() + Me.cmdLocation = New System.Windows.Forms.Button() + Me.cmdPMConstants = New System.Windows.Forms.Button() + Me.cmdHSMissingOptions = New System.Windows.Forms.Button() + Me.ucrReceiverWindSpeed = New instat.ucrReceiverSingle() + Me.ucrChkWind = New instat.ucrCheck() + Me.cmdEvapOptions = New System.Windows.Forms.Button() Me.rdoHargreavesSamani = New System.Windows.Forms.RadioButton() Me.rdoPenmanMonteith = New System.Windows.Forms.RadioButton() - Me.cmdEvapOptions = New System.Windows.Forms.Button() - Me.ucrInputMissingMethod = New instat.ucrInputComboBox() + Me.lblSolar = New System.Windows.Forms.Label() Me.ucrInputSolar = New instat.ucrInputComboBox() + Me.lblRadiation = New System.Windows.Forms.Label() Me.ucrReceiverRadiation = New instat.ucrReceiverSingle() Me.ucrInputCrop = New instat.ucrInputComboBox() Me.ucrNewColName = New instat.ucrSave() + Me.lblDate = New System.Windows.Forms.Label() Me.ucrReceiverDate = New instat.ucrReceiverSingle() Me.ucrPnlMethod = New instat.UcrPanel() + Me.lblCrop = New System.Windows.Forms.Label() + Me.lblTimeStep = New System.Windows.Forms.Label() Me.ucrInputTimeStep = New instat.ucrInputComboBox() + Me.lblHumidityMin = New System.Windows.Forms.Label() Me.ucrReceiverHumidityMin = New instat.ucrReceiverSingle() + Me.lblHumidityMax = New System.Windows.Forms.Label() Me.ucrReceiverHumidityMax = New instat.ucrReceiverSingle() + Me.lblTmin = New System.Windows.Forms.Label() Me.ucrReceiverTmin = New instat.ucrReceiverSingle() + Me.lblTmax = New System.Windows.Forms.Label() Me.ucrReceiverTmax = New instat.ucrReceiverSingle() Me.ucrSelectorEvapotranspiration = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() - Me.ucrReceiverWindSpeed = New instat.ucrReceiverSingle() - Me.ucrChkWind = New instat.ucrCheck() Me.SuspendLayout() ' - 'lblTmax - ' - Me.lblTmax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTmax.Location = New System.Drawing.Point(311, 120) - Me.lblTmax.Name = "lblTmax" - Me.lblTmax.Size = New System.Drawing.Size(47, 13) - Me.lblTmax.TabIndex = 8 - Me.lblTmax.Text = "Tmax:" - ' - 'lblTmin - ' - Me.lblTmin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTmin.Location = New System.Drawing.Point(311, 85) - Me.lblTmin.Name = "lblTmin" - Me.lblTmin.Size = New System.Drawing.Size(42, 14) - Me.lblTmin.TabIndex = 6 - Me.lblTmin.Text = "Tmin:" - ' - 'lblHumidityMax - ' - Me.lblHumidityMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHumidityMax.Location = New System.Drawing.Point(311, 156) - Me.lblHumidityMax.Name = "lblHumidityMax" - Me.lblHumidityMax.Size = New System.Drawing.Size(124, 19) - Me.lblHumidityMax.TabIndex = 10 - Me.lblHumidityMax.Text = "Humidity Max:" - ' - 'lblHumidityMin - ' - Me.lblHumidityMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHumidityMin.Location = New System.Drawing.Point(311, 197) - Me.lblHumidityMin.Name = "lblHumidityMin" - Me.lblHumidityMin.Size = New System.Drawing.Size(123, 19) - Me.lblHumidityMin.TabIndex = 12 - Me.lblHumidityMin.Text = "Humidity Min:" - ' - 'lblTimeStep - ' - Me.lblTimeStep.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTimeStep.Location = New System.Drawing.Point(2, 242) - Me.lblTimeStep.Name = "lblTimeStep" - Me.lblTimeStep.Size = New System.Drawing.Size(107, 20) - Me.lblTimeStep.TabIndex = 22 - Me.lblTimeStep.Text = "Time Step" - ' - 'lblCrop - ' - Me.lblCrop.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCrop.Location = New System.Drawing.Point(2, 344) - Me.lblCrop.Name = "lblCrop" - Me.lblCrop.Size = New System.Drawing.Size(71, 20) - Me.lblCrop.TabIndex = 30 - Me.lblCrop.Text = "Crop" - ' - 'lblDate + 'cmdHSConstants + ' + Me.cmdHSConstants.Location = New System.Drawing.Point(171, 342) + Me.cmdHSConstants.Name = "cmdHSConstants" + Me.cmdHSConstants.Size = New System.Drawing.Size(123, 23) + Me.cmdHSConstants.TabIndex = 69 + Me.cmdHSConstants.Tag = "Options" + Me.cmdHSConstants.Text = "Constants" + Me.cmdHSConstants.UseVisualStyleBackColor = True + ' + 'cmdLocation + ' + Me.cmdLocation.Location = New System.Drawing.Point(10, 341) + Me.cmdLocation.Name = "cmdLocation" + Me.cmdLocation.Size = New System.Drawing.Size(123, 23) + Me.cmdLocation.TabIndex = 68 + Me.cmdLocation.Tag = "Options" + Me.cmdLocation.Text = "Location" + Me.cmdLocation.UseVisualStyleBackColor = True + ' + 'cmdPMConstants + ' + Me.cmdPMConstants.Location = New System.Drawing.Point(171, 342) + Me.cmdPMConstants.Name = "cmdPMConstants" + Me.cmdPMConstants.Size = New System.Drawing.Size(123, 23) + Me.cmdPMConstants.TabIndex = 67 + Me.cmdPMConstants.Tag = "Options" + Me.cmdPMConstants.Text = "Constants" + Me.cmdPMConstants.UseVisualStyleBackColor = True + ' + 'cmdHSMissingOptions + ' + Me.cmdHSMissingOptions.Location = New System.Drawing.Point(319, 341) + Me.cmdHSMissingOptions.Name = "cmdHSMissingOptions" + Me.cmdHSMissingOptions.Size = New System.Drawing.Size(123, 23) + Me.cmdHSMissingOptions.TabIndex = 66 + Me.cmdHSMissingOptions.Tag = "Options" + Me.cmdHSMissingOptions.Text = "Missing Options" + Me.cmdHSMissingOptions.UseVisualStyleBackColor = True ' - Me.lblDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDate.Location = New System.Drawing.Point(311, 48) - Me.lblDate.Name = "lblDate" - Me.lblDate.Size = New System.Drawing.Size(43, 14) - Me.lblDate.TabIndex = 4 - Me.lblDate.Text = "Date:" - ' - 'lblMissingMethod + 'ucrReceiverWindSpeed ' - Me.lblMissingMethod.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMissingMethod.Location = New System.Drawing.Point(2, 310) - Me.lblMissingMethod.Name = "lblMissingMethod" - Me.lblMissingMethod.Size = New System.Drawing.Size(107, 20) - Me.lblMissingMethod.TabIndex = 28 - Me.lblMissingMethod.Text = "Missing Method" + Me.ucrReceiverWindSpeed.AutoSize = True + Me.ucrReceiverWindSpeed.frmParent = Me + Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(319, 313) + Me.ucrReceiverWindSpeed.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverWindSpeed.Name = "ucrReceiverWindSpeed" + Me.ucrReceiverWindSpeed.Selector = Nothing + Me.ucrReceiverWindSpeed.Size = New System.Drawing.Size(123, 20) + Me.ucrReceiverWindSpeed.strNcFilePath = "" + Me.ucrReceiverWindSpeed.TabIndex = 42 + Me.ucrReceiverWindSpeed.ucrSelector = Nothing ' - 'lblSolar + 'ucrChkWind ' - Me.lblSolar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSolar.Location = New System.Drawing.Point(2, 275) - Me.lblSolar.Name = "lblSolar" - Me.lblSolar.Size = New System.Drawing.Size(58, 18) - Me.lblSolar.TabIndex = 26 - Me.lblSolar.Text = "Solar" + Me.ucrChkWind.AutoSize = True + Me.ucrChkWind.Checked = False + Me.ucrChkWind.Location = New System.Drawing.Point(319, 290) + Me.ucrChkWind.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkWind.Name = "ucrChkWind" + Me.ucrChkWind.Size = New System.Drawing.Size(123, 23) + Me.ucrChkWind.TabIndex = 39 ' - 'lblRadiation + 'cmdEvapOptions ' - Me.lblRadiation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRadiation.Location = New System.Drawing.Point(311, 237) - Me.lblRadiation.Name = "lblRadiation" - Me.lblRadiation.Size = New System.Drawing.Size(120, 17) - Me.lblRadiation.TabIndex = 14 - Me.lblRadiation.Text = "Solar:" + Me.cmdEvapOptions.Location = New System.Drawing.Point(319, 341) + Me.cmdEvapOptions.Name = "cmdEvapOptions" + Me.cmdEvapOptions.Size = New System.Drawing.Size(123, 23) + Me.cmdEvapOptions.TabIndex = 65 + Me.cmdEvapOptions.Tag = "Options" + Me.cmdEvapOptions.Text = "Missing Options" + Me.cmdEvapOptions.UseVisualStyleBackColor = True ' 'rdoHargreavesSamani ' @@ -151,10 +136,10 @@ Partial Class dlgEvapotranspiration Me.rdoHargreavesSamani.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoHargreavesSamani.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoHargreavesSamani.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoHargreavesSamani.Location = New System.Drawing.Point(210, 12) + Me.rdoHargreavesSamani.Location = New System.Drawing.Point(215, 10) Me.rdoHargreavesSamani.Name = "rdoHargreavesSamani" Me.rdoHargreavesSamani.Size = New System.Drawing.Size(131, 27) - Me.rdoHargreavesSamani.TabIndex = 2 + Me.rdoHargreavesSamani.TabIndex = 43 Me.rdoHargreavesSamani.TabStop = True Me.rdoHargreavesSamani.Text = "Hargreaves- Samani" Me.rdoHargreavesSamani.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -168,35 +153,23 @@ Partial Class dlgEvapotranspiration Me.rdoPenmanMonteith.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoPenmanMonteith.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoPenmanMonteith.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoPenmanMonteith.Location = New System.Drawing.Point(103, 12) + Me.rdoPenmanMonteith.Location = New System.Drawing.Point(108, 10) Me.rdoPenmanMonteith.Name = "rdoPenmanMonteith" Me.rdoPenmanMonteith.Size = New System.Drawing.Size(109, 27) - Me.rdoPenmanMonteith.TabIndex = 1 + Me.rdoPenmanMonteith.TabIndex = 41 Me.rdoPenmanMonteith.TabStop = True Me.rdoPenmanMonteith.Text = "Penman-Monteith" Me.rdoPenmanMonteith.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoPenmanMonteith.UseVisualStyleBackColor = True ' - 'cmdEvapOptions - ' - Me.cmdEvapOptions.Location = New System.Drawing.Point(314, 343) - Me.cmdEvapOptions.Name = "cmdEvapOptions" - Me.cmdEvapOptions.Size = New System.Drawing.Size(123, 23) - Me.cmdEvapOptions.TabIndex = 34 - Me.cmdEvapOptions.Tag = "Options" - Me.cmdEvapOptions.Text = "Missing Options" - Me.cmdEvapOptions.UseVisualStyleBackColor = True - ' - 'ucrInputMissingMethod + 'lblSolar ' - Me.ucrInputMissingMethod.AddQuotesIfUnrecognised = True - Me.ucrInputMissingMethod.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputMissingMethod.GetSetSelectedIndex = -1 - Me.ucrInputMissingMethod.IsReadOnly = False - Me.ucrInputMissingMethod.Location = New System.Drawing.Point(109, 310) - Me.ucrInputMissingMethod.Name = "ucrInputMissingMethod" - Me.ucrInputMissingMethod.Size = New System.Drawing.Size(137, 21) - Me.ucrInputMissingMethod.TabIndex = 29 + Me.lblSolar.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblSolar.Location = New System.Drawing.Point(10, 269) + Me.lblSolar.Name = "lblSolar" + Me.lblSolar.Size = New System.Drawing.Size(58, 18) + Me.lblSolar.TabIndex = 59 + Me.lblSolar.Text = "Solar" ' 'ucrInputSolar ' @@ -204,22 +177,32 @@ Partial Class dlgEvapotranspiration Me.ucrInputSolar.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputSolar.GetSetSelectedIndex = -1 Me.ucrInputSolar.IsReadOnly = False - Me.ucrInputSolar.Location = New System.Drawing.Point(109, 275) + Me.ucrInputSolar.Location = New System.Drawing.Point(114, 266) + Me.ucrInputSolar.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputSolar.Name = "ucrInputSolar" Me.ucrInputSolar.Size = New System.Drawing.Size(137, 21) - Me.ucrInputSolar.TabIndex = 27 + Me.ucrInputSolar.TabIndex = 60 + ' + 'lblRadiation + ' + Me.lblRadiation.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRadiation.Location = New System.Drawing.Point(319, 240) + Me.lblRadiation.Name = "lblRadiation" + Me.lblRadiation.Size = New System.Drawing.Size(120, 13) + Me.lblRadiation.TabIndex = 55 + Me.lblRadiation.Text = "Solar:" ' 'ucrReceiverRadiation ' Me.ucrReceiverRadiation.AutoSize = True Me.ucrReceiverRadiation.frmParent = Me - Me.ucrReceiverRadiation.Location = New System.Drawing.Point(314, 254) + Me.ucrReceiverRadiation.Location = New System.Drawing.Point(319, 256) Me.ucrReceiverRadiation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRadiation.Name = "ucrReceiverRadiation" Me.ucrReceiverRadiation.Selector = Nothing Me.ucrReceiverRadiation.Size = New System.Drawing.Size(123, 20) Me.ucrReceiverRadiation.strNcFilePath = "" - Me.ucrReceiverRadiation.TabIndex = 15 + Me.ucrReceiverRadiation.TabIndex = 56 Me.ucrReceiverRadiation.ucrSelector = Nothing ' 'ucrInputCrop @@ -228,40 +211,69 @@ Partial Class dlgEvapotranspiration Me.ucrInputCrop.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputCrop.GetSetSelectedIndex = -1 Me.ucrInputCrop.IsReadOnly = False - Me.ucrInputCrop.Location = New System.Drawing.Point(109, 343) + Me.ucrInputCrop.Location = New System.Drawing.Point(114, 292) + Me.ucrInputCrop.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputCrop.Name = "ucrInputCrop" Me.ucrInputCrop.Size = New System.Drawing.Size(137, 21) - Me.ucrInputCrop.TabIndex = 31 + Me.ucrInputCrop.TabIndex = 62 ' 'ucrNewColName ' Me.ucrNewColName.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrNewColName.Location = New System.Drawing.Point(5, 386) + Me.ucrNewColName.Location = New System.Drawing.Point(10, 384) Me.ucrNewColName.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrNewColName.Name = "ucrNewColName" Me.ucrNewColName.Size = New System.Drawing.Size(388, 24) - Me.ucrNewColName.TabIndex = 32 + Me.ucrNewColName.TabIndex = 63 + ' + 'lblDate + ' + Me.lblDate.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblDate.Location = New System.Drawing.Point(319, 45) + Me.lblDate.Name = "lblDate" + Me.lblDate.Size = New System.Drawing.Size(43, 13) + Me.lblDate.TabIndex = 45 + Me.lblDate.Text = "Date:" ' 'ucrReceiverDate ' Me.ucrReceiverDate.AutoSize = True Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(314, 63) + Me.ucrReceiverDate.Location = New System.Drawing.Point(319, 61) Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDate.Name = "ucrReceiverDate" Me.ucrReceiverDate.Selector = Nothing Me.ucrReceiverDate.Size = New System.Drawing.Size(123, 20) Me.ucrReceiverDate.strNcFilePath = "" - Me.ucrReceiverDate.TabIndex = 5 + Me.ucrReceiverDate.TabIndex = 46 Me.ucrReceiverDate.ucrSelector = Nothing ' 'ucrPnlMethod ' Me.ucrPnlMethod.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlMethod.Location = New System.Drawing.Point(102, 10) + Me.ucrPnlMethod.Location = New System.Drawing.Point(107, 8) + Me.ucrPnlMethod.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlMethod.Name = "ucrPnlMethod" Me.ucrPnlMethod.Size = New System.Drawing.Size(244, 37) - Me.ucrPnlMethod.TabIndex = 0 + Me.ucrPnlMethod.TabIndex = 40 + ' + 'lblCrop + ' + Me.lblCrop.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblCrop.Location = New System.Drawing.Point(10, 297) + Me.lblCrop.Name = "lblCrop" + Me.lblCrop.Size = New System.Drawing.Size(71, 20) + Me.lblCrop.TabIndex = 61 + Me.lblCrop.Text = "Crop" + ' + 'lblTimeStep + ' + Me.lblTimeStep.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblTimeStep.Location = New System.Drawing.Point(10, 240) + Me.lblTimeStep.Name = "lblTimeStep" + Me.lblTimeStep.Size = New System.Drawing.Size(92, 20) + Me.lblTimeStep.TabIndex = 57 + Me.lblTimeStep.Text = "Time Step" ' 'ucrInputTimeStep ' @@ -269,61 +281,98 @@ Partial Class dlgEvapotranspiration Me.ucrInputTimeStep.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputTimeStep.GetSetSelectedIndex = -1 Me.ucrInputTimeStep.IsReadOnly = False - Me.ucrInputTimeStep.Location = New System.Drawing.Point(109, 241) + Me.ucrInputTimeStep.Location = New System.Drawing.Point(114, 240) + Me.ucrInputTimeStep.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputTimeStep.Name = "ucrInputTimeStep" - Me.ucrInputTimeStep.Size = New System.Drawing.Size(113, 21) - Me.ucrInputTimeStep.TabIndex = 23 + Me.ucrInputTimeStep.Size = New System.Drawing.Size(137, 21) + Me.ucrInputTimeStep.TabIndex = 58 + ' + 'lblHumidityMin + ' + Me.lblHumidityMin.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblHumidityMin.Location = New System.Drawing.Point(319, 200) + Me.lblHumidityMin.Name = "lblHumidityMin" + Me.lblHumidityMin.Size = New System.Drawing.Size(123, 13) + Me.lblHumidityMin.TabIndex = 53 + Me.lblHumidityMin.Text = "Humidity Min:" ' 'ucrReceiverHumidityMin ' Me.ucrReceiverHumidityMin.AutoSize = True Me.ucrReceiverHumidityMin.frmParent = Me - Me.ucrReceiverHumidityMin.Location = New System.Drawing.Point(314, 216) + Me.ucrReceiverHumidityMin.Location = New System.Drawing.Point(319, 216) Me.ucrReceiverHumidityMin.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverHumidityMin.Name = "ucrReceiverHumidityMin" Me.ucrReceiverHumidityMin.Selector = Nothing Me.ucrReceiverHumidityMin.Size = New System.Drawing.Size(123, 20) Me.ucrReceiverHumidityMin.strNcFilePath = "" - Me.ucrReceiverHumidityMin.TabIndex = 13 + Me.ucrReceiverHumidityMin.TabIndex = 54 Me.ucrReceiverHumidityMin.ucrSelector = Nothing ' + 'lblHumidityMax + ' + Me.lblHumidityMax.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblHumidityMax.Location = New System.Drawing.Point(319, 161) + Me.lblHumidityMax.Name = "lblHumidityMax" + Me.lblHumidityMax.Size = New System.Drawing.Size(124, 13) + Me.lblHumidityMax.TabIndex = 51 + Me.lblHumidityMax.Text = "Humidity Max:" + ' 'ucrReceiverHumidityMax ' Me.ucrReceiverHumidityMax.AutoSize = True Me.ucrReceiverHumidityMax.frmParent = Me - Me.ucrReceiverHumidityMax.Location = New System.Drawing.Point(314, 175) + Me.ucrReceiverHumidityMax.Location = New System.Drawing.Point(319, 177) Me.ucrReceiverHumidityMax.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverHumidityMax.Name = "ucrReceiverHumidityMax" Me.ucrReceiverHumidityMax.Selector = Nothing Me.ucrReceiverHumidityMax.Size = New System.Drawing.Size(123, 20) Me.ucrReceiverHumidityMax.strNcFilePath = "" - Me.ucrReceiverHumidityMax.TabIndex = 11 + Me.ucrReceiverHumidityMax.TabIndex = 52 Me.ucrReceiverHumidityMax.ucrSelector = Nothing ' + 'lblTmin + ' + Me.lblTmin.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblTmin.Location = New System.Drawing.Point(319, 84) + Me.lblTmin.Name = "lblTmin" + Me.lblTmin.Size = New System.Drawing.Size(42, 13) + Me.lblTmin.TabIndex = 47 + Me.lblTmin.Text = "Tmin:" + ' 'ucrReceiverTmin ' Me.ucrReceiverTmin.AutoSize = True Me.ucrReceiverTmin.frmParent = Me - Me.ucrReceiverTmin.Location = New System.Drawing.Point(314, 99) + Me.ucrReceiverTmin.Location = New System.Drawing.Point(319, 99) Me.ucrReceiverTmin.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverTmin.Name = "ucrReceiverTmin" Me.ucrReceiverTmin.Selector = Nothing Me.ucrReceiverTmin.Size = New System.Drawing.Size(123, 20) Me.ucrReceiverTmin.strNcFilePath = "" - Me.ucrReceiverTmin.TabIndex = 7 + Me.ucrReceiverTmin.TabIndex = 48 Me.ucrReceiverTmin.ucrSelector = Nothing ' + 'lblTmax + ' + Me.lblTmax.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblTmax.Location = New System.Drawing.Point(319, 123) + Me.lblTmax.Name = "lblTmax" + Me.lblTmax.Size = New System.Drawing.Size(47, 13) + Me.lblTmax.TabIndex = 49 + Me.lblTmax.Text = "Tmax:" + ' 'ucrReceiverTmax ' Me.ucrReceiverTmax.AutoSize = True Me.ucrReceiverTmax.frmParent = Me - Me.ucrReceiverTmax.Location = New System.Drawing.Point(314, 133) + Me.ucrReceiverTmax.Location = New System.Drawing.Point(319, 138) Me.ucrReceiverTmax.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverTmax.Name = "ucrReceiverTmax" Me.ucrReceiverTmax.Selector = Nothing Me.ucrReceiverTmax.Size = New System.Drawing.Size(123, 20) Me.ucrReceiverTmax.strNcFilePath = "" - Me.ucrReceiverTmax.TabIndex = 9 + Me.ucrReceiverTmax.TabIndex = 50 Me.ucrReceiverTmax.ucrSelector = Nothing ' 'ucrSelectorEvapotranspiration @@ -332,42 +381,21 @@ Partial Class dlgEvapotranspiration Me.ucrSelectorEvapotranspiration.bDropUnusedFilterLevels = False Me.ucrSelectorEvapotranspiration.bShowHiddenColumns = False Me.ucrSelectorEvapotranspiration.bUseCurrentFilter = True - Me.ucrSelectorEvapotranspiration.Location = New System.Drawing.Point(5, 50) + Me.ucrSelectorEvapotranspiration.Location = New System.Drawing.Point(10, 48) Me.ucrSelectorEvapotranspiration.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorEvapotranspiration.Name = "ucrSelectorEvapotranspiration" Me.ucrSelectorEvapotranspiration.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorEvapotranspiration.TabIndex = 3 + Me.ucrSelectorEvapotranspiration.TabIndex = 44 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(5, 421) + Me.ucrBase.Location = New System.Drawing.Point(10, 419) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) - Me.ucrBase.TabIndex = 33 - ' - 'ucrReceiverWindSpeed - ' - Me.ucrReceiverWindSpeed.AutoSize = True - Me.ucrReceiverWindSpeed.frmParent = Me - Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(314, 297) - Me.ucrReceiverWindSpeed.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverWindSpeed.Name = "ucrReceiverWindSpeed" - Me.ucrReceiverWindSpeed.Selector = Nothing - Me.ucrReceiverWindSpeed.Size = New System.Drawing.Size(123, 20) - Me.ucrReceiverWindSpeed.strNcFilePath = "" - Me.ucrReceiverWindSpeed.TabIndex = 2 - Me.ucrReceiverWindSpeed.ucrSelector = Nothing - ' - 'ucrChkWind - ' - Me.ucrChkWind.AutoSize = True - Me.ucrChkWind.Checked = False - Me.ucrChkWind.Location = New System.Drawing.Point(314, 277) - Me.ucrChkWind.Name = "ucrChkWind" - Me.ucrChkWind.Size = New System.Drawing.Size(123, 31) - Me.ucrChkWind.TabIndex = 0 + Me.ucrBase.TabIndex = 64 ' 'dlgEvapotranspiration ' @@ -375,13 +403,15 @@ Partial Class dlgEvapotranspiration Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(453, 478) + Me.Controls.Add(Me.cmdHSConstants) + Me.Controls.Add(Me.cmdLocation) + Me.Controls.Add(Me.cmdPMConstants) + Me.Controls.Add(Me.cmdHSMissingOptions) Me.Controls.Add(Me.ucrReceiverWindSpeed) Me.Controls.Add(Me.ucrChkWind) Me.Controls.Add(Me.cmdEvapOptions) Me.Controls.Add(Me.rdoHargreavesSamani) Me.Controls.Add(Me.rdoPenmanMonteith) - Me.Controls.Add(Me.ucrInputMissingMethod) - Me.Controls.Add(Me.lblMissingMethod) Me.Controls.Add(Me.lblSolar) Me.Controls.Add(Me.ucrInputSolar) Me.Controls.Add(Me.lblRadiation) @@ -415,33 +445,35 @@ Partial Class dlgEvapotranspiration End Sub - Friend WithEvents ucrBase As ucrButtons - Friend WithEvents ucrSelectorEvapotranspiration As ucrSelectorByDataFrameAddRemove - Friend WithEvents lblTmax As Label + Friend WithEvents cmdHSConstants As Button + Friend WithEvents cmdLocation As Button + Friend WithEvents cmdPMConstants As Button + Friend WithEvents cmdHSMissingOptions As Button + Friend WithEvents ucrReceiverWindSpeed As ucrReceiverSingle + Friend WithEvents ucrChkWind As ucrCheck + Friend WithEvents cmdEvapOptions As Button + Friend WithEvents rdoHargreavesSamani As RadioButton + Friend WithEvents rdoPenmanMonteith As RadioButton + Friend WithEvents lblSolar As Label + Friend WithEvents ucrInputSolar As ucrInputComboBox + Friend WithEvents lblRadiation As Label + Friend WithEvents ucrReceiverRadiation As ucrReceiverSingle + Friend WithEvents ucrInputCrop As ucrInputComboBox + Friend WithEvents ucrNewColName As ucrSave + Friend WithEvents lblDate As Label + Friend WithEvents ucrReceiverDate As ucrReceiverSingle + Friend WithEvents ucrPnlMethod As UcrPanel + Friend WithEvents lblCrop As Label + Friend WithEvents lblTimeStep As Label + Friend WithEvents ucrInputTimeStep As ucrInputComboBox Friend WithEvents lblHumidityMin As Label Friend WithEvents ucrReceiverHumidityMin As ucrReceiverSingle Friend WithEvents lblHumidityMax As Label Friend WithEvents ucrReceiverHumidityMax As ucrReceiverSingle Friend WithEvents lblTmin As Label Friend WithEvents ucrReceiverTmin As ucrReceiverSingle - Friend WithEvents lblCrop As Label - Friend WithEvents ucrInputCrop As ucrInputComboBox - Friend WithEvents lblTimeStep As Label - Friend WithEvents ucrInputTimeStep As ucrInputComboBox - Friend WithEvents ucrPnlMethod As UcrPanel - Friend WithEvents ucrReceiverDate As ucrReceiverSingle - Friend WithEvents lblDate As Label - Friend WithEvents ucrInputMissingMethod As ucrInputComboBox - Friend WithEvents lblMissingMethod As Label - Friend WithEvents ucrNewColName As ucrSave + Friend WithEvents lblTmax As Label Friend WithEvents ucrReceiverTmax As ucrReceiverSingle - Friend WithEvents ucrInputSolar As ucrInputComboBox - Friend WithEvents lblSolar As Label - Friend WithEvents ucrReceiverRadiation As ucrReceiverSingle - Friend WithEvents lblRadiation As Label - Friend WithEvents rdoHargreavesSamani As RadioButton - Friend WithEvents rdoPenmanMonteith As RadioButton - Friend WithEvents cmdEvapOptions As Button - Friend WithEvents ucrReceiverWindSpeed As ucrReceiverSingle - Friend WithEvents ucrChkWind As ucrCheck + Friend WithEvents ucrSelectorEvapotranspiration As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrBase As ucrButtons End Class \ No newline at end of file diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index d46f3469d35..09a9898d98d 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -322,37 +322,26 @@ Public Class dlgEvapotranspiration End Sub Private Sub cmdHSMissingOptions_Click(sender As Object, e As EventArgs) Handles cmdHSMissingOptions.Click - sdgHSMissingOptions.SetRFunction(clsReadInputs, clsMissingDataVector, bResetSubdialog) - bResetSubdialog = False - sdgHSMissingOptions.ShowDialog() + End Sub Private Sub cmdPMConstants_Click(sender As Object, e As EventArgs) Handles cmdPMConstants.Click - sdgPMConstants.SetRFunction(clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) - sdgPMConstants.ShowDialog() - bResetSubdialog = False - TestOKEnabled() + End Sub Private Sub cmdHSConstants_Click(sender As Object, e As EventArgs) Handles cmdHSConstants.Click sdgHSConstants.SetRFunction(clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) sdgHSConstants.ShowDialog() bResetSubdialog = False - TestOKEnabled() - End Sub - Private Sub cmdLocation_Click(sender As Object, e As EventArgs) Handles cmdLocation.Click sdgLocation.SetRFunction(clsNewVarnamesVectorHS:=clsVarnamesVectorHS, clsNewVarnamesVectorPM:=clsVarnamesVectorPM, clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) sdgLocation.ShowDialog() bResetSubdialog = False TestOKEnabled() End Sub - Private Sub DialogSize() - If rdoPenmanMonteith.Checked Then - Me.Size = New System.Drawing.Size(Me.Width, iBasicHeight) - ucrBase.Location = New Point(ucrBase.Location.X, iBaseMaxY) - ucrNewColName.Location = New Point(ucrNewColName.Location.X, iSaveMaxY) + + ucrNewColName.Location = New Point(ucrNewColName.Location.X, iSaveMaxY) cmdEvapOptions.Location = New Point(cmdEvapOptions.Location.X, iEvapOptions) cmdLocation.Location = New Point(cmdLocation.Location.X, iLocation) ElseIf rdoHargreavesSamani.Checked Then From a024f84ba4422eb1fe7d822df905c81474b2229e Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 26 Jun 2023 21:15:29 +0100 Subject: [PATCH 03/48] Add PM Constants subdialog --- instat/instat.vbproj | 9 + instat/sdgPMConstants.Designer.vb | 306 ++++++++++++++++++++++++++++++ instat/sdgPMConstants.resx | 120 ++++++++++++ instat/sdgPMConstants.vb | 3 + 4 files changed, 438 insertions(+) create mode 100644 instat/sdgPMConstants.Designer.vb create mode 100644 instat/sdgPMConstants.resx create mode 100644 instat/sdgPMConstants.vb diff --git a/instat/instat.vbproj b/instat/instat.vbproj index a7b0b5b4b53..3e0ba583617 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -272,6 +272,12 @@ Form + + sdgPMConstants.vb + + + Form + sdgSummaryThemes.vb @@ -3117,6 +3123,9 @@ sdgPairPlotOptions.vb + + sdgPMConstants.vb + sdgSummaryThemes.vb diff --git a/instat/sdgPMConstants.Designer.vb b/instat/sdgPMConstants.Designer.vb new file mode 100644 index 00000000000..a439e9a6d29 --- /dev/null +++ b/instat/sdgPMConstants.Designer.vb @@ -0,0 +1,306 @@ + _ +Partial Class sdgPMConstants + Inherits System.Windows.Forms.Form + + 'Form remplace la méthode Dispose pour nettoyer la liste des composants. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Requise par le Concepteur Windows Form + Private components As System.ComponentModel.IContainer + + 'REMARQUE : la procédure suivante est requise par le Concepteur Windows Form + 'Elle peut être modifiée à l'aide du Concepteur Windows Form. + 'Ne la modifiez pas à l'aide de l'éditeur de code. + _ + Private Sub InitializeComponent() + Me.ucrInputAs = New instat.ucrInputTextBox() + Me.ucrInputBS = New instat.ucrInputTextBox() + Me.lblBS = New System.Windows.Forms.Label() + Me.lblAS = New System.Windows.Forms.Label() + Me.ucrNudHeigth = New instat.ucrNud() + Me.ucrInputSoilFlux = New instat.ucrInputTextBox() + Me.ucrInputSolarConstant = New instat.ucrInputTextBox() + Me.ucrInputLambda = New instat.ucrInputTextBox() + Me.ucrInputSigma = New instat.ucrInputTextBox() + Me.lblSoilUnit = New System.Windows.Forms.Label() + Me.lblSoilFlux = New System.Windows.Forms.Label() + Me.lblSigma = New System.Windows.Forms.Label() + Me.lblHeigthUnit = New System.Windows.Forms.Label() + Me.lblSolarUnit = New System.Windows.Forms.Label() + Me.lblSigmaUnit = New System.Windows.Forms.Label() + Me.lblHeigth = New System.Windows.Forms.Label() + Me.lblLambdaUnit = New System.Windows.Forms.Label() + Me.lblSolarConstant = New System.Windows.Forms.Label() + Me.lblLambda = New System.Windows.Forms.Label() + Me.UcrButtonsSubdialogue1 = New instat.ucrButtonsSubdialogue() + Me.SuspendLayout() + ' + 'ucrInputAs + ' + Me.ucrInputAs.AddQuotesIfUnrecognised = True + Me.ucrInputAs.AutoSize = True + Me.ucrInputAs.IsMultiline = False + Me.ucrInputAs.IsReadOnly = False + Me.ucrInputAs.Location = New System.Drawing.Point(135, 149) + Me.ucrInputAs.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputAs.Name = "ucrInputAs" + Me.ucrInputAs.Size = New System.Drawing.Size(63, 21) + Me.ucrInputAs.TabIndex = 62 + ' + 'ucrInputBS + ' + Me.ucrInputBS.AddQuotesIfUnrecognised = True + Me.ucrInputBS.AutoSize = True + Me.ucrInputBS.IsMultiline = False + Me.ucrInputBS.IsReadOnly = False + Me.ucrInputBS.Location = New System.Drawing.Point(135, 178) + Me.ucrInputBS.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputBS.Name = "ucrInputBS" + Me.ucrInputBS.Size = New System.Drawing.Size(63, 21) + Me.ucrInputBS.TabIndex = 61 + ' + 'lblBS + ' + Me.lblBS.AutoSize = True + Me.lblBS.Location = New System.Drawing.Point(5, 186) + Me.lblBS.Name = "lblBS" + Me.lblBS.Size = New System.Drawing.Size(18, 13) + Me.lblBS.TabIndex = 60 + Me.lblBS.Text = "bs" + ' + 'lblAS + ' + Me.lblAS.AutoSize = True + Me.lblAS.Location = New System.Drawing.Point(5, 153) + Me.lblAS.Name = "lblAS" + Me.lblAS.Size = New System.Drawing.Size(18, 13) + Me.lblAS.TabIndex = 59 + Me.lblAS.Text = "as" + ' + 'ucrNudHeigth + ' + Me.ucrNudHeigth.AutoSize = True + Me.ucrNudHeigth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHeigth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHeigth.Location = New System.Drawing.Point(135, 71) + Me.ucrNudHeigth.Margin = New System.Windows.Forms.Padding(6) + Me.ucrNudHeigth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudHeigth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHeigth.Name = "ucrNudHeigth" + Me.ucrNudHeigth.Size = New System.Drawing.Size(63, 20) + Me.ucrNudHeigth.TabIndex = 58 + Me.ucrNudHeigth.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputSoilFlux + ' + Me.ucrInputSoilFlux.AddQuotesIfUnrecognised = True + Me.ucrInputSoilFlux.AutoSize = True + Me.ucrInputSoilFlux.IsMultiline = False + Me.ucrInputSoilFlux.IsReadOnly = False + Me.ucrInputSoilFlux.Location = New System.Drawing.Point(135, 122) + Me.ucrInputSoilFlux.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSoilFlux.Name = "ucrInputSoilFlux" + Me.ucrInputSoilFlux.Size = New System.Drawing.Size(63, 21) + Me.ucrInputSoilFlux.TabIndex = 57 + ' + 'ucrInputSolarConstant + ' + Me.ucrInputSolarConstant.AddQuotesIfUnrecognised = True + Me.ucrInputSolarConstant.AutoSize = True + Me.ucrInputSolarConstant.IsMultiline = False + Me.ucrInputSolarConstant.IsReadOnly = False + Me.ucrInputSolarConstant.Location = New System.Drawing.Point(135, 43) + Me.ucrInputSolarConstant.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSolarConstant.Name = "ucrInputSolarConstant" + Me.ucrInputSolarConstant.Size = New System.Drawing.Size(63, 21) + Me.ucrInputSolarConstant.TabIndex = 56 + ' + 'ucrInputLambda + ' + Me.ucrInputLambda.AddQuotesIfUnrecognised = True + Me.ucrInputLambda.AutoSize = True + Me.ucrInputLambda.IsMultiline = False + Me.ucrInputLambda.IsReadOnly = False + Me.ucrInputLambda.Location = New System.Drawing.Point(135, 11) + Me.ucrInputLambda.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputLambda.Name = "ucrInputLambda" + Me.ucrInputLambda.Size = New System.Drawing.Size(63, 21) + Me.ucrInputLambda.TabIndex = 55 + ' + 'ucrInputSigma + ' + Me.ucrInputSigma.AddQuotesIfUnrecognised = True + Me.ucrInputSigma.AutoSize = True + Me.ucrInputSigma.IsMultiline = False + Me.ucrInputSigma.IsReadOnly = False + Me.ucrInputSigma.Location = New System.Drawing.Point(135, 96) + Me.ucrInputSigma.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSigma.Name = "ucrInputSigma" + Me.ucrInputSigma.Size = New System.Drawing.Size(63, 21) + Me.ucrInputSigma.TabIndex = 54 + ' + 'lblSoilUnit + ' + Me.lblSoilUnit.AutoSize = True + Me.lblSoilUnit.Location = New System.Drawing.Point(213, 126) + Me.lblSoilUnit.Name = "lblSoilUnit" + Me.lblSoilUnit.Size = New System.Drawing.Size(82, 13) + Me.lblSoilUnit.TabIndex = 53 + Me.lblSoilUnit.Text = "MJ.m^-2.day^-1" + ' + 'lblSoilFlux + ' + Me.lblSoilFlux.AutoSize = True + Me.lblSoilFlux.Location = New System.Drawing.Point(5, 127) + Me.lblSoilFlux.Name = "lblSoilFlux" + Me.lblSoilFlux.Size = New System.Drawing.Size(72, 13) + Me.lblSoilFlux.TabIndex = 52 + Me.lblSoilFlux.Text = "Soil Heat Flux" + ' + 'lblSigma + ' + Me.lblSigma.AutoSize = True + Me.lblSigma.Location = New System.Drawing.Point(5, 101) + Me.lblSigma.Name = "lblSigma" + Me.lblSigma.Size = New System.Drawing.Size(36, 13) + Me.lblSigma.TabIndex = 51 + Me.lblSigma.Text = "Sigma" + ' + 'lblHeigthUnit + ' + Me.lblHeigthUnit.AutoSize = True + Me.lblHeigthUnit.Location = New System.Drawing.Point(213, 73) + Me.lblHeigthUnit.Name = "lblHeigthUnit" + Me.lblHeigthUnit.Size = New System.Drawing.Size(39, 13) + Me.lblHeigthUnit.TabIndex = 50 + Me.lblHeigthUnit.Text = "Meters" + ' + 'lblSolarUnit + ' + Me.lblSolarUnit.AutoSize = True + Me.lblSolarUnit.Location = New System.Drawing.Point(213, 47) + Me.lblSolarUnit.Name = "lblSolarUnit" + Me.lblSolarUnit.Size = New System.Drawing.Size(81, 13) + Me.lblSolarUnit.TabIndex = 49 + Me.lblSolarUnit.Text = "MJ.m^-2.min^-1" + ' + 'lblSigmaUnit + ' + Me.lblSigmaUnit.AutoSize = True + Me.lblSigmaUnit.Location = New System.Drawing.Point(213, 100) + Me.lblSigmaUnit.Name = "lblSigmaUnit" + Me.lblSigmaUnit.Size = New System.Drawing.Size(107, 13) + Me.lblSigmaUnit.TabIndex = 48 + Me.lblSigmaUnit.Text = "MJ.K^-4.m^-2.day^-1" + ' + 'lblHeigth + ' + Me.lblHeigth.AutoSize = True + Me.lblHeigth.Location = New System.Drawing.Point(5, 73) + Me.lblHeigth.Name = "lblHeigth" + Me.lblHeigth.Size = New System.Drawing.Size(130, 13) + Me.lblHeigth.TabIndex = 47 + Me.lblHeigth.Text = "Height of Wind Instrument" + ' + 'lblLambdaUnit + ' + Me.lblLambdaUnit.AutoSize = True + Me.lblLambdaUnit.Location = New System.Drawing.Point(213, 15) + Me.lblLambdaUnit.Name = "lblLambdaUnit" + Me.lblLambdaUnit.Size = New System.Drawing.Size(51, 13) + Me.lblLambdaUnit.TabIndex = 46 + Me.lblLambdaUnit.Text = "MJ.kg^-1" + ' + 'lblSolarConstant + ' + Me.lblSolarConstant.AutoSize = True + Me.lblSolarConstant.Location = New System.Drawing.Point(5, 48) + Me.lblSolarConstant.Name = "lblSolarConstant" + Me.lblSolarConstant.Size = New System.Drawing.Size(101, 13) + Me.lblSolarConstant.TabIndex = 45 + Me.lblSolarConstant.Text = "Solar Constant(Gsc)" + ' + 'lblLambda + ' + Me.lblLambda.AutoSize = True + Me.lblLambda.Location = New System.Drawing.Point(5, 16) + Me.lblLambda.Name = "lblLambda" + Me.lblLambda.Size = New System.Drawing.Size(45, 13) + Me.lblLambda.TabIndex = 44 + Me.lblLambda.Text = "Lambda" + ' + 'UcrButtonsSubdialogue1 + ' + Me.UcrButtonsSubdialogue1.AutoSize = True + Me.UcrButtonsSubdialogue1.Location = New System.Drawing.Point(28, 207) + Me.UcrButtonsSubdialogue1.Margin = New System.Windows.Forms.Padding(4) + Me.UcrButtonsSubdialogue1.Name = "UcrButtonsSubdialogue1" + Me.UcrButtonsSubdialogue1.Size = New System.Drawing.Size(259, 29) + Me.UcrButtonsSubdialogue1.TabIndex = 43 + ' + 'sdgPMConstants + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(325, 246) + Me.Controls.Add(Me.ucrInputAs) + Me.Controls.Add(Me.ucrInputBS) + Me.Controls.Add(Me.lblBS) + Me.Controls.Add(Me.lblAS) + Me.Controls.Add(Me.ucrNudHeigth) + Me.Controls.Add(Me.ucrInputSoilFlux) + Me.Controls.Add(Me.ucrInputSolarConstant) + Me.Controls.Add(Me.ucrInputLambda) + Me.Controls.Add(Me.ucrInputSigma) + Me.Controls.Add(Me.lblSoilUnit) + Me.Controls.Add(Me.lblSoilFlux) + Me.Controls.Add(Me.lblSigma) + Me.Controls.Add(Me.lblHeigthUnit) + Me.Controls.Add(Me.lblSolarUnit) + Me.Controls.Add(Me.lblSigmaUnit) + Me.Controls.Add(Me.lblHeigth) + Me.Controls.Add(Me.lblLambdaUnit) + Me.Controls.Add(Me.lblSolarConstant) + Me.Controls.Add(Me.lblLambda) + Me.Controls.Add(Me.UcrButtonsSubdialogue1) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "sdgPMConstants" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "PM Constants" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrInputAs As ucrInputTextBox + Friend WithEvents ucrInputBS As ucrInputTextBox + Friend WithEvents lblBS As Label + Friend WithEvents lblAS As Label + Friend WithEvents ucrNudHeigth As ucrNud + Friend WithEvents ucrInputSoilFlux As ucrInputTextBox + Friend WithEvents ucrInputSolarConstant As ucrInputTextBox + Friend WithEvents ucrInputLambda As ucrInputTextBox + Friend WithEvents ucrInputSigma As ucrInputTextBox + Friend WithEvents lblSoilUnit As Label + Friend WithEvents lblSoilFlux As Label + Friend WithEvents lblSigma As Label + Friend WithEvents lblHeigthUnit As Label + Friend WithEvents lblSolarUnit As Label + Friend WithEvents lblSigmaUnit As Label + Friend WithEvents lblHeigth As Label + Friend WithEvents lblLambdaUnit As Label + Friend WithEvents lblSolarConstant As Label + Friend WithEvents lblLambda As Label + Friend WithEvents UcrButtonsSubdialogue1 As ucrButtonsSubdialogue +End Class diff --git a/instat/sdgPMConstants.resx b/instat/sdgPMConstants.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgPMConstants.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgPMConstants.vb b/instat/sdgPMConstants.vb new file mode 100644 index 00000000000..0c648e1e5a8 --- /dev/null +++ b/instat/sdgPMConstants.vb @@ -0,0 +1,3 @@ +Public Class sdgPMConstants + +End Class \ No newline at end of file From 5839a423e6c02c553c54a7737c7aedc94509ca3a Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 26 Jun 2023 21:20:31 +0100 Subject: [PATCH 04/48] Minor Change --- instat/dlgEvapotranspiration.vb | 25 ++++++------ instat/sdgPMConstants.vb | 70 ++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 12 deletions(-) diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index 09a9898d98d..8aa2af96b48 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -340,18 +340,21 @@ Public Class dlgEvapotranspiration TestOKEnabled() End Sub - - ucrNewColName.Location = New Point(ucrNewColName.Location.X, iSaveMaxY) - cmdEvapOptions.Location = New Point(cmdEvapOptions.Location.X, iEvapOptions) - cmdLocation.Location = New Point(cmdLocation.Location.X, iLocation) + Private Sub DialogSize() + If rdoPenmanMonteith.Checked Then + Me.Size = New System.Drawing.Size(Me.Width, iBasicHeight) + ucrBase.Location = New Point(ucrBase.Location.X, iBaseMaxY) + ucrNewColName.Location = New Point(ucrNewColName.Location.X, iSaveMaxY) + cmdEvapOptions.Location = New Point(cmdEvapOptions.Location.X, iEvapOptions) + cmdLocation.Location = New Point(cmdLocation.Location.X, iLocation) ElseIf rdoHargreavesSamani.Checked Then - ucrReceiverDate.SetMeAsReceiver() - Me.Size = New System.Drawing.Size(Me.Width, iBasicHeight * 0.9) - ucrBase.Location = New Point(ucrBase.Location.X, iBaseMaxY / 1.15) - ucrNewColName.Location = New Point(ucrNewColName.Location.X, iSaveMaxY / 1.183) - cmdHSMissingOptions.Location = New Point(cmdHSMissingOptions.Location.X, iHSMissingOptions / 1.187) - cmdHSConstants.Location = New Point(cmdHSConstants.Location.X, iHSConstants / 1.187) - cmdLocation.Location = New Point(cmdLocation.Location.X, iLocation / 1.187) + ucrReceiverDate.SetMeAsReceiver() + Me.Size = New System.Drawing.Size(Me.Width, iBasicHeight * 0.9) + ucrBase.Location = New Point(ucrBase.Location.X, iBaseMaxY / 1.15) + ucrNewColName.Location = New Point(ucrNewColName.Location.X, iSaveMaxY / 1.183) + cmdHSMissingOptions.Location = New Point(cmdHSMissingOptions.Location.X, iHSMissingOptions / 1.187) + cmdHSConstants.Location = New Point(cmdHSConstants.Location.X, iHSConstants / 1.187) + cmdLocation.Location = New Point(cmdLocation.Location.X, iLocation / 1.187) End If End Sub diff --git a/instat/sdgPMConstants.vb b/instat/sdgPMConstants.vb index 0c648e1e5a8..dcfa014003f 100644 --- a/instat/sdgPMConstants.vb +++ b/instat/sdgPMConstants.vb @@ -1,3 +1,71 @@ -Public Class sdgPMConstants +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . +Imports instat.Translations +Public Class sdgPMConstants + Public bFirstLoad As Boolean = True + Public bControlsInitialised As Boolean = False + Public clsListFunction As New RFunction + + Private Sub sdgPMConstants_Load(sender As Object, e As EventArgs) Handles UcrButtonsSubdialogue1.Load + autoTranslate(Me) + End Sub + + Private Sub InitialiseControls() + ucrInputLambda.SetParameter(New RParameter("lambda", 1)) + ucrInputLambda.AddQuotesIfUnrecognised = False + ucrInputLambda.SetLinkedDisplayControl(lblLambda) + + ucrInputSigma.SetParameter(New RParameter("sigma", 5)) + ucrInputSigma.AddQuotesIfUnrecognised = False + + ucrInputSolarConstant.SetParameter(New RParameter("Gsc", 3)) + ucrInputSolarConstant.AddQuotesIfUnrecognised = False + ucrInputSolarConstant.SetLinkedDisplayControl(lblSolarConstant) + + ucrNudHeigth.SetParameter(New RParameter("z", 4)) + ucrNudHeigth.SetMinMax(0, 10) + ucrNudHeigth.Increment = 1 + + ucrInputSoilFlux.SetParameter(New RParameter("G", 6)) + ucrInputSoilFlux.AddQuotesIfUnrecognised = False + ucrInputSoilFlux.SetLinkedDisplayControl(lblSoilFlux) + + ucrInputAs.SetParameter(New RParameter("as", 7)) + ucrInputAs.AddQuotesIfUnrecognised = False + ucrInputAs.SetLinkedDisplayControl(lblAS) + + ucrInputBS.SetParameter(New RParameter("bs", 8)) + ucrInputBS.AddQuotesIfUnrecognised = False + ucrInputBS.SetLinkedDisplayControl(lblBS) + + bControlsInitialised = True + End Sub + + Public Sub SetRFunction(clsNewListFunction As RFunction, Optional bReset As Boolean = False) + clsListFunction = clsNewListFunction + If Not bControlsInitialised Then + InitialiseControls() + End If + ucrNudHeigth.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSigma.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSoilFlux.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputAs.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputBS.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + End Sub End Class \ No newline at end of file From 33a93e6f1ae870d11534d31a2bebca5615b0749f Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 26 Jun 2023 21:25:56 +0100 Subject: [PATCH 05/48] Add HS constant --- instat/instat.vbproj | 9 ++ instat/sdgHSConstants.Designer.vb | 133 ++++++++++++++++++++++++++++++ instat/sdgHSConstants.resx | 120 +++++++++++++++++++++++++++ instat/sdgHSConstants.vb | 3 + 4 files changed, 265 insertions(+) create mode 100644 instat/sdgHSConstants.Designer.vb create mode 100644 instat/sdgHSConstants.resx create mode 100644 instat/sdgHSConstants.vb diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 3e0ba583617..77463fe0ca4 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -266,6 +266,12 @@ + + sdgHSConstants.vb + + + Form + sdgPairPlotOptions.vb @@ -3120,6 +3126,9 @@ dlgThreeVariablePivotTable.vb + + sdgHSConstants.vb + sdgPairPlotOptions.vb diff --git a/instat/sdgHSConstants.Designer.vb b/instat/sdgHSConstants.Designer.vb new file mode 100644 index 00000000000..393afc3db56 --- /dev/null +++ b/instat/sdgHSConstants.Designer.vb @@ -0,0 +1,133 @@ + _ +Partial Class sdgHSConstants + Inherits System.Windows.Forms.Form + + 'Form remplace la méthode Dispose pour nettoyer la liste des composants. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Requise par le Concepteur Windows Form + Private components As System.ComponentModel.IContainer + + 'REMARQUE : la procédure suivante est requise par le Concepteur Windows Form + 'Elle peut être modifiée à l'aide du Concepteur Windows Form. + 'Ne la modifiez pas à l'aide de l'éditeur de code. + _ + Private Sub InitializeComponent() + Me.lblGSCUnit = New System.Windows.Forms.Label() + Me.ucrInputSolarConstant = New instat.ucrInputTextBox() + Me.lblLambaUnit = New System.Windows.Forms.Label() + Me.ucrSdgButtons = New instat.ucrButtonsSubdialogue() + Me.ucrInputLambda = New instat.ucrInputTextBox() + Me.lbllambda = New System.Windows.Forms.Label() + Me.lblSolarConstant = New System.Windows.Forms.Label() + Me.SuspendLayout() + ' + 'lblGSCUnit + ' + Me.lblGSCUnit.AutoSize = True + Me.lblGSCUnit.Location = New System.Drawing.Point(177, 37) + Me.lblGSCUnit.Name = "lblGSCUnit" + Me.lblGSCUnit.Size = New System.Drawing.Size(81, 13) + Me.lblGSCUnit.TabIndex = 20 + Me.lblGSCUnit.Text = "MJ.m^-2.min^-1" + ' + 'ucrInputSolarConstant + ' + Me.ucrInputSolarConstant.AddQuotesIfUnrecognised = True + Me.ucrInputSolarConstant.AutoSize = True + Me.ucrInputSolarConstant.IsMultiline = False + Me.ucrInputSolarConstant.IsReadOnly = False + Me.ucrInputSolarConstant.Location = New System.Drawing.Point(113, 33) + Me.ucrInputSolarConstant.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSolarConstant.Name = "ucrInputSolarConstant" + Me.ucrInputSolarConstant.Size = New System.Drawing.Size(52, 21) + Me.ucrInputSolarConstant.TabIndex = 23 + ' + 'lblLambaUnit + ' + Me.lblLambaUnit.AutoSize = True + Me.lblLambaUnit.Location = New System.Drawing.Point(177, 11) + Me.lblLambaUnit.Name = "lblLambaUnit" + Me.lblLambaUnit.Size = New System.Drawing.Size(51, 13) + Me.lblLambaUnit.TabIndex = 19 + Me.lblLambaUnit.Text = "MJ.kg^-1" + ' + 'ucrSdgButtons + ' + Me.ucrSdgButtons.AutoSize = True + Me.ucrSdgButtons.Location = New System.Drawing.Point(5, 87) + Me.ucrSdgButtons.Margin = New System.Windows.Forms.Padding(4) + Me.ucrSdgButtons.Name = "ucrSdgButtons" + Me.ucrSdgButtons.Size = New System.Drawing.Size(259, 29) + Me.ucrSdgButtons.TabIndex = 21 + ' + 'ucrInputLambda + ' + Me.ucrInputLambda.AddQuotesIfUnrecognised = True + Me.ucrInputLambda.AutoSize = True + Me.ucrInputLambda.IsMultiline = False + Me.ucrInputLambda.IsReadOnly = False + Me.ucrInputLambda.Location = New System.Drawing.Point(113, 7) + Me.ucrInputLambda.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputLambda.Name = "ucrInputLambda" + Me.ucrInputLambda.Size = New System.Drawing.Size(52, 21) + Me.ucrInputLambda.TabIndex = 22 + ' + 'lbllambda + ' + Me.lbllambda.AutoSize = True + Me.lbllambda.Location = New System.Drawing.Point(2, 11) + Me.lbllambda.Name = "lbllambda" + Me.lbllambda.Size = New System.Drawing.Size(45, 13) + Me.lbllambda.TabIndex = 17 + Me.lbllambda.Text = "Lambda" + ' + 'lblSolarConstant + ' + Me.lblSolarConstant.AutoSize = True + Me.lblSolarConstant.Location = New System.Drawing.Point(2, 37) + Me.lblSolarConstant.Name = "lblSolarConstant" + Me.lblSolarConstant.Size = New System.Drawing.Size(101, 13) + Me.lblSolarConstant.TabIndex = 18 + Me.lblSolarConstant.Text = "Solar Constant(Gsc)" + ' + 'sdgHSConstants + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(267, 123) + Me.Controls.Add(Me.lblGSCUnit) + Me.Controls.Add(Me.ucrInputSolarConstant) + Me.Controls.Add(Me.lblLambaUnit) + Me.Controls.Add(Me.ucrSdgButtons) + Me.Controls.Add(Me.ucrInputLambda) + Me.Controls.Add(Me.lbllambda) + Me.Controls.Add(Me.lblSolarConstant) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "sdgHSConstants" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "HS Constants" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents lblGSCUnit As Label + Friend WithEvents ucrInputSolarConstant As ucrInputTextBox + Friend WithEvents lblLambaUnit As Label + Friend WithEvents ucrSdgButtons As ucrButtonsSubdialogue + Friend WithEvents ucrInputLambda As ucrInputTextBox + Friend WithEvents lbllambda As Label + Friend WithEvents lblSolarConstant As Label +End Class diff --git a/instat/sdgHSConstants.resx b/instat/sdgHSConstants.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgHSConstants.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgHSConstants.vb b/instat/sdgHSConstants.vb new file mode 100644 index 00000000000..e7f43fe7167 --- /dev/null +++ b/instat/sdgHSConstants.vb @@ -0,0 +1,3 @@ +Public Class sdgHSConstants + +End Class \ No newline at end of file From 52cba66aa7c7c9810f5631bca5a9802326a35d1a Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 26 Jun 2023 21:34:58 +0100 Subject: [PATCH 06/48] minor Change --- instat/sdgHSConstants.Designer.vb | 2 +- instat/sdgHSConstants.vb | 49 ++++++++++++++++++++++++++++++- instat/sdgPMConstants.Designer.vb | 2 +- 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/instat/sdgHSConstants.Designer.vb b/instat/sdgHSConstants.Designer.vb index 393afc3db56..96dd4ec9072 100644 --- a/instat/sdgHSConstants.Designer.vb +++ b/instat/sdgHSConstants.Designer.vb @@ -117,7 +117,7 @@ Partial Class sdgHSConstants Me.MinimizeBox = False Me.Name = "sdgHSConstants" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "HS Constants" + Me.Text = "Hargreaves Samani Constants" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/sdgHSConstants.vb b/instat/sdgHSConstants.vb index e7f43fe7167..2d01df93a7b 100644 --- a/instat/sdgHSConstants.vb +++ b/instat/sdgHSConstants.vb @@ -1,3 +1,50 @@ -Public Class sdgHSConstants +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . +Imports instat.Translations +Public Class sdgHSConstants + Public bFirstLoad As Boolean = True + Public bControlsInitialised As Boolean = False + Public clsListFunction As New RFunction + Private Sub sdgHSConstants_Load(sender As Object, e As EventArgs) Handles ucrSdgButtons.Load + autoTranslate(Me) + End Sub + + Private Sub InitialiseControls() + ucrInputLambda.SetParameter(New RParameter("lambda", 1)) + ucrInputLambda.AddQuotesIfUnrecognised = False + 'ucrInputLambda.IsReadOnly = True + ucrInputLambda.SetLinkedDisplayControl(lbllambda) + 'ucrInputLambda.SetRDefault(2.45) + + ucrInputSolarConstant.SetParameter(New RParameter("Gsc", 3)) + ucrInputSolarConstant.AddQuotesIfUnrecognised = False + ucrInputSolarConstant.SetLinkedDisplayControl(lblSolarConstant) + 'ucrInputSolarConstant.SetRDefault(0.082) + + bControlsInitialised = True + End Sub + + Public Sub SetRFunction(clsNewListFunction As RFunction, Optional bReset As Boolean = False) + clsListFunction = clsNewListFunction + + If Not bControlsInitialised Then + InitialiseControls() + End If + ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + End Sub End Class \ No newline at end of file diff --git a/instat/sdgPMConstants.Designer.vb b/instat/sdgPMConstants.Designer.vb index a439e9a6d29..b822e8799ab 100644 --- a/instat/sdgPMConstants.Designer.vb +++ b/instat/sdgPMConstants.Designer.vb @@ -277,7 +277,7 @@ Partial Class sdgPMConstants Me.MinimizeBox = False Me.Name = "sdgPMConstants" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "PM Constants" + Me.Text = "Penman Monteith Constants" Me.ResumeLayout(False) Me.PerformLayout() From 7c92eb0ee9ad5156a2826dcb4cf1bc37a42c8e9f Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 26 Jun 2023 21:40:07 +0100 Subject: [PATCH 07/48] minor change --- ...ssingOptionsEvapotranspiration.Designer.vb | 74 +++++++++++++------ instat/sdgMissingOptionsEvapotranspiration.vb | 2 +- 2 files changed, 51 insertions(+), 25 deletions(-) diff --git a/instat/sdgMissingOptionsEvapotranspiration.Designer.vb b/instat/sdgMissingOptionsEvapotranspiration.Designer.vb index 89002ae7927..9a3b4a7aa1d 100644 --- a/instat/sdgMissingOptionsEvapotranspiration.Designer.vb +++ b/instat/sdgMissingOptionsEvapotranspiration.Designer.vb @@ -28,6 +28,8 @@ Partial Class sdgMissingOptionsEvapotranspiration Me.grpMissingDataOpts = New System.Windows.Forms.GroupBox() Me.ucrChkInterpMissingEntries = New instat.ucrCheck() Me.ucrChkInterpMissingDays = New instat.ucrCheck() + Me.ucrInputMissingMethod = New instat.ucrInputComboBox() + Me.lblMissingMethod = New System.Windows.Forms.Label() Me.ucrNudMaxDurationMissingData = New instat.ucrNud() Me.ucrNudMaxMissingDays = New instat.ucrNud() Me.ucrNudMaxMissingData = New instat.ucrNud() @@ -38,38 +40,38 @@ Partial Class sdgMissingOptionsEvapotranspiration 'lblMaxPerctMissindData ' Me.lblMaxPerctMissindData.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxPerctMissindData.Location = New System.Drawing.Point(9, 69) + Me.lblMaxPerctMissindData.Location = New System.Drawing.Point(2, 47) Me.lblMaxPerctMissindData.Name = "lblMaxPerctMissindData" Me.lblMaxPerctMissindData.Size = New System.Drawing.Size(169, 19) - Me.lblMaxPerctMissindData.TabIndex = 29 + Me.lblMaxPerctMissindData.TabIndex = 39 Me.lblMaxPerctMissindData.Text = "Max Missing Data" ' 'lblMaxDurationMissingData ' Me.lblMaxDurationMissingData.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxDurationMissingData.Location = New System.Drawing.Point(9, 45) + Me.lblMaxDurationMissingData.Location = New System.Drawing.Point(2, 23) Me.lblMaxDurationMissingData.Name = "lblMaxDurationMissingData" Me.lblMaxDurationMissingData.Size = New System.Drawing.Size(160, 20) - Me.lblMaxDurationMissingData.TabIndex = 27 + Me.lblMaxDurationMissingData.TabIndex = 37 Me.lblMaxDurationMissingData.Text = "Max Duration Missing Data" ' 'lblMaxMissingDays ' Me.lblMaxMissingDays.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxMissingDays.Location = New System.Drawing.Point(9, 22) + Me.lblMaxMissingDays.Location = New System.Drawing.Point(2, 0) Me.lblMaxMissingDays.Name = "lblMaxMissingDays" Me.lblMaxMissingDays.Size = New System.Drawing.Size(169, 20) - Me.lblMaxMissingDays.TabIndex = 25 + Me.lblMaxMissingDays.TabIndex = 35 Me.lblMaxMissingDays.Text = "Max Missing Days" ' 'grpMissingDataOpts ' Me.grpMissingDataOpts.Controls.Add(Me.ucrChkInterpMissingEntries) Me.grpMissingDataOpts.Controls.Add(Me.ucrChkInterpMissingDays) - Me.grpMissingDataOpts.Location = New System.Drawing.Point(9, 106) + Me.grpMissingDataOpts.Location = New System.Drawing.Point(2, 117) Me.grpMissingDataOpts.Name = "grpMissingDataOpts" Me.grpMissingDataOpts.Size = New System.Drawing.Size(198, 66) - Me.grpMissingDataOpts.TabIndex = 31 + Me.grpMissingDataOpts.TabIndex = 41 Me.grpMissingDataOpts.TabStop = False Me.grpMissingDataOpts.Text = "Missing Data Options" ' @@ -91,17 +93,37 @@ Partial Class sdgMissingOptionsEvapotranspiration Me.ucrChkInterpMissingDays.Size = New System.Drawing.Size(168, 23) Me.ucrChkInterpMissingDays.TabIndex = 6 ' + 'ucrInputMissingMethod + ' + Me.ucrInputMissingMethod.AddQuotesIfUnrecognised = True + Me.ucrInputMissingMethod.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputMissingMethod.GetSetSelectedIndex = -1 + Me.ucrInputMissingMethod.IsReadOnly = False + Me.ucrInputMissingMethod.Location = New System.Drawing.Point(90, 75) + Me.ucrInputMissingMethod.Name = "ucrInputMissingMethod" + Me.ucrInputMissingMethod.Size = New System.Drawing.Size(137, 21) + Me.ucrInputMissingMethod.TabIndex = 43 + ' + 'lblMissingMethod + ' + Me.lblMissingMethod.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMissingMethod.Location = New System.Drawing.Point(-1, 77) + Me.lblMissingMethod.Name = "lblMissingMethod" + Me.lblMissingMethod.Size = New System.Drawing.Size(90, 19) + Me.lblMissingMethod.TabIndex = 42 + Me.lblMissingMethod.Text = "Missing Method" + ' 'ucrNudMaxDurationMissingData ' Me.ucrNudMaxDurationMissingData.AutoSize = True Me.ucrNudMaxDurationMissingData.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxDurationMissingData.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxDurationMissingData.Location = New System.Drawing.Point(184, 69) + Me.ucrNudMaxDurationMissingData.Location = New System.Drawing.Point(177, 47) Me.ucrNudMaxDurationMissingData.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxDurationMissingData.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxDurationMissingData.Name = "ucrNudMaxDurationMissingData" Me.ucrNudMaxDurationMissingData.Size = New System.Drawing.Size(50, 20) - Me.ucrNudMaxDurationMissingData.TabIndex = 30 + Me.ucrNudMaxDurationMissingData.TabIndex = 40 Me.ucrNudMaxDurationMissingData.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrNudMaxMissingDays @@ -109,12 +131,12 @@ Partial Class sdgMissingOptionsEvapotranspiration Me.ucrNudMaxMissingDays.AutoSize = True Me.ucrNudMaxMissingDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxMissingDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxMissingDays.Location = New System.Drawing.Point(184, 22) + Me.ucrNudMaxMissingDays.Location = New System.Drawing.Point(177, 0) Me.ucrNudMaxMissingDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxMissingDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxMissingDays.Name = "ucrNudMaxMissingDays" Me.ucrNudMaxMissingDays.Size = New System.Drawing.Size(50, 20) - Me.ucrNudMaxMissingDays.TabIndex = 26 + Me.ucrNudMaxMissingDays.TabIndex = 36 Me.ucrNudMaxMissingDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrNudMaxMissingData @@ -122,34 +144,36 @@ Partial Class sdgMissingOptionsEvapotranspiration Me.ucrNudMaxMissingData.AutoSize = True Me.ucrNudMaxMissingData.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxMissingData.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxMissingData.Location = New System.Drawing.Point(184, 45) + Me.ucrNudMaxMissingData.Location = New System.Drawing.Point(177, 23) Me.ucrNudMaxMissingData.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxMissingData.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxMissingData.Name = "ucrNudMaxMissingData" Me.ucrNudMaxMissingData.Size = New System.Drawing.Size(50, 20) - Me.ucrNudMaxMissingData.TabIndex = 28 + Me.ucrNudMaxMissingData.TabIndex = 38 Me.ucrNudMaxMissingData.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrSdgButtons ' Me.ucrSdgButtons.AutoSize = True - Me.ucrSdgButtons.Location = New System.Drawing.Point(0, 189) + Me.ucrSdgButtons.Location = New System.Drawing.Point(-7, 200) Me.ucrSdgButtons.Name = "ucrSdgButtons" Me.ucrSdgButtons.Size = New System.Drawing.Size(259, 29) - Me.ucrSdgButtons.TabIndex = 3 + Me.ucrSdgButtons.TabIndex = 34 ' 'sdgMissingOptionsEvapotranspiration ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(245, 229) + Me.ClientSize = New System.Drawing.Size(238, 229) Me.Controls.Add(Me.lblMaxPerctMissindData) - Me.Controls.Add(Me.ucrNudMaxDurationMissingData) - Me.Controls.Add(Me.ucrNudMaxMissingDays) Me.Controls.Add(Me.lblMaxDurationMissingData) Me.Controls.Add(Me.lblMaxMissingDays) - Me.Controls.Add(Me.ucrNudMaxMissingData) Me.Controls.Add(Me.grpMissingDataOpts) + Me.Controls.Add(Me.ucrInputMissingMethod) + Me.Controls.Add(Me.lblMissingMethod) + Me.Controls.Add(Me.ucrNudMaxDurationMissingData) + Me.Controls.Add(Me.ucrNudMaxMissingDays) + Me.Controls.Add(Me.ucrNudMaxMissingData) Me.Controls.Add(Me.ucrSdgButtons) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False @@ -164,14 +188,16 @@ Partial Class sdgMissingOptionsEvapotranspiration End Sub - Friend WithEvents ucrSdgButtons As ucrButtonsSubdialogue Friend WithEvents lblMaxPerctMissindData As Label - Friend WithEvents ucrNudMaxDurationMissingData As ucrNud - Friend WithEvents ucrNudMaxMissingDays As ucrNud Friend WithEvents lblMaxDurationMissingData As Label Friend WithEvents lblMaxMissingDays As Label - Friend WithEvents ucrNudMaxMissingData As ucrNud Friend WithEvents grpMissingDataOpts As GroupBox Friend WithEvents ucrChkInterpMissingEntries As ucrCheck Friend WithEvents ucrChkInterpMissingDays As ucrCheck + Friend WithEvents ucrInputMissingMethod As ucrInputComboBox + Friend WithEvents lblMissingMethod As Label + Friend WithEvents ucrNudMaxDurationMissingData As ucrNud + Friend WithEvents ucrNudMaxMissingDays As ucrNud + Friend WithEvents ucrNudMaxMissingData As ucrNud + Friend WithEvents ucrSdgButtons As ucrButtonsSubdialogue End Class diff --git a/instat/sdgMissingOptionsEvapotranspiration.vb b/instat/sdgMissingOptionsEvapotranspiration.vb index 19373554b6f..2329429df2a 100644 --- a/instat/sdgMissingOptionsEvapotranspiration.vb +++ b/instat/sdgMissingOptionsEvapotranspiration.vb @@ -19,7 +19,7 @@ Public Class sdgMissingOptionsEvapotranspiration Public bFirstLoad As Boolean = True Public bControlsInitialised As Boolean = False Public clsReadInputs, clsMissingDataVector As New RFunction - Private Sub sdgMissingOptionsEvapotranspiration_Load(sender As Object, e As EventArgs) Handles ucrSdgButtons.Load + Private Sub sdgMissingOptionsEvapotranspiration_Load(sender As Object, e As EventArgs) autoTranslate(Me) End Sub From f6fc051fc11844374b8c268b38f078eb6726f132 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 26 Jun 2023 21:45:14 +0100 Subject: [PATCH 08/48] Add Location --- instat/instat.vbproj | 9 ++ instat/sdgLocation.Designer.vb | 41 ++++++ instat/sdgLocation.resx | 120 ++++++++++++++++++ instat/sdgLocation.vb | 3 + instat/sdgMissingOptionsEvapotranspiration.vb | 14 +- 5 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 instat/sdgLocation.Designer.vb create mode 100644 instat/sdgLocation.resx create mode 100644 instat/sdgLocation.vb diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 77463fe0ca4..8a4329dc938 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -272,6 +272,12 @@ Form + + sdgLocation.vb + + + Form + sdgPairPlotOptions.vb @@ -3129,6 +3135,9 @@ sdgHSConstants.vb + + sdgLocation.vb + sdgPairPlotOptions.vb diff --git a/instat/sdgLocation.Designer.vb b/instat/sdgLocation.Designer.vb new file mode 100644 index 00000000000..2eccbec8252 --- /dev/null +++ b/instat/sdgLocation.Designer.vb @@ -0,0 +1,41 @@ + _ +Partial Class sdgLocation + Inherits System.Windows.Forms.Form + + 'Form remplace la méthode Dispose pour nettoyer la liste des composants. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Requise par le Concepteur Windows Form + Private components As System.ComponentModel.IContainer + + 'REMARQUE : la procédure suivante est requise par le Concepteur Windows Form + 'Elle peut être modifiée à l'aide du Concepteur Windows Form. + 'Ne la modifiez pas à l'aide de l'éditeur de code. + _ + Private Sub InitializeComponent() + Me.SuspendLayout() + ' + 'sdgLocation + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(330, 320) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "sdgLocation" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Location" + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/instat/sdgLocation.resx b/instat/sdgLocation.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgLocation.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgLocation.vb b/instat/sdgLocation.vb new file mode 100644 index 00000000000..d9659102cab --- /dev/null +++ b/instat/sdgLocation.vb @@ -0,0 +1,3 @@ +Public Class sdgLocation + +End Class \ No newline at end of file diff --git a/instat/sdgMissingOptionsEvapotranspiration.vb b/instat/sdgMissingOptionsEvapotranspiration.vb index 2329429df2a..44ce80745de 100644 --- a/instat/sdgMissingOptionsEvapotranspiration.vb +++ b/instat/sdgMissingOptionsEvapotranspiration.vb @@ -19,11 +19,22 @@ Public Class sdgMissingOptionsEvapotranspiration Public bFirstLoad As Boolean = True Public bControlsInitialised As Boolean = False Public clsReadInputs, clsMissingDataVector As New RFunction - Private Sub sdgMissingOptionsEvapotranspiration_Load(sender As Object, e As EventArgs) + Private Sub sdgMissingOptionsEvapotranspiration_Load(sender As Object, e As EventArgs) Handles ucrSdgButtons.Load autoTranslate(Me) End Sub Public Sub InitialiseControls() + Dim dctInputMissingMethod As New Dictionary(Of String, String) + + ucrInputMissingMethod.SetParameter(New RParameter("missing_method", 8)) + dctInputMissingMethod.Add("monthly average", Chr(34) & "monthly average" & Chr(34)) + dctInputMissingMethod.Add("seasonal average", Chr(34) & "seasonal average" & Chr(34)) + dctInputMissingMethod.Add("DoY average", Chr(34) & "DoY average" & Chr(34)) + dctInputMissingMethod.Add("neighbouring average", Chr(34) & "neighbouring average" & Chr(34)) + ucrInputMissingMethod.SetItems(dctInputMissingMethod) + ucrInputMissingMethod.SetDropDownStyleAsNonEditable() + ucrInputMissingMethod.SetLinkedDisplayControl(lblMissingMethod) + ucrChkInterpMissingDays.SetParameter(New RParameter("interp_missing_days", 5)) ucrChkInterpMissingDays.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkInterpMissingDays.SetRDefault("FALSE") @@ -52,6 +63,7 @@ Public Class sdgMissingOptionsEvapotranspiration clsReadInputs = clsNewReadInputs clsMissingDataVector = clsNewMissingDataVector + ucrInputMissingMethod.SetRCode(clsReadInputs, bReset, bCloneIfNeeded:=True) ucrChkInterpMissingDays.SetRCode(clsReadInputs, bReset, bCloneIfNeeded:=True) ucrChkInterpMissingEntries.SetRCode(clsReadInputs, bReset, bCloneIfNeeded:=True) ucrNudMaxMissingData.SetRCode(clsMissingDataVector, bReset, bCloneIfNeeded:=True) From 297cfff6f0e924f8fc5373f39dcd3e1ed91970b9 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 26 Jun 2023 21:48:39 +0100 Subject: [PATCH 09/48] minor change --- instat/sdgLocation.Designer.vb | 274 ++++++++++++++++++++++++++++++++- 1 file changed, 273 insertions(+), 1 deletion(-) diff --git a/instat/sdgLocation.Designer.vb b/instat/sdgLocation.Designer.vb index 2eccbec8252..4ca1dde9cdc 100644 --- a/instat/sdgLocation.Designer.vb +++ b/instat/sdgLocation.Designer.vb @@ -22,20 +22,292 @@ Partial Class sdgLocation 'Ne la modifiez pas à l'aide de l'éditeur de code. _ Private Sub InitializeComponent() + Me.lblAltitude1 = New System.Windows.Forms.Label() + Me.ucrInputElevation = New instat.ucrInputTextBox() + Me.ucrInputLatitude = New instat.ucrInputTextBox() + Me.lblLatitude1 = New System.Windows.Forms.Label() + Me.lblLongitude1 = New System.Windows.Forms.Label() + Me.ucrInputLongitude = New instat.ucrInputTextBox() + Me.lblDegreesLon = New System.Windows.Forms.Label() + Me.lblDegreesLat = New System.Windows.Forms.Label() + Me.lblElevationunit = New System.Windows.Forms.Label() + Me.ucrSubDialogueBase = New instat.ucrButtonsSubdialogue() + Me.ucrReceiverStation = New instat.ucrReceiverSingle() + Me.Station = New System.Windows.Forms.Label() + Me.ucrReceiverLongitude = New instat.ucrReceiverSingle() + Me.lblLongitude = New System.Windows.Forms.Label() + Me.lblLatitude = New System.Windows.Forms.Label() + Me.ucrReceiverLatitude = New instat.ucrReceiverSingle() + Me.ucrReceiverAltitude = New instat.ucrReceiverSingle() + Me.lblAltitude = New System.Windows.Forms.Label() + Me.grpLocation = New System.Windows.Forms.GroupBox() + Me.ucrSelectorLocation = New instat.ucrSelectorByDataFrameAddRemove() + Me.grpLocation.SuspendLayout() Me.SuspendLayout() ' + 'lblAltitude1 + ' + Me.lblAltitude1.AutoSize = True + Me.lblAltitude1.Location = New System.Drawing.Point(9, 24) + Me.lblAltitude1.Name = "lblAltitude1" + Me.lblAltitude1.Size = New System.Drawing.Size(42, 13) + Me.lblAltitude1.TabIndex = 22 + Me.lblAltitude1.Text = "Altitude" + ' + 'ucrInputElevation + ' + Me.ucrInputElevation.AddQuotesIfUnrecognised = True + Me.ucrInputElevation.AutoSize = True + Me.ucrInputElevation.IsMultiline = False + Me.ucrInputElevation.IsReadOnly = False + Me.ucrInputElevation.Location = New System.Drawing.Point(67, 19) + Me.ucrInputElevation.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputElevation.Name = "ucrInputElevation" + Me.ucrInputElevation.Size = New System.Drawing.Size(89, 21) + Me.ucrInputElevation.TabIndex = 19 + ' + 'ucrInputLatitude + ' + Me.ucrInputLatitude.AddQuotesIfUnrecognised = True + Me.ucrInputLatitude.AutoSize = True + Me.ucrInputLatitude.IsMultiline = False + Me.ucrInputLatitude.IsReadOnly = False + Me.ucrInputLatitude.Location = New System.Drawing.Point(67, 48) + Me.ucrInputLatitude.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputLatitude.Name = "ucrInputLatitude" + Me.ucrInputLatitude.Size = New System.Drawing.Size(89, 20) + Me.ucrInputLatitude.TabIndex = 21 + ' + 'lblLatitude1 + ' + Me.lblLatitude1.AutoSize = True + Me.lblLatitude1.Location = New System.Drawing.Point(9, 52) + Me.lblLatitude1.Name = "lblLatitude1" + Me.lblLatitude1.Size = New System.Drawing.Size(45, 13) + Me.lblLatitude1.TabIndex = 20 + Me.lblLatitude1.Text = "Latitude" + ' + 'lblLongitude1 + ' + Me.lblLongitude1.AutoSize = True + Me.lblLongitude1.Location = New System.Drawing.Point(9, 81) + Me.lblLongitude1.Name = "lblLongitude1" + Me.lblLongitude1.Size = New System.Drawing.Size(54, 13) + Me.lblLongitude1.TabIndex = 19 + Me.lblLongitude1.Text = "Longitude" + ' + 'ucrInputLongitude + ' + Me.ucrInputLongitude.AddQuotesIfUnrecognised = True + Me.ucrInputLongitude.AutoSize = True + Me.ucrInputLongitude.IsMultiline = False + Me.ucrInputLongitude.IsReadOnly = False + Me.ucrInputLongitude.Location = New System.Drawing.Point(67, 75) + Me.ucrInputLongitude.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputLongitude.Name = "ucrInputLongitude" + Me.ucrInputLongitude.Size = New System.Drawing.Size(89, 21) + Me.ucrInputLongitude.TabIndex = 17 + ' + 'lblDegreesLon + ' + Me.lblDegreesLon.AutoSize = True + Me.lblDegreesLon.Location = New System.Drawing.Point(164, 81) + Me.lblDegreesLon.Name = "lblDegreesLon" + Me.lblDegreesLon.Size = New System.Drawing.Size(46, 13) + Me.lblDegreesLon.TabIndex = 8 + Me.lblDegreesLon.Text = "Radians" + ' + 'lblDegreesLat + ' + Me.lblDegreesLat.AutoSize = True + Me.lblDegreesLat.Location = New System.Drawing.Point(164, 52) + Me.lblDegreesLat.Name = "lblDegreesLat" + Me.lblDegreesLat.Size = New System.Drawing.Size(46, 13) + Me.lblDegreesLat.TabIndex = 7 + Me.lblDegreesLat.Text = "Radians" + ' + 'lblElevationunit + ' + Me.lblElevationunit.AutoSize = True + Me.lblElevationunit.Location = New System.Drawing.Point(164, 24) + Me.lblElevationunit.Name = "lblElevationunit" + Me.lblElevationunit.Size = New System.Drawing.Size(39, 13) + Me.lblElevationunit.TabIndex = 6 + Me.lblElevationunit.Text = "Meters" + ' + 'ucrSubDialogueBase + ' + Me.ucrSubDialogueBase.AutoSize = True + Me.ucrSubDialogueBase.Location = New System.Drawing.Point(57, 314) + Me.ucrSubDialogueBase.Name = "ucrSubDialogueBase" + Me.ucrSubDialogueBase.Size = New System.Drawing.Size(224, 30) + Me.ucrSubDialogueBase.TabIndex = 27 + ' + 'ucrReceiverStation + ' + Me.ucrReceiverStation.AutoSize = True + Me.ucrReceiverStation.frmParent = Me + Me.ucrReceiverStation.Location = New System.Drawing.Point(241, 23) + Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStation.Name = "ucrReceiverStation" + Me.ucrReceiverStation.Selector = Nothing + Me.ucrReceiverStation.Size = New System.Drawing.Size(89, 20) + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.TabIndex = 26 + Me.ucrReceiverStation.ucrSelector = Nothing + ' + 'Station + ' + Me.Station.AutoSize = True + Me.Station.Location = New System.Drawing.Point(241, 10) + Me.Station.Name = "Station" + Me.Station.Size = New System.Drawing.Size(40, 13) + Me.Station.TabIndex = 22 + Me.Station.Text = "Station" + ' + 'ucrReceiverLongitude + ' + Me.ucrReceiverLongitude.AutoSize = True + Me.ucrReceiverLongitude.frmParent = Me + Me.ucrReceiverLongitude.Location = New System.Drawing.Point(241, 133) + Me.ucrReceiverLongitude.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLongitude.Name = "ucrReceiverLongitude" + Me.ucrReceiverLongitude.Selector = Nothing + Me.ucrReceiverLongitude.Size = New System.Drawing.Size(89, 20) + Me.ucrReceiverLongitude.strNcFilePath = "" + Me.ucrReceiverLongitude.TabIndex = 25 + Me.ucrReceiverLongitude.ucrSelector = Nothing + ' + 'lblLongitude + ' + Me.lblLongitude.AutoSize = True + Me.lblLongitude.Location = New System.Drawing.Point(241, 119) + Me.lblLongitude.Name = "lblLongitude" + Me.lblLongitude.Size = New System.Drawing.Size(54, 13) + Me.lblLongitude.TabIndex = 20 + Me.lblLongitude.Text = "Longitude" + ' + 'lblLatitude + ' + Me.lblLatitude.AutoSize = True + Me.lblLatitude.Location = New System.Drawing.Point(241, 81) + Me.lblLatitude.Name = "lblLatitude" + Me.lblLatitude.Size = New System.Drawing.Size(45, 13) + Me.lblLatitude.TabIndex = 19 + Me.lblLatitude.Text = "Latitude" + ' + 'ucrReceiverLatitude + ' + Me.ucrReceiverLatitude.AutoSize = True + Me.ucrReceiverLatitude.frmParent = Me + Me.ucrReceiverLatitude.Location = New System.Drawing.Point(241, 94) + Me.ucrReceiverLatitude.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLatitude.Name = "ucrReceiverLatitude" + Me.ucrReceiverLatitude.Selector = Nothing + Me.ucrReceiverLatitude.Size = New System.Drawing.Size(89, 20) + Me.ucrReceiverLatitude.strNcFilePath = "" + Me.ucrReceiverLatitude.TabIndex = 24 + Me.ucrReceiverLatitude.ucrSelector = Nothing + ' + 'ucrReceiverAltitude + ' + Me.ucrReceiverAltitude.AutoSize = True + Me.ucrReceiverAltitude.frmParent = Me + Me.ucrReceiverAltitude.Location = New System.Drawing.Point(241, 57) + Me.ucrReceiverAltitude.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAltitude.Name = "ucrReceiverAltitude" + Me.ucrReceiverAltitude.Selector = Nothing + Me.ucrReceiverAltitude.Size = New System.Drawing.Size(89, 20) + Me.ucrReceiverAltitude.strNcFilePath = "" + Me.ucrReceiverAltitude.TabIndex = 23 + Me.ucrReceiverAltitude.ucrSelector = Nothing + ' + 'lblAltitude + ' + Me.lblAltitude.AutoSize = True + Me.lblAltitude.Location = New System.Drawing.Point(241, 44) + Me.lblAltitude.Name = "lblAltitude" + Me.lblAltitude.Size = New System.Drawing.Size(42, 13) + Me.lblAltitude.TabIndex = 21 + Me.lblAltitude.Text = "Altitude" + ' + 'grpLocation + ' + Me.grpLocation.Controls.Add(Me.lblAltitude1) + Me.grpLocation.Controls.Add(Me.ucrInputElevation) + Me.grpLocation.Controls.Add(Me.ucrInputLatitude) + Me.grpLocation.Controls.Add(Me.lblLatitude1) + Me.grpLocation.Controls.Add(Me.lblLongitude1) + Me.grpLocation.Controls.Add(Me.ucrInputLongitude) + Me.grpLocation.Controls.Add(Me.lblDegreesLon) + Me.grpLocation.Controls.Add(Me.lblDegreesLat) + Me.grpLocation.Controls.Add(Me.lblElevationunit) + Me.grpLocation.Location = New System.Drawing.Point(12, 198) + Me.grpLocation.Name = "grpLocation" + Me.grpLocation.Size = New System.Drawing.Size(212, 109) + Me.grpLocation.TabIndex = 29 + Me.grpLocation.TabStop = False + Me.grpLocation.Text = "Location" + ' + 'ucrSelectorLocation + ' + Me.ucrSelectorLocation.AutoSize = True + Me.ucrSelectorLocation.bDropUnusedFilterLevels = False + Me.ucrSelectorLocation.bShowHiddenColumns = False + Me.ucrSelectorLocation.bUseCurrentFilter = True + Me.ucrSelectorLocation.Location = New System.Drawing.Point(8, 10) + Me.ucrSelectorLocation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorLocation.Name = "ucrSelectorLocation" + Me.ucrSelectorLocation.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorLocation.TabIndex = 28 + ' 'sdgLocation ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(330, 320) + Me.ClientSize = New System.Drawing.Size(339, 351) + Me.Controls.Add(Me.ucrSubDialogueBase) + Me.Controls.Add(Me.ucrReceiverStation) + Me.Controls.Add(Me.Station) + Me.Controls.Add(Me.ucrReceiverLongitude) + Me.Controls.Add(Me.lblLongitude) + Me.Controls.Add(Me.lblLatitude) + Me.Controls.Add(Me.ucrReceiverLatitude) + Me.Controls.Add(Me.ucrReceiverAltitude) + Me.Controls.Add(Me.lblAltitude) + Me.Controls.Add(Me.grpLocation) + Me.Controls.Add(Me.ucrSelectorLocation) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgLocation" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Location" + Me.grpLocation.ResumeLayout(False) + Me.grpLocation.PerformLayout() Me.ResumeLayout(False) + Me.PerformLayout() End Sub + + Friend WithEvents lblAltitude1 As Label + Friend WithEvents ucrInputElevation As ucrInputTextBox + Friend WithEvents ucrInputLatitude As ucrInputTextBox + Friend WithEvents lblLatitude1 As Label + Friend WithEvents lblLongitude1 As Label + Friend WithEvents ucrInputLongitude As ucrInputTextBox + Friend WithEvents lblDegreesLon As Label + Friend WithEvents lblDegreesLat As Label + Friend WithEvents lblElevationunit As Label + Friend WithEvents ucrSubDialogueBase As ucrButtonsSubdialogue + Friend WithEvents ucrReceiverStation As ucrReceiverSingle + Friend WithEvents Station As Label + Friend WithEvents ucrReceiverLongitude As ucrReceiverSingle + Friend WithEvents lblLongitude As Label + Friend WithEvents lblLatitude As Label + Friend WithEvents ucrReceiverLatitude As ucrReceiverSingle + Friend WithEvents ucrReceiverAltitude As ucrReceiverSingle + Friend WithEvents lblAltitude As Label + Friend WithEvents grpLocation As GroupBox + Friend WithEvents ucrSelectorLocation As ucrSelectorByDataFrameAddRemove End Class From 40cc2ea7244aac31b9ba314b11bf9e7d52e32967 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 26 Jun 2023 21:54:17 +0100 Subject: [PATCH 10/48] Added HS missing options --- instat/instat.vbproj | 9 ++ instat/sdgHSMissingOptions.Designer.vb | 41 ++++++++ instat/sdgHSMissingOptions.resx | 120 ++++++++++++++++++++++++ instat/sdgHSMissingOptions.vb | 3 + instat/sdgLocation.vb | 124 ++++++++++++++++++++++++- 5 files changed, 296 insertions(+), 1 deletion(-) create mode 100644 instat/sdgHSMissingOptions.Designer.vb create mode 100644 instat/sdgHSMissingOptions.resx create mode 100644 instat/sdgHSMissingOptions.vb diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 8a4329dc938..dad45e187ac 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -272,6 +272,12 @@ Form + + sdgHSMissingOptions.vb + + + Form + sdgLocation.vb @@ -3135,6 +3141,9 @@ sdgHSConstants.vb + + sdgHSMissingOptions.vb + sdgLocation.vb diff --git a/instat/sdgHSMissingOptions.Designer.vb b/instat/sdgHSMissingOptions.Designer.vb new file mode 100644 index 00000000000..0e9938a6f1c --- /dev/null +++ b/instat/sdgHSMissingOptions.Designer.vb @@ -0,0 +1,41 @@ + _ +Partial Class sdgHSMissingOptions + Inherits System.Windows.Forms.Form + + 'Form remplace la méthode Dispose pour nettoyer la liste des composants. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Requise par le Concepteur Windows Form + Private components As System.ComponentModel.IContainer + + 'REMARQUE : la procédure suivante est requise par le Concepteur Windows Form + 'Elle peut être modifiée à l'aide du Concepteur Windows Form. + 'Ne la modifiez pas à l'aide de l'éditeur de code. + _ + Private Sub InitializeComponent() + Me.SuspendLayout() + ' + 'sdgHSMissingOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "sdgHSMissingOptions" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Hargreaves Samani Missing Options" + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/instat/sdgHSMissingOptions.resx b/instat/sdgHSMissingOptions.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgHSMissingOptions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgHSMissingOptions.vb b/instat/sdgHSMissingOptions.vb new file mode 100644 index 00000000000..a3c6aaa6488 --- /dev/null +++ b/instat/sdgHSMissingOptions.vb @@ -0,0 +1,3 @@ +Public Class sdgHSMissingOptions + +End Class \ No newline at end of file diff --git a/instat/sdgLocation.vb b/instat/sdgLocation.vb index d9659102cab..13d078fc047 100644 --- a/instat/sdgLocation.vb +++ b/instat/sdgLocation.vb @@ -1,3 +1,125 @@ -Public Class sdgLocation +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . +Imports instat.Translations +Public Class sdgLocation + Private bFirstLoad As Boolean = True + Private bControlsInitialised As Boolean = False + Private clsVarnamesVectorPM, clsVarnamesVectorHS, clsListFunction As New RFunction + + Private Sub sdgLocation_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + ucrSelectorLocation.Reset() + EnableDesableSelector() + bFirstLoad = False + End If + End Sub + + Private Sub InitialiseDialog() + ucrSelectorLocation.SetParameter(New RParameter("station_df", 0)) + ucrSelectorLocation.SetParameterIsrfunction() + + ucrReceiverStation.SetParameter(New RParameter("name", 1)) + ucrReceiverStation.SetParameterIsRFunction() + ucrReceiverStation.Selector = ucrSelectorLocation + ucrReceiverStation.SetClimaticType("station") + ucrReceiverStation.bAutoFill = True + + ucrReceiverLatitude.SetParameter(New RParameter("lat_rad", 2)) + ucrReceiverLatitude.SetParameterIsRFunction() + ucrReceiverLatitude.Selector = ucrSelectorLocation + ucrReceiverLatitude.SetClimaticType("lat") + ucrReceiverLatitude.bAutoFill = True + + ucrInputLatitude.SetParameter(New RParameter("lat_rad", 2)) + ucrInputLatitude.AddQuotesIfUnrecognised = False + ucrInputLatitude.SetLinkedDisplayControl(lblLatitude) + + ucrReceiverLongitude.SetParameter(New RParameter("lon", 3)) + ucrReceiverLongitude.SetParameterIsRFunction() + ucrReceiverLongitude.Selector = ucrSelectorLocation + ucrReceiverLongitude.SetClimaticType("lon") + ucrReceiverLongitude.bAutoFill = True + + ucrInputLongitude.SetParameter(New RParameter("lon", 3)) + ucrInputLongitude.AddQuotesIfUnrecognised = False + ucrInputLongitude.SetLinkedDisplayControl(lblLongitude) + ucrInputLongitude.SetRDefault(0) + + ucrReceiverAltitude.SetParameter(New RParameter("Elev", 4)) + ucrReceiverAltitude.SetParameterIsRFunction() + ucrReceiverAltitude.Selector = ucrSelectorLocation + ucrReceiverAltitude.SetClimaticType("alt") + ucrReceiverAltitude.bAutoFill = True + + ucrInputElevation.SetParameter(New RParameter("Elev", 4)) + ucrInputElevation.AddQuotesIfUnrecognised = False + ucrInputElevation.SetLinkedDisplayControl(lblLatitude) + + bControlsInitialised = True + End Sub + + Public Sub SetRFunction(clsNewVarnamesVectorHS As RFunction, clsNewVarnamesVectorPM As RFunction, clsNewListFunction As RFunction, Optional bReset As Boolean = False) + clsListFunction = clsNewListFunction + clsVarnamesVectorPM = clsNewVarnamesVectorPM + clsVarnamesVectorHS = clsNewVarnamesVectorHS + + If Not bControlsInitialised Then + InitialiseDialog() + End If + + ucrReceiverLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorHS, New RParameter("lon", 3), iAdditionalPairNo:=1) + ucrInputLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorHS, New RParameter("lon", 3), iAdditionalPairNo:=1) + + ucrSelectorLocation.SetRCode(clsVarnamesVectorPM, bReset, bCloneIfNeeded:=True) + ucrReceiverStation.SetRCode(clsVarnamesVectorPM, bReset, bCloneIfNeeded:=True) + ucrReceiverLatitude.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrReceiverAltitude.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrReceiverLongitude.SetRCode(clsVarnamesVectorPM, bReset, bCloneIfNeeded:=True) + + If bReset Then + ucrInputElevation.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputLongitude.SetRCode(clsVarnamesVectorPM, bReset, bCloneIfNeeded:=True) + ucrInputLatitude.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + End If + End Sub + + Private Sub EnableDesableSelector() + If ucrReceiverLatitude.IsEmpty AndAlso ucrReceiverAltitude.IsEmpty Then + ucrInputLatitude.Enabled = True + ucrInputElevation.Enabled = True + ucrInputLongitude.Enabled = True + Else + ucrInputLatitude.Enabled = False + ucrInputElevation.Enabled = False + ucrInputLongitude.Enabled = False + End If + End Sub + + Private Sub ucrReceiverAltitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverAltitude.ControlValueChanged, ucrReceiverLatitude.ControlValueChanged, ucrReceiverLongitude.ControlValueChanged + EnableDesableSelector() + End Sub + + Private Sub ucrInputElevation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputElevation.ControlValueChanged, ucrInputLatitude.ControlValueChanged, ucrInputLongitude.ControlValueChanged + EnableDesableSelector() + End Sub + + Private Sub ucrSelectorLocation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorLocation.ControlValueChanged + EnableDesableSelector() + End Sub End Class \ No newline at end of file From a27856ac0d15741af8fde4e46e1f0e0ad9fe51ed Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 26 Jun 2023 21:56:28 +0100 Subject: [PATCH 11/48] minor change --- instat/sdgHSMissingOptions.Designer.vb | 138 ++++++++++++++++++++++++- instat/sdgHSMissingOptions.vb | 2 + 2 files changed, 139 insertions(+), 1 deletion(-) diff --git a/instat/sdgHSMissingOptions.Designer.vb b/instat/sdgHSMissingOptions.Designer.vb index 0e9938a6f1c..8308dadfad0 100644 --- a/instat/sdgHSMissingOptions.Designer.vb +++ b/instat/sdgHSMissingOptions.Designer.vb @@ -22,20 +22,156 @@ Partial Class sdgHSMissingOptions 'Ne la modifiez pas à l'aide de l'éditeur de code. _ Private Sub InitializeComponent() + Me.gprMissingDataOptions = New System.Windows.Forms.GroupBox() + Me.ucrChkInterpMissingEntries = New instat.ucrCheck() + Me.ucrChkInterpMissingDays = New instat.ucrCheck() + Me.ucrNudMaxMissingData = New instat.ucrNud() + Me.ucrNudMaxDurationMissingData = New instat.ucrNud() + Me.lblMaxMissingData = New System.Windows.Forms.Label() + Me.lblMaxDurationMissingData = New System.Windows.Forms.Label() + Me.ucrSdgButtons = New instat.ucrButtonsSubdialogue() + Me.ucrNudMaxMissingDays = New instat.ucrNud() + Me.lblMaxMissingDays = New System.Windows.Forms.Label() + Me.gprMissingDataOptions.SuspendLayout() Me.SuspendLayout() ' + 'gprMissingDataOptions + ' + Me.gprMissingDataOptions.Controls.Add(Me.ucrChkInterpMissingEntries) + Me.gprMissingDataOptions.Controls.Add(Me.ucrChkInterpMissingDays) + Me.gprMissingDataOptions.Location = New System.Drawing.Point(11, 90) + Me.gprMissingDataOptions.Name = "gprMissingDataOptions" + Me.gprMissingDataOptions.Size = New System.Drawing.Size(200, 82) + Me.gprMissingDataOptions.TabIndex = 17 + Me.gprMissingDataOptions.TabStop = False + Me.gprMissingDataOptions.Text = "Missing Data Options" + ' + 'ucrChkInterpMissingEntries + ' + Me.ucrChkInterpMissingEntries.AutoSize = True + Me.ucrChkInterpMissingEntries.Checked = False + Me.ucrChkInterpMissingEntries.Location = New System.Drawing.Point(7, 53) + Me.ucrChkInterpMissingEntries.Name = "ucrChkInterpMissingEntries" + Me.ucrChkInterpMissingEntries.Size = New System.Drawing.Size(183, 23) + Me.ucrChkInterpMissingEntries.TabIndex = 1 + ' + 'ucrChkInterpMissingDays + ' + Me.ucrChkInterpMissingDays.AutoSize = True + Me.ucrChkInterpMissingDays.Checked = False + Me.ucrChkInterpMissingDays.Location = New System.Drawing.Point(7, 22) + Me.ucrChkInterpMissingDays.Name = "ucrChkInterpMissingDays" + Me.ucrChkInterpMissingDays.Size = New System.Drawing.Size(183, 23) + Me.ucrChkInterpMissingDays.TabIndex = 0 + ' + 'ucrNudMaxMissingData + ' + Me.ucrNudMaxMissingData.AutoSize = True + Me.ucrNudMaxMissingData.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxMissingData.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudMaxMissingData.Location = New System.Drawing.Point(151, 64) + Me.ucrNudMaxMissingData.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudMaxMissingData.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxMissingData.Name = "ucrNudMaxMissingData" + Me.ucrNudMaxMissingData.Size = New System.Drawing.Size(50, 20) + Me.ucrNudMaxMissingData.TabIndex = 16 + Me.ucrNudMaxMissingData.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudMaxDurationMissingData + ' + Me.ucrNudMaxDurationMissingData.AutoSize = True + Me.ucrNudMaxDurationMissingData.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxDurationMissingData.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudMaxDurationMissingData.Location = New System.Drawing.Point(151, 38) + Me.ucrNudMaxDurationMissingData.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudMaxDurationMissingData.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxDurationMissingData.Name = "ucrNudMaxDurationMissingData" + Me.ucrNudMaxDurationMissingData.Size = New System.Drawing.Size(50, 20) + Me.ucrNudMaxDurationMissingData.TabIndex = 15 + Me.ucrNudMaxDurationMissingData.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblMaxMissingData + ' + Me.lblMaxMissingData.AutoSize = True + Me.lblMaxMissingData.Location = New System.Drawing.Point(11, 64) + Me.lblMaxMissingData.Name = "lblMaxMissingData" + Me.lblMaxMissingData.Size = New System.Drawing.Size(91, 13) + Me.lblMaxMissingData.TabIndex = 14 + Me.lblMaxMissingData.Text = "Max Missing Data" + ' + 'lblMaxDurationMissingData + ' + Me.lblMaxDurationMissingData.AutoSize = True + Me.lblMaxDurationMissingData.Location = New System.Drawing.Point(11, 39) + Me.lblMaxDurationMissingData.Name = "lblMaxDurationMissingData" + Me.lblMaxDurationMissingData.Size = New System.Drawing.Size(134, 13) + Me.lblMaxDurationMissingData.TabIndex = 13 + Me.lblMaxDurationMissingData.Text = "Max Duration Missing Data" + ' + 'ucrSdgButtons + ' + Me.ucrSdgButtons.AutoSize = True + Me.ucrSdgButtons.Location = New System.Drawing.Point(11, 178) + Me.ucrSdgButtons.Name = "ucrSdgButtons" + Me.ucrSdgButtons.Size = New System.Drawing.Size(259, 29) + Me.ucrSdgButtons.TabIndex = 12 + ' + 'ucrNudMaxMissingDays + ' + Me.ucrNudMaxMissingDays.AutoSize = True + Me.ucrNudMaxMissingDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxMissingDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudMaxMissingDays.Location = New System.Drawing.Point(151, 11) + Me.ucrNudMaxMissingDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudMaxMissingDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxMissingDays.Name = "ucrNudMaxMissingDays" + Me.ucrNudMaxMissingDays.Size = New System.Drawing.Size(50, 20) + Me.ucrNudMaxMissingDays.TabIndex = 11 + Me.ucrNudMaxMissingDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblMaxMissingDays + ' + Me.lblMaxMissingDays.AutoSize = True + Me.lblMaxMissingDays.Location = New System.Drawing.Point(11, 11) + Me.lblMaxMissingDays.Name = "lblMaxMissingDays" + Me.lblMaxMissingDays.Size = New System.Drawing.Size(92, 13) + Me.lblMaxMissingDays.TabIndex = 10 + Me.lblMaxMissingDays.Text = "Max Missing Days" + ' 'sdgHSMissingOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 450) + Me.ClientSize = New System.Drawing.Size(235, 216) + Me.Controls.Add(Me.gprMissingDataOptions) + Me.Controls.Add(Me.ucrNudMaxMissingData) + Me.Controls.Add(Me.ucrNudMaxDurationMissingData) + Me.Controls.Add(Me.lblMaxMissingData) + Me.Controls.Add(Me.lblMaxDurationMissingData) + Me.Controls.Add(Me.ucrSdgButtons) + Me.Controls.Add(Me.ucrNudMaxMissingDays) + Me.Controls.Add(Me.lblMaxMissingDays) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgHSMissingOptions" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Hargreaves Samani Missing Options" + Me.gprMissingDataOptions.ResumeLayout(False) + Me.gprMissingDataOptions.PerformLayout() Me.ResumeLayout(False) + Me.PerformLayout() End Sub + + Friend WithEvents gprMissingDataOptions As GroupBox + Friend WithEvents ucrChkInterpMissingEntries As ucrCheck + Friend WithEvents ucrChkInterpMissingDays As ucrCheck + Friend WithEvents ucrNudMaxMissingData As ucrNud + Friend WithEvents ucrNudMaxDurationMissingData As ucrNud + Friend WithEvents lblMaxMissingData As Label + Friend WithEvents lblMaxDurationMissingData As Label + Friend WithEvents ucrSdgButtons As ucrButtonsSubdialogue + Friend WithEvents ucrNudMaxMissingDays As ucrNud + Friend WithEvents lblMaxMissingDays As Label End Class diff --git a/instat/sdgHSMissingOptions.vb b/instat/sdgHSMissingOptions.vb index a3c6aaa6488..c5aa6441bbe 100644 --- a/instat/sdgHSMissingOptions.vb +++ b/instat/sdgHSMissingOptions.vb @@ -1,3 +1,5 @@ Public Class sdgHSMissingOptions + Private Sub sdgMissingOptionsEvapotranspiration_Load(sender As Object, e As EventArgs) + End Sub End Class \ No newline at end of file From 54fa8010862f786b2538b9945ab375af05165fbe Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 26 Jun 2023 22:28:32 +0100 Subject: [PATCH 12/48] minor change --- instat/sdgHSMissingOptions.vb | 66 ++++++++++++++++++- ...ssingOptionsEvapotranspiration.Designer.vb | 24 +++---- 2 files changed, 75 insertions(+), 15 deletions(-) diff --git a/instat/sdgHSMissingOptions.vb b/instat/sdgHSMissingOptions.vb index c5aa6441bbe..b502011ee7d 100644 --- a/instat/sdgHSMissingOptions.vb +++ b/instat/sdgHSMissingOptions.vb @@ -1,5 +1,65 @@ -Public Class sdgHSMissingOptions - Private Sub sdgMissingOptionsEvapotranspiration_Load(sender As Object, e As EventArgs) +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . +Imports instat.Translations +Public Class sdgHSMissingOptions + Public bFirstLoad As Boolean = True + Public bControlsInitialised As Boolean = False + Public clsReadInputs, clsMissingDataVector As New RFunction + + Private Sub sdgMissingOptionsEvapotranspiration_Load(sender As Object, e As EventArgs) Handles ucrSdgButtons.Load + autoTranslate(Me) End Sub -End Class \ No newline at end of file + + Public Sub InitialiseControls() + Dim dctInputMissingMethod As New Dictionary(Of String, String) + + ucrChkInterpMissingDays.SetParameter(New RParameter("interp_missing_days", 5)) + ucrChkInterpMissingDays.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkInterpMissingDays.SetRDefault("FALSE") + ucrChkInterpMissingDays.SetText("Interpolate Missing Days") + + ucrChkInterpMissingEntries.SetParameter(New RParameter("interp_missing_entries", 6)) + ucrChkInterpMissingEntries.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkInterpMissingEntries.SetRDefault("FALSE") + ucrChkInterpMissingEntries.SetText("Interpolate Missing Entries") + + ucrNudMaxMissingData.SetParameter(New RParameter("x", bNewIncludeArgumentName:=False)) + ucrNudMaxMissingData.SetMinMax(1, 99) + + ucrNudMaxMissingDays.SetParameter(New RParameter("y", bNewIncludeArgumentName:=False)) + ucrNudMaxMissingDays.SetMinMax(1, 99) + + ucrNudMaxDurationMissingData.SetParameter(New RParameter("z", bNewIncludeArgumentName:=False)) + ucrNudMaxDurationMissingData.SetMinMax(1, 99) + End Sub + + Public Sub SetRFunction(clsNewReadInputs As RFunction, clsNewMissingDataVector As RFunction, Optional bReset As Boolean = False) + If Not bControlsInitialised Then + InitialiseControls() + End If + + clsReadInputs = clsNewReadInputs + clsMissingDataVector = clsNewMissingDataVector + + ucrChkInterpMissingDays.SetRCode(clsReadInputs, bReset, bCloneIfNeeded:=True) + ucrChkInterpMissingEntries.SetRCode(clsReadInputs, bReset, bCloneIfNeeded:=True) + ucrNudMaxMissingData.SetRCode(clsMissingDataVector, bReset, bCloneIfNeeded:=True) + ucrNudMaxMissingDays.SetRCode(clsMissingDataVector, bReset, bCloneIfNeeded:=True) + ucrNudMaxDurationMissingData.SetRCode(clsMissingDataVector, bReset, bCloneIfNeeded:=True) + End Sub + +End Class diff --git a/instat/sdgMissingOptionsEvapotranspiration.Designer.vb b/instat/sdgMissingOptionsEvapotranspiration.Designer.vb index 9a3b4a7aa1d..3333d1423ac 100644 --- a/instat/sdgMissingOptionsEvapotranspiration.Designer.vb +++ b/instat/sdgMissingOptionsEvapotranspiration.Designer.vb @@ -40,7 +40,7 @@ Partial Class sdgMissingOptionsEvapotranspiration 'lblMaxPerctMissindData ' Me.lblMaxPerctMissindData.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxPerctMissindData.Location = New System.Drawing.Point(2, 47) + Me.lblMaxPerctMissindData.Location = New System.Drawing.Point(5, 60) Me.lblMaxPerctMissindData.Name = "lblMaxPerctMissindData" Me.lblMaxPerctMissindData.Size = New System.Drawing.Size(169, 19) Me.lblMaxPerctMissindData.TabIndex = 39 @@ -49,7 +49,7 @@ Partial Class sdgMissingOptionsEvapotranspiration 'lblMaxDurationMissingData ' Me.lblMaxDurationMissingData.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxDurationMissingData.Location = New System.Drawing.Point(2, 23) + Me.lblMaxDurationMissingData.Location = New System.Drawing.Point(5, 36) Me.lblMaxDurationMissingData.Name = "lblMaxDurationMissingData" Me.lblMaxDurationMissingData.Size = New System.Drawing.Size(160, 20) Me.lblMaxDurationMissingData.TabIndex = 37 @@ -58,7 +58,7 @@ Partial Class sdgMissingOptionsEvapotranspiration 'lblMaxMissingDays ' Me.lblMaxMissingDays.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxMissingDays.Location = New System.Drawing.Point(2, 0) + Me.lblMaxMissingDays.Location = New System.Drawing.Point(5, 13) Me.lblMaxMissingDays.Name = "lblMaxMissingDays" Me.lblMaxMissingDays.Size = New System.Drawing.Size(169, 20) Me.lblMaxMissingDays.TabIndex = 35 @@ -68,7 +68,7 @@ Partial Class sdgMissingOptionsEvapotranspiration ' Me.grpMissingDataOpts.Controls.Add(Me.ucrChkInterpMissingEntries) Me.grpMissingDataOpts.Controls.Add(Me.ucrChkInterpMissingDays) - Me.grpMissingDataOpts.Location = New System.Drawing.Point(2, 117) + Me.grpMissingDataOpts.Location = New System.Drawing.Point(5, 121) Me.grpMissingDataOpts.Name = "grpMissingDataOpts" Me.grpMissingDataOpts.Size = New System.Drawing.Size(198, 66) Me.grpMissingDataOpts.TabIndex = 41 @@ -79,7 +79,7 @@ Partial Class sdgMissingOptionsEvapotranspiration ' Me.ucrChkInterpMissingEntries.AutoSize = True Me.ucrChkInterpMissingEntries.Checked = False - Me.ucrChkInterpMissingEntries.Location = New System.Drawing.Point(2, 38) + Me.ucrChkInterpMissingEntries.Location = New System.Drawing.Point(5, 36) Me.ucrChkInterpMissingEntries.Name = "ucrChkInterpMissingEntries" Me.ucrChkInterpMissingEntries.Size = New System.Drawing.Size(188, 23) Me.ucrChkInterpMissingEntries.TabIndex = 5 @@ -88,7 +88,7 @@ Partial Class sdgMissingOptionsEvapotranspiration ' Me.ucrChkInterpMissingDays.AutoSize = True Me.ucrChkInterpMissingDays.Checked = False - Me.ucrChkInterpMissingDays.Location = New System.Drawing.Point(2, 16) + Me.ucrChkInterpMissingDays.Location = New System.Drawing.Point(5, 14) Me.ucrChkInterpMissingDays.Name = "ucrChkInterpMissingDays" Me.ucrChkInterpMissingDays.Size = New System.Drawing.Size(168, 23) Me.ucrChkInterpMissingDays.TabIndex = 6 @@ -99,7 +99,7 @@ Partial Class sdgMissingOptionsEvapotranspiration Me.ucrInputMissingMethod.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputMissingMethod.GetSetSelectedIndex = -1 Me.ucrInputMissingMethod.IsReadOnly = False - Me.ucrInputMissingMethod.Location = New System.Drawing.Point(90, 75) + Me.ucrInputMissingMethod.Location = New System.Drawing.Point(93, 88) Me.ucrInputMissingMethod.Name = "ucrInputMissingMethod" Me.ucrInputMissingMethod.Size = New System.Drawing.Size(137, 21) Me.ucrInputMissingMethod.TabIndex = 43 @@ -107,7 +107,7 @@ Partial Class sdgMissingOptionsEvapotranspiration 'lblMissingMethod ' Me.lblMissingMethod.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMissingMethod.Location = New System.Drawing.Point(-1, 77) + Me.lblMissingMethod.Location = New System.Drawing.Point(2, 90) Me.lblMissingMethod.Name = "lblMissingMethod" Me.lblMissingMethod.Size = New System.Drawing.Size(90, 19) Me.lblMissingMethod.TabIndex = 42 @@ -118,7 +118,7 @@ Partial Class sdgMissingOptionsEvapotranspiration Me.ucrNudMaxDurationMissingData.AutoSize = True Me.ucrNudMaxDurationMissingData.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxDurationMissingData.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxDurationMissingData.Location = New System.Drawing.Point(177, 47) + Me.ucrNudMaxDurationMissingData.Location = New System.Drawing.Point(180, 60) Me.ucrNudMaxDurationMissingData.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxDurationMissingData.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxDurationMissingData.Name = "ucrNudMaxDurationMissingData" @@ -131,7 +131,7 @@ Partial Class sdgMissingOptionsEvapotranspiration Me.ucrNudMaxMissingDays.AutoSize = True Me.ucrNudMaxMissingDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxMissingDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxMissingDays.Location = New System.Drawing.Point(177, 0) + Me.ucrNudMaxMissingDays.Location = New System.Drawing.Point(180, 13) Me.ucrNudMaxMissingDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxMissingDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxMissingDays.Name = "ucrNudMaxMissingDays" @@ -144,7 +144,7 @@ Partial Class sdgMissingOptionsEvapotranspiration Me.ucrNudMaxMissingData.AutoSize = True Me.ucrNudMaxMissingData.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxMissingData.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxMissingData.Location = New System.Drawing.Point(177, 23) + Me.ucrNudMaxMissingData.Location = New System.Drawing.Point(180, 36) Me.ucrNudMaxMissingData.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxMissingData.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxMissingData.Name = "ucrNudMaxMissingData" @@ -155,7 +155,7 @@ Partial Class sdgMissingOptionsEvapotranspiration 'ucrSdgButtons ' Me.ucrSdgButtons.AutoSize = True - Me.ucrSdgButtons.Location = New System.Drawing.Point(-7, 200) + Me.ucrSdgButtons.Location = New System.Drawing.Point(-4, 198) Me.ucrSdgButtons.Name = "ucrSdgButtons" Me.ucrSdgButtons.Size = New System.Drawing.Size(259, 29) Me.ucrSdgButtons.TabIndex = 34 From b3fa81f7d48031234012267fe1208cbb05e368aa Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 26 Jun 2023 23:01:53 +0100 Subject: [PATCH 13/48] minor change --- instat/dlgEvapotranspiration.vb | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index 8aa2af96b48..d46f3469d35 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -322,18 +322,26 @@ Public Class dlgEvapotranspiration End Sub Private Sub cmdHSMissingOptions_Click(sender As Object, e As EventArgs) Handles cmdHSMissingOptions.Click - + sdgHSMissingOptions.SetRFunction(clsReadInputs, clsMissingDataVector, bResetSubdialog) + bResetSubdialog = False + sdgHSMissingOptions.ShowDialog() End Sub Private Sub cmdPMConstants_Click(sender As Object, e As EventArgs) Handles cmdPMConstants.Click - + sdgPMConstants.SetRFunction(clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) + sdgPMConstants.ShowDialog() + bResetSubdialog = False + TestOKEnabled() End Sub Private Sub cmdHSConstants_Click(sender As Object, e As EventArgs) Handles cmdHSConstants.Click sdgHSConstants.SetRFunction(clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) sdgHSConstants.ShowDialog() bResetSubdialog = False + TestOKEnabled() + End Sub + Private Sub cmdLocation_Click(sender As Object, e As EventArgs) Handles cmdLocation.Click sdgLocation.SetRFunction(clsNewVarnamesVectorHS:=clsVarnamesVectorHS, clsNewVarnamesVectorPM:=clsVarnamesVectorPM, clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) sdgLocation.ShowDialog() bResetSubdialog = False @@ -345,16 +353,16 @@ Public Class dlgEvapotranspiration Me.Size = New System.Drawing.Size(Me.Width, iBasicHeight) ucrBase.Location = New Point(ucrBase.Location.X, iBaseMaxY) ucrNewColName.Location = New Point(ucrNewColName.Location.X, iSaveMaxY) - cmdEvapOptions.Location = New Point(cmdEvapOptions.Location.X, iEvapOptions) - cmdLocation.Location = New Point(cmdLocation.Location.X, iLocation) + cmdEvapOptions.Location = New Point(cmdEvapOptions.Location.X, iEvapOptions) + cmdLocation.Location = New Point(cmdLocation.Location.X, iLocation) ElseIf rdoHargreavesSamani.Checked Then - ucrReceiverDate.SetMeAsReceiver() - Me.Size = New System.Drawing.Size(Me.Width, iBasicHeight * 0.9) - ucrBase.Location = New Point(ucrBase.Location.X, iBaseMaxY / 1.15) - ucrNewColName.Location = New Point(ucrNewColName.Location.X, iSaveMaxY / 1.183) - cmdHSMissingOptions.Location = New Point(cmdHSMissingOptions.Location.X, iHSMissingOptions / 1.187) - cmdHSConstants.Location = New Point(cmdHSConstants.Location.X, iHSConstants / 1.187) - cmdLocation.Location = New Point(cmdLocation.Location.X, iLocation / 1.187) + ucrReceiverDate.SetMeAsReceiver() + Me.Size = New System.Drawing.Size(Me.Width, iBasicHeight * 0.9) + ucrBase.Location = New Point(ucrBase.Location.X, iBaseMaxY / 1.15) + ucrNewColName.Location = New Point(ucrNewColName.Location.X, iSaveMaxY / 1.183) + cmdHSMissingOptions.Location = New Point(cmdHSMissingOptions.Location.X, iHSMissingOptions / 1.187) + cmdHSConstants.Location = New Point(cmdHSConstants.Location.X, iHSConstants / 1.187) + cmdLocation.Location = New Point(cmdLocation.Location.X, iLocation / 1.187) End If End Sub From d278beea3e3c806df8891b9dacba027dd50870cf Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 26 Jun 2023 23:38:25 +0100 Subject: [PATCH 14/48] Add PT method --- instat/dlgEvapotranspiration.vb | 57 ++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index d46f3469d35..d51ad5e1974 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -24,7 +24,7 @@ Public Class dlgEvapotranspiration Private iSaveMaxY As Integer Private iEvapOptions, iHSConstants, iLocation As Integer Private iHSMissingOptions As Integer - Private clsETPenmanMonteith, clsHargreavesSamani, clsListFunction, clsDataFunctionPM, clsDataFunctionHS, clsReadInputs, clsVector, clsMissingDataVector, clsVarnamesVectorPM, clsVarnamesVectorHS, clsLibraryEvap As New RFunction + Private clsETPenmanMonteith, clsHargreavesSamani, clsListFunction, clsDataFunctionPM, clsDataFunctionHS, clsDataFunctionPT, clsETPriestleyTaylor, clsReadInputs, clsVector, clsMissingDataVector, clsVarnamesVectorPT, clsVarnamesVectorPM, clsVarnamesVectorHS, clsLibraryEvap As New RFunction Private clsDayFunc, clsMonthFunc, clsYearFunc As New RFunction Private clsBaseOperator As New ROperator @@ -156,6 +156,8 @@ Public Class dlgEvapotranspiration clsHargreavesSamani = New RFunction clsDataFunctionPM = New RFunction clsDataFunctionHS = New RFunction + clsDataFunctionPT = New RFunction + clsETPriestleyTaylor = New RFunction clsBaseOperator = New ROperator clsReadInputs = New RFunction clsDayFunc = New RFunction @@ -180,6 +182,11 @@ Public Class dlgEvapotranspiration clsDataFunctionHS.AddParameter("Month", clsRFunctionParameter:=clsMonthFunc) clsDataFunctionHS.AddParameter("Day", clsRFunctionParameter:=clsDayFunc) + clsDataFunctionPT.SetRCommand("data.frame") + clsDataFunctionPT.AddParameter("Year", clsRFunctionParameter:=clsYearFunc) + clsDataFunctionPT.AddParameter("Month", clsRFunctionParameter:=clsMonthFunc) + clsDataFunctionPT.AddParameter("Day", clsRFunctionParameter:=clsDayFunc) + clsDayFunc.SetPackageName("lubridate") clsDayFunc.SetRCommand("day") @@ -201,8 +208,16 @@ Public Class dlgEvapotranspiration clsReadInputs.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorPM, iPosition:=0) clsReadInputs.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionPM, iPosition:=1) clsReadInputs.AddParameter("missing_method", Chr(34) & "monthly average" & Chr(34), iPosition:=8) + clsReadInputs.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorPT, iPosition:=10) + clsReadInputs.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionPT, iPosition:=11) clsReadInputs.SetAssignTo("temp_data") + clsVarnamesVectorPT.SetRCommand("c") + clsVarnamesVectorPT.AddParameter("Tmax", Chr(34) & "Tmax" & Chr(34), bIncludeArgumentName:=False) + clsVarnamesVectorPT.AddParameter("Tmin", Chr(34) & "Tmin" & Chr(34), bIncludeArgumentName:=False) + clsVarnamesVectorPT.AddParameter("RHmax", Chr(34) & "RHmax" & Chr(34), bIncludeArgumentName:=False) + clsVarnamesVectorPT.AddParameter("RHmin", Chr(34) & "RHmin" & Chr(34), bIncludeArgumentName:=False) + clsVarnamesVectorPM.SetRCommand("c") clsVarnamesVectorPM.AddParameter("Tmax", Chr(34) & "Tmax" & Chr(34), bIncludeArgumentName:=False) clsVarnamesVectorPM.AddParameter("Tmin", Chr(34) & "Tmin" & Chr(34), bIncludeArgumentName:=False) @@ -254,6 +269,16 @@ Public Class dlgEvapotranspiration clsHargreavesSamani.AddParameter("save.csv", Chr(34) & "no" & Chr(34), iPosition:=4) clsHargreavesSamani.SetAssignTo("Hargreaves_Samani") + clsETPriestleyTaylor.SetPackageName("Evapotranspiration") + clsETPriestleyTaylor.SetRCommand("ET.PriestleyTaylor") + clsETPriestleyTaylor.AddParameter("data", clsRFunctionParameter:=clsReadInputs, iPosition:=0) + clsETPriestleyTaylor.AddParameter("constants", "constants", iPosition:=1, bIncludeArgumentName:=False) + clsETPriestleyTaylor.AddParameter("ts", Chr(34) & "daily" & Chr(34), iPosition:=2) + clsETPriestleyTaylor.AddParameter("message", Chr(34) & "yes" & Chr(34), iPosition:=3) + clsETPriestleyTaylor.AddParameter("alpha", 0.23, iPosition:=4) + clsETPriestleyTaylor.AddParameter("save.csv", Chr(34) & "no" & Chr(34), iPosition:=5) + clsETPriestleyTaylor.SetAssignTo("Priestley_Taylor") + clsBaseOperator.SetOperation("$") clsBaseOperator.bSpaceAroundOperation = False clsBaseOperator.AddParameter("ET.PenmanMonteith", clsRFunctionParameter:=clsETPenmanMonteith, iPosition:=0) @@ -270,7 +295,14 @@ Public Class dlgEvapotranspiration ucrReceiverDate.AddAdditionalCodeParameterPair(clsYearFunc, New RParameter("x", 0), iAdditionalPairNo:=2) ucrReceiverTmax.AddAdditionalCodeParameterPair(clsDataFunctionHS, New RParameter("Tmax", 3), iAdditionalPairNo:=1) ucrReceiverTmin.AddAdditionalCodeParameterPair(clsDataFunctionHS, New RParameter("Tmin", 4), iAdditionalPairNo:=1) + ucrReceiverExtraRadiation.AddAdditionalCodeParameterPair(clsDataFunctionHS, New RParameter("R_a", 6), iAdditionalPairNo:=1) + ucrReceiverTmax.AddAdditionalCodeParameterPair(clsDataFunctionPT, New RParameter("Tmax", 3), iAdditionalPairNo:=2) + ucrReceiverTmin.AddAdditionalCodeParameterPair(clsDataFunctionPT, New RParameter("Tmin", 4), iAdditionalPairNo:=2) ucrInputTimeStep.AddAdditionalCodeParameterPair(clsHargreavesSamani, New RParameter("ts", 2), iAdditionalPairNo:=1) + ucrInputTimeStep.AddAdditionalCodeParameterPair(clsETPriestleyTaylor, New RParameter("ts", 2), iAdditionalPairNo:=2) + ucrInputSolar.AddAdditionalCodeParameterPair(clsETPriestleyTaylor, New RParameter("solar", 3), iAdditionalPairNo:=1) + ucrReceiverHumidityMax.AddAdditionalCodeParameterPair(clsDataFunctionPT, New RParameter("RHmax", 4), iAdditionalPairNo:=1) + ucrReceiverHumidityMin.AddAdditionalCodeParameterPair(clsDataFunctionPT, New RParameter("RHmin", 5), iAdditionalPairNo:=1) ucrReceiverDate.SetRCode(clsDayFunc, bReset) ucrReceiverTmax.SetRCode(clsDataFunctionPM, bReset) @@ -283,6 +315,7 @@ Public Class dlgEvapotranspiration ucrChkWind.SetRCode(clsETPenmanMonteith, bReset) ucrNewColName.SetRCode(clsBaseOperator, bReset) ucrPnlMethod.SetRCode(clsBaseOperator, bReset) + ucrNudAlpha.SetRCode(clsETPriestleyTaylor, bReset) If bReset Then ucrInputSolar.SetRCode(clsETPenmanMonteith, bReset) End If @@ -373,6 +406,9 @@ Public Class dlgEvapotranspiration ElseIf rdoHargreavesSamani.Checked Then clsReadInputs.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorHS, iPosition:=0) clsReadInputs.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionHS, iPosition:=1) + ElseIf rdoPriestleyTaylor.Checked Then + clsReadInputs.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorPT, iPosition:=0) + clsReadInputs.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionPT, iPosition:=1) End If End Sub @@ -390,6 +426,11 @@ Public Class dlgEvapotranspiration Else clsBaseOperator.RemoveParameterByName("ET.HargreavesSamani") End If + If rdoPriestleyTaylor.Checked Then + clsBaseOperator.AddParameter("ET.PriestleyTaylor", clsRFunctionParameter:=clsETPriestleyTaylor, iPosition:=0) + Else + clsBaseOperator.RemoveParameterByName("ET.PriestleyTaylor") + End If End Sub Private Sub EnableDesableSubDialog() @@ -423,28 +464,42 @@ Public Class dlgEvapotranspiration ucrReceiverRadiation.bAutoFill = True clsVarnamesVectorPM.AddParameter("n", Chr(34) & "n" & Chr(34), bIncludeArgumentName:=False) clsDataFunctionPM.AddParameter("n", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsVarnamesVectorPT.AddParameter("n", Chr(34) & "n" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPT.AddParameter("n", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) clsVarnamesVectorPM.RemoveParameterByName("Rs") clsVarnamesVectorPM.RemoveParameterByName("Cd") + clsVarnamesVectorPT.RemoveParameterByName("Rs") + clsVarnamesVectorPT.RemoveParameterByName("Cd") clsDataFunctionPM.RemoveParameterByName("Rs") clsDataFunctionPM.RemoveParameterByName("cd") + clsDataFunctionPT.RemoveParameterByName("Rs") + clsDataFunctionPT.RemoveParameterByName("cd") Case "radiation" ucrReceiverRadiation.SetClimaticType("radiation") ucrReceiverRadiation.bAutoFill = True clsVarnamesVectorPM.AddParameter("Rs", Chr(34) & "Rs" & Chr(34), bIncludeArgumentName:=False) clsDataFunctionPM.AddParameter("Rs", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsVarnamesVectorPT.AddParameter("Rs", Chr(34) & "Rs" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPT.AddParameter("Rs", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) clsVarnamesVectorPM.RemoveParameterByName("n") clsVarnamesVectorPM.RemoveParameterByName("Cd") clsDataFunctionPM.RemoveParameterByName("n") clsDataFunctionPM.RemoveParameterByName("cd") + clsDataFunctionPT.RemoveParameterByName("n") + clsDataFunctionPT.RemoveParameterByName("cd") Case "cloud" ucrReceiverRadiation.SetClimaticType("cloud_cover") ucrReceiverRadiation.bAutoFill = True clsVarnamesVectorPM.AddParameter("Cd", Chr(34) & "Cd" & Chr(34), bIncludeArgumentName:=False) clsDataFunctionPM.AddParameter("Cd", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsVarnamesVectorPT.AddParameter("Cd", Chr(34) & "Cd" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPT.AddParameter("Cd", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) clsVarnamesVectorPM.RemoveParameterByName("n") clsVarnamesVectorPM.RemoveParameterByName("Rs") clsDataFunctionPM.RemoveParameterByName("n") clsDataFunctionPM.RemoveParameterByName("Rs") + clsDataFunctionPT.RemoveParameterByName("n") + clsDataFunctionPT.RemoveParameterByName("Rs") End Select End Sub Private Sub ucrPnlMethod_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlMethod.ControlContentsChanged, ucrNewColName.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverTmax.ControlContentsChanged, ucrReceiverTmin.ControlContentsChanged, ucrReceiverHumidityMax.ControlContentsChanged, ucrReceiverHumidityMin.ControlContentsChanged, ucrReceiverRadiation.ControlContentsChanged, ucrReceiverWindSpeed.ControlContentsChanged, ucrInputTimeStep.ControlContentsChanged, ucrChkWind.ControlContentsChanged, ucrChkWind.ControlContentsChanged From 84928e0d5660474137de2f5359d9969227753576 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 26 Jun 2023 23:50:58 +0100 Subject: [PATCH 15/48] minor change --- instat/dlgEvapotranspiration.Designer.vb | 28 ++++++++++++++++++++---- instat/dlgEvapotranspiration.vb | 12 ++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/instat/dlgEvapotranspiration.Designer.vb b/instat/dlgEvapotranspiration.Designer.vb index 725a9a16f90..66fd5d8800c 100644 --- a/instat/dlgEvapotranspiration.Designer.vb +++ b/instat/dlgEvapotranspiration.Designer.vb @@ -53,6 +53,7 @@ Partial Class dlgEvapotranspiration Me.ucrReceiverTmax = New instat.ucrReceiverSingle() Me.ucrSelectorEvapotranspiration = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() + Me.rdoPriestleyTaylor = New System.Windows.Forms.RadioButton() Me.SuspendLayout() ' 'cmdHSConstants @@ -136,7 +137,7 @@ Partial Class dlgEvapotranspiration Me.rdoHargreavesSamani.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoHargreavesSamani.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoHargreavesSamani.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoHargreavesSamani.Location = New System.Drawing.Point(215, 10) + Me.rdoHargreavesSamani.Location = New System.Drawing.Point(150, 10) Me.rdoHargreavesSamani.Name = "rdoHargreavesSamani" Me.rdoHargreavesSamani.Size = New System.Drawing.Size(131, 27) Me.rdoHargreavesSamani.TabIndex = 43 @@ -153,7 +154,7 @@ Partial Class dlgEvapotranspiration Me.rdoPenmanMonteith.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoPenmanMonteith.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoPenmanMonteith.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoPenmanMonteith.Location = New System.Drawing.Point(108, 10) + Me.rdoPenmanMonteith.Location = New System.Drawing.Point(43, 10) Me.rdoPenmanMonteith.Name = "rdoPenmanMonteith" Me.rdoPenmanMonteith.Size = New System.Drawing.Size(109, 27) Me.rdoPenmanMonteith.TabIndex = 41 @@ -251,10 +252,10 @@ Partial Class dlgEvapotranspiration 'ucrPnlMethod ' Me.ucrPnlMethod.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlMethod.Location = New System.Drawing.Point(107, 8) + Me.ucrPnlMethod.Location = New System.Drawing.Point(41, 8) Me.ucrPnlMethod.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlMethod.Name = "ucrPnlMethod" - Me.ucrPnlMethod.Size = New System.Drawing.Size(244, 37) + Me.ucrPnlMethod.Size = New System.Drawing.Size(397, 37) Me.ucrPnlMethod.TabIndex = 40 ' 'lblCrop @@ -397,12 +398,30 @@ Partial Class dlgEvapotranspiration Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 64 ' + 'rdoPriestleyTaylor + ' + Me.rdoPriestleyTaylor.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoPriestleyTaylor.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoPriestleyTaylor.FlatAppearance.BorderSize = 2 + Me.rdoPriestleyTaylor.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoPriestleyTaylor.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoPriestleyTaylor.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoPriestleyTaylor.Location = New System.Drawing.Point(279, 10) + Me.rdoPriestleyTaylor.Name = "rdoPriestleyTaylor" + Me.rdoPriestleyTaylor.Size = New System.Drawing.Size(131, 27) + Me.rdoPriestleyTaylor.TabIndex = 70 + Me.rdoPriestleyTaylor.TabStop = True + Me.rdoPriestleyTaylor.Text = "Priestley-Taylor" + Me.rdoPriestleyTaylor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoPriestleyTaylor.UseVisualStyleBackColor = True + ' 'dlgEvapotranspiration ' 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(453, 478) + Me.Controls.Add(Me.rdoPriestleyTaylor) Me.Controls.Add(Me.cmdHSConstants) Me.Controls.Add(Me.cmdLocation) Me.Controls.Add(Me.cmdPMConstants) @@ -476,4 +495,5 @@ Partial Class dlgEvapotranspiration Friend WithEvents ucrReceiverTmax As ucrReceiverSingle Friend WithEvents ucrSelectorEvapotranspiration As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrBase As ucrButtons + Friend WithEvents rdoPriestleyTaylor As RadioButton End Class \ No newline at end of file diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index d51ad5e1974..507425b2402 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -60,6 +60,7 @@ Public Class dlgEvapotranspiration ucrReceiverDate.Selector = ucrSelectorEvapotranspiration ucrReceiverTmax.Selector = ucrSelectorEvapotranspiration ucrReceiverTmin.Selector = ucrSelectorEvapotranspiration + ucrReceiverExtraRadiation.Selector = ucrSelectorEvapotranspiration ucrReceiverHumidityMax.Selector = ucrSelectorEvapotranspiration ucrReceiverHumidityMin.Selector = ucrSelectorEvapotranspiration ucrReceiverRadiation.Selector = ucrSelectorEvapotranspiration @@ -80,6 +81,10 @@ Public Class dlgEvapotranspiration ucrReceiverTmin.SetClimaticType("temp_min") ucrReceiverTmin.bAutoFill = True + ucrReceiverExtraRadiation.SetParameter(New RParameter("R_a", 4)) + ucrReceiverExtraRadiation.SetParameterIsRFunction() + ucrReceiverExtraRadiation.SetClimaticType("R_a") + ucrReceiverHumidityMax.SetParameter(New RParameter("RHmax", 4)) ucrReceiverHumidityMax.SetParameterIsRFunction() ucrReceiverHumidityMax.SetClimaticType("hum_max") @@ -121,6 +126,12 @@ Public Class dlgEvapotranspiration ucrChkWind.SetValuesCheckedAndUnchecked(Chr(34) & "yes" & Chr(34), Chr(34) & "no" & Chr(34)) ucrChkWind.SetRDefault(Chr(34) & "yes" & Chr(34)) + ucrNudAlpha.SetParameter(New RParameter("alpha", 4)) + ucrNudAlpha.SetMinMax(0, 1) + ucrNudAlpha.DecimalPlaces = 2 + ucrNudAlpha.Increment = 0.05 + ucrNudAlpha.SetLinkedDisplayControl(lblAlpha) + 'panel setting ucrPnlMethod.AddRadioButton(rdoPenmanMonteith) ucrPnlMethod.AddRadioButton(rdoHargreavesSamani) @@ -136,6 +147,7 @@ Public Class dlgEvapotranspiration ucrPnlMethod.AddToLinkedControls(ucrChkWind, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlMethod.AddToLinkedControls(ucrInputSolar, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrReceiverExtraRadiation.SetLinkedDisplayControl(lblRa) ucrReceiverRadiation.SetLinkedDisplayControl(lblRadiation) ucrReceiverHumidityMax.SetLinkedDisplayControl(lblHumidityMax) ucrReceiverHumidityMin.SetLinkedDisplayControl(lblHumidityMin) From da8bf803954e0bf30044e862734f75ec291772f8 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 27 Jun 2023 10:21:46 +0100 Subject: [PATCH 16/48] minor change --- instat/dlgEvapotranspiration.Designer.vb | 300 ++++++++++++++--------- instat/dlgEvapotranspiration.vb | 30 ++- 2 files changed, 203 insertions(+), 127 deletions(-) diff --git a/instat/dlgEvapotranspiration.Designer.vb b/instat/dlgEvapotranspiration.Designer.vb index 66fd5d8800c..7fb39edcf67 100644 --- a/instat/dlgEvapotranspiration.Designer.vb +++ b/instat/dlgEvapotranspiration.Designer.vb @@ -26,34 +26,38 @@ Partial Class dlgEvapotranspiration Me.cmdLocation = New System.Windows.Forms.Button() Me.cmdPMConstants = New System.Windows.Forms.Button() Me.cmdHSMissingOptions = New System.Windows.Forms.Button() - Me.ucrReceiverWindSpeed = New instat.ucrReceiverSingle() - Me.ucrChkWind = New instat.ucrCheck() Me.cmdEvapOptions = New System.Windows.Forms.Button() Me.rdoHargreavesSamani = New System.Windows.Forms.RadioButton() Me.rdoPenmanMonteith = New System.Windows.Forms.RadioButton() Me.lblSolar = New System.Windows.Forms.Label() - Me.ucrInputSolar = New instat.ucrInputComboBox() Me.lblRadiation = New System.Windows.Forms.Label() + Me.lblDate = New System.Windows.Forms.Label() + Me.lblCrop = New System.Windows.Forms.Label() + Me.lblTimeStep = New System.Windows.Forms.Label() + Me.lblHumidityMin = New System.Windows.Forms.Label() + Me.lblHumidityMax = New System.Windows.Forms.Label() + Me.lblTmin = New System.Windows.Forms.Label() + Me.lblTmax = New System.Windows.Forms.Label() + Me.rdoPriestleyTaylor = New System.Windows.Forms.RadioButton() + Me.lblRA = New System.Windows.Forms.Label() + Me.lblAlpha = New System.Windows.Forms.Label() + Me.ucrReceiverWindSpeed = New instat.ucrReceiverSingle() + Me.ucrChkWind = New instat.ucrCheck() + Me.ucrInputSolar = New instat.ucrInputComboBox() Me.ucrReceiverRadiation = New instat.ucrReceiverSingle() Me.ucrInputCrop = New instat.ucrInputComboBox() Me.ucrNewColName = New instat.ucrSave() - Me.lblDate = New System.Windows.Forms.Label() Me.ucrReceiverDate = New instat.ucrReceiverSingle() Me.ucrPnlMethod = New instat.UcrPanel() - Me.lblCrop = New System.Windows.Forms.Label() - Me.lblTimeStep = New System.Windows.Forms.Label() Me.ucrInputTimeStep = New instat.ucrInputComboBox() - Me.lblHumidityMin = New System.Windows.Forms.Label() Me.ucrReceiverHumidityMin = New instat.ucrReceiverSingle() - Me.lblHumidityMax = New System.Windows.Forms.Label() Me.ucrReceiverHumidityMax = New instat.ucrReceiverSingle() - Me.lblTmin = New System.Windows.Forms.Label() Me.ucrReceiverTmin = New instat.ucrReceiverSingle() - Me.lblTmax = New System.Windows.Forms.Label() Me.ucrReceiverTmax = New instat.ucrReceiverSingle() Me.ucrSelectorEvapotranspiration = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() - Me.rdoPriestleyTaylor = New System.Windows.Forms.RadioButton() + Me.ucrReceiverExtraRadiation = New instat.ucrReceiverSingle() + Me.ucrNudAlpha = New instat.ucrNud() Me.SuspendLayout() ' 'cmdHSConstants @@ -96,29 +100,6 @@ Partial Class dlgEvapotranspiration Me.cmdHSMissingOptions.Text = "Missing Options" Me.cmdHSMissingOptions.UseVisualStyleBackColor = True ' - 'ucrReceiverWindSpeed - ' - Me.ucrReceiverWindSpeed.AutoSize = True - Me.ucrReceiverWindSpeed.frmParent = Me - Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(319, 313) - Me.ucrReceiverWindSpeed.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverWindSpeed.Name = "ucrReceiverWindSpeed" - Me.ucrReceiverWindSpeed.Selector = Nothing - Me.ucrReceiverWindSpeed.Size = New System.Drawing.Size(123, 20) - Me.ucrReceiverWindSpeed.strNcFilePath = "" - Me.ucrReceiverWindSpeed.TabIndex = 42 - Me.ucrReceiverWindSpeed.ucrSelector = Nothing - ' - 'ucrChkWind - ' - Me.ucrChkWind.AutoSize = True - Me.ucrChkWind.Checked = False - Me.ucrChkWind.Location = New System.Drawing.Point(319, 290) - Me.ucrChkWind.Margin = New System.Windows.Forms.Padding(6) - Me.ucrChkWind.Name = "ucrChkWind" - Me.ucrChkWind.Size = New System.Drawing.Size(123, 23) - Me.ucrChkWind.TabIndex = 39 - ' 'cmdEvapOptions ' Me.cmdEvapOptions.Location = New System.Drawing.Point(319, 341) @@ -172,6 +153,136 @@ Partial Class dlgEvapotranspiration Me.lblSolar.TabIndex = 59 Me.lblSolar.Text = "Solar" ' + 'lblRadiation + ' + Me.lblRadiation.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRadiation.Location = New System.Drawing.Point(319, 240) + Me.lblRadiation.Name = "lblRadiation" + Me.lblRadiation.Size = New System.Drawing.Size(120, 13) + Me.lblRadiation.TabIndex = 55 + Me.lblRadiation.Text = "Solar:" + ' + 'lblDate + ' + Me.lblDate.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblDate.Location = New System.Drawing.Point(319, 45) + Me.lblDate.Name = "lblDate" + Me.lblDate.Size = New System.Drawing.Size(43, 13) + Me.lblDate.TabIndex = 45 + Me.lblDate.Text = "Date:" + ' + 'lblCrop + ' + Me.lblCrop.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblCrop.Location = New System.Drawing.Point(10, 297) + Me.lblCrop.Name = "lblCrop" + Me.lblCrop.Size = New System.Drawing.Size(71, 20) + Me.lblCrop.TabIndex = 61 + Me.lblCrop.Text = "Crop" + ' + 'lblTimeStep + ' + Me.lblTimeStep.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblTimeStep.Location = New System.Drawing.Point(10, 240) + Me.lblTimeStep.Name = "lblTimeStep" + Me.lblTimeStep.Size = New System.Drawing.Size(92, 20) + Me.lblTimeStep.TabIndex = 57 + Me.lblTimeStep.Text = "Time Step" + ' + 'lblHumidityMin + ' + Me.lblHumidityMin.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblHumidityMin.Location = New System.Drawing.Point(319, 200) + Me.lblHumidityMin.Name = "lblHumidityMin" + Me.lblHumidityMin.Size = New System.Drawing.Size(123, 13) + Me.lblHumidityMin.TabIndex = 53 + Me.lblHumidityMin.Text = "Humidity Min:" + ' + 'lblHumidityMax + ' + Me.lblHumidityMax.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblHumidityMax.Location = New System.Drawing.Point(319, 161) + Me.lblHumidityMax.Name = "lblHumidityMax" + Me.lblHumidityMax.Size = New System.Drawing.Size(124, 13) + Me.lblHumidityMax.TabIndex = 51 + Me.lblHumidityMax.Text = "Humidity Max:" + ' + 'lblTmin + ' + Me.lblTmin.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblTmin.Location = New System.Drawing.Point(319, 84) + Me.lblTmin.Name = "lblTmin" + Me.lblTmin.Size = New System.Drawing.Size(42, 13) + Me.lblTmin.TabIndex = 47 + Me.lblTmin.Text = "Tmin:" + ' + 'lblTmax + ' + Me.lblTmax.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblTmax.Location = New System.Drawing.Point(319, 123) + Me.lblTmax.Name = "lblTmax" + Me.lblTmax.Size = New System.Drawing.Size(47, 13) + Me.lblTmax.TabIndex = 49 + Me.lblTmax.Text = "Tmax:" + ' + 'rdoPriestleyTaylor + ' + Me.rdoPriestleyTaylor.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoPriestleyTaylor.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoPriestleyTaylor.FlatAppearance.BorderSize = 2 + Me.rdoPriestleyTaylor.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoPriestleyTaylor.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoPriestleyTaylor.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoPriestleyTaylor.Location = New System.Drawing.Point(279, 10) + Me.rdoPriestleyTaylor.Name = "rdoPriestleyTaylor" + Me.rdoPriestleyTaylor.Size = New System.Drawing.Size(131, 27) + Me.rdoPriestleyTaylor.TabIndex = 70 + Me.rdoPriestleyTaylor.TabStop = True + Me.rdoPriestleyTaylor.Text = "Priestley-Taylor" + Me.rdoPriestleyTaylor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoPriestleyTaylor.UseVisualStyleBackColor = True + ' + 'lblRA + ' + Me.lblRA.AutoSize = True + Me.lblRA.Location = New System.Drawing.Point(319, 161) + Me.lblRA.Name = "lblRA" + Me.lblRA.Size = New System.Drawing.Size(124, 13) + Me.lblRA.TabIndex = 39 + Me.lblRA.Text = "Extraterrestrial Radiation:" + ' + 'lblAlpha + ' + Me.lblAlpha.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblAlpha.Location = New System.Drawing.Point(12, 297) + Me.lblAlpha.Name = "lblAlpha" + Me.lblAlpha.Size = New System.Drawing.Size(71, 20) + Me.lblAlpha.TabIndex = 37 + Me.lblAlpha.Text = "Alpha" + ' + 'ucrReceiverWindSpeed + ' + Me.ucrReceiverWindSpeed.AutoSize = True + Me.ucrReceiverWindSpeed.frmParent = Me + Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(319, 313) + Me.ucrReceiverWindSpeed.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverWindSpeed.Name = "ucrReceiverWindSpeed" + Me.ucrReceiverWindSpeed.Selector = Nothing + Me.ucrReceiverWindSpeed.Size = New System.Drawing.Size(123, 20) + Me.ucrReceiverWindSpeed.strNcFilePath = "" + Me.ucrReceiverWindSpeed.TabIndex = 42 + Me.ucrReceiverWindSpeed.ucrSelector = Nothing + ' + 'ucrChkWind + ' + Me.ucrChkWind.AutoSize = True + Me.ucrChkWind.Checked = False + Me.ucrChkWind.Location = New System.Drawing.Point(319, 290) + Me.ucrChkWind.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkWind.Name = "ucrChkWind" + Me.ucrChkWind.Size = New System.Drawing.Size(123, 23) + Me.ucrChkWind.TabIndex = 39 + ' 'ucrInputSolar ' Me.ucrInputSolar.AddQuotesIfUnrecognised = True @@ -184,15 +295,6 @@ Partial Class dlgEvapotranspiration Me.ucrInputSolar.Size = New System.Drawing.Size(137, 21) Me.ucrInputSolar.TabIndex = 60 ' - 'lblRadiation - ' - Me.lblRadiation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRadiation.Location = New System.Drawing.Point(319, 240) - Me.lblRadiation.Name = "lblRadiation" - Me.lblRadiation.Size = New System.Drawing.Size(120, 13) - Me.lblRadiation.TabIndex = 55 - Me.lblRadiation.Text = "Solar:" - ' 'ucrReceiverRadiation ' Me.ucrReceiverRadiation.AutoSize = True @@ -227,15 +329,6 @@ Partial Class dlgEvapotranspiration Me.ucrNewColName.Size = New System.Drawing.Size(388, 24) Me.ucrNewColName.TabIndex = 63 ' - 'lblDate - ' - Me.lblDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDate.Location = New System.Drawing.Point(319, 45) - Me.lblDate.Name = "lblDate" - Me.lblDate.Size = New System.Drawing.Size(43, 13) - Me.lblDate.TabIndex = 45 - Me.lblDate.Text = "Date:" - ' 'ucrReceiverDate ' Me.ucrReceiverDate.AutoSize = True @@ -258,24 +351,6 @@ Partial Class dlgEvapotranspiration Me.ucrPnlMethod.Size = New System.Drawing.Size(397, 37) Me.ucrPnlMethod.TabIndex = 40 ' - 'lblCrop - ' - Me.lblCrop.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCrop.Location = New System.Drawing.Point(10, 297) - Me.lblCrop.Name = "lblCrop" - Me.lblCrop.Size = New System.Drawing.Size(71, 20) - Me.lblCrop.TabIndex = 61 - Me.lblCrop.Text = "Crop" - ' - 'lblTimeStep - ' - Me.lblTimeStep.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTimeStep.Location = New System.Drawing.Point(10, 240) - Me.lblTimeStep.Name = "lblTimeStep" - Me.lblTimeStep.Size = New System.Drawing.Size(92, 20) - Me.lblTimeStep.TabIndex = 57 - Me.lblTimeStep.Text = "Time Step" - ' 'ucrInputTimeStep ' Me.ucrInputTimeStep.AddQuotesIfUnrecognised = True @@ -288,15 +363,6 @@ Partial Class dlgEvapotranspiration Me.ucrInputTimeStep.Size = New System.Drawing.Size(137, 21) Me.ucrInputTimeStep.TabIndex = 58 ' - 'lblHumidityMin - ' - Me.lblHumidityMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHumidityMin.Location = New System.Drawing.Point(319, 200) - Me.lblHumidityMin.Name = "lblHumidityMin" - Me.lblHumidityMin.Size = New System.Drawing.Size(123, 13) - Me.lblHumidityMin.TabIndex = 53 - Me.lblHumidityMin.Text = "Humidity Min:" - ' 'ucrReceiverHumidityMin ' Me.ucrReceiverHumidityMin.AutoSize = True @@ -310,15 +376,6 @@ Partial Class dlgEvapotranspiration Me.ucrReceiverHumidityMin.TabIndex = 54 Me.ucrReceiverHumidityMin.ucrSelector = Nothing ' - 'lblHumidityMax - ' - Me.lblHumidityMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHumidityMax.Location = New System.Drawing.Point(319, 161) - Me.lblHumidityMax.Name = "lblHumidityMax" - Me.lblHumidityMax.Size = New System.Drawing.Size(124, 13) - Me.lblHumidityMax.TabIndex = 51 - Me.lblHumidityMax.Text = "Humidity Max:" - ' 'ucrReceiverHumidityMax ' Me.ucrReceiverHumidityMax.AutoSize = True @@ -332,15 +389,6 @@ Partial Class dlgEvapotranspiration Me.ucrReceiverHumidityMax.TabIndex = 52 Me.ucrReceiverHumidityMax.ucrSelector = Nothing ' - 'lblTmin - ' - Me.lblTmin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTmin.Location = New System.Drawing.Point(319, 84) - Me.lblTmin.Name = "lblTmin" - Me.lblTmin.Size = New System.Drawing.Size(42, 13) - Me.lblTmin.TabIndex = 47 - Me.lblTmin.Text = "Tmin:" - ' 'ucrReceiverTmin ' Me.ucrReceiverTmin.AutoSize = True @@ -354,15 +402,6 @@ Partial Class dlgEvapotranspiration Me.ucrReceiverTmin.TabIndex = 48 Me.ucrReceiverTmin.ucrSelector = Nothing ' - 'lblTmax - ' - Me.lblTmax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTmax.Location = New System.Drawing.Point(319, 123) - Me.lblTmax.Name = "lblTmax" - Me.lblTmax.Size = New System.Drawing.Size(47, 13) - Me.lblTmax.TabIndex = 49 - Me.lblTmax.Text = "Tmax:" - ' 'ucrReceiverTmax ' Me.ucrReceiverTmax.AutoSize = True @@ -398,22 +437,31 @@ Partial Class dlgEvapotranspiration Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 64 ' - 'rdoPriestleyTaylor - ' - Me.rdoPriestleyTaylor.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoPriestleyTaylor.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoPriestleyTaylor.FlatAppearance.BorderSize = 2 - Me.rdoPriestleyTaylor.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoPriestleyTaylor.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoPriestleyTaylor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoPriestleyTaylor.Location = New System.Drawing.Point(279, 10) - Me.rdoPriestleyTaylor.Name = "rdoPriestleyTaylor" - Me.rdoPriestleyTaylor.Size = New System.Drawing.Size(131, 27) - Me.rdoPriestleyTaylor.TabIndex = 70 - Me.rdoPriestleyTaylor.TabStop = True - Me.rdoPriestleyTaylor.Text = "Priestley-Taylor" - Me.rdoPriestleyTaylor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoPriestleyTaylor.UseVisualStyleBackColor = True + 'ucrReceiverExtraRadiation + ' + Me.ucrReceiverExtraRadiation.AutoSize = True + Me.ucrReceiverExtraRadiation.frmParent = Me + Me.ucrReceiverExtraRadiation.Location = New System.Drawing.Point(319, 177) + Me.ucrReceiverExtraRadiation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverExtraRadiation.Name = "ucrReceiverExtraRadiation" + Me.ucrReceiverExtraRadiation.Selector = Nothing + Me.ucrReceiverExtraRadiation.Size = New System.Drawing.Size(123, 20) + Me.ucrReceiverExtraRadiation.strNcFilePath = "" + Me.ucrReceiverExtraRadiation.TabIndex = 40 + Me.ucrReceiverExtraRadiation.ucrSelector = Nothing + ' + 'ucrNudAlpha + ' + Me.ucrNudAlpha.AutoSize = True + Me.ucrNudAlpha.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAlpha.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudAlpha.Location = New System.Drawing.Point(114, 294) + Me.ucrNudAlpha.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudAlpha.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudAlpha.Name = "ucrNudAlpha" + Me.ucrNudAlpha.Size = New System.Drawing.Size(50, 23) + Me.ucrNudAlpha.TabIndex = 71 + Me.ucrNudAlpha.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'dlgEvapotranspiration ' @@ -421,6 +469,7 @@ Partial Class dlgEvapotranspiration Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(453, 478) + Me.Controls.Add(Me.ucrNudAlpha) Me.Controls.Add(Me.rdoPriestleyTaylor) Me.Controls.Add(Me.cmdHSConstants) Me.Controls.Add(Me.cmdLocation) @@ -453,6 +502,9 @@ Partial Class dlgEvapotranspiration Me.Controls.Add(Me.ucrReceiverTmax) Me.Controls.Add(Me.ucrSelectorEvapotranspiration) Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.lblRA) + Me.Controls.Add(Me.ucrReceiverExtraRadiation) + Me.Controls.Add(Me.lblAlpha) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -496,4 +548,8 @@ Partial Class dlgEvapotranspiration Friend WithEvents ucrSelectorEvapotranspiration As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrBase As ucrButtons Friend WithEvents rdoPriestleyTaylor As RadioButton + Friend WithEvents ucrReceiverExtraRadiation As ucrReceiverSingle + Friend WithEvents lblRA As Label + Friend WithEvents ucrNudAlpha As ucrNud + Friend WithEvents lblAlpha As Label End Class \ No newline at end of file diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index 507425b2402..2f66e2d30d5 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -135,17 +135,22 @@ Public Class dlgEvapotranspiration 'panel setting ucrPnlMethod.AddRadioButton(rdoPenmanMonteith) ucrPnlMethod.AddRadioButton(rdoHargreavesSamani) + ucrPnlMethod.AddRadioButton(rdoPriestleyTaylor) ucrPnlMethod.AddParameterValueFunctionNamesCondition(rdoPenmanMonteith, "ET.PenmanMonteith", "ET.PenmanMonteith") ucrPnlMethod.AddParameterValueFunctionNamesCondition(rdoHargreavesSamani, "ET.HargreavesSamani", "ET.HargreavesSamani") + ucrPnlMethod.AddParameterValueFunctionNamesCondition(rdoPriestleyTaylor, "ET.PriestleyTaylor", "ET.PriestleyTaylor") ucrPnlMethod.AddToLinkedControls(ucrInputCrop, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlMethod.AddToLinkedControls(ucrReceiverHumidityMax, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) - ucrPnlMethod.AddToLinkedControls(ucrReceiverHumidityMin, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) - ucrPnlMethod.AddToLinkedControls(ucrInputTimeStep, {rdoPenmanMonteith, rdoHargreavesSamani}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + 'ucrPnlMethod.AddToLinkedControls(ucrReceiverHumidityMax, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) + 'ucrPnlMethod.AddToLinkedControls(ucrReceiverHumidityMin, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) + ucrPnlMethod.AddToLinkedControls({ucrReceiverHumidityMax, ucrReceiverHumidityMin}, {rdoPenmanMonteith, rdoPriestleyTaylor}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) + ucrPnlMethod.AddToLinkedControls(ucrInputTimeStep, {rdoPenmanMonteith, rdoHargreavesSamani, rdoPriestleyTaylor}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkWind.AddToLinkedControls(ucrReceiverWindSpeed, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlMethod.AddToLinkedControls(ucrReceiverRadiation, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlMethod.AddToLinkedControls(ucrReceiverRadiation, {rdoPenmanMonteith, rdoPriestleyTaylor}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlMethod.AddToLinkedControls(ucrChkWind, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlMethod.AddToLinkedControls(ucrInputSolar, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlMethod.AddToLinkedControls(ucrInputSolar, {rdoPenmanMonteith, rdoPriestleyTaylor}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlMethod.AddToLinkedControls(ucrReceiverExtraRadiation, {rdoHargreavesSamani}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlMethod.AddToLinkedControls(ucrNudAlpha, {rdoPriestleyTaylor}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrReceiverExtraRadiation.SetLinkedDisplayControl(lblRa) ucrReceiverRadiation.SetLinkedDisplayControl(lblRadiation) @@ -351,6 +356,14 @@ Public Class dlgEvapotranspiration Else ucrBase.OKEnabled(False) End If + ElseIf rdoPriestleyTaylor.Checked Then + If ucrNewColName.IsComplete AndAlso Not ucrReceiverDate.IsEmpty() AndAlso Not ucrReceiverTmax.IsEmpty() AndAlso Not ucrReceiverTmin.IsEmpty() AndAlso + Not ucrReceiverHumidityMax.IsEmpty() AndAlso Not ucrReceiverHumidityMin.IsEmpty() AndAlso Not ucrReceiverRadiation.IsEmpty() AndAlso + Not ucrInputTimeStep.IsEmpty AndAlso Not ucrInputTimeStep.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If End If End Sub @@ -408,6 +421,13 @@ Public Class dlgEvapotranspiration cmdHSMissingOptions.Location = New Point(cmdHSMissingOptions.Location.X, iHSMissingOptions / 1.187) cmdHSConstants.Location = New Point(cmdHSConstants.Location.X, iHSConstants / 1.187) cmdLocation.Location = New Point(cmdLocation.Location.X, iLocation / 1.187) + ElseIf rdoPriestleyTaylor.Checked Then + Me.Size = New System.Drawing.Size(Me.Width, iBasicHeight) + ucrBase.Location = New Point(ucrBase.Location.X, iBaseMaxY / 1.01) + ucrNewColName.Location = New Point(ucrNewColName.Location.X, iSaveMaxY / 1.01) + cmdHSMissingOptions.Location = New Point(cmdHSMissingOptions.Location.X, iHSMissingOptions / 1.005) + cmdHSConstants.Location = New Point(cmdHSConstants.Location.X, iHSConstants / 1.005) + cmdLocation.Location = New Point(cmdLocation.Location.X, iLocation / 1.005) End If End Sub From e22d1e5f5cb0a900cc35fa92c0bc6511f3b3b8cf Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 27 Jun 2023 10:39:59 +0100 Subject: [PATCH 17/48] minor change --- instat/DlgDefineClimaticData.Designer.vb | 871 +++++++++++++++-------- instat/DlgDefineClimaticData.vb | 12 +- 2 files changed, 566 insertions(+), 317 deletions(-) diff --git a/instat/DlgDefineClimaticData.Designer.vb b/instat/DlgDefineClimaticData.Designer.vb index 9b36b9bc27d..5996a884e71 100644 --- a/instat/DlgDefineClimaticData.Designer.vb +++ b/instat/DlgDefineClimaticData.Designer.vb @@ -38,6 +38,42 @@ Partial Class DlgDefineClimaticData 'Do not modify it using the code editor. Private Sub InitializeComponent() + Me.ucrChkLinkedMetaData = New instat.ucrCheck() + Me.ucrSelectorLinkedDataFrame = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrInputCheckInput = New instat.ucrInputTextBox() + Me.cmdCheckUnique = New System.Windows.Forms.Button() + Me.ucrSelectorDefineClimaticData = New instat.ucrSelectorByDataFrameAddRemove() + Me.lblStationName = New System.Windows.Forms.Label() + Me.lblDOY = New System.Windows.Forms.Label() + Me.lblLongitude = New System.Windows.Forms.Label() + Me.lblLatitude = New System.Windows.Forms.Label() + Me.lblAltitude = New System.Windows.Forms.Label() + Me.grpStation = New System.Windows.Forms.GroupBox() + Me.ucrReceiverStation = New instat.ucrReceiverSingle() + Me.ucrReceiverLongitude = New instat.ucrReceiverSingle() + Me.ucrReceiverLatitude = New instat.ucrReceiverSingle() + Me.ucrReceiverAltitude = New instat.ucrReceiverSingle() + Me.ucrBase = New instat.ucrButtons() + Me.grpDateTime = New System.Windows.Forms.GroupBox() + Me.ucrReceiverYear = New instat.ucrReceiverSingle() + Me.lblDate = New System.Windows.Forms.Label() + Me.lblMonth = New System.Windows.Forms.Label() + Me.ucrReceiverDOY = New instat.ucrReceiverSingle() + Me.lblYear = New System.Windows.Forms.Label() + Me.ucrReceiverDate = New instat.ucrReceiverSingle() + Me.ucrReceiverMonth = New instat.ucrReceiverSingle() + Me.ucrReceiverDay = New instat.ucrReceiverSingle() + Me.lblDay = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.Label4 = New System.Windows.Forms.Label() + Me.ucrReceiverStationMeta = New instat.ucrReceiverSingle() + Me.ucrReceiverLonMeta = New instat.ucrReceiverSingle() + Me.ucrReceiverLatMeta = New instat.ucrReceiverSingle() + Me.ucrReceiverAltMeta = New instat.ucrReceiverSingle() + Me.grpMeta = New System.Windows.Forms.GroupBox() + Me.lblRain = New System.Windows.Forms.Label() Me.grpElements = New System.Windows.Forms.GroupBox() Me.ucrReceiverMaxRH = New instat.ucrReceiverSingle() Me.lblMaxRH = New System.Windows.Forms.Label() @@ -46,7 +82,6 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverWindDirection = New instat.ucrReceiverSingle() Me.ucrReceiverRain = New instat.ucrReceiverSingle() Me.ucrReceiverSunshine = New instat.ucrReceiverSingle() - Me.lblRain = New System.Windows.Forms.Label() Me.ucrReceiverRadiation = New instat.ucrReceiverSingle() Me.ucrReceiverMaxTemp = New instat.ucrReceiverSingle() Me.ucrReceiverCloudCover = New instat.ucrReceiverSingle() @@ -59,29 +94,443 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverMinTemp = New instat.ucrReceiverSingle() Me.lblWindSpeed = New System.Windows.Forms.Label() Me.lblWindDirection = New System.Windows.Forms.Label() - Me.lblStationName = New System.Windows.Forms.Label() - Me.lblDOY = New System.Windows.Forms.Label() - Me.lblDay = New System.Windows.Forms.Label() - Me.lblMonth = New System.Windows.Forms.Label() - Me.lblYear = New System.Windows.Forms.Label() - Me.lblDate = New System.Windows.Forms.Label() - Me.grpDateTime = New System.Windows.Forms.GroupBox() - Me.ucrReceiverYear = New instat.ucrReceiverSingle() - Me.ucrReceiverDOY = New instat.ucrReceiverSingle() - Me.ucrReceiverDate = New instat.ucrReceiverSingle() - Me.ucrReceiverMonth = New instat.ucrReceiverSingle() - Me.ucrReceiverDay = New instat.ucrReceiverSingle() - Me.grpStation = New System.Windows.Forms.GroupBox() - Me.ucrReceiverStationName = New instat.ucrReceiverSingle() - Me.cmdCheckUnique = New System.Windows.Forms.Button() - Me.ucrInputCheckInput = New instat.ucrInputTextBox() - Me.ucrBase = New instat.ucrButtons() - Me.ucrSelectorDefineClimaticData = New instat.ucrSelectorByDataFrameAddRemove() - Me.grpElements.SuspendLayout() - Me.grpDateTime.SuspendLayout() Me.grpStation.SuspendLayout() + Me.grpDateTime.SuspendLayout() + Me.grpMeta.SuspendLayout() + Me.grpElements.SuspendLayout() Me.SuspendLayout() ' + 'ucrChkLinkedMetaData + ' + Me.ucrChkLinkedMetaData.AutoSize = True + Me.ucrChkLinkedMetaData.Checked = False + Me.ucrChkLinkedMetaData.Location = New System.Drawing.Point(6, 190) + Me.ucrChkLinkedMetaData.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkLinkedMetaData.Name = "ucrChkLinkedMetaData" + Me.ucrChkLinkedMetaData.Size = New System.Drawing.Size(195, 23) + Me.ucrChkLinkedMetaData.TabIndex = 21 + ' + 'ucrSelectorLinkedDataFrame + ' + Me.ucrSelectorLinkedDataFrame.AutoSize = True + Me.ucrSelectorLinkedDataFrame.bDropUnusedFilterLevels = False + Me.ucrSelectorLinkedDataFrame.bShowHiddenColumns = False + Me.ucrSelectorLinkedDataFrame.bUseCurrentFilter = True + Me.ucrSelectorLinkedDataFrame.Location = New System.Drawing.Point(6, 225) + 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 + ' + 'ucrInputCheckInput + ' + Me.ucrInputCheckInput.AddQuotesIfUnrecognised = True + 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.Name = "ucrInputCheckInput" + Me.ucrInputCheckInput.Size = New System.Drawing.Size(253, 21) + Me.ucrInputCheckInput.TabIndex = 18 + ' + 'cmdCheckUnique + ' + Me.cmdCheckUnique.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdCheckUnique.Location = New System.Drawing.Point(6, 437) + Me.cmdCheckUnique.Name = "cmdCheckUnique" + Me.cmdCheckUnique.Size = New System.Drawing.Size(139, 23) + Me.cmdCheckUnique.TabIndex = 17 + Me.cmdCheckUnique.Text = "Check Duplicates" + Me.cmdCheckUnique.UseVisualStyleBackColor = True + ' + 'ucrSelectorDefineClimaticData + ' + Me.ucrSelectorDefineClimaticData.AutoSize = True + Me.ucrSelectorDefineClimaticData.bDropUnusedFilterLevels = False + Me.ucrSelectorDefineClimaticData.bShowHiddenColumns = False + Me.ucrSelectorDefineClimaticData.bUseCurrentFilter = True + Me.ucrSelectorDefineClimaticData.Location = New System.Drawing.Point(6, -6) + 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 + ' + 'lblStationName + ' + Me.lblStationName.AutoSize = True + Me.lblStationName.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblStationName.Location = New System.Drawing.Point(27, 16) + Me.lblStationName.Name = "lblStationName" + Me.lblStationName.Size = New System.Drawing.Size(38, 13) + Me.lblStationName.TabIndex = 0 + Me.lblStationName.Text = "Name:" + ' + 'lblDOY + ' + Me.lblDOY.AutoSize = True + Me.lblDOY.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblDOY.Location = New System.Drawing.Point(31, 157) + Me.lblDOY.Name = "lblDOY" + Me.lblDOY.Size = New System.Drawing.Size(66, 13) + Me.lblDOY.TabIndex = 8 + 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(27, 93) + Me.lblLongitude.Name = "lblLongitude" + Me.lblLongitude.Size = New System.Drawing.Size(57, 13) + Me.lblLongitude.TabIndex = 6 + Me.lblLongitude.Text = "Longitude:" + ' + 'lblLatitude + ' + Me.lblLatitude.AutoSize = True + Me.lblLatitude.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblLatitude.Location = New System.Drawing.Point(27, 55) + Me.lblLatitude.Name = "lblLatitude" + Me.lblLatitude.Size = New System.Drawing.Size(48, 13) + Me.lblLatitude.TabIndex = 4 + Me.lblLatitude.Text = "Latitude:" + ' + 'lblAltitude + ' + Me.lblAltitude.AutoSize = True + Me.lblAltitude.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblAltitude.Location = New System.Drawing.Point(27, 132) + Me.lblAltitude.Name = "lblAltitude" + Me.lblAltitude.Size = New System.Drawing.Size(45, 13) + Me.lblAltitude.TabIndex = 2 + Me.lblAltitude.Text = "Altitude:" + ' + 'grpStation + ' + Me.grpStation.Controls.Add(Me.lblLongitude) + Me.grpStation.Controls.Add(Me.lblLatitude) + Me.grpStation.Controls.Add(Me.lblAltitude) + Me.grpStation.Controls.Add(Me.lblStationName) + Me.grpStation.Controls.Add(Me.ucrReceiverStation) + 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, 234) + Me.grpStation.Name = "grpStation" + Me.grpStation.Size = New System.Drawing.Size(112, 173) + Me.grpStation.TabIndex = 14 + Me.grpStation.TabStop = False + Me.grpStation.Tag = "" + Me.grpStation.Text = "Station" + ' + 'ucrReceiverStation + ' + Me.ucrReceiverStation.AutoSize = True + Me.ucrReceiverStation.frmParent = Me + Me.ucrReceiverStation.Location = New System.Drawing.Point(27, 31) + Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStation.Name = "ucrReceiverStation" + Me.ucrReceiverStation.Selector = Nothing + Me.ucrReceiverStation.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.TabIndex = 8 + Me.ucrReceiverStation.ucrSelector = Nothing + ' + 'ucrReceiverLongitude + ' + Me.ucrReceiverLongitude.AutoSize = True + Me.ucrReceiverLongitude.frmParent = Me + Me.ucrReceiverLongitude.Location = New System.Drawing.Point(27, 108) + Me.ucrReceiverLongitude.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLongitude.Name = "ucrReceiverLongitude" + Me.ucrReceiverLongitude.Selector = Nothing + Me.ucrReceiverLongitude.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverLongitude.strNcFilePath = "" + Me.ucrReceiverLongitude.TabIndex = 10 + Me.ucrReceiverLongitude.ucrSelector = Nothing + ' + 'ucrReceiverLatitude + ' + Me.ucrReceiverLatitude.AutoSize = True + Me.ucrReceiverLatitude.frmParent = Me + Me.ucrReceiverLatitude.Location = New System.Drawing.Point(27, 70) + Me.ucrReceiverLatitude.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLatitude.Name = "ucrReceiverLatitude" + Me.ucrReceiverLatitude.Selector = Nothing + Me.ucrReceiverLatitude.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverLatitude.strNcFilePath = "" + Me.ucrReceiverLatitude.TabIndex = 9 + Me.ucrReceiverLatitude.ucrSelector = Nothing + ' + 'ucrReceiverAltitude + ' + Me.ucrReceiverAltitude.AutoSize = True + Me.ucrReceiverAltitude.frmParent = Me + Me.ucrReceiverAltitude.Location = New System.Drawing.Point(27, 147) + Me.ucrReceiverAltitude.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAltitude.Name = "ucrReceiverAltitude" + Me.ucrReceiverAltitude.Selector = Nothing + Me.ucrReceiverAltitude.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverAltitude.strNcFilePath = "" + Me.ucrReceiverAltitude.TabIndex = 11 + Me.ucrReceiverAltitude.ucrSelector = Nothing + ' + '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.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 19 + ' + 'grpDateTime + ' + Me.grpDateTime.Controls.Add(Me.lblDOY) + Me.grpDateTime.Controls.Add(Me.ucrReceiverYear) + Me.grpDateTime.Controls.Add(Me.lblDate) + Me.grpDateTime.Controls.Add(Me.lblMonth) + Me.grpDateTime.Controls.Add(Me.ucrReceiverDOY) + Me.grpDateTime.Controls.Add(Me.lblYear) + Me.grpDateTime.Controls.Add(Me.ucrReceiverDate) + 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(372, 234) + Me.grpDateTime.Name = "grpDateTime" + Me.grpDateTime.Size = New System.Drawing.Size(126, 196) + Me.grpDateTime.TabIndex = 15 + Me.grpDateTime.TabStop = False + Me.grpDateTime.Tag = "" + Me.grpDateTime.Text = "Date and Time" + ' + 'ucrReceiverYear + ' + Me.ucrReceiverYear.AutoSize = True + Me.ucrReceiverYear.frmParent = Me + Me.ucrReceiverYear.Location = New System.Drawing.Point(31, 64) + 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.strNcFilePath = "" + Me.ucrReceiverYear.TabIndex = 3 + Me.ucrReceiverYear.ucrSelector = Nothing + ' + 'lblDate + ' + Me.lblDate.AutoSize = True + Me.lblDate.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblDate.Location = New System.Drawing.Point(31, 15) + Me.lblDate.Name = "lblDate" + Me.lblDate.Size = New System.Drawing.Size(33, 13) + Me.lblDate.TabIndex = 0 + Me.lblDate.Text = "Date:" + ' + 'lblMonth + ' + Me.lblMonth.AutoSize = True + Me.lblMonth.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMonth.Location = New System.Drawing.Point(31, 86) + Me.lblMonth.Name = "lblMonth" + Me.lblMonth.Size = New System.Drawing.Size(40, 13) + Me.lblMonth.TabIndex = 4 + Me.lblMonth.Text = "Month:" + ' + 'ucrReceiverDOY + ' + Me.ucrReceiverDOY.AutoSize = True + Me.ucrReceiverDOY.frmParent = Me + Me.ucrReceiverDOY.Location = New System.Drawing.Point(31, 172) + 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.strNcFilePath = "" + Me.ucrReceiverDOY.TabIndex = 9 + Me.ucrReceiverDOY.ucrSelector = Nothing + ' + 'lblYear + ' + Me.lblYear.AutoSize = True + Me.lblYear.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblYear.Location = New System.Drawing.Point(31, 50) + Me.lblYear.Name = "lblYear" + Me.lblYear.Size = New System.Drawing.Size(32, 13) + Me.lblYear.TabIndex = 2 + Me.lblYear.Text = "Year:" + ' + 'ucrReceiverDate + ' + Me.ucrReceiverDate.AutoSize = True + Me.ucrReceiverDate.frmParent = Me + Me.ucrReceiverDate.Location = New System.Drawing.Point(31, 28) + 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.strNcFilePath = "" + Me.ucrReceiverDate.TabIndex = 1 + Me.ucrReceiverDate.ucrSelector = Nothing + ' + 'ucrReceiverMonth + ' + Me.ucrReceiverMonth.AutoSize = True + Me.ucrReceiverMonth.frmParent = Me + Me.ucrReceiverMonth.Location = New System.Drawing.Point(31, 100) + 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.strNcFilePath = "" + Me.ucrReceiverMonth.TabIndex = 5 + Me.ucrReceiverMonth.ucrSelector = Nothing + ' + 'ucrReceiverDay + ' + Me.ucrReceiverDay.AutoSize = True + Me.ucrReceiverDay.frmParent = Me + Me.ucrReceiverDay.Location = New System.Drawing.Point(31, 135) + 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.strNcFilePath = "" + Me.ucrReceiverDay.TabIndex = 7 + Me.ucrReceiverDay.ucrSelector = Nothing + ' + 'lblDay + ' + Me.lblDay.AutoSize = True + Me.lblDay.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblDay.Location = New System.Drawing.Point(31, 122) + Me.lblDay.Name = "lblDay" + Me.lblDay.Size = New System.Drawing.Size(29, 13) + Me.lblDay.TabIndex = 6 + Me.lblDay.Text = "Day:" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label1.Location = New System.Drawing.Point(27, 93) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(57, 13) + Me.Label1.TabIndex = 6 + Me.Label1.Text = "Longitude:" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label2.Location = New System.Drawing.Point(27, 55) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(48, 13) + Me.Label2.TabIndex = 4 + Me.Label2.Text = "Latitude:" + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label3.Location = New System.Drawing.Point(27, 132) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(45, 13) + Me.Label3.TabIndex = 2 + Me.Label3.Text = "Altitude:" + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label4.Location = New System.Drawing.Point(27, 16) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(38, 13) + Me.Label4.TabIndex = 0 + Me.Label4.Text = "Name:" + ' + 'ucrReceiverStationMeta + ' + Me.ucrReceiverStationMeta.AutoSize = True + Me.ucrReceiverStationMeta.frmParent = Me + Me.ucrReceiverStationMeta.Location = New System.Drawing.Point(29, 31) + 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.strNcFilePath = "" + Me.ucrReceiverStationMeta.TabIndex = 8 + Me.ucrReceiverStationMeta.ucrSelector = Nothing + ' + 'ucrReceiverLonMeta + ' + Me.ucrReceiverLonMeta.AutoSize = True + Me.ucrReceiverLonMeta.frmParent = Me + Me.ucrReceiverLonMeta.Location = New System.Drawing.Point(27, 108) + 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.strNcFilePath = "" + Me.ucrReceiverLonMeta.TabIndex = 10 + Me.ucrReceiverLonMeta.ucrSelector = Nothing + ' + 'ucrReceiverLatMeta + ' + Me.ucrReceiverLatMeta.AutoSize = True + Me.ucrReceiverLatMeta.frmParent = Me + Me.ucrReceiverLatMeta.Location = New System.Drawing.Point(27, 70) + 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.strNcFilePath = "" + Me.ucrReceiverLatMeta.TabIndex = 9 + Me.ucrReceiverLatMeta.ucrSelector = Nothing + ' + 'ucrReceiverAltMeta + ' + Me.ucrReceiverAltMeta.AutoSize = True + Me.ucrReceiverAltMeta.frmParent = Me + Me.ucrReceiverAltMeta.Location = New System.Drawing.Point(27, 147) + 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.strNcFilePath = "" + Me.ucrReceiverAltMeta.TabIndex = 11 + Me.ucrReceiverAltMeta.ucrSelector = Nothing + ' + 'grpMeta + ' + Me.grpMeta.Controls.Add(Me.Label1) + Me.grpMeta.Controls.Add(Me.Label2) + Me.grpMeta.Controls.Add(Me.Label3) + Me.grpMeta.Controls.Add(Me.Label4) + Me.grpMeta.Controls.Add(Me.ucrReceiverStationMeta) + 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, 234) + Me.grpMeta.Name = "grpMeta" + Me.grpMeta.Size = New System.Drawing.Size(112, 173) + Me.grpMeta.TabIndex = 22 + Me.grpMeta.TabStop = False + Me.grpMeta.Tag = "" + Me.grpMeta.Text = "Station" + ' + 'lblRain + ' + Me.lblRain.AutoSize = True + Me.lblRain.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRain.Location = New System.Drawing.Point(33, 15) + Me.lblRain.Name = "lblRain" + Me.lblRain.Size = New System.Drawing.Size(32, 13) + Me.lblRain.TabIndex = 0 + Me.lblRain.Text = "Rain:" + ' 'grpElements ' Me.grpElements.Controls.Add(Me.ucrReceiverMaxRH) @@ -104,10 +553,10 @@ 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(306, 6) + Me.grpElements.Location = New System.Drawing.Point(238, -6) Me.grpElements.Name = "grpElements" - Me.grpElements.Size = New System.Drawing.Size(146, 424) - Me.grpElements.TabIndex = 3 + Me.grpElements.Size = New System.Drawing.Size(260, 225) + Me.grpElements.TabIndex = 16 Me.grpElements.TabStop = False Me.grpElements.Text = "Elements" ' @@ -115,11 +564,11 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMaxRH.AutoSize = True Me.ucrReceiverMaxRH.frmParent = Me - Me.ucrReceiverMaxRH.Location = New System.Drawing.Point(16, 395) + Me.ucrReceiverMaxRH.Location = New System.Drawing.Point(162, 193) Me.ucrReceiverMaxRH.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxRH.Name = "ucrReceiverMaxRH" Me.ucrReceiverMaxRH.Selector = Nothing - Me.ucrReceiverMaxRH.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMaxRH.Size = New System.Drawing.Size(99, 20) Me.ucrReceiverMaxRH.strNcFilePath = "" Me.ucrReceiverMaxRH.TabIndex = 19 Me.ucrReceiverMaxRH.ucrSelector = Nothing @@ -128,7 +577,7 @@ Partial Class DlgDefineClimaticData ' Me.lblMaxRH.AutoSize = True Me.lblMaxRH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxRH.Location = New System.Drawing.Point(16, 379) + Me.lblMaxRH.Location = New System.Drawing.Point(159, 178) Me.lblMaxRH.Name = "lblMaxRH" Me.lblMaxRH.Size = New System.Drawing.Size(90, 13) Me.lblMaxRH.TabIndex = 18 @@ -138,11 +587,11 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMinRH.AutoSize = True Me.ucrReceiverMinRH.frmParent = Me - Me.ucrReceiverMinRH.Location = New System.Drawing.Point(16, 354) + Me.ucrReceiverMinRH.Location = New System.Drawing.Point(162, 152) Me.ucrReceiverMinRH.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinRH.Name = "ucrReceiverMinRH" Me.ucrReceiverMinRH.Selector = Nothing - Me.ucrReceiverMinRH.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMinRH.Size = New System.Drawing.Size(99, 20) Me.ucrReceiverMinRH.strNcFilePath = "" Me.ucrReceiverMinRH.TabIndex = 17 Me.ucrReceiverMinRH.ucrSelector = Nothing @@ -151,7 +600,7 @@ Partial Class DlgDefineClimaticData ' Me.lblMinimumRH.AutoSize = True Me.lblMinimumRH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMinimumRH.Location = New System.Drawing.Point(16, 338) + Me.lblMinimumRH.Location = New System.Drawing.Point(159, 137) Me.lblMinimumRH.Name = "lblMinimumRH" Me.lblMinimumRH.Size = New System.Drawing.Size(87, 13) Me.lblMinimumRH.TabIndex = 16 @@ -161,11 +610,11 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverWindDirection.AutoSize = True Me.ucrReceiverWindDirection.frmParent = Me - Me.ucrReceiverWindDirection.Location = New System.Drawing.Point(16, 193) + Me.ucrReceiverWindDirection.Location = New System.Drawing.Point(36, 193) Me.ucrReceiverWindDirection.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverWindDirection.Name = "ucrReceiverWindDirection" Me.ucrReceiverWindDirection.Selector = Nothing - Me.ucrReceiverWindDirection.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverWindDirection.Size = New System.Drawing.Size(111, 20) Me.ucrReceiverWindDirection.strNcFilePath = "" Me.ucrReceiverWindDirection.TabIndex = 9 Me.ucrReceiverWindDirection.ucrSelector = Nothing @@ -174,11 +623,11 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverRain.AutoSize = True Me.ucrReceiverRain.frmParent = Me - Me.ucrReceiverRain.Location = New System.Drawing.Point(16, 31) + Me.ucrReceiverRain.Location = New System.Drawing.Point(36, 31) Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRain.Name = "ucrReceiverRain" Me.ucrReceiverRain.Selector = Nothing - Me.ucrReceiverRain.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverRain.Size = New System.Drawing.Size(111, 20) Me.ucrReceiverRain.strNcFilePath = "" Me.ucrReceiverRain.TabIndex = 1 Me.ucrReceiverRain.ucrSelector = Nothing @@ -187,34 +636,24 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverSunshine.AutoSize = True Me.ucrReceiverSunshine.frmParent = Me - Me.ucrReceiverSunshine.Location = New System.Drawing.Point(16, 231) + Me.ucrReceiverSunshine.Location = New System.Drawing.Point(162, 31) Me.ucrReceiverSunshine.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSunshine.Name = "ucrReceiverSunshine" Me.ucrReceiverSunshine.Selector = Nothing - Me.ucrReceiverSunshine.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSunshine.Size = New System.Drawing.Size(99, 20) Me.ucrReceiverSunshine.strNcFilePath = "" Me.ucrReceiverSunshine.TabIndex = 11 Me.ucrReceiverSunshine.ucrSelector = Nothing ' - 'lblRain - ' - Me.lblRain.AutoSize = True - Me.lblRain.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRain.Location = New System.Drawing.Point(16, 16) - Me.lblRain.Name = "lblRain" - Me.lblRain.Size = New System.Drawing.Size(32, 13) - Me.lblRain.TabIndex = 0 - Me.lblRain.Text = "Rain:" - ' 'ucrReceiverRadiation ' Me.ucrReceiverRadiation.AutoSize = True Me.ucrReceiverRadiation.frmParent = Me - Me.ucrReceiverRadiation.Location = New System.Drawing.Point(16, 272) + Me.ucrReceiverRadiation.Location = New System.Drawing.Point(162, 70) Me.ucrReceiverRadiation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRadiation.Name = "ucrReceiverRadiation" Me.ucrReceiverRadiation.Selector = Nothing - Me.ucrReceiverRadiation.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverRadiation.Size = New System.Drawing.Size(99, 20) Me.ucrReceiverRadiation.strNcFilePath = "" Me.ucrReceiverRadiation.TabIndex = 13 Me.ucrReceiverRadiation.ucrSelector = Nothing @@ -223,11 +662,11 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMaxTemp.AutoSize = True Me.ucrReceiverMaxTemp.frmParent = Me - Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(16, 111) + Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(36, 111) Me.ucrReceiverMaxTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxTemp.Name = "ucrReceiverMaxTemp" Me.ucrReceiverMaxTemp.Selector = Nothing - Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(111, 20) Me.ucrReceiverMaxTemp.strNcFilePath = "" Me.ucrReceiverMaxTemp.TabIndex = 5 Me.ucrReceiverMaxTemp.ucrSelector = Nothing @@ -236,11 +675,11 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverCloudCover.AutoSize = True Me.ucrReceiverCloudCover.frmParent = Me - Me.ucrReceiverCloudCover.Location = New System.Drawing.Point(16, 313) + Me.ucrReceiverCloudCover.Location = New System.Drawing.Point(162, 111) Me.ucrReceiverCloudCover.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverCloudCover.Name = "ucrReceiverCloudCover" Me.ucrReceiverCloudCover.Selector = Nothing - Me.ucrReceiverCloudCover.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverCloudCover.Size = New System.Drawing.Size(99, 20) Me.ucrReceiverCloudCover.strNcFilePath = "" Me.ucrReceiverCloudCover.TabIndex = 15 Me.ucrReceiverCloudCover.ucrSelector = Nothing @@ -249,7 +688,7 @@ Partial Class DlgDefineClimaticData ' Me.lblMaxTemp.AutoSize = True Me.lblMaxTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxTemp.Location = New System.Drawing.Point(16, 96) + Me.lblMaxTemp.Location = New System.Drawing.Point(33, 96) Me.lblMaxTemp.Name = "lblMaxTemp" Me.lblMaxTemp.Size = New System.Drawing.Size(117, 13) Me.lblMaxTemp.TabIndex = 4 @@ -259,7 +698,7 @@ Partial Class DlgDefineClimaticData ' Me.lblCloudCover.AutoSize = True Me.lblCloudCover.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCloudCover.Location = New System.Drawing.Point(16, 297) + Me.lblCloudCover.Location = New System.Drawing.Point(159, 96) Me.lblCloudCover.Name = "lblCloudCover" Me.lblCloudCover.Size = New System.Drawing.Size(68, 13) Me.lblCloudCover.TabIndex = 14 @@ -269,7 +708,7 @@ Partial Class DlgDefineClimaticData ' Me.lblMinTemp.AutoSize = True Me.lblMinTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMinTemp.Location = New System.Drawing.Point(16, 55) + Me.lblMinTemp.Location = New System.Drawing.Point(33, 55) Me.lblMinTemp.Name = "lblMinTemp" Me.lblMinTemp.Size = New System.Drawing.Size(111, 13) Me.lblMinTemp.TabIndex = 2 @@ -279,7 +718,7 @@ Partial Class DlgDefineClimaticData ' Me.lblRadiation.AutoSize = True Me.lblRadiation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRadiation.Location = New System.Drawing.Point(16, 257) + Me.lblRadiation.Location = New System.Drawing.Point(159, 55) Me.lblRadiation.Name = "lblRadiation" Me.lblRadiation.Size = New System.Drawing.Size(55, 13) Me.lblRadiation.TabIndex = 12 @@ -289,11 +728,11 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverWindSpeed.AutoSize = True Me.ucrReceiverWindSpeed.frmParent = Me - Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(16, 152) + Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(36, 152) Me.ucrReceiverWindSpeed.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverWindSpeed.Name = "ucrReceiverWindSpeed" Me.ucrReceiverWindSpeed.Selector = Nothing - Me.ucrReceiverWindSpeed.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverWindSpeed.Size = New System.Drawing.Size(111, 20) Me.ucrReceiverWindSpeed.strNcFilePath = "" Me.ucrReceiverWindSpeed.TabIndex = 7 Me.ucrReceiverWindSpeed.ucrSelector = Nothing @@ -302,7 +741,7 @@ Partial Class DlgDefineClimaticData ' Me.lblSunshine.AutoSize = True Me.lblSunshine.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSunshine.Location = New System.Drawing.Point(16, 217) + Me.lblSunshine.Location = New System.Drawing.Point(159, 15) Me.lblSunshine.Name = "lblSunshine" Me.lblSunshine.Size = New System.Drawing.Size(85, 13) Me.lblSunshine.TabIndex = 10 @@ -312,11 +751,11 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMinTemp.AutoSize = True Me.ucrReceiverMinTemp.frmParent = Me - Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(16, 70) + Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(36, 70) Me.ucrReceiverMinTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinTemp.Name = "ucrReceiverMinTemp" Me.ucrReceiverMinTemp.Selector = Nothing - Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(111, 20) Me.ucrReceiverMinTemp.strNcFilePath = "" Me.ucrReceiverMinTemp.TabIndex = 3 Me.ucrReceiverMinTemp.ucrSelector = Nothing @@ -325,7 +764,7 @@ Partial Class DlgDefineClimaticData ' Me.lblWindSpeed.AutoSize = True Me.lblWindSpeed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblWindSpeed.Location = New System.Drawing.Point(16, 137) + Me.lblWindSpeed.Location = New System.Drawing.Point(33, 137) Me.lblWindSpeed.Name = "lblWindSpeed" Me.lblWindSpeed.Size = New System.Drawing.Size(69, 13) Me.lblWindSpeed.TabIndex = 6 @@ -335,291 +774,101 @@ Partial Class DlgDefineClimaticData ' Me.lblWindDirection.AutoSize = True Me.lblWindDirection.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblWindDirection.Location = New System.Drawing.Point(16, 178) + Me.lblWindDirection.Location = New System.Drawing.Point(33, 178) Me.lblWindDirection.Name = "lblWindDirection" Me.lblWindDirection.Size = New System.Drawing.Size(80, 13) Me.lblWindDirection.TabIndex = 8 Me.lblWindDirection.Text = "Wind Direction:" ' - 'lblStationName - ' - Me.lblStationName.AutoSize = True - Me.lblStationName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblStationName.Location = New System.Drawing.Point(7, 16) - Me.lblStationName.Name = "lblStationName" - Me.lblStationName.Size = New System.Drawing.Size(38, 13) - Me.lblStationName.TabIndex = 0 - Me.lblStationName.Text = "Name:" - ' - 'lblDOY - ' - Me.lblDOY.AutoSize = True - Me.lblDOY.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDOY.Location = New System.Drawing.Point(15, 180) - Me.lblDOY.Name = "lblDOY" - Me.lblDOY.Size = New System.Drawing.Size(66, 13) - Me.lblDOY.TabIndex = 8 - Me.lblDOY.Text = "Day of Year:" - ' - 'lblDay - ' - Me.lblDay.AutoSize = True - Me.lblDay.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDay.Location = New System.Drawing.Point(15, 139) - Me.lblDay.Name = "lblDay" - Me.lblDay.Size = New System.Drawing.Size(29, 13) - Me.lblDay.TabIndex = 6 - Me.lblDay.Text = "Day:" - ' - 'lblMonth - ' - Me.lblMonth.AutoSize = True - Me.lblMonth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMonth.Location = New System.Drawing.Point(15, 98) - Me.lblMonth.Name = "lblMonth" - Me.lblMonth.Size = New System.Drawing.Size(40, 13) - Me.lblMonth.TabIndex = 4 - Me.lblMonth.Text = "Month:" - ' - 'lblYear - ' - Me.lblYear.AutoSize = True - Me.lblYear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblYear.Location = New System.Drawing.Point(15, 57) - Me.lblYear.Name = "lblYear" - Me.lblYear.Size = New System.Drawing.Size(32, 13) - Me.lblYear.TabIndex = 2 - Me.lblYear.Text = "Year:" - ' - 'lblDate - ' - Me.lblDate.AutoSize = True - Me.lblDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDate.Location = New System.Drawing.Point(15, 17) - Me.lblDate.Name = "lblDate" - Me.lblDate.Size = New System.Drawing.Size(33, 13) - Me.lblDate.TabIndex = 0 - Me.lblDate.Text = "Date:" - ' - 'grpDateTime - ' - Me.grpDateTime.Controls.Add(Me.lblDOY) - Me.grpDateTime.Controls.Add(Me.ucrReceiverYear) - Me.grpDateTime.Controls.Add(Me.lblDate) - Me.grpDateTime.Controls.Add(Me.lblMonth) - Me.grpDateTime.Controls.Add(Me.ucrReceiverDOY) - Me.grpDateTime.Controls.Add(Me.lblYear) - Me.grpDateTime.Controls.Add(Me.ucrReceiverDate) - 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(154, 207) - Me.grpDateTime.Name = "grpDateTime" - Me.grpDateTime.Size = New System.Drawing.Size(148, 223) - Me.grpDateTime.TabIndex = 2 - Me.grpDateTime.TabStop = False - Me.grpDateTime.Tag = "" - Me.grpDateTime.Text = "Date and Time" - ' - 'ucrReceiverYear - ' - Me.ucrReceiverYear.AutoSize = True - Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(15, 72) - Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverYear.Name = "ucrReceiverYear" - Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.TabIndex = 3 - Me.ucrReceiverYear.ucrSelector = Nothing - ' - 'ucrReceiverDOY - ' - Me.ucrReceiverDOY.AutoSize = True - Me.ucrReceiverDOY.frmParent = Me - Me.ucrReceiverDOY.Location = New System.Drawing.Point(15, 195) - Me.ucrReceiverDOY.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverDOY.Name = "ucrReceiverDOY" - Me.ucrReceiverDOY.Selector = Nothing - Me.ucrReceiverDOY.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverDOY.strNcFilePath = "" - Me.ucrReceiverDOY.TabIndex = 9 - Me.ucrReceiverDOY.ucrSelector = Nothing - ' - 'ucrReceiverDate - ' - Me.ucrReceiverDate.AutoSize = True - Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(15, 31) - Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverDate.Name = "ucrReceiverDate" - Me.ucrReceiverDate.Selector = Nothing - Me.ucrReceiverDate.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverDate.strNcFilePath = "" - Me.ucrReceiverDate.TabIndex = 1 - Me.ucrReceiverDate.ucrSelector = Nothing - ' - 'ucrReceiverMonth - ' - Me.ucrReceiverMonth.AutoSize = True - Me.ucrReceiverMonth.frmParent = Me - Me.ucrReceiverMonth.Location = New System.Drawing.Point(15, 113) - Me.ucrReceiverMonth.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMonth.Name = "ucrReceiverMonth" - Me.ucrReceiverMonth.Selector = Nothing - Me.ucrReceiverMonth.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverMonth.strNcFilePath = "" - Me.ucrReceiverMonth.TabIndex = 5 - Me.ucrReceiverMonth.ucrSelector = Nothing - ' - 'ucrReceiverDay - ' - Me.ucrReceiverDay.AutoSize = True - Me.ucrReceiverDay.frmParent = Me - Me.ucrReceiverDay.Location = New System.Drawing.Point(15, 154) - Me.ucrReceiverDay.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverDay.Name = "ucrReceiverDay" - Me.ucrReceiverDay.Selector = Nothing - Me.ucrReceiverDay.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverDay.strNcFilePath = "" - Me.ucrReceiverDay.TabIndex = 7 - Me.ucrReceiverDay.ucrSelector = Nothing - ' - 'grpStation - ' - Me.grpStation.Controls.Add(Me.lblStationName) - Me.grpStation.Controls.Add(Me.ucrReceiverStationName) - Me.grpStation.Location = New System.Drawing.Point(13, 208) - Me.grpStation.Name = "grpStation" - Me.grpStation.Size = New System.Drawing.Size(135, 57) - Me.grpStation.TabIndex = 1 - Me.grpStation.TabStop = False - Me.grpStation.Tag = "" - Me.grpStation.Text = "Station" - ' - 'ucrReceiverStationName - ' - Me.ucrReceiverStationName.AutoSize = True - Me.ucrReceiverStationName.frmParent = Me - Me.ucrReceiverStationName.Location = New System.Drawing.Point(7, 31) - Me.ucrReceiverStationName.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStationName.Name = "ucrReceiverStationName" - Me.ucrReceiverStationName.Selector = Nothing - Me.ucrReceiverStationName.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverStationName.strNcFilePath = "" - Me.ucrReceiverStationName.TabIndex = 1 - Me.ucrReceiverStationName.ucrSelector = Nothing - ' - 'cmdCheckUnique - ' - Me.cmdCheckUnique.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCheckUnique.Location = New System.Drawing.Point(9, 435) - Me.cmdCheckUnique.Name = "cmdCheckUnique" - Me.cmdCheckUnique.Size = New System.Drawing.Size(139, 23) - Me.cmdCheckUnique.TabIndex = 4 - Me.cmdCheckUnique.Text = "Check Duplicates" - Me.cmdCheckUnique.UseVisualStyleBackColor = True - ' - 'ucrInputCheckInput - ' - Me.ucrInputCheckInput.AddQuotesIfUnrecognised = True - Me.ucrInputCheckInput.AutoSize = True - Me.ucrInputCheckInput.IsMultiline = False - Me.ucrInputCheckInput.IsReadOnly = False - Me.ucrInputCheckInput.Location = New System.Drawing.Point(154, 437) - Me.ucrInputCheckInput.Name = "ucrInputCheckInput" - Me.ucrInputCheckInput.Size = New System.Drawing.Size(253, 21) - Me.ucrInputCheckInput.TabIndex = 5 - ' - 'ucrBase - ' - Me.ucrBase.AutoSize = True - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(13, 464) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) - Me.ucrBase.TabIndex = 6 - ' - 'ucrSelectorDefineClimaticData - ' - Me.ucrSelectorDefineClimaticData.AutoSize = True - Me.ucrSelectorDefineClimaticData.bDropUnusedFilterLevels = False - Me.ucrSelectorDefineClimaticData.bShowHiddenColumns = False - Me.ucrSelectorDefineClimaticData.bUseCurrentFilter = True - Me.ucrSelectorDefineClimaticData.Location = New System.Drawing.Point(13, 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 = 0 - ' 'DlgDefineClimaticData ' 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(464, 522) + Me.ClientSize = New System.Drawing.Size(502, 460) + 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.grpMeta) Me.Controls.Add(Me.grpElements) - Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.ucrSelectorDefineClimaticData) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "DlgDefineClimaticData" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Define Climatic Data" - Me.grpElements.ResumeLayout(False) - Me.grpElements.PerformLayout() - Me.grpDateTime.ResumeLayout(False) - Me.grpDateTime.PerformLayout() Me.grpStation.ResumeLayout(False) Me.grpStation.PerformLayout() + Me.grpDateTime.ResumeLayout(False) + Me.grpDateTime.PerformLayout() + Me.grpMeta.ResumeLayout(False) + Me.grpMeta.PerformLayout() + Me.grpElements.ResumeLayout(False) + Me.grpElements.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() End Sub + Friend WithEvents ucrChkLinkedMetaData As ucrCheck + Friend WithEvents ucrSelectorLinkedDataFrame As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrInputCheckInput As ucrInputTextBox + Friend WithEvents cmdCheckUnique As Button Friend WithEvents ucrSelectorDefineClimaticData As ucrSelectorByDataFrameAddRemove - Friend WithEvents grpElements As GroupBox + Friend WithEvents lblStationName As Label + Friend WithEvents lblDOY As Label + Friend WithEvents lblLongitude As Label + Friend WithEvents lblLatitude As Label + Friend WithEvents lblAltitude As Label + Friend WithEvents grpStation As GroupBox + Friend WithEvents ucrReceiverStation As ucrReceiverSingle + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents grpDateTime As GroupBox + Friend WithEvents ucrReceiverYear As ucrReceiverSingle + Friend WithEvents lblDate As Label + Friend WithEvents lblMonth As Label + Friend WithEvents ucrReceiverDOY As ucrReceiverSingle + Friend WithEvents lblYear As Label Friend WithEvents ucrReceiverDate As ucrReceiverSingle - Friend WithEvents ucrReceiverRain As ucrReceiverSingle - Friend WithEvents ucrReceiverMaxTemp As ucrReceiverSingle + Friend WithEvents ucrReceiverMonth As ucrReceiverSingle + Friend WithEvents ucrReceiverDay As ucrReceiverSingle + Friend WithEvents lblDay As Label + Friend WithEvents grpMeta As GroupBox + Friend WithEvents Label1 As Label + Friend WithEvents Label2 As Label + Friend WithEvents Label3 As Label + Friend WithEvents Label4 As Label + Friend WithEvents ucrReceiverStationMeta As ucrReceiverSingle + Friend WithEvents ucrReceiverLonMeta As ucrReceiverSingle + Friend WithEvents ucrReceiverLatMeta As ucrReceiverSingle + Friend WithEvents ucrReceiverAltMeta As ucrReceiverSingle + Friend WithEvents grpElements As GroupBox + Friend WithEvents ucrReceiverMaxRH As ucrReceiverSingle + Friend WithEvents lblMaxRH As Label + Friend WithEvents ucrReceiverMinRH As ucrReceiverSingle + Friend WithEvents lblMinimumRH As Label Friend WithEvents ucrReceiverWindDirection As ucrReceiverSingle + Friend WithEvents ucrReceiverRain As ucrReceiverSingle Friend WithEvents ucrReceiverSunshine As ucrReceiverSingle + Friend WithEvents lblRain As Label Friend WithEvents ucrReceiverRadiation As ucrReceiverSingle + Friend WithEvents ucrReceiverMaxTemp As ucrReceiverSingle Friend WithEvents ucrReceiverCloudCover As ucrReceiverSingle + Friend WithEvents lblMaxTemp As Label Friend WithEvents lblCloudCover As Label + Friend WithEvents lblMinTemp As Label Friend WithEvents lblRadiation As Label - Friend WithEvents lblWindDirection As Label + Friend WithEvents ucrReceiverWindSpeed As ucrReceiverSingle Friend WithEvents lblSunshine As Label - Friend WithEvents lblWindSpeed As Label Friend WithEvents ucrReceiverMinTemp As ucrReceiverSingle - Friend WithEvents ucrReceiverWindSpeed As ucrReceiverSingle - Friend WithEvents lblRain As Label - Friend WithEvents lblMinTemp As Label - Friend WithEvents lblMaxTemp As Label - Friend WithEvents lblDate As Label - Friend WithEvents ucrBase As ucrButtons - Friend WithEvents ucrReceiverDay As ucrReceiverSingle - Friend WithEvents lblDay As Label - Friend WithEvents ucrReceiverMonth As ucrReceiverSingle - Friend WithEvents lblMonth As Label - Friend WithEvents ucrReceiverYear As ucrReceiverSingle - Friend WithEvents lblYear As Label - Friend WithEvents ucrReceiverStationName As ucrReceiverSingle - Friend WithEvents lblStationName As Label - Friend WithEvents lblDOY As Label - Friend WithEvents ucrReceiverDOY As ucrReceiverSingle - Friend WithEvents grpDateTime As GroupBox - Friend WithEvents grpStation As GroupBox - Friend WithEvents ucrInputCheckInput As ucrInputTextBox - Friend WithEvents cmdCheckUnique As Button - Friend WithEvents ucrReceiverMinRH As ucrReceiverSingle - Friend WithEvents lblMinimumRH As Label - Friend WithEvents ucrReceiverMaxRH As ucrReceiverSingle - Friend WithEvents lblMaxRH As Label + Friend WithEvents lblWindSpeed As Label + Friend WithEvents lblWindDirection As Label + Friend WithEvents ucrReceiverLongitude As ucrReceiverSingle + Friend WithEvents ucrReceiverLatitude As ucrReceiverSingle + Friend WithEvents ucrReceiverAltitude As ucrReceiverSingle End Class diff --git a/instat/DlgDefineClimaticData.vb b/instat/DlgDefineClimaticData.vb index 3ad6acdc97b..43e25b2213c 100644 --- a/instat/DlgDefineClimaticData.vb +++ b/instat/DlgDefineClimaticData.vb @@ -137,7 +137,7 @@ Public Class DlgDefineClimaticData End If End Sub - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) SetDefaults() SetRCodeForControls(True) TestOKEnabled() @@ -206,11 +206,11 @@ Public Class DlgDefineClimaticData Return lstValues End Function - Private Sub Selector_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSelectorDefineClimaticData.ControlContentsChanged + Private Sub Selector_ControlContentsChanged(ucrChangedControl As ucrCore) AutoFillReceivers() End Sub - Private Sub cmdCheckUnique_Click(sender As Object, e As EventArgs) Handles cmdCheckUnique.Click + Private Sub cmdCheckUnique_Click(sender As Object, e As EventArgs) Dim iAnyDuplicated As Integer Try @@ -253,7 +253,7 @@ Public Class DlgDefineClimaticData bIsUnique = True End Sub - Private Sub ucrReceiverDate_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDate.ControlValueChanged, ucrReceiverStationName.ControlValueChanged + Private Sub ucrReceiverDate_ControlValueChanged(ucrChangedControl As ucrCore) EnableDisableCheckUniqueBtn() If Not ucrReceiverStationName.IsEmpty Then clsConcFunction.AddParameter("x1", ucrReceiverStationName.GetVariableNames, bIncludeArgumentName:=False) @@ -267,12 +267,12 @@ Public Class DlgDefineClimaticData End If End Sub - Private Sub ucrSelectorDefineClimaticData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorDefineClimaticData.ControlValueChanged + Private Sub ucrSelectorDefineClimaticData_ControlValueChanged(ucrChangedControl As ucrCore) strCurrentDataframeName = ucrSelectorDefineClimaticData.strCurrentDataFrame clsGetColFunction.AddParameter("data_name", Chr(34) & strCurrentDataframeName & Chr(34), iPosition:=0) End Sub - Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDate.ControlContentsChanged + Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) TestOKEnabled() End Sub End Class \ No newline at end of file From 20658298e1e81fd19ea647d494176ea94f442125 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Fri, 30 Jun 2023 11:27:39 +0100 Subject: [PATCH 18/48] minor changes --- instat/DlgDefineClimaticData.Designer.vb | 102 ++++---- instat/DlgDefineClimaticData.vb | 178 ++++++++++++-- instat/dlgEvapotranspiration.Designer.vb | 13 + instat/dlgEvapotranspiration.vb | 185 +++++++++----- instat/instat.vbproj | 9 + instat/sdgHSConstants.vb | 7 +- instat/sdgPMConstants.vb | 17 +- instat/sdgPTConstants.Designer.vb | 292 +++++++++++++++++++++++ instat/sdgPTConstants.resx | 120 ++++++++++ instat/sdgPTConstants.vb | 74 ++++++ 10 files changed, 857 insertions(+), 140 deletions(-) create mode 100644 instat/sdgPTConstants.Designer.vb create mode 100644 instat/sdgPTConstants.resx create mode 100644 instat/sdgPTConstants.vb diff --git a/instat/DlgDefineClimaticData.Designer.vb b/instat/DlgDefineClimaticData.Designer.vb index 5996a884e71..cfd7f27a21e 100644 --- a/instat/DlgDefineClimaticData.Designer.vb +++ b/instat/DlgDefineClimaticData.Designer.vb @@ -104,7 +104,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrChkLinkedMetaData.AutoSize = True Me.ucrChkLinkedMetaData.Checked = False - Me.ucrChkLinkedMetaData.Location = New System.Drawing.Point(6, 190) + Me.ucrChkLinkedMetaData.Location = New System.Drawing.Point(16, 204) Me.ucrChkLinkedMetaData.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkLinkedMetaData.Name = "ucrChkLinkedMetaData" Me.ucrChkLinkedMetaData.Size = New System.Drawing.Size(195, 23) @@ -116,7 +116,7 @@ Partial Class DlgDefineClimaticData Me.ucrSelectorLinkedDataFrame.bDropUnusedFilterLevels = False Me.ucrSelectorLinkedDataFrame.bShowHiddenColumns = False Me.ucrSelectorLinkedDataFrame.bUseCurrentFilter = True - Me.ucrSelectorLinkedDataFrame.Location = New System.Drawing.Point(6, 225) + Me.ucrSelectorLinkedDataFrame.Location = New System.Drawing.Point(16, 224) Me.ucrSelectorLinkedDataFrame.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorLinkedDataFrame.Name = "ucrSelectorLinkedDataFrame" Me.ucrSelectorLinkedDataFrame.Size = New System.Drawing.Size(213, 183) @@ -150,7 +150,7 @@ Partial Class DlgDefineClimaticData Me.ucrSelectorDefineClimaticData.bDropUnusedFilterLevels = False Me.ucrSelectorDefineClimaticData.bShowHiddenColumns = False Me.ucrSelectorDefineClimaticData.bUseCurrentFilter = True - Me.ucrSelectorDefineClimaticData.Location = New System.Drawing.Point(6, -6) + Me.ucrSelectorDefineClimaticData.Location = New System.Drawing.Point(16, 9) Me.ucrSelectorDefineClimaticData.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorDefineClimaticData.Name = "ucrSelectorDefineClimaticData" Me.ucrSelectorDefineClimaticData.Size = New System.Drawing.Size(213, 183) @@ -160,7 +160,7 @@ Partial Class DlgDefineClimaticData ' Me.lblStationName.AutoSize = True Me.lblStationName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblStationName.Location = New System.Drawing.Point(27, 16) + Me.lblStationName.Location = New System.Drawing.Point(10, 14) Me.lblStationName.Name = "lblStationName" Me.lblStationName.Size = New System.Drawing.Size(38, 13) Me.lblStationName.TabIndex = 0 @@ -170,7 +170,7 @@ Partial Class DlgDefineClimaticData ' Me.lblDOY.AutoSize = True Me.lblDOY.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDOY.Location = New System.Drawing.Point(31, 157) + Me.lblDOY.Location = New System.Drawing.Point(12, 155) Me.lblDOY.Name = "lblDOY" Me.lblDOY.Size = New System.Drawing.Size(66, 13) Me.lblDOY.TabIndex = 8 @@ -180,7 +180,7 @@ Partial Class DlgDefineClimaticData ' Me.lblLongitude.AutoSize = True Me.lblLongitude.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLongitude.Location = New System.Drawing.Point(27, 93) + Me.lblLongitude.Location = New System.Drawing.Point(10, 91) Me.lblLongitude.Name = "lblLongitude" Me.lblLongitude.Size = New System.Drawing.Size(57, 13) Me.lblLongitude.TabIndex = 6 @@ -190,7 +190,7 @@ Partial Class DlgDefineClimaticData ' Me.lblLatitude.AutoSize = True Me.lblLatitude.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLatitude.Location = New System.Drawing.Point(27, 55) + Me.lblLatitude.Location = New System.Drawing.Point(10, 53) Me.lblLatitude.Name = "lblLatitude" Me.lblLatitude.Size = New System.Drawing.Size(48, 13) Me.lblLatitude.TabIndex = 4 @@ -200,7 +200,7 @@ Partial Class DlgDefineClimaticData ' Me.lblAltitude.AutoSize = True Me.lblAltitude.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblAltitude.Location = New System.Drawing.Point(27, 132) + Me.lblAltitude.Location = New System.Drawing.Point(10, 130) Me.lblAltitude.Name = "lblAltitude" Me.lblAltitude.Size = New System.Drawing.Size(45, 13) Me.lblAltitude.TabIndex = 2 @@ -228,7 +228,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverStation.AutoSize = True Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Location = New System.Drawing.Point(27, 31) + Me.ucrReceiverStation.Location = New System.Drawing.Point(10, 29) Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStation.Name = "ucrReceiverStation" Me.ucrReceiverStation.Selector = Nothing @@ -241,7 +241,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverLongitude.AutoSize = True Me.ucrReceiverLongitude.frmParent = Me - Me.ucrReceiverLongitude.Location = New System.Drawing.Point(27, 108) + Me.ucrReceiverLongitude.Location = New System.Drawing.Point(10, 106) Me.ucrReceiverLongitude.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverLongitude.Name = "ucrReceiverLongitude" Me.ucrReceiverLongitude.Selector = Nothing @@ -254,7 +254,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverLatitude.AutoSize = True Me.ucrReceiverLatitude.frmParent = Me - Me.ucrReceiverLatitude.Location = New System.Drawing.Point(27, 70) + Me.ucrReceiverLatitude.Location = New System.Drawing.Point(10, 68) Me.ucrReceiverLatitude.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverLatitude.Name = "ucrReceiverLatitude" Me.ucrReceiverLatitude.Selector = Nothing @@ -267,7 +267,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverAltitude.AutoSize = True Me.ucrReceiverAltitude.frmParent = Me - Me.ucrReceiverAltitude.Location = New System.Drawing.Point(27, 147) + Me.ucrReceiverAltitude.Location = New System.Drawing.Point(10, 145) Me.ucrReceiverAltitude.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverAltitude.Name = "ucrReceiverAltitude" Me.ucrReceiverAltitude.Selector = Nothing @@ -310,7 +310,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverYear.AutoSize = True Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(31, 64) + Me.ucrReceiverYear.Location = New System.Drawing.Point(12, 62) Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYear.Name = "ucrReceiverYear" Me.ucrReceiverYear.Selector = Nothing @@ -323,7 +323,7 @@ Partial Class DlgDefineClimaticData ' Me.lblDate.AutoSize = True Me.lblDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDate.Location = New System.Drawing.Point(31, 15) + Me.lblDate.Location = New System.Drawing.Point(12, 13) Me.lblDate.Name = "lblDate" Me.lblDate.Size = New System.Drawing.Size(33, 13) Me.lblDate.TabIndex = 0 @@ -333,7 +333,7 @@ Partial Class DlgDefineClimaticData ' Me.lblMonth.AutoSize = True Me.lblMonth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMonth.Location = New System.Drawing.Point(31, 86) + Me.lblMonth.Location = New System.Drawing.Point(12, 84) Me.lblMonth.Name = "lblMonth" Me.lblMonth.Size = New System.Drawing.Size(40, 13) Me.lblMonth.TabIndex = 4 @@ -343,7 +343,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverDOY.AutoSize = True Me.ucrReceiverDOY.frmParent = Me - Me.ucrReceiverDOY.Location = New System.Drawing.Point(31, 172) + Me.ucrReceiverDOY.Location = New System.Drawing.Point(12, 170) Me.ucrReceiverDOY.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDOY.Name = "ucrReceiverDOY" Me.ucrReceiverDOY.Selector = Nothing @@ -356,7 +356,7 @@ Partial Class DlgDefineClimaticData ' Me.lblYear.AutoSize = True Me.lblYear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblYear.Location = New System.Drawing.Point(31, 50) + Me.lblYear.Location = New System.Drawing.Point(12, 48) Me.lblYear.Name = "lblYear" Me.lblYear.Size = New System.Drawing.Size(32, 13) Me.lblYear.TabIndex = 2 @@ -366,7 +366,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverDate.AutoSize = True Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(31, 28) + Me.ucrReceiverDate.Location = New System.Drawing.Point(12, 26) Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDate.Name = "ucrReceiverDate" Me.ucrReceiverDate.Selector = Nothing @@ -379,7 +379,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMonth.AutoSize = True Me.ucrReceiverMonth.frmParent = Me - Me.ucrReceiverMonth.Location = New System.Drawing.Point(31, 100) + Me.ucrReceiverMonth.Location = New System.Drawing.Point(12, 98) Me.ucrReceiverMonth.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMonth.Name = "ucrReceiverMonth" Me.ucrReceiverMonth.Selector = Nothing @@ -392,7 +392,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverDay.AutoSize = True Me.ucrReceiverDay.frmParent = Me - Me.ucrReceiverDay.Location = New System.Drawing.Point(31, 135) + Me.ucrReceiverDay.Location = New System.Drawing.Point(12, 133) Me.ucrReceiverDay.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDay.Name = "ucrReceiverDay" Me.ucrReceiverDay.Selector = Nothing @@ -405,7 +405,7 @@ Partial Class DlgDefineClimaticData ' Me.lblDay.AutoSize = True Me.lblDay.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDay.Location = New System.Drawing.Point(31, 122) + Me.lblDay.Location = New System.Drawing.Point(12, 120) Me.lblDay.Name = "lblDay" Me.lblDay.Size = New System.Drawing.Size(29, 13) Me.lblDay.TabIndex = 6 @@ -415,7 +415,7 @@ Partial Class DlgDefineClimaticData ' Me.Label1.AutoSize = True Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(27, 93) + Me.Label1.Location = New System.Drawing.Point(9, 93) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(57, 13) Me.Label1.TabIndex = 6 @@ -425,7 +425,7 @@ Partial Class DlgDefineClimaticData ' Me.Label2.AutoSize = True Me.Label2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label2.Location = New System.Drawing.Point(27, 55) + Me.Label2.Location = New System.Drawing.Point(9, 55) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(48, 13) Me.Label2.TabIndex = 4 @@ -435,7 +435,7 @@ Partial Class DlgDefineClimaticData ' Me.Label3.AutoSize = True Me.Label3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label3.Location = New System.Drawing.Point(27, 132) + Me.Label3.Location = New System.Drawing.Point(9, 132) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(45, 13) Me.Label3.TabIndex = 2 @@ -445,7 +445,7 @@ Partial Class DlgDefineClimaticData ' Me.Label4.AutoSize = True Me.Label4.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label4.Location = New System.Drawing.Point(27, 16) + Me.Label4.Location = New System.Drawing.Point(9, 16) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(38, 13) Me.Label4.TabIndex = 0 @@ -455,7 +455,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverStationMeta.AutoSize = True Me.ucrReceiverStationMeta.frmParent = Me - Me.ucrReceiverStationMeta.Location = New System.Drawing.Point(29, 31) + Me.ucrReceiverStationMeta.Location = New System.Drawing.Point(11, 31) Me.ucrReceiverStationMeta.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStationMeta.Name = "ucrReceiverStationMeta" Me.ucrReceiverStationMeta.Selector = Nothing @@ -468,7 +468,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverLonMeta.AutoSize = True Me.ucrReceiverLonMeta.frmParent = Me - Me.ucrReceiverLonMeta.Location = New System.Drawing.Point(27, 108) + Me.ucrReceiverLonMeta.Location = New System.Drawing.Point(9, 108) Me.ucrReceiverLonMeta.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverLonMeta.Name = "ucrReceiverLonMeta" Me.ucrReceiverLonMeta.Selector = Nothing @@ -481,7 +481,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverLatMeta.AutoSize = True Me.ucrReceiverLatMeta.frmParent = Me - Me.ucrReceiverLatMeta.Location = New System.Drawing.Point(27, 70) + Me.ucrReceiverLatMeta.Location = New System.Drawing.Point(9, 70) Me.ucrReceiverLatMeta.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverLatMeta.Name = "ucrReceiverLatMeta" Me.ucrReceiverLatMeta.Selector = Nothing @@ -494,7 +494,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverAltMeta.AutoSize = True Me.ucrReceiverAltMeta.frmParent = Me - Me.ucrReceiverAltMeta.Location = New System.Drawing.Point(27, 147) + Me.ucrReceiverAltMeta.Location = New System.Drawing.Point(9, 147) Me.ucrReceiverAltMeta.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverAltMeta.Name = "ucrReceiverAltMeta" Me.ucrReceiverAltMeta.Selector = Nothing @@ -525,7 +525,7 @@ Partial Class DlgDefineClimaticData ' Me.lblRain.AutoSize = True Me.lblRain.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRain.Location = New System.Drawing.Point(33, 15) + Me.lblRain.Location = New System.Drawing.Point(15, 15) Me.lblRain.Name = "lblRain" Me.lblRain.Size = New System.Drawing.Size(32, 13) Me.lblRain.TabIndex = 0 @@ -553,7 +553,7 @@ 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(238, -6) + Me.grpElements.Location = New System.Drawing.Point(238, 6) Me.grpElements.Name = "grpElements" Me.grpElements.Size = New System.Drawing.Size(260, 225) Me.grpElements.TabIndex = 16 @@ -564,7 +564,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMaxRH.AutoSize = True Me.ucrReceiverMaxRH.frmParent = Me - Me.ucrReceiverMaxRH.Location = New System.Drawing.Point(162, 193) + Me.ucrReceiverMaxRH.Location = New System.Drawing.Point(144, 193) Me.ucrReceiverMaxRH.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxRH.Name = "ucrReceiverMaxRH" Me.ucrReceiverMaxRH.Selector = Nothing @@ -577,7 +577,7 @@ Partial Class DlgDefineClimaticData ' Me.lblMaxRH.AutoSize = True Me.lblMaxRH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxRH.Location = New System.Drawing.Point(159, 178) + Me.lblMaxRH.Location = New System.Drawing.Point(141, 178) Me.lblMaxRH.Name = "lblMaxRH" Me.lblMaxRH.Size = New System.Drawing.Size(90, 13) Me.lblMaxRH.TabIndex = 18 @@ -587,7 +587,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMinRH.AutoSize = True Me.ucrReceiverMinRH.frmParent = Me - Me.ucrReceiverMinRH.Location = New System.Drawing.Point(162, 152) + Me.ucrReceiverMinRH.Location = New System.Drawing.Point(144, 152) Me.ucrReceiverMinRH.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinRH.Name = "ucrReceiverMinRH" Me.ucrReceiverMinRH.Selector = Nothing @@ -600,7 +600,7 @@ Partial Class DlgDefineClimaticData ' Me.lblMinimumRH.AutoSize = True Me.lblMinimumRH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMinimumRH.Location = New System.Drawing.Point(159, 137) + Me.lblMinimumRH.Location = New System.Drawing.Point(141, 137) Me.lblMinimumRH.Name = "lblMinimumRH" Me.lblMinimumRH.Size = New System.Drawing.Size(87, 13) Me.lblMinimumRH.TabIndex = 16 @@ -610,7 +610,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverWindDirection.AutoSize = True Me.ucrReceiverWindDirection.frmParent = Me - Me.ucrReceiverWindDirection.Location = New System.Drawing.Point(36, 193) + Me.ucrReceiverWindDirection.Location = New System.Drawing.Point(18, 193) Me.ucrReceiverWindDirection.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverWindDirection.Name = "ucrReceiverWindDirection" Me.ucrReceiverWindDirection.Selector = Nothing @@ -623,7 +623,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverRain.AutoSize = True Me.ucrReceiverRain.frmParent = Me - Me.ucrReceiverRain.Location = New System.Drawing.Point(36, 31) + Me.ucrReceiverRain.Location = New System.Drawing.Point(18, 31) Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRain.Name = "ucrReceiverRain" Me.ucrReceiverRain.Selector = Nothing @@ -636,7 +636,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverSunshine.AutoSize = True Me.ucrReceiverSunshine.frmParent = Me - Me.ucrReceiverSunshine.Location = New System.Drawing.Point(162, 31) + Me.ucrReceiverSunshine.Location = New System.Drawing.Point(144, 31) Me.ucrReceiverSunshine.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSunshine.Name = "ucrReceiverSunshine" Me.ucrReceiverSunshine.Selector = Nothing @@ -649,7 +649,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverRadiation.AutoSize = True Me.ucrReceiverRadiation.frmParent = Me - Me.ucrReceiverRadiation.Location = New System.Drawing.Point(162, 70) + Me.ucrReceiverRadiation.Location = New System.Drawing.Point(144, 70) Me.ucrReceiverRadiation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRadiation.Name = "ucrReceiverRadiation" Me.ucrReceiverRadiation.Selector = Nothing @@ -662,7 +662,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMaxTemp.AutoSize = True Me.ucrReceiverMaxTemp.frmParent = Me - Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(36, 111) + Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(18, 111) Me.ucrReceiverMaxTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxTemp.Name = "ucrReceiverMaxTemp" Me.ucrReceiverMaxTemp.Selector = Nothing @@ -675,7 +675,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverCloudCover.AutoSize = True Me.ucrReceiverCloudCover.frmParent = Me - Me.ucrReceiverCloudCover.Location = New System.Drawing.Point(162, 111) + Me.ucrReceiverCloudCover.Location = New System.Drawing.Point(144, 111) Me.ucrReceiverCloudCover.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverCloudCover.Name = "ucrReceiverCloudCover" Me.ucrReceiverCloudCover.Selector = Nothing @@ -688,7 +688,7 @@ Partial Class DlgDefineClimaticData ' Me.lblMaxTemp.AutoSize = True Me.lblMaxTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxTemp.Location = New System.Drawing.Point(33, 96) + Me.lblMaxTemp.Location = New System.Drawing.Point(15, 96) Me.lblMaxTemp.Name = "lblMaxTemp" Me.lblMaxTemp.Size = New System.Drawing.Size(117, 13) Me.lblMaxTemp.TabIndex = 4 @@ -698,7 +698,7 @@ Partial Class DlgDefineClimaticData ' Me.lblCloudCover.AutoSize = True Me.lblCloudCover.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCloudCover.Location = New System.Drawing.Point(159, 96) + Me.lblCloudCover.Location = New System.Drawing.Point(141, 96) Me.lblCloudCover.Name = "lblCloudCover" Me.lblCloudCover.Size = New System.Drawing.Size(68, 13) Me.lblCloudCover.TabIndex = 14 @@ -708,7 +708,7 @@ Partial Class DlgDefineClimaticData ' Me.lblMinTemp.AutoSize = True Me.lblMinTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMinTemp.Location = New System.Drawing.Point(33, 55) + Me.lblMinTemp.Location = New System.Drawing.Point(15, 55) Me.lblMinTemp.Name = "lblMinTemp" Me.lblMinTemp.Size = New System.Drawing.Size(111, 13) Me.lblMinTemp.TabIndex = 2 @@ -718,7 +718,7 @@ Partial Class DlgDefineClimaticData ' Me.lblRadiation.AutoSize = True Me.lblRadiation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRadiation.Location = New System.Drawing.Point(159, 55) + Me.lblRadiation.Location = New System.Drawing.Point(141, 55) Me.lblRadiation.Name = "lblRadiation" Me.lblRadiation.Size = New System.Drawing.Size(55, 13) Me.lblRadiation.TabIndex = 12 @@ -728,7 +728,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverWindSpeed.AutoSize = True Me.ucrReceiverWindSpeed.frmParent = Me - Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(36, 152) + Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(18, 152) Me.ucrReceiverWindSpeed.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverWindSpeed.Name = "ucrReceiverWindSpeed" Me.ucrReceiverWindSpeed.Selector = Nothing @@ -741,7 +741,7 @@ Partial Class DlgDefineClimaticData ' Me.lblSunshine.AutoSize = True Me.lblSunshine.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSunshine.Location = New System.Drawing.Point(159, 15) + Me.lblSunshine.Location = New System.Drawing.Point(141, 15) Me.lblSunshine.Name = "lblSunshine" Me.lblSunshine.Size = New System.Drawing.Size(85, 13) Me.lblSunshine.TabIndex = 10 @@ -751,7 +751,7 @@ Partial Class DlgDefineClimaticData ' Me.ucrReceiverMinTemp.AutoSize = True Me.ucrReceiverMinTemp.frmParent = Me - Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(36, 70) + Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(18, 70) Me.ucrReceiverMinTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinTemp.Name = "ucrReceiverMinTemp" Me.ucrReceiverMinTemp.Selector = Nothing @@ -764,7 +764,7 @@ Partial Class DlgDefineClimaticData ' Me.lblWindSpeed.AutoSize = True Me.lblWindSpeed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblWindSpeed.Location = New System.Drawing.Point(33, 137) + Me.lblWindSpeed.Location = New System.Drawing.Point(15, 137) Me.lblWindSpeed.Name = "lblWindSpeed" Me.lblWindSpeed.Size = New System.Drawing.Size(69, 13) Me.lblWindSpeed.TabIndex = 6 @@ -774,7 +774,7 @@ Partial Class DlgDefineClimaticData ' Me.lblWindDirection.AutoSize = True Me.lblWindDirection.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblWindDirection.Location = New System.Drawing.Point(33, 178) + Me.lblWindDirection.Location = New System.Drawing.Point(15, 178) Me.lblWindDirection.Name = "lblWindDirection" Me.lblWindDirection.Size = New System.Drawing.Size(80, 13) Me.lblWindDirection.TabIndex = 8 @@ -794,8 +794,8 @@ Partial Class DlgDefineClimaticData Me.Controls.Add(Me.grpStation) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.grpDateTime) - Me.Controls.Add(Me.grpMeta) Me.Controls.Add(Me.grpElements) + Me.Controls.Add(Me.grpMeta) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False diff --git a/instat/DlgDefineClimaticData.vb b/instat/DlgDefineClimaticData.vb index 43e25b2213c..2f12a5b87a3 100644 --- a/instat/DlgDefineClimaticData.vb +++ b/instat/DlgDefineClimaticData.vb @@ -21,11 +21,13 @@ Imports RDotNet Public Class DlgDefineClimaticData Public bFirstLoad As Boolean = True Private bReset As Boolean = True - Dim clsTypesFunction As New RFunction + Dim clsTypesFunction, clsNewTypesFunction As New RFunction Dim lstReceivers As New List(Of ucrReceiverSingle) + Dim lstNewReceivers As New List(Of ucrReceiverSingle) Dim lstRecognisedTypes As New List(Of KeyValuePair(Of String, List(Of String))) - Private clsDefaultFunction As New RFunction - Private clsAnyDuplicatesFunction, clsConcFunction, clsGetColFunction As New RFunction + Dim lstNewRecognisedTypes As New List(Of KeyValuePair(Of String, List(Of String))) + Private clsDefaultFunction, clsNewDefautFunction As New RFunction + Private clsAnyDuplicatesFunction, clsConcFunction, clsNewConcFunction, clsGetColFunction, clsDummyFunction As New RFunction Private strCurrentDataframeName As String Private bIsUnique As Boolean = True @@ -45,12 +47,15 @@ Public Class DlgDefineClimaticData Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 328 - Dim kvpRain As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("rain", {"rain", "prec", "rr", "prcp", "x5"}.ToList()) + Dim kvpRain As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("rain", {"rain", "prec", "rr", "prcp"}.ToList()) Dim kvpDate As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("date", {"date", "record"}.ToList()) Dim kvpStation As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("station", {"station", "id", "name"}.ToList()) + Dim kvpAltitude As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("alt", {"alt", "altitude", "elevation", "elev"}.ToList()) + 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"}.ToList()) - Dim kvpTempMax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"tmax", "tx", "tempmax", "tmp_max", "x2", "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", "x3", "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"}.ToList()) + Dim kvpTempMin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"tmin", "tn", "tempmin", "tmp_min"}.ToList()) Dim kvpRadiation As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("radiation", {"radiation", "rad"}.ToList()) Dim kvpSunshineHours As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("sunshine_hours", {"sunshine", "sunh", "sunhrs"}.ToList()) Dim kvpWindDirection As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("wind_direction", {"winddirection"}.ToList()) @@ -62,18 +67,28 @@ Public Class DlgDefineClimaticData Dim kvpMinRH As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("hum_min", {"minhum", "hmin", "hn"}.ToList()) Dim kvpMaxRH As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("hum_max", {"maxhum", "hmax", "hx"}.ToList()) - - lstRecognisedTypes.AddRange({kvpRain, kvpStation, kvpCloudCover, kvpTempMax, kvpTempMin, kvpRadiation, kvpSunshineHours, + lstRecognisedTypes.AddRange({kvpRain, kvpCloudCover, kvpTempMax, kvpTempMin, kvpRadiation, kvpSunshineHours, kvpStation, kvpAltitude, kvpLatitude, kvpLongitude, kvpWindDirection, kvpWindSpeed, kvpYear, kvpMonth, kvpDay, kvpDOY, kvpDate, kvpMinRH, kvpMaxRH}) + lstNewRecognisedTypes.AddRange({kvpStation, kvpAltitude, kvpLatitude, kvpLongitude}) lstReceivers.AddRange({ucrReceiverCloudCover, ucrReceiverDay, ucrReceiverMaxTemp, ucrReceiverMinTemp, ucrReceiverMonth, ucrReceiverRadiation, - ucrReceiverRain, ucrReceiverStationName, ucrReceiverSunshine, ucrReceiverWindDirection, ucrReceiverWindSpeed, - ucrReceiverYear, ucrReceiverDOY, ucrReceiverDate, ucrReceiverMinRH, ucrReceiverMaxRH}) + ucrReceiverRain, ucrReceiverStation, ucrReceiverAltitude, ucrReceiverLatitude, ucrReceiverLongitude, ucrReceiverSunshine, + ucrReceiverWindDirection, ucrReceiverWindSpeed, ucrReceiverYear, ucrReceiverDOY, ucrReceiverDate, ucrReceiverMinRH, ucrReceiverMaxRH}) + lstNewReceivers.AddRange({ucrReceiverStationMeta, ucrReceiverAltMeta, ucrReceiverLatMeta, ucrReceiverLonMeta}) ucrSelectorDefineClimaticData.SetParameter(New RParameter("data_name", 0)) ucrSelectorDefineClimaticData.SetParameterIsString() + ucrSelectorLinkedDataFrame.SetParameter(New RParameter("data_name", 1)) + ucrSelectorLinkedDataFrame.SetParameterIsString() ucrReceiverDate.Tag = "date" ucrReceiverCloudCover.Tag = "cloud_cover" - ucrReceiverStationName.Tag = "station" + ucrReceiverStation.Tag = "station" + ucrReceiverAltitude.Tag = "alt" + ucrReceiverLongitude.Tag = "lon" + ucrReceiverLatitude.Tag = "lat" + ucrReceiverStationMeta.Tag = "station" + ucrReceiverAltMeta.Tag = "alt" + ucrReceiverLonMeta.Tag = "lon" + ucrReceiverLatMeta.Tag = "lat" ucrReceiverMaxTemp.Tag = "temp_max" ucrReceiverMinTemp.Tag = "temp_min" ucrReceiverRadiation.Tag = "radiation" @@ -91,6 +106,12 @@ Public Class DlgDefineClimaticData ucrReceiverDate.SetIncludedDataTypes({"Date"}) SetRSelector() + NewSetRSelector() + + ucrChkLinkedMetaData.SetText("Linked Meta Data") + ucrChkLinkedMetaData.SetParameter(New RParameter("check", 0)) + ucrChkLinkedMetaData.SetValuesCheckedAndUnchecked("True", "False") + ucrBase.clsRsyntax.iCallType = 2 End Sub @@ -99,34 +120,60 @@ Public Class DlgDefineClimaticData clsGetColFunction = New RFunction clsAnyDuplicatesFunction = New RFunction clsConcFunction = New RFunction + clsNewConcFunction = New RFunction + clsDummyFunction = New RFunction + clsNewDefautFunction = New RFunction ucrSelectorDefineClimaticData.Reset() + ucrSelectorLinkedDataFrame.Reset() ucrInputCheckInput.Reset() ucrReceiverDate.SetMeAsReceiver() + ucrSelectorLinkedDataFrame.Visible = False + grpMeta.Visible = False + + ucrChkLinkedMetaData.SetParameter(New RParameter("y", 0)) clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$define_as_climatic") clsDefaultFunction.AddParameter("types", clsRFunctionParameter:=clsTypesFunction) clsDefaultFunction.AddParameter("key_col_names", clsRFunctionParameter:=clsConcFunction, iPosition:=2) + clsNewDefautFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$define_as_climatic") + clsNewDefautFunction.AddParameter("types", clsRFunctionParameter:=clsNewTypesFunction) + clsNewDefautFunction.AddParameter("key_col_names", clsRFunctionParameter:=clsNewConcFunction, iPosition:=2) + + clsDummyFunction.AddParameter("checked", "FALSE", iPosition:=0) + clsTypesFunction.SetRCommand("c") + clsNewTypesFunction.SetRCommand("c") clsConcFunction.SetRCommand("c") + clsNewConcFunction.SetRCommand("c") + clsAnyDuplicatesFunction.SetRCommand("anyDuplicated") clsAnyDuplicatesFunction.AddParameter("x", clsRFunctionParameter:=clsGetColFunction) + ucrBase.clsRsyntax.ClearCodes() clsGetColFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") clsGetColFunction.AddParameter("data_name", Chr(34) & strCurrentDataframeName & Chr(34)) clsGetColFunction.AddParameter("col_names", clsRFunctionParameter:=clsConcFunction) ucrBase.clsRsyntax.SetBaseRFunction(clsDefaultFunction) + ucrBase.clsRsyntax.bSeparateThread = False AutoFillReceivers() EnableDisableCheckUniqueBtn() End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrSelectorDefineClimaticData.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) + If bReset Then + ucrSelectorDefineClimaticData.SetRCode(clsDefaultFunction, bReset) + ucrSelectorLinkedDataFrame.SetRCode(clsNewDefautFunction, bReset) + End If + SetRCodesforReceivers(bReset) + + ucrChkLinkedMetaData.SetRCode(clsDummyFunction, bReset) + End Sub Private Sub TestOKEnabled() @@ -137,7 +184,7 @@ Public Class DlgDefineClimaticData End If End Sub - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeForControls(True) TestOKEnabled() @@ -148,6 +195,10 @@ Public Class DlgDefineClimaticData For Each ucrTempReceiver In lstReceivers ucrTempReceiver.SetRCode(clsTypesFunction, bReset) Next + + For Each ucrTempReceiver In lstNewReceivers + ucrTempReceiver.SetRCode(clsNewTypesFunction, bReset) + Next End Sub Private Sub SetRSelector() @@ -160,6 +211,16 @@ Public Class DlgDefineClimaticData Next End Sub + Private Sub NewSetRSelector() + Dim ucrTempReceiver As ucrReceiver + For Each ucrTempReceiver In lstNewReceivers + ucrTempReceiver.SetParameter(New RParameter(ucrTempReceiver.Tag)) + ucrTempReceiver.Selector = ucrSelectorLinkedDataFrame + ucrTempReceiver.SetParameterIsString() + ucrTempReceiver.bExcludeFromSelector = True + Next + End Sub + Private Sub AutoFillReceivers() Dim lstRecognisedValues As List(Of String) Dim ucrCurrentReceiver As ucrReceiver @@ -174,7 +235,6 @@ Public Class DlgDefineClimaticData If lstRecognisedValues.Count > 0 Then For Each lviTempVariable As ListViewItem In ucrSelectorDefineClimaticData.lstAvailableVariable.Items For Each strValue As String In lstRecognisedValues - 'To strip out any non-word characters and underscores If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]|_", String.Empty).Contains(strValue) Then ucrTempReceiver.Add(lviTempVariable.Text, ucrSelectorDefineClimaticData.ucrAvailableDataFrames.cboAvailableDataFrames.Text) bFound = True @@ -186,6 +246,40 @@ Public Class DlgDefineClimaticData Exit For End If Next + + End If + Next + + If ucrCurrentReceiver IsNot Nothing Then + ucrCurrentReceiver.SetMeAsReceiver() + End If + End Sub + + Private Sub NewAutoFillReceivers() + Dim lstRecognisedValues As List(Of String) + Dim ucrCurrentReceiver As ucrReceiver + Dim bFound As Boolean = False + + ucrCurrentReceiver = ucrSelectorLinkedDataFrame.CurrentReceiver + + For Each ucrTempReceiver As ucrReceiver In lstNewReceivers + ucrTempReceiver.SetMeAsReceiver() + lstRecognisedValues = GetNewRecognisedValues(ucrTempReceiver.Tag) + + If lstRecognisedValues.Count > 0 Then + For Each lviTempVariable As ListViewItem In ucrSelectorLinkedDataFrame.lstAvailableVariable.Items + For Each strValue As String In lstRecognisedValues + If Regex.Replace(lviTempVariable.Text.ToLower(), "[^\w]|_", String.Empty).Contains(strValue) Then + ucrTempReceiver.Add(lviTempVariable.Text, ucrSelectorLinkedDataFrame.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + bFound = True + Exit For + End If + Next + If bFound Then + bFound = False + Exit For + End If + Next End If Next @@ -206,11 +300,19 @@ Public Class DlgDefineClimaticData Return lstValues End Function - Private Sub Selector_ControlContentsChanged(ucrChangedControl As ucrCore) - AutoFillReceivers() - End Sub + Private Function GetNewRecognisedValues(strVariable As String) As List(Of String) + Dim lstValues As New List(Of String) - Private Sub cmdCheckUnique_Click(sender As Object, e As EventArgs) + For Each kvpTemp As KeyValuePair(Of String, List(Of String)) In lstNewRecognisedTypes + If kvpTemp.Key = strVariable Then + lstValues = kvpTemp.Value + Exit For + End If + Next + Return lstValues + End Function + + Private Sub cmdCheckUnique_Click(sender As Object, e As EventArgs) Handles cmdCheckUnique.Click Dim iAnyDuplicated As Integer Try @@ -227,7 +329,7 @@ Public Class DlgDefineClimaticData ucrInputCheckInput.SetName("") ucrInputCheckInput.txtInput.BackColor = Color.LightCoral bIsUnique = False - If ucrReceiverStationName.IsEmpty Then + If ucrReceiverStation.IsEmpty Then ucrInputCheckInput.SetName("Duplicate dates found.") MsgBox("You have multiple rows with the same dates. Did you forget to add the station column? Otherwise, use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.", MsgBoxStyle.Information, Title:="Duplicates") Else @@ -253,10 +355,10 @@ Public Class DlgDefineClimaticData bIsUnique = True End Sub - Private Sub ucrReceiverDate_ControlValueChanged(ucrChangedControl As ucrCore) + Private Sub ucrReceiverDate_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDate.ControlValueChanged EnableDisableCheckUniqueBtn() - If Not ucrReceiverStationName.IsEmpty Then - clsConcFunction.AddParameter("x1", ucrReceiverStationName.GetVariableNames, bIncludeArgumentName:=False) + If Not ucrReceiverStation.IsEmpty Then + clsConcFunction.AddParameter("x1", ucrReceiverStation.GetVariableNames, bIncludeArgumentName:=False) Else clsConcFunction.RemoveParameterByName("x1") End If @@ -267,12 +369,40 @@ Public Class DlgDefineClimaticData End If End Sub - Private Sub ucrSelectorDefineClimaticData_ControlValueChanged(ucrChangedControl As ucrCore) + Private Sub ucrSelectorDefineClimaticData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorDefineClimaticData.ControlValueChanged strCurrentDataframeName = ucrSelectorDefineClimaticData.strCurrentDataFrame clsGetColFunction.AddParameter("data_name", Chr(34) & strCurrentDataframeName & Chr(34), iPosition:=0) + AutoFillReceivers() + SetRSelector() End Sub - Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) + Private Sub ucrSelectorLinkedDataFrame_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorLinkedDataFrame.ControlValueChanged + clsGetColFunction.AddParameter("data_name", Chr(34) & ucrSelectorLinkedDataFrame.strCurrentDataFrame & Chr(34), iPosition:=1) + NewAutoFillReceivers() + NewSetRSelector() + End Sub + + Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDate.ControlContentsChanged TestOKEnabled() End Sub + + Private Sub ucrChkLinkedMetaData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLinkedMetaData.ControlValueChanged, ucrReceiverAltMeta.ControlValueChanged, ucrReceiverLatMeta.ControlValueChanged, ucrReceiverLonMeta.ControlValueChanged, ucrReceiverStationMeta.ControlValueChanged + If ucrChkLinkedMetaData.Checked Then + ucrSelectorLinkedDataFrame.Visible = True + grpMeta.Visible = True + grpStation.Visible = False + ucrBase.clsRsyntax.AddToAfterCodes(clsNewDefautFunction, iPosition:=0) + clsNewDefautFunction.iCallType = 2 + Else + ucrSelectorLinkedDataFrame.Visible = False + grpMeta.Visible = False + grpStation.Visible = True + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsNewDefautFunction) + End If + If Not ucrReceiverStationMeta.IsEmpty Then + clsNewConcFunction.AddParameter("x1", ucrReceiverStationMeta.GetVariableNames, bIncludeArgumentName:=False) + Else + clsNewConcFunction.RemoveParameterByName("x1") + End If + End Sub End Class \ No newline at end of file diff --git a/instat/dlgEvapotranspiration.Designer.vb b/instat/dlgEvapotranspiration.Designer.vb index 7fb39edcf67..dee08be68f1 100644 --- a/instat/dlgEvapotranspiration.Designer.vb +++ b/instat/dlgEvapotranspiration.Designer.vb @@ -58,6 +58,7 @@ Partial Class dlgEvapotranspiration Me.ucrBase = New instat.ucrButtons() Me.ucrReceiverExtraRadiation = New instat.ucrReceiverSingle() Me.ucrNudAlpha = New instat.ucrNud() + Me.cmdPTConstants = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'cmdHSConstants @@ -463,6 +464,16 @@ Partial Class dlgEvapotranspiration Me.ucrNudAlpha.TabIndex = 71 Me.ucrNudAlpha.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' + 'cmdPTConstants + ' + Me.cmdPTConstants.Location = New System.Drawing.Point(171, 341) + Me.cmdPTConstants.Name = "cmdPTConstants" + Me.cmdPTConstants.Size = New System.Drawing.Size(123, 23) + Me.cmdPTConstants.TabIndex = 72 + Me.cmdPTConstants.Tag = "Options" + Me.cmdPTConstants.Text = "Constants" + Me.cmdPTConstants.UseVisualStyleBackColor = True + ' 'dlgEvapotranspiration ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -505,6 +516,7 @@ Partial Class dlgEvapotranspiration Me.Controls.Add(Me.lblRA) Me.Controls.Add(Me.ucrReceiverExtraRadiation) Me.Controls.Add(Me.lblAlpha) + Me.Controls.Add(Me.cmdPTConstants) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -552,4 +564,5 @@ Partial Class dlgEvapotranspiration Friend WithEvents lblRA As Label Friend WithEvents ucrNudAlpha As ucrNud Friend WithEvents lblAlpha As Label + Friend WithEvents cmdPTConstants As Button End Class \ No newline at end of file diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index 2f66e2d30d5..52aa70e90b5 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -76,6 +76,9 @@ Public Class dlgEvapotranspiration ucrReceiverTmax.SetClimaticType("temp_max") ucrReceiverTmax.bAutoFill = True + ucrReceiverRadiation.SetParameter(New RParameter("radiation", 1)) + ucrReceiverRadiation.SetParameterIsRFunction() + ucrReceiverTmin.SetParameter(New RParameter("Tmin", 3)) ucrReceiverTmin.SetParameterIsRFunction() ucrReceiverTmin.SetClimaticType("temp_min") @@ -110,7 +113,7 @@ Public Class dlgEvapotranspiration ucrInputSolar.SetParameter(New RParameter("solar", 3)) dctInputSolar.Add("sunshine hours", Chr(34) & "sunshine hours" & Chr(34)) dctInputSolar.Add("cloud", Chr(34) & "cloud" & Chr(34)) - dctInputSolar.Add("radiation", Chr(34) & "radiation" & Chr(34)) + dctInputSolar.Add("radiation", Chr(34) & "data" & Chr(34)) ucrInputSolar.SetItems(dctInputSolar) ucrInputSolar.SetDropDownStyleAsNonEditable() @@ -141,8 +144,6 @@ Public Class dlgEvapotranspiration ucrPnlMethod.AddParameterValueFunctionNamesCondition(rdoPriestleyTaylor, "ET.PriestleyTaylor", "ET.PriestleyTaylor") ucrPnlMethod.AddToLinkedControls(ucrInputCrop, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - 'ucrPnlMethod.AddToLinkedControls(ucrReceiverHumidityMax, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) - 'ucrPnlMethod.AddToLinkedControls(ucrReceiverHumidityMin, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) ucrPnlMethod.AddToLinkedControls({ucrReceiverHumidityMax, ucrReceiverHumidityMin}, {rdoPenmanMonteith, rdoPriestleyTaylor}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) ucrPnlMethod.AddToLinkedControls(ucrInputTimeStep, {rdoPenmanMonteith, rdoHargreavesSamani, rdoPriestleyTaylor}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkWind.AddToLinkedControls(ucrReceiverWindSpeed, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -150,7 +151,7 @@ Public Class dlgEvapotranspiration ucrPnlMethod.AddToLinkedControls(ucrChkWind, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlMethod.AddToLinkedControls(ucrInputSolar, {rdoPenmanMonteith, rdoPriestleyTaylor}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlMethod.AddToLinkedControls(ucrReceiverExtraRadiation, {rdoHargreavesSamani}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlMethod.AddToLinkedControls(ucrNudAlpha, {rdoPriestleyTaylor}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlMethod.AddToLinkedControls(ucrNudAlpha, {rdoPriestleyTaylor}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.23") ucrReceiverExtraRadiation.SetLinkedDisplayControl(lblRa) ucrReceiverRadiation.SetLinkedDisplayControl(lblRadiation) @@ -258,12 +259,7 @@ Public Class dlgEvapotranspiration clsListFunction.AddParameter("Elev", 0, iPosition:=0) clsListFunction.AddParameter("lambda", 2.54, iPosition:=1) clsListFunction.AddParameter("lat_rad", 0, iPosition:=2) - clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5) clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) - clsListFunction.AddParameter("z", 2, iPosition:=4) - clsListFunction.AddParameter("G", 0, iPosition:=6) - clsListFunction.AddParameter("as", 0.25, iPosition:=7) - clsListFunction.AddParameter("bs", 0.5, iPosition:=8) clsListFunction.SetAssignTo("constants") clsETPenmanMonteith.SetPackageName("Evapotranspiration") @@ -302,9 +298,9 @@ Public Class dlgEvapotranspiration clsBaseOperator.AddParameter("ET.Daily", strParameterValue:="ET.Daily", iPosition:=1) ucrBase.clsRsyntax.ClearCodes() - ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrNewColName.GetText, strTempDataframe:=ucrSelectorEvapotranspiration.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrNewColName.GetText) ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) ucrBase.clsRsyntax.AddToBeforeCodes(clsListFunction, iPosition:=1) + Constants() End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -336,6 +332,7 @@ Public Class dlgEvapotranspiration If bReset Then ucrInputSolar.SetRCode(clsETPenmanMonteith, bReset) End If + Constants() End Sub Private Sub TestOKEnabled() @@ -399,6 +396,13 @@ Public Class dlgEvapotranspiration TestOKEnabled() End Sub + Private Sub cmdPTConstants_Click(sender As Object, e As EventArgs) Handles cmdPTConstants.Click + sdgPTConstants.SetRFunction(clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) + sdgPTConstants.ShowDialog() + bResetSubdialog = False + TestOKEnabled() + End Sub + Private Sub cmdLocation_Click(sender As Object, e As EventArgs) Handles cmdLocation.Click sdgLocation.SetRFunction(clsNewVarnamesVectorHS:=clsVarnamesVectorHS, clsNewVarnamesVectorPM:=clsVarnamesVectorPM, clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) sdgLocation.ShowDialog() @@ -446,6 +450,8 @@ Public Class dlgEvapotranspiration Private Sub ucrPnlMethod_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlMethod.ControlValueChanged Method() + Solar() + Constants() DialogSize() EnableDesableSubDialog() If rdoPenmanMonteith.Checked Then @@ -471,11 +477,19 @@ Public Class dlgEvapotranspiration cmdPMConstants.Visible = True cmdHSMissingOptions.Visible = False cmdHSConstants.Visible = False - Else + cmdPTConstants.Visible = False + ElseIf rdoHargreavesSamani.Checked Then cmdEvapOptions.Visible = False cmdPMConstants.Visible = False + cmdPTConstants.Visible = False cmdHSMissingOptions.Visible = True cmdHSConstants.Visible = True + Else + cmdEvapOptions.Visible = False + cmdPMConstants.Visible = False + cmdHSMissingOptions.Visible = True + cmdPTConstants.Visible = True + cmdHSConstants.Visible = False End If End Sub @@ -488,54 +502,113 @@ Public Class dlgEvapotranspiration End If End Sub - Private Sub ucrInputSolar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSolar.ControlValueChanged, ucrReceiverRadiation.ControlValueChanged - Select Case ucrInputSolar.GetText - Case "sunshine hours" - clsETPenmanMonteith.AddParameter("solar", Chr(34) & "sunshine hours" & Chr(34), iPosition:=3) - ucrReceiverRadiation.SetClimaticType("sunshine_hours") - ucrReceiverRadiation.bAutoFill = True - clsVarnamesVectorPM.AddParameter("n", Chr(34) & "n" & Chr(34), bIncludeArgumentName:=False) - clsDataFunctionPM.AddParameter("n", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) - clsVarnamesVectorPT.AddParameter("n", Chr(34) & "n" & Chr(34), bIncludeArgumentName:=False) - clsDataFunctionPT.AddParameter("n", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) - clsVarnamesVectorPM.RemoveParameterByName("Rs") - clsVarnamesVectorPM.RemoveParameterByName("Cd") - clsVarnamesVectorPT.RemoveParameterByName("Rs") - clsVarnamesVectorPT.RemoveParameterByName("Cd") - clsDataFunctionPM.RemoveParameterByName("Rs") - clsDataFunctionPM.RemoveParameterByName("cd") - clsDataFunctionPT.RemoveParameterByName("Rs") - clsDataFunctionPT.RemoveParameterByName("cd") - Case "radiation" - ucrReceiverRadiation.SetClimaticType("radiation") - ucrReceiverRadiation.bAutoFill = True - clsVarnamesVectorPM.AddParameter("Rs", Chr(34) & "Rs" & Chr(34), bIncludeArgumentName:=False) - clsDataFunctionPM.AddParameter("Rs", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) - clsVarnamesVectorPT.AddParameter("Rs", Chr(34) & "Rs" & Chr(34), bIncludeArgumentName:=False) - clsDataFunctionPT.AddParameter("Rs", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) - clsVarnamesVectorPM.RemoveParameterByName("n") - clsVarnamesVectorPM.RemoveParameterByName("Cd") - clsDataFunctionPM.RemoveParameterByName("n") - clsDataFunctionPM.RemoveParameterByName("cd") - clsDataFunctionPT.RemoveParameterByName("n") - clsDataFunctionPT.RemoveParameterByName("cd") - Case "cloud" - ucrReceiverRadiation.SetClimaticType("cloud_cover") - ucrReceiverRadiation.bAutoFill = True - clsVarnamesVectorPM.AddParameter("Cd", Chr(34) & "Cd" & Chr(34), bIncludeArgumentName:=False) - clsDataFunctionPM.AddParameter("Cd", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) - clsVarnamesVectorPT.AddParameter("Cd", Chr(34) & "Cd" & Chr(34), bIncludeArgumentName:=False) - clsDataFunctionPT.AddParameter("Cd", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) - clsVarnamesVectorPM.RemoveParameterByName("n") - clsVarnamesVectorPM.RemoveParameterByName("Rs") - clsDataFunctionPM.RemoveParameterByName("n") - clsDataFunctionPM.RemoveParameterByName("Rs") - clsDataFunctionPT.RemoveParameterByName("n") - clsDataFunctionPT.RemoveParameterByName("Rs") - End Select + Private Sub Constants() + If rdoPenmanMonteith.Checked Then + clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5) + clsListFunction.AddParameter("z", 2, iPosition:=4) + clsListFunction.AddParameter("G", 0, iPosition:=6) + clsListFunction.AddParameter("as", 0.25, iPosition:=7) + clsListFunction.AddParameter("bs", 0.5, iPosition:=8) + clsListFunction.RemoveParameterByName("alphaPT") + ElseIf rdoHargreavesSamani.Checked Then + clsListFunction.RemoveParameterByName("alphaPT") + clsListFunction.RemoveParameterByName("sigma") + clsListFunction.RemoveParameterByName("z") + clsListFunction.RemoveParameterByName("G") + clsListFunction.RemoveParameterByName("as") + clsListFunction.RemoveParameterByName("bs") + Else + clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5) + clsListFunction.AddParameter("G", 0, iPosition:=6) + clsListFunction.AddParameter("as", 0.25, iPosition:=7) + clsListFunction.AddParameter("bs", 0.5, iPosition:=8) + clsListFunction.AddParameter("alphaPT", 1.26, iPosition:=9) + clsListFunction.RemoveParameterByName("z") + End If + End Sub + + Private Sub Solar() + If rdoPenmanMonteith.Checked AndAlso ucrInputSolar.GetText = "sunshine hours" Then + ucrReceiverRadiation.SetClimaticType("sunshine_hours") + ucrReceiverRadiation.bAutoFill = True + clsETPenmanMonteith.AddParameter("solar", Chr(34) & "sunshine hours" & Chr(34), iPosition:=3) + clsVarnamesVectorPM.AddParameter("n", Chr(34) & "n" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPM.AddParameter("n", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsVarnamesVectorPM.RemoveParameterByName("Rs") + clsVarnamesVectorPM.RemoveParameterByName("Cd") + clsDataFunctionPM.RemoveParameterByName("Rs") + clsDataFunctionPM.RemoveParameterByName("cd") + ElseIf rdoPenmanMonteith.Checked AndAlso ucrInputSolar.GetText = "radiation" Then + ucrReceiverRadiation.SetClimaticType("radiation") + ucrReceiverRadiation.bAutoFill = True + clsETPenmanMonteith.AddParameter("solar", Chr(34) & "data" & Chr(34), iPosition:=3) + clsVarnamesVectorPM.AddParameter("Rs", Chr(34) & "Rs" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPM.AddParameter("Rs", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsVarnamesVectorPM.RemoveParameterByName("n") + clsVarnamesVectorPM.RemoveParameterByName("Cd") + clsDataFunctionPM.RemoveParameterByName("n") + clsDataFunctionPM.RemoveParameterByName("cd") + ElseIf rdoPenmanMonteith.Checked AndAlso ucrInputSolar.GetText = "cloud" Then + ucrReceiverRadiation.SetClimaticType("cloud_cover") + ucrReceiverRadiation.bAutoFill = True + clsETPenmanMonteith.AddParameter("solar", Chr(34) & "cloud" & Chr(34), iPosition:=3) + clsVarnamesVectorPM.AddParameter("Cd", Chr(34) & "Cd" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPM.AddParameter("Cd", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsVarnamesVectorPM.RemoveParameterByName("n") + clsVarnamesVectorPM.RemoveParameterByName("Rs") + clsDataFunctionPM.RemoveParameterByName("n") + clsDataFunctionPM.RemoveParameterByName("Rs") + ElseIf rdoPriestleyTaylor.Checked AndAlso ucrInputSolar.GetText = "sunshine hours" Then + ucrReceiverRadiation.SetClimaticType("sunshine_hours") + ucrReceiverRadiation.bAutoFill = True + clsETPriestleyTaylor.AddParameter("solar", Chr(34) & "sunshine hours" & Chr(34), iPosition:=3) + clsVarnamesVectorPT.AddParameter("n", Chr(34) & "n" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPT.AddParameter("n", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsVarnamesVectorPT.RemoveParameterByName("Rs") + clsVarnamesVectorPT.RemoveParameterByName("Cd") + clsDataFunctionPT.RemoveParameterByName("Rs") + clsDataFunctionPT.RemoveParameterByName("cd") + ElseIf rdoPriestleyTaylor.Checked AndAlso ucrInputSolar.GetText = "radiation" Then + ucrReceiverRadiation.SetClimaticType("radiation") + ucrReceiverRadiation.bAutoFill = True + clsETPriestleyTaylor.AddParameter("solar", Chr(34) & "data" & Chr(34), iPosition:=3) + clsVarnamesVectorPT.AddParameter("Rs", Chr(34) & "Rs" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPT.AddParameter("Rs", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsDataFunctionPT.RemoveParameterByName("n") + clsDataFunctionPT.RemoveParameterByName("cd") + clsVarnamesVectorPT.RemoveParameterByName("n") + clsVarnamesVectorPT.RemoveParameterByName("cd") + ElseIf rdoPriestleyTaylor.Checked AndAlso ucrInputSolar.GetText = "cloud" Then + ucrReceiverRadiation.SetClimaticType("cloud_cover") + ucrReceiverRadiation.bAutoFill = True + clsETPriestleyTaylor.AddParameter("solar", Chr(34) & "cloud" & Chr(34), iPosition:=3) + clsVarnamesVectorPT.AddParameter("Cd", Chr(34) & "Cd" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPT.AddParameter("Cd", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsDataFunctionPT.RemoveParameterByName("n") + clsDataFunctionPT.RemoveParameterByName("Rs") + clsVarnamesVectorPT.RemoveParameterByName("n") + clsVarnamesVectorPT.RemoveParameterByName("Rs") + End If + End Sub + + Private Sub ucrInputSolar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSolar.ControlValueChanged + Solar() End Sub Private Sub ucrPnlMethod_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlMethod.ControlContentsChanged, ucrNewColName.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverTmax.ControlContentsChanged, ucrReceiverTmin.ControlContentsChanged, ucrReceiverHumidityMax.ControlContentsChanged, ucrReceiverHumidityMin.ControlContentsChanged, ucrReceiverRadiation.ControlContentsChanged, ucrReceiverWindSpeed.ControlContentsChanged, ucrInputTimeStep.ControlContentsChanged, ucrChkWind.ControlContentsChanged, ucrChkWind.ControlContentsChanged TestOKEnabled() End Sub + + Private Sub ucrSelectorEvapotranspiration_DataFrameChanged() Handles ucrSelectorEvapotranspiration.DataFrameChanged + Method() + End Sub + + Private Sub ucrSelectorEvapotranspiration_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorEvapotranspiration.ControlValueChanged + ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrNewColName.GetText, strTempDataframe:=ucrSelectorEvapotranspiration.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrNewColName.GetText) + Method() + End Sub + + Private Sub ucrReceiverRadiation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRadiation.ControlValueChanged + Solar() + End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index dad45e187ac..93279b10cc0 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -296,6 +296,12 @@ Form + + sdgPTConstants.vb + + + Form + sdgSummaryThemes.vb @@ -3153,6 +3159,9 @@ sdgPMConstants.vb + + sdgPTConstants.vb + sdgSummaryThemes.vb diff --git a/instat/sdgHSConstants.vb b/instat/sdgHSConstants.vb index 2d01df93a7b..89b4cb866f5 100644 --- a/instat/sdgHSConstants.vb +++ b/instat/sdgHSConstants.vb @@ -17,6 +17,7 @@ Imports instat.Translations Public Class sdgHSConstants Public bFirstLoad As Boolean = True + Private bReset As Boolean = True Public bControlsInitialised As Boolean = False Public clsListFunction As New RFunction Private Sub sdgHSConstants_Load(sender As Object, e As EventArgs) Handles ucrSdgButtons.Load @@ -44,7 +45,9 @@ Public Class sdgHSConstants If Not bControlsInitialised Then InitialiseControls() End If - ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + If bReset Then + ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + End If End Sub End Class \ No newline at end of file diff --git a/instat/sdgPMConstants.vb b/instat/sdgPMConstants.vb index dcfa014003f..eda01891146 100644 --- a/instat/sdgPMConstants.vb +++ b/instat/sdgPMConstants.vb @@ -17,6 +17,7 @@ Imports instat.Translations Public Class sdgPMConstants Public bFirstLoad As Boolean = True + Private bReset As Boolean = True Public bControlsInitialised As Boolean = False Public clsListFunction As New RFunction @@ -60,12 +61,14 @@ Public Class sdgPMConstants If Not bControlsInitialised Then InitialiseControls() End If - ucrNudHeigth.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputSigma.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputSoilFlux.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputAs.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputBS.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + If bReset Then + ucrNudHeigth.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSigma.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSoilFlux.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputAs.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputBS.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + End If End Sub End Class \ No newline at end of file diff --git a/instat/sdgPTConstants.Designer.vb b/instat/sdgPTConstants.Designer.vb new file mode 100644 index 00000000000..6b687eb9083 --- /dev/null +++ b/instat/sdgPTConstants.Designer.vb @@ -0,0 +1,292 @@ + _ +Partial Class sdgPTConstants + Inherits System.Windows.Forms.Form + + 'Form remplace la méthode Dispose pour nettoyer la liste des composants. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Requise par le Concepteur Windows Form + Private components As System.ComponentModel.IContainer + + 'REMARQUE : la procédure suivante est requise par le Concepteur Windows Form + 'Elle peut être modifiée à l'aide du Concepteur Windows Form. + 'Ne la modifiez pas à l'aide de l'éditeur de code. + _ + Private Sub InitializeComponent() + Me.ucrInputAs = New instat.ucrInputTextBox() + Me.ucrInputBS = New instat.ucrInputTextBox() + Me.lblBS = New System.Windows.Forms.Label() + Me.lblAS = New System.Windows.Forms.Label() + Me.ucrInputSoilFlux = New instat.ucrInputTextBox() + Me.ucrInputSolarConstant = New instat.ucrInputTextBox() + Me.ucrInputLambda = New instat.ucrInputTextBox() + Me.ucrInputSigma = New instat.ucrInputTextBox() + Me.lblSoilUnit = New System.Windows.Forms.Label() + Me.lblSoilFlux = New System.Windows.Forms.Label() + Me.lblSigma = New System.Windows.Forms.Label() + Me.lblSolarUnit = New System.Windows.Forms.Label() + Me.lblSigmaUnit = New System.Windows.Forms.Label() + Me.lblAlphaPT = New System.Windows.Forms.Label() + Me.lblLambdaUnit = New System.Windows.Forms.Label() + Me.lblSolarConstant = New System.Windows.Forms.Label() + Me.lblLambda = New System.Windows.Forms.Label() + Me.UcrButtonsSubdialogue1 = New instat.ucrButtonsSubdialogue() + Me.ucrInputAlphaPT = New instat.ucrInputTextBox() + Me.SuspendLayout() + ' + 'ucrInputAs + ' + Me.ucrInputAs.AddQuotesIfUnrecognised = True + Me.ucrInputAs.AutoSize = True + Me.ucrInputAs.IsMultiline = False + Me.ucrInputAs.IsReadOnly = False + Me.ucrInputAs.Location = New System.Drawing.Point(141, 149) + Me.ucrInputAs.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputAs.Name = "ucrInputAs" + Me.ucrInputAs.Size = New System.Drawing.Size(63, 21) + Me.ucrInputAs.TabIndex = 82 + ' + 'ucrInputBS + ' + Me.ucrInputBS.AddQuotesIfUnrecognised = True + Me.ucrInputBS.AutoSize = True + Me.ucrInputBS.IsMultiline = False + Me.ucrInputBS.IsReadOnly = False + Me.ucrInputBS.Location = New System.Drawing.Point(141, 178) + Me.ucrInputBS.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputBS.Name = "ucrInputBS" + Me.ucrInputBS.Size = New System.Drawing.Size(63, 21) + Me.ucrInputBS.TabIndex = 81 + ' + 'lblBS + ' + Me.lblBS.AutoSize = True + Me.lblBS.Location = New System.Drawing.Point(11, 186) + Me.lblBS.Name = "lblBS" + Me.lblBS.Size = New System.Drawing.Size(18, 13) + Me.lblBS.TabIndex = 80 + Me.lblBS.Text = "bs" + ' + 'lblAS + ' + Me.lblAS.AutoSize = True + Me.lblAS.Location = New System.Drawing.Point(11, 153) + Me.lblAS.Name = "lblAS" + Me.lblAS.Size = New System.Drawing.Size(18, 13) + Me.lblAS.TabIndex = 79 + Me.lblAS.Text = "as" + ' + 'ucrInputSoilFlux + ' + Me.ucrInputSoilFlux.AddQuotesIfUnrecognised = True + Me.ucrInputSoilFlux.AutoSize = True + Me.ucrInputSoilFlux.IsMultiline = False + Me.ucrInputSoilFlux.IsReadOnly = False + Me.ucrInputSoilFlux.Location = New System.Drawing.Point(141, 122) + Me.ucrInputSoilFlux.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSoilFlux.Name = "ucrInputSoilFlux" + Me.ucrInputSoilFlux.Size = New System.Drawing.Size(63, 21) + Me.ucrInputSoilFlux.TabIndex = 77 + ' + 'ucrInputSolarConstant + ' + Me.ucrInputSolarConstant.AddQuotesIfUnrecognised = True + Me.ucrInputSolarConstant.AutoSize = True + Me.ucrInputSolarConstant.IsMultiline = False + Me.ucrInputSolarConstant.IsReadOnly = False + Me.ucrInputSolarConstant.Location = New System.Drawing.Point(141, 41) + Me.ucrInputSolarConstant.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSolarConstant.Name = "ucrInputSolarConstant" + Me.ucrInputSolarConstant.Size = New System.Drawing.Size(63, 21) + Me.ucrInputSolarConstant.TabIndex = 76 + ' + 'ucrInputLambda + ' + Me.ucrInputLambda.AddQuotesIfUnrecognised = True + Me.ucrInputLambda.AutoSize = True + Me.ucrInputLambda.IsMultiline = False + Me.ucrInputLambda.IsReadOnly = False + Me.ucrInputLambda.Location = New System.Drawing.Point(141, 11) + Me.ucrInputLambda.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputLambda.Name = "ucrInputLambda" + Me.ucrInputLambda.Size = New System.Drawing.Size(63, 21) + Me.ucrInputLambda.TabIndex = 75 + ' + 'ucrInputSigma + ' + Me.ucrInputSigma.AddQuotesIfUnrecognised = True + Me.ucrInputSigma.AutoSize = True + Me.ucrInputSigma.IsMultiline = False + Me.ucrInputSigma.IsReadOnly = False + Me.ucrInputSigma.Location = New System.Drawing.Point(141, 96) + Me.ucrInputSigma.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSigma.Name = "ucrInputSigma" + Me.ucrInputSigma.Size = New System.Drawing.Size(63, 21) + Me.ucrInputSigma.TabIndex = 74 + ' + 'lblSoilUnit + ' + Me.lblSoilUnit.AutoSize = True + Me.lblSoilUnit.Location = New System.Drawing.Point(219, 126) + Me.lblSoilUnit.Name = "lblSoilUnit" + Me.lblSoilUnit.Size = New System.Drawing.Size(82, 13) + Me.lblSoilUnit.TabIndex = 73 + Me.lblSoilUnit.Text = "MJ.m^-2.day^-1" + ' + 'lblSoilFlux + ' + Me.lblSoilFlux.AutoSize = True + Me.lblSoilFlux.Location = New System.Drawing.Point(11, 127) + Me.lblSoilFlux.Name = "lblSoilFlux" + Me.lblSoilFlux.Size = New System.Drawing.Size(72, 13) + Me.lblSoilFlux.TabIndex = 72 + Me.lblSoilFlux.Text = "Soil Heat Flux" + ' + 'lblSigma + ' + Me.lblSigma.AutoSize = True + Me.lblSigma.Location = New System.Drawing.Point(11, 101) + Me.lblSigma.Name = "lblSigma" + Me.lblSigma.Size = New System.Drawing.Size(36, 13) + Me.lblSigma.TabIndex = 71 + Me.lblSigma.Text = "Sigma" + ' + 'lblSolarUnit + ' + Me.lblSolarUnit.AutoSize = True + Me.lblSolarUnit.Location = New System.Drawing.Point(219, 45) + Me.lblSolarUnit.Name = "lblSolarUnit" + Me.lblSolarUnit.Size = New System.Drawing.Size(81, 13) + Me.lblSolarUnit.TabIndex = 69 + Me.lblSolarUnit.Text = "MJ.m^-2.min^-1" + ' + 'lblSigmaUnit + ' + Me.lblSigmaUnit.AutoSize = True + Me.lblSigmaUnit.Location = New System.Drawing.Point(219, 100) + Me.lblSigmaUnit.Name = "lblSigmaUnit" + Me.lblSigmaUnit.Size = New System.Drawing.Size(107, 13) + Me.lblSigmaUnit.TabIndex = 68 + Me.lblSigmaUnit.Text = "MJ.K^-4.m^-2.day^-1" + ' + 'lblAlphaPT + ' + Me.lblAlphaPT.AutoSize = True + Me.lblAlphaPT.Location = New System.Drawing.Point(11, 73) + Me.lblAlphaPT.Name = "lblAlphaPT" + Me.lblAlphaPT.Size = New System.Drawing.Size(48, 13) + Me.lblAlphaPT.TabIndex = 67 + Me.lblAlphaPT.Text = "AlphaPT" + ' + 'lblLambdaUnit + ' + Me.lblLambdaUnit.AutoSize = True + Me.lblLambdaUnit.Location = New System.Drawing.Point(219, 15) + Me.lblLambdaUnit.Name = "lblLambdaUnit" + Me.lblLambdaUnit.Size = New System.Drawing.Size(51, 13) + Me.lblLambdaUnit.TabIndex = 66 + Me.lblLambdaUnit.Text = "MJ.kg^-1" + ' + 'lblSolarConstant + ' + Me.lblSolarConstant.AutoSize = True + Me.lblSolarConstant.Location = New System.Drawing.Point(11, 46) + Me.lblSolarConstant.Name = "lblSolarConstant" + Me.lblSolarConstant.Size = New System.Drawing.Size(101, 13) + Me.lblSolarConstant.TabIndex = 65 + Me.lblSolarConstant.Text = "Solar Constant(Gsc)" + ' + 'lblLambda + ' + Me.lblLambda.AutoSize = True + Me.lblLambda.Location = New System.Drawing.Point(11, 16) + Me.lblLambda.Name = "lblLambda" + Me.lblLambda.Size = New System.Drawing.Size(45, 13) + Me.lblLambda.TabIndex = 64 + Me.lblLambda.Text = "Lambda" + ' + 'UcrButtonsSubdialogue1 + ' + Me.UcrButtonsSubdialogue1.AutoSize = True + Me.UcrButtonsSubdialogue1.Location = New System.Drawing.Point(34, 207) + Me.UcrButtonsSubdialogue1.Margin = New System.Windows.Forms.Padding(4) + Me.UcrButtonsSubdialogue1.Name = "UcrButtonsSubdialogue1" + Me.UcrButtonsSubdialogue1.Size = New System.Drawing.Size(259, 29) + Me.UcrButtonsSubdialogue1.TabIndex = 63 + ' + 'ucrInputAlphaPT + ' + Me.ucrInputAlphaPT.AddQuotesIfUnrecognised = True + Me.ucrInputAlphaPT.AutoSize = True + Me.ucrInputAlphaPT.IsMultiline = False + Me.ucrInputAlphaPT.IsReadOnly = False + Me.ucrInputAlphaPT.Location = New System.Drawing.Point(141, 69) + Me.ucrInputAlphaPT.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputAlphaPT.Name = "ucrInputAlphaPT" + Me.ucrInputAlphaPT.Size = New System.Drawing.Size(63, 21) + Me.ucrInputAlphaPT.TabIndex = 83 + ' + 'sdgPTConstants + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(325, 246) + Me.Controls.Add(Me.ucrInputAlphaPT) + Me.Controls.Add(Me.ucrInputAs) + Me.Controls.Add(Me.ucrInputBS) + Me.Controls.Add(Me.lblBS) + Me.Controls.Add(Me.lblAS) + Me.Controls.Add(Me.ucrInputSoilFlux) + Me.Controls.Add(Me.ucrInputSolarConstant) + Me.Controls.Add(Me.ucrInputLambda) + Me.Controls.Add(Me.ucrInputSigma) + Me.Controls.Add(Me.lblSoilUnit) + Me.Controls.Add(Me.lblSoilFlux) + Me.Controls.Add(Me.lblSigma) + Me.Controls.Add(Me.lblSolarUnit) + Me.Controls.Add(Me.lblSigmaUnit) + Me.Controls.Add(Me.lblAlphaPT) + Me.Controls.Add(Me.lblLambdaUnit) + Me.Controls.Add(Me.lblSolarConstant) + Me.Controls.Add(Me.lblLambda) + Me.Controls.Add(Me.UcrButtonsSubdialogue1) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "sdgPTConstants" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Priestley Taylor Constants" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrInputAs As ucrInputTextBox + Friend WithEvents ucrInputBS As ucrInputTextBox + Friend WithEvents lblBS As Label + Friend WithEvents lblAS As Label + Friend WithEvents ucrInputSoilFlux As ucrInputTextBox + Friend WithEvents ucrInputSolarConstant As ucrInputTextBox + Friend WithEvents ucrInputLambda As ucrInputTextBox + Friend WithEvents ucrInputSigma As ucrInputTextBox + Friend WithEvents lblSoilUnit As Label + Friend WithEvents lblSoilFlux As Label + Friend WithEvents lblSigma As Label + Friend WithEvents lblSolarUnit As Label + Friend WithEvents lblSigmaUnit As Label + Friend WithEvents lblAlphaPT As Label + Friend WithEvents lblLambdaUnit As Label + Friend WithEvents lblSolarConstant As Label + Friend WithEvents lblLambda As Label + Friend WithEvents UcrButtonsSubdialogue1 As ucrButtonsSubdialogue + Friend WithEvents ucrInputAlphaPT As ucrInputTextBox +End Class diff --git a/instat/sdgPTConstants.resx b/instat/sdgPTConstants.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgPTConstants.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgPTConstants.vb b/instat/sdgPTConstants.vb new file mode 100644 index 00000000000..ba64a36a722 --- /dev/null +++ b/instat/sdgPTConstants.vb @@ -0,0 +1,74 @@ +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . + +Imports instat.Translations +Public Class sdgPTConstants + Public bFirstLoad As Boolean = True + Private bReset As Boolean = True + Public bControlsInitialised As Boolean = False + Public clsListFunction As New RFunction + + Private Sub sdgPTConstants_Load(sender As Object, e As EventArgs) Handles UcrButtonsSubdialogue1.Load + autoTranslate(Me) + End Sub + + Private Sub InitialiseControls() + ucrInputLambda.SetParameter(New RParameter("lambda", 1)) + ucrInputLambda.AddQuotesIfUnrecognised = False + ucrInputLambda.SetLinkedDisplayControl(lblLambda) + + ucrInputSigma.SetParameter(New RParameter("sigma", 4)) + ucrInputSigma.AddQuotesIfUnrecognised = False + + ucrInputSolarConstant.SetParameter(New RParameter("Gsc", 3)) + ucrInputSolarConstant.AddQuotesIfUnrecognised = False + ucrInputSolarConstant.SetLinkedDisplayControl(lblSolarConstant) + + ucrInputAlphaPT.SetParameter(New RParameter("alphaPT", 5)) + ucrInputAlphaPT.AddQuotesIfUnrecognised = False + ucrInputAlphaPT.SetLinkedDisplayControl(lblAlphaPT) + + ucrInputSoilFlux.SetParameter(New RParameter("G", 6)) + ucrInputSoilFlux.AddQuotesIfUnrecognised = False + ucrInputSoilFlux.SetLinkedDisplayControl(lblSoilFlux) + + ucrInputAs.SetParameter(New RParameter("as", 7)) + ucrInputAs.AddQuotesIfUnrecognised = False + ucrInputAs.SetLinkedDisplayControl(lblAS) + + ucrInputBS.SetParameter(New RParameter("bs", 8)) + ucrInputBS.AddQuotesIfUnrecognised = False + ucrInputBS.SetLinkedDisplayControl(lblBS) + + bControlsInitialised = True + End Sub + + Public Sub SetRFunction(clsNewListFunction As RFunction, Optional bReset As Boolean = False) + clsListFunction = clsNewListFunction + If Not bControlsInitialised Then + InitialiseControls() + End If + If bReset Then + ucrInputAlphaPT.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSigma.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSoilFlux.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputAs.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputBS.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + End If + End Sub +End Class \ No newline at end of file From bed39e238fb13c94bd620e7f75a625fec0333eb1 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Fri, 21 Jul 2023 16:10:35 +0100 Subject: [PATCH 19/48] minor changes --- instat/dlgEvapotranspiration.vb | 14 ++++++------- instat/sdgHSConstants.vb | 8 ++----- instat/sdgLocation.vb | 37 +++++++++++++++++++++++++++++---- instat/sdgPMConstants.vb | 16 +++++++------- instat/sdgPTConstants.vb | 16 +++++++------- 5 files changed, 56 insertions(+), 35 deletions(-) diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index 52aa70e90b5..dc95dd884ff 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -256,10 +256,6 @@ Public Class dlgEvapotranspiration clsListFunction.ClearParameters() clsListFunction.SetRCommand("list") - clsListFunction.AddParameter("Elev", 0, iPosition:=0) - clsListFunction.AddParameter("lambda", 2.54, iPosition:=1) - clsListFunction.AddParameter("lat_rad", 0, iPosition:=2) - clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) clsListFunction.SetAssignTo("constants") clsETPenmanMonteith.SetPackageName("Evapotranspiration") @@ -300,7 +296,6 @@ Public Class dlgEvapotranspiration ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) ucrBase.clsRsyntax.AddToBeforeCodes(clsListFunction, iPosition:=1) - Constants() End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -332,7 +327,6 @@ Public Class dlgEvapotranspiration If bReset Then ucrInputSolar.SetRCode(clsETPenmanMonteith, bReset) End If - Constants() End Sub Private Sub TestOKEnabled() @@ -404,7 +398,7 @@ Public Class dlgEvapotranspiration End Sub Private Sub cmdLocation_Click(sender As Object, e As EventArgs) Handles cmdLocation.Click - sdgLocation.SetRFunction(clsNewVarnamesVectorHS:=clsVarnamesVectorHS, clsNewVarnamesVectorPM:=clsVarnamesVectorPM, clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) + sdgLocation.SetRFunction(clsNewVarnamesVectorHS:=clsVarnamesVectorHS, clsNewVarnamesVectorPM:=clsVarnamesVectorPM, clsNewVarnamesVectorPT:=clsVarnamesVectorPT, clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) sdgLocation.ShowDialog() bResetSubdialog = False TestOKEnabled() @@ -509,8 +503,12 @@ Public Class dlgEvapotranspiration clsListFunction.AddParameter("G", 0, iPosition:=6) clsListFunction.AddParameter("as", 0.25, iPosition:=7) clsListFunction.AddParameter("bs", 0.5, iPosition:=8) + clsListFunction.AddParameter("lambda", 2.54, iPosition:=1) + clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) clsListFunction.RemoveParameterByName("alphaPT") ElseIf rdoHargreavesSamani.Checked Then + clsListFunction.AddParameter("lambda", 2.54, iPosition:=1) + clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) clsListFunction.RemoveParameterByName("alphaPT") clsListFunction.RemoveParameterByName("sigma") clsListFunction.RemoveParameterByName("z") @@ -518,6 +516,8 @@ Public Class dlgEvapotranspiration clsListFunction.RemoveParameterByName("as") clsListFunction.RemoveParameterByName("bs") Else + clsListFunction.AddParameter("lambda", 2.54, iPosition:=1) + clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5) clsListFunction.AddParameter("G", 0, iPosition:=6) clsListFunction.AddParameter("as", 0.25, iPosition:=7) diff --git a/instat/sdgHSConstants.vb b/instat/sdgHSConstants.vb index 89b4cb866f5..6188e66cd4c 100644 --- a/instat/sdgHSConstants.vb +++ b/instat/sdgHSConstants.vb @@ -29,12 +29,10 @@ Public Class sdgHSConstants ucrInputLambda.AddQuotesIfUnrecognised = False 'ucrInputLambda.IsReadOnly = True ucrInputLambda.SetLinkedDisplayControl(lbllambda) - 'ucrInputLambda.SetRDefault(2.45) ucrInputSolarConstant.SetParameter(New RParameter("Gsc", 3)) ucrInputSolarConstant.AddQuotesIfUnrecognised = False ucrInputSolarConstant.SetLinkedDisplayControl(lblSolarConstant) - 'ucrInputSolarConstant.SetRDefault(0.082) bControlsInitialised = True End Sub @@ -45,9 +43,7 @@ Public Class sdgHSConstants If Not bControlsInitialised Then InitialiseControls() End If - If bReset Then - ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - End If + ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) End Sub End Class \ No newline at end of file diff --git a/instat/sdgLocation.vb b/instat/sdgLocation.vb index 13d078fc047..527dbc15cad 100644 --- a/instat/sdgLocation.vb +++ b/instat/sdgLocation.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class sdgLocation Private bFirstLoad As Boolean = True Private bControlsInitialised As Boolean = False - Private clsVarnamesVectorPM, clsVarnamesVectorHS, clsListFunction As New RFunction + Private clsVarnamesVectorPM, clsVarnamesVectorHS, clsVarnamesVectorPT, clsListFunction As New RFunction Private Sub sdgLocation_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -28,6 +28,9 @@ Public Class sdgLocation EnableDesableSelector() bFirstLoad = False End If + + SetDefaults() + End Sub Private Sub InitialiseDialog() @@ -73,11 +76,15 @@ Public Class sdgLocation bControlsInitialised = True End Sub - - Public Sub SetRFunction(clsNewVarnamesVectorHS As RFunction, clsNewVarnamesVectorPM As RFunction, clsNewListFunction As RFunction, Optional bReset As Boolean = False) + Private Sub SetDefaults() + clsListFunction.AddParameter("Elev", 0, iPosition:=0) + clsListFunction.AddParameter("lat_rad", 0, iPosition:=2) + End Sub + Public Sub SetRFunction(clsNewVarnamesVectorHS As RFunction, clsNewVarnamesVectorPM As RFunction, clsNewListFunction As RFunction, clsNewVarnamesVectorPT As RFunction, Optional bReset As Boolean = False) clsListFunction = clsNewListFunction clsVarnamesVectorPM = clsNewVarnamesVectorPM clsVarnamesVectorHS = clsNewVarnamesVectorHS + clsVarnamesVectorPM = clsNewVarnamesVectorPT If Not bControlsInitialised Then InitialiseDialog() @@ -85,6 +92,10 @@ Public Class sdgLocation ucrReceiverLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorHS, New RParameter("lon", 3), iAdditionalPairNo:=1) ucrInputLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorHS, New RParameter("lon", 3), iAdditionalPairNo:=1) + ucrReceiverLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorPT, New RParameter("lon", 3), iAdditionalPairNo:=2) + ucrInputLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorPT, New RParameter("lon", 3), iAdditionalPairNo:=2) + ucrSelectorLocation.AddAdditionalCodeParameterPair(clsVarnamesVectorHS, New RParameter("data", 0), iAdditionalPairNo:=1) + ucrSelectorLocation.AddAdditionalCodeParameterPair(clsVarnamesVectorPT, New RParameter("data", 0), iAdditionalPairNo:=2) ucrSelectorLocation.SetRCode(clsVarnamesVectorPM, bReset, bCloneIfNeeded:=True) ucrReceiverStation.SetRCode(clsVarnamesVectorPM, bReset, bCloneIfNeeded:=True) @@ -115,11 +126,29 @@ Public Class sdgLocation EnableDesableSelector() End Sub - Private Sub ucrInputElevation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputElevation.ControlValueChanged, ucrInputLatitude.ControlValueChanged, ucrInputLongitude.ControlValueChanged + Private Sub ucrInputElevation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputElevation.ControlValueChanged EnableDesableSelector() + If Not ucrInputElevation.IsEmpty Then + clsListFunction.AddParameter("Elev", ucrInputElevation.GetText(), iPosition:=0) + Else + clsListFunction.RemoveParameterByName("Elev") + End If End Sub Private Sub ucrSelectorLocation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorLocation.ControlValueChanged EnableDesableSelector() End Sub + + Private Sub ucrInputLatitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLatitude.ControlValueChanged + EnableDesableSelector() + If Not ucrInputLatitude.IsEmpty Then + clsListFunction.AddParameter("lat_rad", ucrInputLatitude.GetText(), iPosition:=2) + Else + clsListFunction.RemoveParameterByName("lat_rad") + End If + End Sub + + Private Sub ucrInputLongitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLongitude.ControlValueChanged + EnableDesableSelector() + End Sub End Class \ No newline at end of file diff --git a/instat/sdgPMConstants.vb b/instat/sdgPMConstants.vb index eda01891146..27946723592 100644 --- a/instat/sdgPMConstants.vb +++ b/instat/sdgPMConstants.vb @@ -61,14 +61,12 @@ Public Class sdgPMConstants If Not bControlsInitialised Then InitialiseControls() End If - If bReset Then - ucrNudHeigth.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputSigma.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputSoilFlux.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputAs.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputBS.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - End If + ucrNudHeigth.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSigma.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSoilFlux.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputAs.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputBS.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) End Sub End Class \ No newline at end of file diff --git a/instat/sdgPTConstants.vb b/instat/sdgPTConstants.vb index ba64a36a722..03bb78e22e2 100644 --- a/instat/sdgPTConstants.vb +++ b/instat/sdgPTConstants.vb @@ -61,14 +61,12 @@ Public Class sdgPTConstants If Not bControlsInitialised Then InitialiseControls() End If - If bReset Then - ucrInputAlphaPT.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputSigma.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputSoilFlux.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputAs.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputBS.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - End If + ucrInputAlphaPT.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSigma.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSoilFlux.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputAs.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrInputBS.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) End Sub End Class \ No newline at end of file From 108ea0432a9f20ef13da2fb5263ed368ad8c58f0 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 26 Jul 2023 14:57:37 +0100 Subject: [PATCH 20/48] minor change --- instat/dlgEvapotranspiration.vb | 4 +++- instat/sdgLocation.vb | 13 +++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index dc95dd884ff..97c7c35c0ff 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -241,7 +241,6 @@ Public Class dlgEvapotranspiration clsVarnamesVectorPM.AddParameter("Tmin", Chr(34) & "Tmin" & Chr(34), bIncludeArgumentName:=False) clsVarnamesVectorPM.AddParameter("RHmax", Chr(34) & "RHmax" & Chr(34), bIncludeArgumentName:=False) clsVarnamesVectorPM.AddParameter("RHmin", Chr(34) & "RHmin" & Chr(34), bIncludeArgumentName:=False) - clsVarnamesVectorPM.AddParameter("lon", 0, iPosition:=3) clsVarnamesVectorHS.SetRCommand("c") clsVarnamesVectorHS.AddParameter("Tmax", Chr(34) & "Tmax" & Chr(34), bIncludeArgumentName:=False) @@ -498,6 +497,7 @@ Public Class dlgEvapotranspiration Private Sub Constants() If rdoPenmanMonteith.Checked Then + clsVarnamesVectorPM.RemoveParameterByName("lon") clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5) clsListFunction.AddParameter("z", 2, iPosition:=4) clsListFunction.AddParameter("G", 0, iPosition:=6) @@ -507,6 +507,7 @@ Public Class dlgEvapotranspiration clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) clsListFunction.RemoveParameterByName("alphaPT") ElseIf rdoHargreavesSamani.Checked Then + clsVarnamesVectorHS.RemoveParameterByName("lon") clsListFunction.AddParameter("lambda", 2.54, iPosition:=1) clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) clsListFunction.RemoveParameterByName("alphaPT") @@ -516,6 +517,7 @@ Public Class dlgEvapotranspiration clsListFunction.RemoveParameterByName("as") clsListFunction.RemoveParameterByName("bs") Else + clsVarnamesVectorPT.RemoveParameterByName("lon") clsListFunction.AddParameter("lambda", 2.54, iPosition:=1) clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5) diff --git a/instat/sdgLocation.vb b/instat/sdgLocation.vb index 527dbc15cad..b605087a20b 100644 --- a/instat/sdgLocation.vb +++ b/instat/sdgLocation.vb @@ -28,9 +28,6 @@ Public Class sdgLocation EnableDesableSelector() bFirstLoad = False End If - - SetDefaults() - End Sub Private Sub InitialiseDialog() @@ -52,6 +49,7 @@ Public Class sdgLocation ucrInputLatitude.SetParameter(New RParameter("lat_rad", 2)) ucrInputLatitude.AddQuotesIfUnrecognised = False ucrInputLatitude.SetLinkedDisplayControl(lblLatitude) + ucrInputLatitude.SetRDefault("0") ucrReceiverLongitude.SetParameter(New RParameter("lon", 3)) ucrReceiverLongitude.SetParameterIsRFunction() @@ -73,13 +71,11 @@ Public Class sdgLocation ucrInputElevation.SetParameter(New RParameter("Elev", 4)) ucrInputElevation.AddQuotesIfUnrecognised = False ucrInputElevation.SetLinkedDisplayControl(lblLatitude) + ucrInputElevation.SetRDefault("0") bControlsInitialised = True End Sub - Private Sub SetDefaults() - clsListFunction.AddParameter("Elev", 0, iPosition:=0) - clsListFunction.AddParameter("lat_rad", 0, iPosition:=2) - End Sub + Public Sub SetRFunction(clsNewVarnamesVectorHS As RFunction, clsNewVarnamesVectorPM As RFunction, clsNewListFunction As RFunction, clsNewVarnamesVectorPT As RFunction, Optional bReset As Boolean = False) clsListFunction = clsNewListFunction clsVarnamesVectorPM = clsNewVarnamesVectorPM @@ -94,14 +90,11 @@ Public Class sdgLocation ucrInputLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorHS, New RParameter("lon", 3), iAdditionalPairNo:=1) ucrReceiverLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorPT, New RParameter("lon", 3), iAdditionalPairNo:=2) ucrInputLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorPT, New RParameter("lon", 3), iAdditionalPairNo:=2) - ucrSelectorLocation.AddAdditionalCodeParameterPair(clsVarnamesVectorHS, New RParameter("data", 0), iAdditionalPairNo:=1) - ucrSelectorLocation.AddAdditionalCodeParameterPair(clsVarnamesVectorPT, New RParameter("data", 0), iAdditionalPairNo:=2) ucrSelectorLocation.SetRCode(clsVarnamesVectorPM, bReset, bCloneIfNeeded:=True) ucrReceiverStation.SetRCode(clsVarnamesVectorPM, bReset, bCloneIfNeeded:=True) ucrReceiverLatitude.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) ucrReceiverAltitude.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrReceiverLongitude.SetRCode(clsVarnamesVectorPM, bReset, bCloneIfNeeded:=True) If bReset Then ucrInputElevation.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) From 7f2e032e3e3c594bfbe27529498aa8ceabccb46f Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 22 Nov 2023 13:32:35 +0100 Subject: [PATCH 21/48] minor change --- instat/dlgEvapotranspiration.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index 97c7c35c0ff..0178401c091 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -503,7 +503,7 @@ Public Class dlgEvapotranspiration clsListFunction.AddParameter("G", 0, iPosition:=6) clsListFunction.AddParameter("as", 0.25, iPosition:=7) clsListFunction.AddParameter("bs", 0.5, iPosition:=8) - clsListFunction.AddParameter("lambda", 2.54, iPosition:=1) + clsListFunction.AddParameter("lambda", 2.45, iPosition:=1) clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) clsListFunction.RemoveParameterByName("alphaPT") ElseIf rdoHargreavesSamani.Checked Then From d8b6c4cdbf17cc7ac2b3b31eca7d73e2453684bb Mon Sep 17 00:00:00 2001 From: n-thony Date: Thu, 14 Dec 2023 10:18:46 +0300 Subject: [PATCH 22/48] added key --- instat/dlgUnstack.vb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/instat/dlgUnstack.vb b/instat/dlgUnstack.vb index da19bceda13..840ee305df4 100644 --- a/instat/dlgUnstack.vb +++ b/instat/dlgUnstack.vb @@ -26,6 +26,7 @@ Public Class dlgUnstack Private clsDummyCarryFunction As New RFunction Private clsHierachyFunction As New RFunction Private clsSelectDataFunction As New RFunction + Private clsAddKeyFunction As New RFunction Private clsUnstackedOperator, clsCommaOperator, clsformulaOperator, clspipeOperator As New ROperator Private clsDcastFunction As New RFunction Private clsBaseRCode As New RCodeStructure @@ -124,6 +125,7 @@ Public Class dlgUnstack clsformulaOperator = New ROperator clsDummyFunction = New RFunction clsDummyCarryFunction = New RFunction + clsAddKeyFunction = New RFunction clsDummyCarryFunction.AddParameter("checked", "FALSE", iPosition:=0) @@ -133,6 +135,10 @@ Public Class dlgUnstack ucrSelectorForUnstack.Reset() ucrNewDFName.Reset() + + clsAddKeyFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_key") + clsAddKeyFunction.AddParameter("key_name", "key", iPosition:=2) + ' Operations clsformulaOperator.SetOperation("~") clsformulaOperator.bBrackets = False @@ -172,9 +178,10 @@ Public Class dlgUnstack End Sub Private Sub SetRCodeforControls(bReset As Boolean) - ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsformulaOperator, New RParameter("right", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) - ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsCommaOperator, New RParameter("x", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=2) - ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsSelectDataFunction, New RParameter("factor", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=3) + ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsAddKeyFunction, New RParameter("col_names", 1), iAdditionalPairNo:=1) + ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsformulaOperator, New RParameter("right", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=2) + ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsCommaOperator, New RParameter("x", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=3) + ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsSelectDataFunction, New RParameter("factor", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=4) ucrNewDFName.AddAdditionalRCode(clsUnstackedOperator, iAdditionalPairNo:=1) ucrPnlUnstackCol.SetRCode(clsDummyFunction, bReset) @@ -345,6 +352,7 @@ Public Class dlgUnstack clsBaseRCode = clsUnstackedOperator clsDummyFunction.AddParameter("checked", "hierarchy", iPosition:=0) ucrBase.clsRsyntax.SetBaseROperator(clsUnstackedOperator) + ucrBase.clsRsyntax.AddToAfterCodes(clsAddKeyFunction, 0) clsDcastFunction.RemoveAssignTo() End If ucrNewDFName.SetRCode(clsBaseRCode) From df8084e86544d44e6296b8de48e5d29892fe5855 Mon Sep 17 00:00:00 2001 From: n-thony Date: Thu, 14 Dec 2023 11:30:37 +0300 Subject: [PATCH 23/48] added the link --- instat/dlgUnstack.vb | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/instat/dlgUnstack.vb b/instat/dlgUnstack.vb index 840ee305df4..2e4b939f2b7 100644 --- a/instat/dlgUnstack.vb +++ b/instat/dlgUnstack.vb @@ -26,7 +26,7 @@ Public Class dlgUnstack Private clsDummyCarryFunction As New RFunction Private clsHierachyFunction As New RFunction Private clsSelectDataFunction As New RFunction - Private clsAddKeyFunction As New RFunction + Private clsAddKeyFunction, clsAddLinkFunction As New RFunction Private clsUnstackedOperator, clsCommaOperator, clsformulaOperator, clspipeOperator As New ROperator Private clsDcastFunction As New RFunction Private clsBaseRCode As New RCodeStructure @@ -126,6 +126,7 @@ Public Class dlgUnstack clsDummyFunction = New RFunction clsDummyCarryFunction = New RFunction clsAddKeyFunction = New RFunction + clsAddLinkFunction = New RFunction clsDummyCarryFunction.AddParameter("checked", "FALSE", iPosition:=0) @@ -135,9 +136,11 @@ Public Class dlgUnstack ucrSelectorForUnstack.Reset() ucrNewDFName.Reset() - clsAddKeyFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_key") - clsAddKeyFunction.AddParameter("key_name", "key", iPosition:=2) + clsAddKeyFunction.AddParameter("key_name", Chr(34) & "key" & Chr(34), iPosition:=2) + + clsAddLinkFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_link") + clsAddLinkFunction.AddParameter("type", Chr(34) & "keyed_link" & Chr(34), iPosition:=3) ' Operations clsformulaOperator.SetOperation("~") @@ -178,10 +181,9 @@ Public Class dlgUnstack End Sub Private Sub SetRCodeforControls(bReset As Boolean) - ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsAddKeyFunction, New RParameter("col_names", 1), iAdditionalPairNo:=1) - ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsformulaOperator, New RParameter("right", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=2) - ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsCommaOperator, New RParameter("x", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=3) - ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsSelectDataFunction, New RParameter("factor", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=4) + ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsformulaOperator, New RParameter("right", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsCommaOperator, New RParameter("x", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=2) + ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsSelectDataFunction, New RParameter("factor", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=3) ucrNewDFName.AddAdditionalRCode(clsUnstackedOperator, iAdditionalPairNo:=1) ucrPnlUnstackCol.SetRCode(clsDummyFunction, bReset) @@ -276,6 +278,7 @@ Public Class dlgUnstack Private Sub ucrSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorForUnstack.ControlValueChanged NewDefaultName() AddRemoveDataOrPipeOperator() + clsAddLinkFunction.AddParameter("from_data_frame", Chr(34) & ucrSelectorForUnstack.strCurrentDataFrame & Chr(34), iPosition:=0) End Sub Private Sub SetFormula() @@ -319,7 +322,7 @@ Public Class dlgUnstack For Each strcolumn In ucrReceiverCarryColumns.GetVariableNamesAsList If Not ucrMultipleColumnsReceiver.GetVariableNamesAsList.Contains(strcolumn) Then clsTempCommaOperator.AddParameter(strcolumn, strcolumn, iPosition:=iposition) - iposition = iposition + 1 + iposition += 1 End If Next clsSelectDataFunction.AddParameter("comma", clsROperatorParameter:=clsTempCommaOperator, iPosition:=3, bIncludeArgumentName:=False) @@ -339,23 +342,37 @@ Public Class dlgUnstack CarryColumnsParameter() End Sub - Private Sub ucrPnlUnstackCol_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlUnstackCol.ControlValueChanged + Private Sub ucrPnlUnstackCol_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlUnstackCol.ControlValueChanged, ucrReceiverFactorToUnstackby.ControlValueChanged + ucrNewDFName.SetRCode(clsBaseRCode) + If rdoSingle.Checked OrElse rdoMultiple.Checked Then clsBaseRCode = clsDcastFunction ucrBase.clsRsyntax.SetBaseRFunction(clsDcastFunction) + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsAddKeyFunction) + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsAddLinkFunction) If rdoSingle.Checked Then clsDummyFunction.AddParameter("checked", "single", iPosition:=0) ElseIf rdoMultiple.Checked Then clsDummyFunction.AddParameter("checked", "multiple", iPosition:=0) End If ElseIf rdoRestoreHierarchy.Checked Then + ucrReceiverFactorToUnstackby.bWithQuotes = True clsBaseRCode = clsUnstackedOperator clsDummyFunction.AddParameter("checked", "hierarchy", iPosition:=0) ucrBase.clsRsyntax.SetBaseROperator(clsUnstackedOperator) - ucrBase.clsRsyntax.AddToAfterCodes(clsAddKeyFunction, 0) + Dim strDataFrame = ucrNewDFName.GetText + If Not String.IsNullOrEmpty(strDataFrame) Then + clsAddKeyFunction.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34), iPosition:=0) + clsAddKeyFunction.AddParameter("col_names", ucrReceiverFactorToUnstackby.GetVariableNames(), iPosition:=1) + clsAddLinkFunction.AddParameter("to_data_frame", Chr(34) & strDataFrame & Chr(34), iPosition:=1) + clsAddLinkFunction.AddParameter("link_pairs", "names(" & ucrReceiverFactorToUnstackby.GetVariableNames() & ")", iPosition:=2) + clsAddKeyFunction.iCallType = 0 + clsAddLinkFunction.iCallType = 0 + ucrBase.clsRsyntax.AddToAfterCodes(clsAddKeyFunction, 0) + ucrBase.clsRsyntax.AddToAfterCodes(clsAddLinkFunction, 1) + End If clsDcastFunction.RemoveAssignTo() End If - ucrNewDFName.SetRCode(clsBaseRCode) CarryColumnsLabelReceiverLocation() SetFormula() ValuesfillParameter() From 10f9c47f5edd098f6ad5a882d15e9a530b5c5465 Mon Sep 17 00:00:00 2001 From: n-thony Date: Thu, 14 Dec 2023 11:51:57 +0300 Subject: [PATCH 24/48] minor bug fix --- instat/dlgUnstack.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/dlgUnstack.vb b/instat/dlgUnstack.vb index 2e4b939f2b7..24b88a083a7 100644 --- a/instat/dlgUnstack.vb +++ b/instat/dlgUnstack.vb @@ -365,7 +365,9 @@ Public Class dlgUnstack clsAddKeyFunction.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34), iPosition:=0) clsAddKeyFunction.AddParameter("col_names", ucrReceiverFactorToUnstackby.GetVariableNames(), iPosition:=1) clsAddLinkFunction.AddParameter("to_data_frame", Chr(34) & strDataFrame & Chr(34), iPosition:=1) - clsAddLinkFunction.AddParameter("link_pairs", "names(" & ucrReceiverFactorToUnstackby.GetVariableNames() & ")", iPosition:=2) + Dim strLinkPair As String = "c(" & ucrReceiverFactorToUnstackby.GetVariableNames(False) & "=" & + ucrReceiverFactorToUnstackby.GetVariableNames() & ")" + clsAddLinkFunction.AddParameter("link_pairs", strLinkPair, iPosition:=2) clsAddKeyFunction.iCallType = 0 clsAddLinkFunction.iCallType = 0 ucrBase.clsRsyntax.AddToAfterCodes(clsAddKeyFunction, 0) From 1392b3c6ad337ba6cc1efe6773725c70359a1c37 Mon Sep 17 00:00:00 2001 From: n-thony Date: Thu, 14 Dec 2023 13:38:10 +0300 Subject: [PATCH 25/48] minor change --- instat/dlgUnstack.vb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/instat/dlgUnstack.vb b/instat/dlgUnstack.vb index 24b88a083a7..abb6ac882eb 100644 --- a/instat/dlgUnstack.vb +++ b/instat/dlgUnstack.vb @@ -225,7 +225,7 @@ Public Class dlgUnstack clsSelectDataFunction.RemoveParameterByName("single") For Each strMultiple In ucrMultipleColumnsReceiver.GetVariableNamesAsList() clsCommaMultiple.AddParameter(strMultiple, strMultiple, iPosition:=position) - position = position + 1 + position += 1 Next clsSelectDataFunction.AddParameter("Multiple_Values", clsROperatorParameter:=clsCommaMultiple, iPosition:=4, bIncludeArgumentName:=False) clsDcastFunction.AddParameter("values_from", ucrMultipleColumnsReceiver.GetVariableNames(False), iPosition:=2) @@ -290,7 +290,7 @@ Public Class dlgUnstack clsCarryColumnsOperator.AddParameter("factor", ucrReceiverFactorToUnstackby.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) For Each strIndicatorVar As String In ucrReceiverCarryColumns.GetVariableNamesAsList clsCarryColumnsOperator.AddParameter(i, strIndicatorVar, iPosition:=i) - i = i + 1 + i += 1 Next If ucrReceiverCarryColumns.GetVariableNamesAsList.Contains(strcoll) Then clsCarryColumnsOperator.RemoveParameterByName("factor") @@ -368,8 +368,6 @@ Public Class dlgUnstack Dim strLinkPair As String = "c(" & ucrReceiverFactorToUnstackby.GetVariableNames(False) & "=" & ucrReceiverFactorToUnstackby.GetVariableNames() & ")" clsAddLinkFunction.AddParameter("link_pairs", strLinkPair, iPosition:=2) - clsAddKeyFunction.iCallType = 0 - clsAddLinkFunction.iCallType = 0 ucrBase.clsRsyntax.AddToAfterCodes(clsAddKeyFunction, 0) ucrBase.clsRsyntax.AddToAfterCodes(clsAddLinkFunction, 1) End If From 4af0ec6f96a9313bb1cdea9c278f776e5097b592 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 20 Dec 2023 10:19:02 +0100 Subject: [PATCH 26/48] fixed Bug in the Edit Cell dialog --- instat/UserControls/DataGrid/ReoGrid/ucrReoGrid.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrReoGrid.vb index c8c84549d30..3b664233955 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrReoGrid.vb @@ -219,8 +219,8 @@ Public MustInherit Class ucrReoGrid Private Function GetRowIndex(currWorkSheet As Worksheet, strRowName As String) As Integer If currWorkSheet IsNot Nothing Then For i As Integer = 0 To currWorkSheet.Rows - 1 - Dim strCol As String = currWorkSheet.RowHeaders(i).Text - If strCol = strRowName Then + Dim strCol As String = currWorkSheet.RowHeaders(i).Text - 1 + If CInt(strCol) = CInt(strRowName) Then Return i End If Next @@ -234,7 +234,7 @@ Public MustInherit Class ucrReoGrid If strColumnHeader.Contains("(") Then strColumnHeader = strColumnHeader.Split("(")(0) End If - Dim iRowIndex = GetRowIndex(grdData.CurrentWorksheet, iRow) + 1 + Dim iRowIndex = GetRowIndex(grdData.CurrentWorksheet, iRow) If strColumnHeader.Trim = strColumn _ AndAlso iRowIndex > -1 Then Return grdData.CurrentWorksheet(iRowIndex, i).ToString() From 5b8caf70674b80b596a794df827a8e27aec6de53 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 20 Dec 2023 12:07:51 +0100 Subject: [PATCH 27/48] Minor code change --- instat/DlgDefineClimaticData.vb | 13 +- instat/dlgEvapotranspiration.vb | 383 +++++++++--------- instat/sdgHSConstants.vb | 7 +- instat/sdgHSMissingOptions.vb | 18 +- instat/sdgLocation.vb | 48 +-- instat/sdgMissingOptionsEvapotranspiration.vb | 18 +- instat/sdgPMConstants.vb | 6 +- instat/sdgPTConstants.vb | 6 +- 8 files changed, 242 insertions(+), 257 deletions(-) diff --git a/instat/DlgDefineClimaticData.vb b/instat/DlgDefineClimaticData.vb index 2f12a5b87a3..f392852cd60 100644 --- a/instat/DlgDefineClimaticData.vb +++ b/instat/DlgDefineClimaticData.vb @@ -21,11 +21,11 @@ Imports RDotNet Public Class DlgDefineClimaticData Public bFirstLoad As Boolean = True Private bReset As Boolean = True - Dim clsTypesFunction, clsNewTypesFunction As New RFunction - Dim lstReceivers As New List(Of ucrReceiverSingle) - Dim lstNewReceivers As New List(Of ucrReceiverSingle) - Dim lstRecognisedTypes As New List(Of KeyValuePair(Of String, List(Of String))) - Dim lstNewRecognisedTypes As New List(Of KeyValuePair(Of String, List(Of String))) + Private clsTypesFunction, clsNewTypesFunction As New RFunction + Private lstReceivers As New List(Of ucrReceiverSingle) + Private lstNewReceivers As New List(Of ucrReceiverSingle) + Private lstRecognisedTypes As New List(Of KeyValuePair(Of String, List(Of String))) + Private lstNewRecognisedTypes As New List(Of KeyValuePair(Of String, List(Of String))) Private clsDefaultFunction, clsNewDefautFunction As New RFunction Private clsAnyDuplicatesFunction, clsConcFunction, clsNewConcFunction, clsGetColFunction, clsDummyFunction As New RFunction Private strCurrentDataframeName As String @@ -246,7 +246,6 @@ Public Class DlgDefineClimaticData Exit For End If Next - End If Next @@ -355,7 +354,7 @@ Public Class DlgDefineClimaticData bIsUnique = True End Sub - Private Sub ucrReceiverDate_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDate.ControlValueChanged + Private Sub ucrReceiverDate_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDate.ControlValueChanged, ucrReceiverStation.ControlContentsChanged EnableDisableCheckUniqueBtn() If Not ucrReceiverStation.IsEmpty Then clsConcFunction.AddParameter("x1", ucrReceiverStation.GetVariableNames, bIncludeArgumentName:=False) diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index 0178401c091..13e70ffc238 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -24,8 +24,8 @@ Public Class dlgEvapotranspiration Private iSaveMaxY As Integer Private iEvapOptions, iHSConstants, iLocation As Integer Private iHSMissingOptions As Integer - Private clsETPenmanMonteith, clsHargreavesSamani, clsListFunction, clsDataFunctionPM, clsDataFunctionHS, clsDataFunctionPT, clsETPriestleyTaylor, clsReadInputs, clsVector, clsMissingDataVector, clsVarnamesVectorPT, clsVarnamesVectorPM, clsVarnamesVectorHS, clsLibraryEvap As New RFunction - Private clsDayFunc, clsMonthFunc, clsYearFunc As New RFunction + Private clsETPenmanMonteithFunction, clsHargreavesSamaniFunction, clsListFunction, clsDataFunctionPMFunction, clsDataFunctionHSFunction, clsDataFunctionPTFunction, clsETPriestleyTaylorFunction, clsReadInputsFunction, clsVectorFunction, clsMissingDataVectorFunction, clsVarnamesVectorPTFunction, clsVarnamesVectorPMFunction, clsVarnamesVectorHSFunction, clsLibraryEvapFunction As New RFunction + Private clsDayFuncFunction, clsMonthFuncFunction, clsYearFuncFunction As New RFunction Private clsBaseOperator As New ROperator Private Sub dlgEvapotranspiration_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -170,18 +170,18 @@ Public Class dlgEvapotranspiration End Sub Private Sub SetDefaults() - clsETPenmanMonteith = New RFunction - clsHargreavesSamani = New RFunction - clsDataFunctionPM = New RFunction - clsDataFunctionHS = New RFunction - clsDataFunctionPT = New RFunction - clsETPriestleyTaylor = New RFunction + clsETPenmanMonteithFunction = New RFunction + clsHargreavesSamaniFunction = New RFunction + clsDataFunctionPMFunction = New RFunction + clsDataFunctionHSFunction = New RFunction + clsDataFunctionPTFunction = New RFunction + clsETPriestleyTaylorFunction = New RFunction clsBaseOperator = New ROperator - clsReadInputs = New RFunction - clsDayFunc = New RFunction - clsMonthFunc = New RFunction - clsYearFunc = New RFunction - clsLibraryEvap = New RFunction + clsReadInputsFunction = New RFunction + clsDayFuncFunction = New RFunction + clsMonthFuncFunction = New RFunction + clsYearFuncFunction = New RFunction + clsLibraryEvapFunction = New RFunction clsListFunction = New RFunction ucrSelectorEvapotranspiration.Reset() @@ -190,106 +190,106 @@ Public Class dlgEvapotranspiration bResetSubdialog = True - clsDataFunctionPM.SetRCommand("data.frame") - clsDataFunctionPM.AddParameter("Year", clsRFunctionParameter:=clsYearFunc) - clsDataFunctionPM.AddParameter("Month", clsRFunctionParameter:=clsMonthFunc) - clsDataFunctionPM.AddParameter("Day", clsRFunctionParameter:=clsDayFunc) - - clsDataFunctionHS.SetRCommand("data.frame") - clsDataFunctionHS.AddParameter("Year", clsRFunctionParameter:=clsYearFunc) - clsDataFunctionHS.AddParameter("Month", clsRFunctionParameter:=clsMonthFunc) - clsDataFunctionHS.AddParameter("Day", clsRFunctionParameter:=clsDayFunc) - - clsDataFunctionPT.SetRCommand("data.frame") - clsDataFunctionPT.AddParameter("Year", clsRFunctionParameter:=clsYearFunc) - clsDataFunctionPT.AddParameter("Month", clsRFunctionParameter:=clsMonthFunc) - clsDataFunctionPT.AddParameter("Day", clsRFunctionParameter:=clsDayFunc) - - clsDayFunc.SetPackageName("lubridate") - clsDayFunc.SetRCommand("day") - - clsMonthFunc.SetPackageName("lubridate") - clsMonthFunc.SetRCommand("month") - - clsYearFunc.SetRCommand("year") - clsYearFunc.SetPackageName("lubridate") - - clsReadInputs.SetPackageName("Evapotranspiration") - clsReadInputs.SetRCommand("ReadInputs") - clsReadInputs.AddParameter("constants", "constants", iPosition:=2) - clsReadInputs.AddParameter("stopmissing", clsRFunctionParameter:=clsMissingDataVector, iPosition:=3) - clsReadInputs.AddParameter("timestep", Chr(34) & "daily" & Chr(34), iPosition:=4) - clsReadInputs.AddParameter("interp_missing_days", "FALSE", iPosition:=5) - clsReadInputs.AddParameter("interp_missing_entries", "FALSE", iPosition:=6) - clsReadInputs.AddParameter("interp_abnormal", "FALSE", iPosition:=7) - clsReadInputs.AddParameter("abnormal_method", "NULL", iPosition:=9) - clsReadInputs.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorPM, iPosition:=0) - clsReadInputs.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionPM, iPosition:=1) - clsReadInputs.AddParameter("missing_method", Chr(34) & "monthly average" & Chr(34), iPosition:=8) - clsReadInputs.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorPT, iPosition:=10) - clsReadInputs.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionPT, iPosition:=11) - clsReadInputs.SetAssignTo("temp_data") - - clsVarnamesVectorPT.SetRCommand("c") - clsVarnamesVectorPT.AddParameter("Tmax", Chr(34) & "Tmax" & Chr(34), bIncludeArgumentName:=False) - clsVarnamesVectorPT.AddParameter("Tmin", Chr(34) & "Tmin" & Chr(34), bIncludeArgumentName:=False) - clsVarnamesVectorPT.AddParameter("RHmax", Chr(34) & "RHmax" & Chr(34), bIncludeArgumentName:=False) - clsVarnamesVectorPT.AddParameter("RHmin", Chr(34) & "RHmin" & Chr(34), bIncludeArgumentName:=False) - - clsVarnamesVectorPM.SetRCommand("c") - clsVarnamesVectorPM.AddParameter("Tmax", Chr(34) & "Tmax" & Chr(34), bIncludeArgumentName:=False) - clsVarnamesVectorPM.AddParameter("Tmin", Chr(34) & "Tmin" & Chr(34), bIncludeArgumentName:=False) - clsVarnamesVectorPM.AddParameter("RHmax", Chr(34) & "RHmax" & Chr(34), bIncludeArgumentName:=False) - clsVarnamesVectorPM.AddParameter("RHmin", Chr(34) & "RHmin" & Chr(34), bIncludeArgumentName:=False) - - clsVarnamesVectorHS.SetRCommand("c") - clsVarnamesVectorHS.AddParameter("Tmax", Chr(34) & "Tmax" & Chr(34), bIncludeArgumentName:=False) - clsVarnamesVectorHS.AddParameter("Tmin", Chr(34) & "Tmin" & Chr(34), bIncludeArgumentName:=False) - - clsMissingDataVector.SetRCommand("c") - clsMissingDataVector.AddParameter("x", 1, bIncludeArgumentName:=False) - clsMissingDataVector.AddParameter("y", 1, bIncludeArgumentName:=False) - clsMissingDataVector.AddParameter("z", 1, bIncludeArgumentName:=False) - - clsVector.SetRCommand("c") + clsDataFunctionPMFunction.SetRCommand("data.frame") + clsDataFunctionPMFunction.AddParameter("Year", clsRFunctionParameter:=clsYearFuncFunction) + clsDataFunctionPMFunction.AddParameter("Month", clsRFunctionParameter:=clsMonthFuncFunction) + clsDataFunctionPMFunction.AddParameter("Day", clsRFunctionParameter:=clsDayFuncFunction) + + clsDataFunctionHSFunction.SetRCommand("data.frame") + clsDataFunctionHSFunction.AddParameter("Year", clsRFunctionParameter:=clsYearFuncFunction) + clsDataFunctionHSFunction.AddParameter("Month", clsRFunctionParameter:=clsMonthFuncFunction) + clsDataFunctionHSFunction.AddParameter("Day", clsRFunctionParameter:=clsDayFuncFunction) + + clsDataFunctionPTFunction.SetRCommand("data.frame") + clsDataFunctionPTFunction.AddParameter("Year", clsRFunctionParameter:=clsYearFuncFunction) + clsDataFunctionPTFunction.AddParameter("Month", clsRFunctionParameter:=clsMonthFuncFunction) + clsDataFunctionPTFunction.AddParameter("Day", clsRFunctionParameter:=clsDayFuncFunction) + + clsDayFuncFunction.SetPackageName("lubridate") + clsDayFuncFunction.SetRCommand("day") + + clsMonthFuncFunction.SetPackageName("lubridate") + clsMonthFuncFunction.SetRCommand("month") + + clsYearFuncFunction.SetRCommand("year") + clsYearFuncFunction.SetPackageName("lubridate") + + clsReadInputsFunction.SetPackageName("Evapotranspiration") + clsReadInputsFunction.SetRCommand("ReadInputs") + clsReadInputsFunction.AddParameter("constants", "constants", iPosition:=2) + clsReadInputsFunction.AddParameter("stopmissing", clsRFunctionParameter:=clsMissingDataVectorFunction, iPosition:=3) + clsReadInputsFunction.AddParameter("timestep", Chr(34) & "daily" & Chr(34), iPosition:=4) + clsReadInputsFunction.AddParameter("interp_missing_days", "FALSE", iPosition:=5) + clsReadInputsFunction.AddParameter("interp_missing_entries", "FALSE", iPosition:=6) + clsReadInputsFunction.AddParameter("interp_abnormal", "FALSE", iPosition:=7) + clsReadInputsFunction.AddParameter("abnormal_method", "NULL", iPosition:=9) + clsReadInputsFunction.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorPMFunction, iPosition:=0) + clsReadInputsFunction.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionPMFunction, iPosition:=1) + clsReadInputsFunction.AddParameter("missing_method", Chr(34) & "monthly average" & Chr(34), iPosition:=8) + clsReadInputsFunction.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorPTFunction, iPosition:=10) + clsReadInputsFunction.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionPTFunction, iPosition:=11) + clsReadInputsFunction.SetAssignTo("temp_data") + + clsVarnamesVectorPTFunction.SetRCommand("c") + clsVarnamesVectorPTFunction.AddParameter("Tmax", Chr(34) & "Tmax" & Chr(34), iPosition:=0) + clsVarnamesVectorPTFunction.AddParameter("Tmin", Chr(34) & "Tmin" & Chr(34), iPosition:=1) + clsVarnamesVectorPTFunction.AddParameter("RHmax", Chr(34) & "RHmax" & Chr(34), iPosition:=2) + clsVarnamesVectorPTFunction.AddParameter("RHmin", Chr(34) & "RHmin" & Chr(34), iPosition:=3) + + clsVarnamesVectorPMFunction.SetRCommand("c") + clsVarnamesVectorPMFunction.AddParameter("Tmax", Chr(34) & "Tmax" & Chr(34), bIncludeArgumentName:=False) + clsVarnamesVectorPMFunction.AddParameter("Tmin", Chr(34) & "Tmin" & Chr(34), bIncludeArgumentName:=False) + clsVarnamesVectorPMFunction.AddParameter("RHmax", Chr(34) & "RHmax" & Chr(34), bIncludeArgumentName:=False) + clsVarnamesVectorPMFunction.AddParameter("RHmin", Chr(34) & "RHmin" & Chr(34), bIncludeArgumentName:=False) + + clsVarnamesVectorHSFunction.SetRCommand("c") + clsVarnamesVectorHSFunction.AddParameter("Tmax", Chr(34) & "Tmax" & Chr(34), bIncludeArgumentName:=False) + clsVarnamesVectorHSFunction.AddParameter("Tmin", Chr(34) & "Tmin" & Chr(34), bIncludeArgumentName:=False) + + clsMissingDataVectorFunction.SetRCommand("c") + clsMissingDataVectorFunction.AddParameter("x", 1, bIncludeArgumentName:=False) + clsMissingDataVectorFunction.AddParameter("y", 1, bIncludeArgumentName:=False) + clsMissingDataVectorFunction.AddParameter("z", 1, bIncludeArgumentName:=False) + + clsVectorFunction.SetRCommand("c") clsListFunction.ClearParameters() clsListFunction.SetRCommand("list") clsListFunction.SetAssignTo("constants") - clsETPenmanMonteith.SetPackageName("Evapotranspiration") - clsETPenmanMonteith.SetRCommand("ET.PenmanMonteith") - clsETPenmanMonteith.AddParameter("data", clsRFunctionParameter:=clsReadInputs, iPosition:=0) - clsETPenmanMonteith.AddParameter("constants", "constants", iPosition:=1) - clsETPenmanMonteith.AddParameter("ts", Chr(34) & "daily" & Chr(34), iPosition:=2) - clsETPenmanMonteith.AddParameter("solar", Chr(34) & "sunshine hours" & Chr(34), iPosition:=3) - clsETPenmanMonteith.AddParameter("message", Chr(34) & "yes" & Chr(34), iPosition:=4) - clsETPenmanMonteith.AddParameter("crops", Chr(34) & "short" & Chr(34), iPosition:=5) - clsETPenmanMonteith.AddParameter("save.csv", Chr(34) & "no" & Chr(34), iPosition:=6) - clsETPenmanMonteith.SetAssignTo("Penman_Monteith") - - clsHargreavesSamani.SetPackageName("Evapotranspiration") - clsHargreavesSamani.SetRCommand("ET.HargreavesSamani") - clsHargreavesSamani.AddParameter("data", clsRFunctionParameter:=clsReadInputs, iPosition:=0) - clsHargreavesSamani.AddParameter("constants", "constants", iPosition:=1) - clsHargreavesSamani.AddParameter("ts", Chr(34) & "daily" & Chr(34), iPosition:=2) - clsHargreavesSamani.AddParameter("message", Chr(34) & "yes" & Chr(34), iPosition:=3) - clsHargreavesSamani.AddParameter("save.csv", Chr(34) & "no" & Chr(34), iPosition:=4) - clsHargreavesSamani.SetAssignTo("Hargreaves_Samani") - - clsETPriestleyTaylor.SetPackageName("Evapotranspiration") - clsETPriestleyTaylor.SetRCommand("ET.PriestleyTaylor") - clsETPriestleyTaylor.AddParameter("data", clsRFunctionParameter:=clsReadInputs, iPosition:=0) - clsETPriestleyTaylor.AddParameter("constants", "constants", iPosition:=1, bIncludeArgumentName:=False) - clsETPriestleyTaylor.AddParameter("ts", Chr(34) & "daily" & Chr(34), iPosition:=2) - clsETPriestleyTaylor.AddParameter("message", Chr(34) & "yes" & Chr(34), iPosition:=3) - clsETPriestleyTaylor.AddParameter("alpha", 0.23, iPosition:=4) - clsETPriestleyTaylor.AddParameter("save.csv", Chr(34) & "no" & Chr(34), iPosition:=5) - clsETPriestleyTaylor.SetAssignTo("Priestley_Taylor") + clsETPenmanMonteithFunction.SetPackageName("Evapotranspiration") + clsETPenmanMonteithFunction.SetRCommand("ET.PenmanMonteith") + clsETPenmanMonteithFunction.AddParameter("data", clsRFunctionParameter:=clsReadInputsFunction, iPosition:=0) + clsETPenmanMonteithFunction.AddParameter("constants", "constants", iPosition:=1) + clsETPenmanMonteithFunction.AddParameter("ts", Chr(34) & "daily" & Chr(34), iPosition:=2) + clsETPenmanMonteithFunction.AddParameter("solar", Chr(34) & "sunshine hours" & Chr(34), iPosition:=3) + clsETPenmanMonteithFunction.AddParameter("message", Chr(34) & "yes" & Chr(34), iPosition:=4) + clsETPenmanMonteithFunction.AddParameter("crops", Chr(34) & "short" & Chr(34), iPosition:=5) + clsETPenmanMonteithFunction.AddParameter("save.csv", Chr(34) & "no" & Chr(34), iPosition:=6) + clsETPenmanMonteithFunction.SetAssignTo("Penman_Monteith") + + clsHargreavesSamaniFunction.SetPackageName("Evapotranspiration") + clsHargreavesSamaniFunction.SetRCommand("ET.HargreavesSamani") + clsHargreavesSamaniFunction.AddParameter("data", clsRFunctionParameter:=clsReadInputsFunction, iPosition:=0) + clsHargreavesSamaniFunction.AddParameter("constants", "constants", iPosition:=1) + clsHargreavesSamaniFunction.AddParameter("ts", Chr(34) & "daily" & Chr(34), iPosition:=2) + clsHargreavesSamaniFunction.AddParameter("message", Chr(34) & "yes" & Chr(34), iPosition:=3) + clsHargreavesSamaniFunction.AddParameter("save.csv", Chr(34) & "no" & Chr(34), iPosition:=4) + clsHargreavesSamaniFunction.SetAssignTo("Hargreaves_Samani") + + clsETPriestleyTaylorFunction.SetPackageName("Evapotranspiration") + clsETPriestleyTaylorFunction.SetRCommand("ET.PriestleyTaylor") + clsETPriestleyTaylorFunction.AddParameter("data", clsRFunctionParameter:=clsReadInputsFunction, iPosition:=0) + clsETPriestleyTaylorFunction.AddParameter("constants", "constants", iPosition:=1, bIncludeArgumentName:=False) + clsETPriestleyTaylorFunction.AddParameter("ts", Chr(34) & "daily" & Chr(34), iPosition:=2) + clsETPriestleyTaylorFunction.AddParameter("message", Chr(34) & "yes" & Chr(34), iPosition:=3) + clsETPriestleyTaylorFunction.AddParameter("alpha", 0.23, iPosition:=4) + clsETPriestleyTaylorFunction.AddParameter("save.csv", Chr(34) & "no" & Chr(34), iPosition:=5) + clsETPriestleyTaylorFunction.SetAssignTo("Priestley_Taylor") clsBaseOperator.SetOperation("$") clsBaseOperator.bSpaceAroundOperation = False - clsBaseOperator.AddParameter("ET.PenmanMonteith", clsRFunctionParameter:=clsETPenmanMonteith, iPosition:=0) + clsBaseOperator.AddParameter("ET.PenmanMonteith", clsRFunctionParameter:=clsETPenmanMonteithFunction, iPosition:=0) clsBaseOperator.AddParameter("ET.Daily", strParameterValue:="ET.Daily", iPosition:=1) ucrBase.clsRsyntax.ClearCodes() @@ -298,33 +298,33 @@ Public Class dlgEvapotranspiration End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrReceiverDate.AddAdditionalCodeParameterPair(clsMonthFunc, New RParameter("x", 0), iAdditionalPairNo:=1) - ucrReceiverDate.AddAdditionalCodeParameterPair(clsYearFunc, New RParameter("x", 0), iAdditionalPairNo:=2) - ucrReceiverTmax.AddAdditionalCodeParameterPair(clsDataFunctionHS, New RParameter("Tmax", 3), iAdditionalPairNo:=1) - ucrReceiverTmin.AddAdditionalCodeParameterPair(clsDataFunctionHS, New RParameter("Tmin", 4), iAdditionalPairNo:=1) - ucrReceiverExtraRadiation.AddAdditionalCodeParameterPair(clsDataFunctionHS, New RParameter("R_a", 6), iAdditionalPairNo:=1) - ucrReceiverTmax.AddAdditionalCodeParameterPair(clsDataFunctionPT, New RParameter("Tmax", 3), iAdditionalPairNo:=2) - ucrReceiverTmin.AddAdditionalCodeParameterPair(clsDataFunctionPT, New RParameter("Tmin", 4), iAdditionalPairNo:=2) - ucrInputTimeStep.AddAdditionalCodeParameterPair(clsHargreavesSamani, New RParameter("ts", 2), iAdditionalPairNo:=1) - ucrInputTimeStep.AddAdditionalCodeParameterPair(clsETPriestleyTaylor, New RParameter("ts", 2), iAdditionalPairNo:=2) - ucrInputSolar.AddAdditionalCodeParameterPair(clsETPriestleyTaylor, New RParameter("solar", 3), iAdditionalPairNo:=1) - ucrReceiverHumidityMax.AddAdditionalCodeParameterPair(clsDataFunctionPT, New RParameter("RHmax", 4), iAdditionalPairNo:=1) - ucrReceiverHumidityMin.AddAdditionalCodeParameterPair(clsDataFunctionPT, New RParameter("RHmin", 5), iAdditionalPairNo:=1) - - ucrReceiverDate.SetRCode(clsDayFunc, bReset) - ucrReceiverTmax.SetRCode(clsDataFunctionPM, bReset) - ucrReceiverTmin.SetRCode(clsDataFunctionPM, bReset) - ucrReceiverHumidityMax.SetRCode(clsDataFunctionPM, bReset) - ucrReceiverHumidityMin.SetRCode(clsDataFunctionPM, bReset) - ucrReceiverWindSpeed.SetRCode(clsDataFunctionPM, bReset) - ucrInputTimeStep.SetRCode(clsETPenmanMonteith, bReset) - ucrInputCrop.SetRCode(clsETPenmanMonteith, bReset) - ucrChkWind.SetRCode(clsETPenmanMonteith, bReset) + ucrReceiverDate.AddAdditionalCodeParameterPair(clsMonthFuncFunction, New RParameter("x", 0), iAdditionalPairNo:=1) + ucrReceiverDate.AddAdditionalCodeParameterPair(clsYearFuncFunction, New RParameter("x", 0), iAdditionalPairNo:=2) + ucrReceiverTmax.AddAdditionalCodeParameterPair(clsDataFunctionHSFunction, New RParameter("Tmax", 3), iAdditionalPairNo:=1) + ucrReceiverTmin.AddAdditionalCodeParameterPair(clsDataFunctionHSFunction, New RParameter("Tmin", 4), iAdditionalPairNo:=1) + ucrReceiverExtraRadiation.AddAdditionalCodeParameterPair(clsDataFunctionHSFunction, New RParameter("R_a", 6), iAdditionalPairNo:=1) + ucrReceiverTmax.AddAdditionalCodeParameterPair(clsDataFunctionPTFunction, New RParameter("Tmax", 3), iAdditionalPairNo:=2) + ucrReceiverTmin.AddAdditionalCodeParameterPair(clsDataFunctionPTFunction, New RParameter("Tmin", 4), iAdditionalPairNo:=2) + ucrInputTimeStep.AddAdditionalCodeParameterPair(clsHargreavesSamaniFunction, New RParameter("ts", 2), iAdditionalPairNo:=1) + ucrInputTimeStep.AddAdditionalCodeParameterPair(clsETPriestleyTaylorFunction, New RParameter("ts", 2), iAdditionalPairNo:=2) + ucrInputSolar.AddAdditionalCodeParameterPair(clsETPriestleyTaylorFunction, New RParameter("solar", 3), iAdditionalPairNo:=1) + ucrReceiverHumidityMax.AddAdditionalCodeParameterPair(clsDataFunctionPTFunction, New RParameter("RHmax", 4), iAdditionalPairNo:=1) + ucrReceiverHumidityMin.AddAdditionalCodeParameterPair(clsDataFunctionPTFunction, New RParameter("RHmin", 5), iAdditionalPairNo:=1) + + ucrReceiverDate.SetRCode(clsDayFuncFunction, bReset) + ucrReceiverTmax.SetRCode(clsDataFunctionPMFunction, bReset) + ucrReceiverTmin.SetRCode(clsDataFunctionPMFunction, bReset) + ucrReceiverHumidityMax.SetRCode(clsDataFunctionPMFunction, bReset) + ucrReceiverHumidityMin.SetRCode(clsDataFunctionPMFunction, bReset) + ucrReceiverWindSpeed.SetRCode(clsDataFunctionPMFunction, bReset) + ucrInputTimeStep.SetRCode(clsETPenmanMonteithFunction, bReset) + ucrInputCrop.SetRCode(clsETPenmanMonteithFunction, bReset) + ucrChkWind.SetRCode(clsETPenmanMonteithFunction, bReset) ucrNewColName.SetRCode(clsBaseOperator, bReset) ucrPnlMethod.SetRCode(clsBaseOperator, bReset) - ucrNudAlpha.SetRCode(clsETPriestleyTaylor, bReset) + ucrNudAlpha.SetRCode(clsETPriestleyTaylorFunction, bReset) If bReset Then - ucrInputSolar.SetRCode(clsETPenmanMonteith, bReset) + ucrInputSolar.SetRCode(clsETPenmanMonteithFunction, bReset) End If End Sub @@ -364,13 +364,13 @@ Public Class dlgEvapotranspiration End Sub Private Sub cmdEvapOptions_Click(sender As Object, e As EventArgs) Handles cmdEvapOptions.Click - sdgMissingOptionsEvapotranspiration.SetRFunction(clsReadInputs, clsMissingDataVector, bResetSubdialog) + sdgMissingOptionsEvapotranspiration.SetRFunction(clsReadInputsFunction, clsMissingDataVectorFunction, bResetSubdialog) bResetSubdialog = False sdgMissingOptionsEvapotranspiration.ShowDialog() End Sub Private Sub cmdHSMissingOptions_Click(sender As Object, e As EventArgs) Handles cmdHSMissingOptions.Click - sdgHSMissingOptions.SetRFunction(clsReadInputs, clsMissingDataVector, bResetSubdialog) + sdgHSMissingOptions.SetRFunction(clsReadInputsFunction, clsMissingDataVectorFunction, bResetSubdialog) bResetSubdialog = False sdgHSMissingOptions.ShowDialog() End Sub @@ -397,7 +397,7 @@ Public Class dlgEvapotranspiration End Sub Private Sub cmdLocation_Click(sender As Object, e As EventArgs) Handles cmdLocation.Click - sdgLocation.SetRFunction(clsNewVarnamesVectorHS:=clsVarnamesVectorHS, clsNewVarnamesVectorPM:=clsVarnamesVectorPM, clsNewVarnamesVectorPT:=clsVarnamesVectorPT, clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) + sdgLocation.SetRFunction(clsNewVarnamesVectorHSFunction:=clsVarnamesVectorHSFunction, clsNewVarnamesVectorPMFunction:=clsVarnamesVectorPMFunction, clsNewVarnamesVectorPTFunction:=clsVarnamesVectorPTFunction, clsNewListFunction:=clsListFunction, bReset:=bResetSubdialog) sdgLocation.ShowDialog() bResetSubdialog = False TestOKEnabled() @@ -430,14 +430,14 @@ Public Class dlgEvapotranspiration Private Sub Method() If rdoPenmanMonteith.Checked Then - clsReadInputs.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorPM, iPosition:=0) - clsReadInputs.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionPM, iPosition:=1) + clsReadInputsFunction.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorPMFunction, iPosition:=0) + clsReadInputsFunction.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionPMFunction, iPosition:=1) ElseIf rdoHargreavesSamani.Checked Then - clsReadInputs.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorHS, iPosition:=0) - clsReadInputs.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionHS, iPosition:=1) + clsReadInputsFunction.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorHSFunction, iPosition:=0) + clsReadInputsFunction.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionHSFunction, iPosition:=1) ElseIf rdoPriestleyTaylor.Checked Then - clsReadInputs.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorPT, iPosition:=0) - clsReadInputs.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionPT, iPosition:=1) + clsReadInputsFunction.AddParameter("varnames", clsRFunctionParameter:=clsVarnamesVectorPTFunction, iPosition:=0) + clsReadInputsFunction.AddParameter("climatedata", clsRFunctionParameter:=clsDataFunctionPTFunction, iPosition:=1) End If End Sub @@ -448,17 +448,17 @@ Public Class dlgEvapotranspiration DialogSize() EnableDesableSubDialog() If rdoPenmanMonteith.Checked Then - clsBaseOperator.AddParameter("ET.PenmanMonteith", clsRFunctionParameter:=clsETPenmanMonteith, iPosition:=0) + clsBaseOperator.AddParameter("ET.PenmanMonteith", clsRFunctionParameter:=clsETPenmanMonteithFunction, iPosition:=0) Else clsBaseOperator.RemoveParameterByName("ET.PenmanMonteith") End If If rdoHargreavesSamani.Checked Then - clsBaseOperator.AddParameter("ET.HargreavesSamani", clsRFunctionParameter:=clsHargreavesSamani, iPosition:=0) + clsBaseOperator.AddParameter("ET.HargreavesSamani", clsRFunctionParameter:=clsHargreavesSamaniFunction, iPosition:=0) Else clsBaseOperator.RemoveParameterByName("ET.HargreavesSamani") End If If rdoPriestleyTaylor.Checked Then - clsBaseOperator.AddParameter("ET.PriestleyTaylor", clsRFunctionParameter:=clsETPriestleyTaylor, iPosition:=0) + clsBaseOperator.AddParameter("ET.PriestleyTaylor", clsRFunctionParameter:=clsETPriestleyTaylorFunction, iPosition:=0) Else clsBaseOperator.RemoveParameterByName("ET.PriestleyTaylor") End If @@ -488,16 +488,16 @@ Public Class dlgEvapotranspiration Private Sub ucrReceiverWindSpeed_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverWindSpeed.ControlValueChanged, ucrChkWind.ControlValueChanged If ucrChkWind.Checked AndAlso Not ucrReceiverWindSpeed.IsEmpty Then - clsVarnamesVectorPM.AddParameter("u2", Chr(34) & "u2" & Chr(34), bIncludeArgumentName:=False) + clsVarnamesVectorPMFunction.AddParameter("u2", Chr(34) & "u2" & Chr(34), bIncludeArgumentName:=False) Else - clsVarnamesVectorPM.RemoveParameterByName("u2") + clsVarnamesVectorPMFunction.RemoveParameterByName("u2") ucrReceiverHumidityMax.SetMeAsReceiver() End If End Sub Private Sub Constants() If rdoPenmanMonteith.Checked Then - clsVarnamesVectorPM.RemoveParameterByName("lon") + clsVarnamesVectorPMFunction.RemoveParameterByName("lon") clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5) clsListFunction.AddParameter("z", 2, iPosition:=4) clsListFunction.AddParameter("G", 0, iPosition:=6) @@ -507,7 +507,7 @@ Public Class dlgEvapotranspiration clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) clsListFunction.RemoveParameterByName("alphaPT") ElseIf rdoHargreavesSamani.Checked Then - clsVarnamesVectorHS.RemoveParameterByName("lon") + clsVarnamesVectorHSFunction.RemoveParameterByName("lon") clsListFunction.AddParameter("lambda", 2.54, iPosition:=1) clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) clsListFunction.RemoveParameterByName("alphaPT") @@ -517,7 +517,7 @@ Public Class dlgEvapotranspiration clsListFunction.RemoveParameterByName("as") clsListFunction.RemoveParameterByName("bs") Else - clsVarnamesVectorPT.RemoveParameterByName("lon") + clsVarnamesVectorPTFunction.RemoveParameterByName("lon") clsListFunction.AddParameter("lambda", 2.54, iPosition:=1) clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5) @@ -533,72 +533,69 @@ Public Class dlgEvapotranspiration If rdoPenmanMonteith.Checked AndAlso ucrInputSolar.GetText = "sunshine hours" Then ucrReceiverRadiation.SetClimaticType("sunshine_hours") ucrReceiverRadiation.bAutoFill = True - clsETPenmanMonteith.AddParameter("solar", Chr(34) & "sunshine hours" & Chr(34), iPosition:=3) - clsVarnamesVectorPM.AddParameter("n", Chr(34) & "n" & Chr(34), bIncludeArgumentName:=False) - clsDataFunctionPM.AddParameter("n", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) - clsVarnamesVectorPM.RemoveParameterByName("Rs") - clsVarnamesVectorPM.RemoveParameterByName("Cd") - clsDataFunctionPM.RemoveParameterByName("Rs") - clsDataFunctionPM.RemoveParameterByName("cd") + clsETPenmanMonteithFunction.AddParameter("solar", Chr(34) & "sunshine hours" & Chr(34), iPosition:=3) + clsVarnamesVectorPMFunction.AddParameter("n", Chr(34) & "n" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPMFunction.AddParameter("n", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsVarnamesVectorPMFunction.RemoveParameterByName("Rs") + clsVarnamesVectorPMFunction.RemoveParameterByName("Cd") + clsDataFunctionPMFunction.RemoveParameterByName("Rs") + clsDataFunctionPMFunction.RemoveParameterByName("cd") ElseIf rdoPenmanMonteith.Checked AndAlso ucrInputSolar.GetText = "radiation" Then ucrReceiverRadiation.SetClimaticType("radiation") ucrReceiverRadiation.bAutoFill = True - clsETPenmanMonteith.AddParameter("solar", Chr(34) & "data" & Chr(34), iPosition:=3) - clsVarnamesVectorPM.AddParameter("Rs", Chr(34) & "Rs" & Chr(34), bIncludeArgumentName:=False) - clsDataFunctionPM.AddParameter("Rs", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) - clsVarnamesVectorPM.RemoveParameterByName("n") - clsVarnamesVectorPM.RemoveParameterByName("Cd") - clsDataFunctionPM.RemoveParameterByName("n") - clsDataFunctionPM.RemoveParameterByName("cd") + clsETPenmanMonteithFunction.AddParameter("solar", Chr(34) & "data" & Chr(34), iPosition:=3) + clsVarnamesVectorPMFunction.AddParameter("Rs", Chr(34) & "Rs" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPMFunction.AddParameter("Rs", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsVarnamesVectorPMFunction.RemoveParameterByName("n") + clsVarnamesVectorPMFunction.RemoveParameterByName("Cd") + clsDataFunctionPMFunction.RemoveParameterByName("n") + clsDataFunctionPMFunction.RemoveParameterByName("cd") ElseIf rdoPenmanMonteith.Checked AndAlso ucrInputSolar.GetText = "cloud" Then ucrReceiverRadiation.SetClimaticType("cloud_cover") ucrReceiverRadiation.bAutoFill = True - clsETPenmanMonteith.AddParameter("solar", Chr(34) & "cloud" & Chr(34), iPosition:=3) - clsVarnamesVectorPM.AddParameter("Cd", Chr(34) & "Cd" & Chr(34), bIncludeArgumentName:=False) - clsDataFunctionPM.AddParameter("Cd", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) - clsVarnamesVectorPM.RemoveParameterByName("n") - clsVarnamesVectorPM.RemoveParameterByName("Rs") - clsDataFunctionPM.RemoveParameterByName("n") - clsDataFunctionPM.RemoveParameterByName("Rs") + clsETPenmanMonteithFunction.AddParameter("solar", Chr(34) & "cloud" & Chr(34), iPosition:=3) + clsVarnamesVectorPMFunction.AddParameter("Cd", Chr(34) & "Cd" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPMFunction.AddParameter("Cd", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsVarnamesVectorPMFunction.RemoveParameterByName("n") + clsVarnamesVectorPMFunction.RemoveParameterByName("Rs") + clsDataFunctionPMFunction.RemoveParameterByName("n") + clsDataFunctionPMFunction.RemoveParameterByName("Rs") ElseIf rdoPriestleyTaylor.Checked AndAlso ucrInputSolar.GetText = "sunshine hours" Then ucrReceiverRadiation.SetClimaticType("sunshine_hours") ucrReceiverRadiation.bAutoFill = True - clsETPriestleyTaylor.AddParameter("solar", Chr(34) & "sunshine hours" & Chr(34), iPosition:=3) - clsVarnamesVectorPT.AddParameter("n", Chr(34) & "n" & Chr(34), bIncludeArgumentName:=False) - clsDataFunctionPT.AddParameter("n", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) - clsVarnamesVectorPT.RemoveParameterByName("Rs") - clsVarnamesVectorPT.RemoveParameterByName("Cd") - clsDataFunctionPT.RemoveParameterByName("Rs") - clsDataFunctionPT.RemoveParameterByName("cd") + clsETPriestleyTaylorFunction.AddParameter("solar", Chr(34) & "sunshine hours" & Chr(34), iPosition:=3) + clsVarnamesVectorPTFunction.AddParameter("n", Chr(34) & "n" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPTFunction.AddParameter("n", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsVarnamesVectorPTFunction.RemoveParameterByName("Rs") + clsVarnamesVectorPTFunction.RemoveParameterByName("Cd") + clsDataFunctionPTFunction.RemoveParameterByName("Rs") + clsDataFunctionPTFunction.RemoveParameterByName("cd") ElseIf rdoPriestleyTaylor.Checked AndAlso ucrInputSolar.GetText = "radiation" Then ucrReceiverRadiation.SetClimaticType("radiation") ucrReceiverRadiation.bAutoFill = True - clsETPriestleyTaylor.AddParameter("solar", Chr(34) & "data" & Chr(34), iPosition:=3) - clsVarnamesVectorPT.AddParameter("Rs", Chr(34) & "Rs" & Chr(34), bIncludeArgumentName:=False) - clsDataFunctionPT.AddParameter("Rs", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) - clsDataFunctionPT.RemoveParameterByName("n") - clsDataFunctionPT.RemoveParameterByName("cd") - clsVarnamesVectorPT.RemoveParameterByName("n") - clsVarnamesVectorPT.RemoveParameterByName("cd") + clsETPriestleyTaylorFunction.AddParameter("solar", Chr(34) & "data" & Chr(34), iPosition:=3) + clsVarnamesVectorPTFunction.AddParameter("Rs", Chr(34) & "Rs" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPTFunction.AddParameter("Rs", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsDataFunctionPTFunction.RemoveParameterByName("n") + clsDataFunctionPTFunction.RemoveParameterByName("cd") + clsVarnamesVectorPTFunction.RemoveParameterByName("n") + clsVarnamesVectorPTFunction.RemoveParameterByName("cd") ElseIf rdoPriestleyTaylor.Checked AndAlso ucrInputSolar.GetText = "cloud" Then ucrReceiverRadiation.SetClimaticType("cloud_cover") ucrReceiverRadiation.bAutoFill = True - clsETPriestleyTaylor.AddParameter("solar", Chr(34) & "cloud" & Chr(34), iPosition:=3) - clsVarnamesVectorPT.AddParameter("Cd", Chr(34) & "Cd" & Chr(34), bIncludeArgumentName:=False) - clsDataFunctionPT.AddParameter("Cd", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) - clsDataFunctionPT.RemoveParameterByName("n") - clsDataFunctionPT.RemoveParameterByName("Rs") - clsVarnamesVectorPT.RemoveParameterByName("n") - clsVarnamesVectorPT.RemoveParameterByName("Rs") + clsETPriestleyTaylorFunction.AddParameter("solar", Chr(34) & "cloud" & Chr(34), iPosition:=3) + clsVarnamesVectorPTFunction.AddParameter("Cd", Chr(34) & "Cd" & Chr(34), bIncludeArgumentName:=False) + clsDataFunctionPTFunction.AddParameter("Cd", clsRFunctionParameter:=ucrReceiverRadiation.GetVariables(), iPosition:=6) + clsDataFunctionPTFunction.RemoveParameterByName("n") + clsDataFunctionPTFunction.RemoveParameterByName("Rs") + clsVarnamesVectorPTFunction.RemoveParameterByName("n") + clsVarnamesVectorPTFunction.RemoveParameterByName("Rs") End If End Sub Private Sub ucrInputSolar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSolar.ControlValueChanged Solar() End Sub - Private Sub ucrPnlMethod_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlMethod.ControlContentsChanged, ucrNewColName.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverTmax.ControlContentsChanged, ucrReceiverTmin.ControlContentsChanged, ucrReceiverHumidityMax.ControlContentsChanged, ucrReceiverHumidityMin.ControlContentsChanged, ucrReceiverRadiation.ControlContentsChanged, ucrReceiverWindSpeed.ControlContentsChanged, ucrInputTimeStep.ControlContentsChanged, ucrChkWind.ControlContentsChanged, ucrChkWind.ControlContentsChanged - TestOKEnabled() - End Sub Private Sub ucrSelectorEvapotranspiration_DataFrameChanged() Handles ucrSelectorEvapotranspiration.DataFrameChanged Method() @@ -612,5 +609,9 @@ Public Class dlgEvapotranspiration Private Sub ucrReceiverRadiation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRadiation.ControlValueChanged Solar() End Sub + + Private Sub ucrPnlMethod_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlMethod.ControlContentsChanged, ucrNewColName.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverTmax.ControlContentsChanged, ucrReceiverTmin.ControlContentsChanged, ucrReceiverHumidityMax.ControlContentsChanged, ucrReceiverHumidityMin.ControlContentsChanged, ucrReceiverRadiation.ControlContentsChanged, ucrReceiverWindSpeed.ControlContentsChanged, ucrInputTimeStep.ControlContentsChanged, ucrChkWind.ControlContentsChanged, ucrChkWind.ControlContentsChanged + TestOKEnabled() + End Sub End Class diff --git a/instat/sdgHSConstants.vb b/instat/sdgHSConstants.vb index 6188e66cd4c..f3a19503bae 100644 --- a/instat/sdgHSConstants.vb +++ b/instat/sdgHSConstants.vb @@ -16,10 +16,10 @@ Imports instat.Translations Public Class sdgHSConstants - Public bFirstLoad As Boolean = True + Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Public bControlsInitialised As Boolean = False - Public clsListFunction As New RFunction + Private bControlsInitialised As Boolean = False + Private clsListFunction As New RFunction Private Sub sdgHSConstants_Load(sender As Object, e As EventArgs) Handles ucrSdgButtons.Load autoTranslate(Me) End Sub @@ -27,7 +27,6 @@ Public Class sdgHSConstants Private Sub InitialiseControls() ucrInputLambda.SetParameter(New RParameter("lambda", 1)) ucrInputLambda.AddQuotesIfUnrecognised = False - 'ucrInputLambda.IsReadOnly = True ucrInputLambda.SetLinkedDisplayControl(lbllambda) ucrInputSolarConstant.SetParameter(New RParameter("Gsc", 3)) diff --git a/instat/sdgHSMissingOptions.vb b/instat/sdgHSMissingOptions.vb index b502011ee7d..45d79335242 100644 --- a/instat/sdgHSMissingOptions.vb +++ b/instat/sdgHSMissingOptions.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class sdgHSMissingOptions Public bFirstLoad As Boolean = True Public bControlsInitialised As Boolean = False - Public clsReadInputs, clsMissingDataVector As New RFunction + Public clsReadInputsFunction, clsMissingDataVectorFunction As New RFunction Private Sub sdgMissingOptionsEvapotranspiration_Load(sender As Object, e As EventArgs) Handles ucrSdgButtons.Load autoTranslate(Me) @@ -47,19 +47,19 @@ Public Class sdgHSMissingOptions ucrNudMaxDurationMissingData.SetMinMax(1, 99) End Sub - Public Sub SetRFunction(clsNewReadInputs As RFunction, clsNewMissingDataVector As RFunction, Optional bReset As Boolean = False) + Public Sub SetRFunction(clsNewReadInputsFunction As RFunction, clsNewMissingDataVectorFunction As RFunction, Optional bReset As Boolean = False) If Not bControlsInitialised Then InitialiseControls() End If - clsReadInputs = clsNewReadInputs - clsMissingDataVector = clsNewMissingDataVector + clsReadInputsFunction = clsNewReadInputsFunction + clsMissingDataVectorFunction = clsNewMissingDataVectorFunction - ucrChkInterpMissingDays.SetRCode(clsReadInputs, bReset, bCloneIfNeeded:=True) - ucrChkInterpMissingEntries.SetRCode(clsReadInputs, bReset, bCloneIfNeeded:=True) - ucrNudMaxMissingData.SetRCode(clsMissingDataVector, bReset, bCloneIfNeeded:=True) - ucrNudMaxMissingDays.SetRCode(clsMissingDataVector, bReset, bCloneIfNeeded:=True) - ucrNudMaxDurationMissingData.SetRCode(clsMissingDataVector, bReset, bCloneIfNeeded:=True) + ucrChkInterpMissingDays.SetRCode(clsReadInputsFunction, bReset, bCloneIfNeeded:=True) + ucrChkInterpMissingEntries.SetRCode(clsReadInputsFunction, bReset, bCloneIfNeeded:=True) + ucrNudMaxMissingData.SetRCode(clsMissingDataVectorFunction, bReset, bCloneIfNeeded:=True) + ucrNudMaxMissingDays.SetRCode(clsMissingDataVectorFunction, bReset, bCloneIfNeeded:=True) + ucrNudMaxDurationMissingData.SetRCode(clsMissingDataVectorFunction, bReset, bCloneIfNeeded:=True) End Sub End Class diff --git a/instat/sdgLocation.vb b/instat/sdgLocation.vb index b605087a20b..ad902300c93 100644 --- a/instat/sdgLocation.vb +++ b/instat/sdgLocation.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class sdgLocation Private bFirstLoad As Boolean = True Private bControlsInitialised As Boolean = False - Private clsVarnamesVectorPM, clsVarnamesVectorHS, clsVarnamesVectorPT, clsListFunction As New RFunction + Private clsVarnamesVectorPMFunction, clsVarnamesVectorHSFunction, clsVarnamesVectorPTFunction, clsListFunction As New RFunction Private Sub sdgLocation_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -76,43 +76,39 @@ Public Class sdgLocation bControlsInitialised = True End Sub - Public Sub SetRFunction(clsNewVarnamesVectorHS As RFunction, clsNewVarnamesVectorPM As RFunction, clsNewListFunction As RFunction, clsNewVarnamesVectorPT As RFunction, Optional bReset As Boolean = False) + Public Sub SetRFunction(clsNewVarnamesVectorHSFunction As RFunction, clsNewVarnamesVectorPMFunction As RFunction, clsNewListFunction As RFunction, clsNewVarnamesVectorPTFunction As RFunction, Optional bReset As Boolean = False) clsListFunction = clsNewListFunction - clsVarnamesVectorPM = clsNewVarnamesVectorPM - clsVarnamesVectorHS = clsNewVarnamesVectorHS - clsVarnamesVectorPM = clsNewVarnamesVectorPT + clsVarnamesVectorPMFunction = clsNewVarnamesVectorPMFunction + clsVarnamesVectorHSFunction = clsNewVarnamesVectorHSFunction + clsVarnamesVectorPMFunction = clsNewVarnamesVectorPTFunction If Not bControlsInitialised Then InitialiseDialog() End If - ucrReceiverLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorHS, New RParameter("lon", 3), iAdditionalPairNo:=1) - ucrInputLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorHS, New RParameter("lon", 3), iAdditionalPairNo:=1) - ucrReceiverLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorPT, New RParameter("lon", 3), iAdditionalPairNo:=2) - ucrInputLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorPT, New RParameter("lon", 3), iAdditionalPairNo:=2) + ucrReceiverLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorHSFunction, New RParameter("lon", 3), iAdditionalPairNo:=1) + ucrInputLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorHSFunction, New RParameter("lon", 3), iAdditionalPairNo:=1) + ucrReceiverLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorPTFunction, New RParameter("lon", 3), iAdditionalPairNo:=2) + ucrInputLongitude.AddAdditionalCodeParameterPair(clsVarnamesVectorPTFunction, New RParameter("lon", 3), iAdditionalPairNo:=2) - ucrSelectorLocation.SetRCode(clsVarnamesVectorPM, bReset, bCloneIfNeeded:=True) - ucrReceiverStation.SetRCode(clsVarnamesVectorPM, bReset, bCloneIfNeeded:=True) + ucrSelectorLocation.SetRCode(clsVarnamesVectorPMFunction, bReset, bCloneIfNeeded:=True) + ucrReceiverStation.SetRCode(clsVarnamesVectorPMFunction, bReset, bCloneIfNeeded:=True) ucrReceiverLatitude.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) ucrReceiverAltitude.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrInputElevation.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) - ucrInputLongitude.SetRCode(clsVarnamesVectorPM, bReset, bCloneIfNeeded:=True) + ucrInputLongitude.SetRCode(clsVarnamesVectorPMFunction, bReset, bCloneIfNeeded:=True) ucrInputLatitude.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True) + ucrReceiverLongitude.SetRCode(clsVarnamesVectorPMFunction, bReset, bCloneIfNeeded:=True) End If End Sub Private Sub EnableDesableSelector() - If ucrReceiverLatitude.IsEmpty AndAlso ucrReceiverAltitude.IsEmpty Then - ucrInputLatitude.Enabled = True - ucrInputElevation.Enabled = True - ucrInputLongitude.Enabled = True - Else - ucrInputLatitude.Enabled = False - ucrInputElevation.Enabled = False - ucrInputLongitude.Enabled = False - End If + Dim bEnableControl As Boolean = ucrReceiverLatitude.IsEmpty AndAlso ucrReceiverAltitude.IsEmpty + ucrInputLatitude.Enabled = bEnableControl + ucrInputElevation.Enabled = bEnableControl + ucrInputLongitude.Enabled = bEnableControl End Sub Private Sub ucrReceiverAltitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverAltitude.ControlValueChanged, ucrReceiverLatitude.ControlValueChanged, ucrReceiverLongitude.ControlValueChanged @@ -121,11 +117,6 @@ Public Class sdgLocation Private Sub ucrInputElevation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputElevation.ControlValueChanged EnableDesableSelector() - If Not ucrInputElevation.IsEmpty Then - clsListFunction.AddParameter("Elev", ucrInputElevation.GetText(), iPosition:=0) - Else - clsListFunction.RemoveParameterByName("Elev") - End If End Sub Private Sub ucrSelectorLocation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorLocation.ControlValueChanged @@ -134,11 +125,6 @@ Public Class sdgLocation Private Sub ucrInputLatitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLatitude.ControlValueChanged EnableDesableSelector() - If Not ucrInputLatitude.IsEmpty Then - clsListFunction.AddParameter("lat_rad", ucrInputLatitude.GetText(), iPosition:=2) - Else - clsListFunction.RemoveParameterByName("lat_rad") - End If End Sub Private Sub ucrInputLongitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLongitude.ControlValueChanged diff --git a/instat/sdgMissingOptionsEvapotranspiration.vb b/instat/sdgMissingOptionsEvapotranspiration.vb index 44ce80745de..7c87ea8b77e 100644 --- a/instat/sdgMissingOptionsEvapotranspiration.vb +++ b/instat/sdgMissingOptionsEvapotranspiration.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class sdgMissingOptionsEvapotranspiration Public bFirstLoad As Boolean = True Public bControlsInitialised As Boolean = False - Public clsReadInputs, clsMissingDataVector As New RFunction + Public clsReadInputsFunction, clsMissingDataVectorFunction As New RFunction Private Sub sdgMissingOptionsEvapotranspiration_Load(sender As Object, e As EventArgs) Handles ucrSdgButtons.Load autoTranslate(Me) End Sub @@ -60,14 +60,14 @@ Public Class sdgMissingOptionsEvapotranspiration InitialiseControls() End If - clsReadInputs = clsNewReadInputs - clsMissingDataVector = clsNewMissingDataVector + clsReadInputsFunction = clsNewReadInputs + clsMissingDataVectorFunction = clsNewMissingDataVector - ucrInputMissingMethod.SetRCode(clsReadInputs, bReset, bCloneIfNeeded:=True) - ucrChkInterpMissingDays.SetRCode(clsReadInputs, bReset, bCloneIfNeeded:=True) - ucrChkInterpMissingEntries.SetRCode(clsReadInputs, bReset, bCloneIfNeeded:=True) - ucrNudMaxMissingData.SetRCode(clsMissingDataVector, bReset, bCloneIfNeeded:=True) - ucrNudMaxMissingDays.SetRCode(clsMissingDataVector, bReset, bCloneIfNeeded:=True) - ucrNudMaxDurationMissingData.SetRCode(clsMissingDataVector, bReset, bCloneIfNeeded:=True) + ucrInputMissingMethod.SetRCode(clsReadInputsFunction, bReset, bCloneIfNeeded:=True) + ucrChkInterpMissingDays.SetRCode(clsReadInputsFunction, bReset, bCloneIfNeeded:=True) + ucrChkInterpMissingEntries.SetRCode(clsReadInputsFunction, bReset, bCloneIfNeeded:=True) + ucrNudMaxMissingData.SetRCode(clsMissingDataVectorFunction, bReset, bCloneIfNeeded:=True) + ucrNudMaxMissingDays.SetRCode(clsMissingDataVectorFunction, bReset, bCloneIfNeeded:=True) + ucrNudMaxDurationMissingData.SetRCode(clsMissingDataVectorFunction, bReset, bCloneIfNeeded:=True) End Sub End Class \ No newline at end of file diff --git a/instat/sdgPMConstants.vb b/instat/sdgPMConstants.vb index 27946723592..4d64e7c2380 100644 --- a/instat/sdgPMConstants.vb +++ b/instat/sdgPMConstants.vb @@ -16,10 +16,10 @@ Imports instat.Translations Public Class sdgPMConstants - Public bFirstLoad As Boolean = True + Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Public bControlsInitialised As Boolean = False - Public clsListFunction As New RFunction + Private bControlsInitialised As Boolean = False + Private clsListFunction As New RFunction Private Sub sdgPMConstants_Load(sender As Object, e As EventArgs) Handles UcrButtonsSubdialogue1.Load autoTranslate(Me) diff --git a/instat/sdgPTConstants.vb b/instat/sdgPTConstants.vb index 03bb78e22e2..d520b9608c4 100644 --- a/instat/sdgPTConstants.vb +++ b/instat/sdgPTConstants.vb @@ -16,10 +16,10 @@ Imports instat.Translations Public Class sdgPTConstants - Public bFirstLoad As Boolean = True + Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Public bControlsInitialised As Boolean = False - Public clsListFunction As New RFunction + Private bControlsInitialised As Boolean = False + Private clsListFunction As New RFunction Private Sub sdgPTConstants_Load(sender As Object, e As EventArgs) Handles UcrButtonsSubdialogue1.Load autoTranslate(Me) From ef7ae9e8712567c22ce11ccff772d58a703ea4a4 Mon Sep 17 00:00:00 2001 From: n-thony Date: Thu, 21 Dec 2023 10:32:05 +0300 Subject: [PATCH 28/48] corrected the translations in the database --- instat/translations/rInstatTranslations.db | Bin 8302592 -> 8302592 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 54df330d4313510ca27103637faaf8ab54d2013b..82986ede7c30ed9c7e24823a908c088e143d99a8 100644 GIT binary patch delta 1044 zcmX}pO>7i(9LDi^-JN}HS8KH|wg~M~QE4kL7D2Y#72K7VzPVJW$W!T-GQ;!*1=N4 zcA|smB)W)h;sqj093py%7m35f5u%rPi8xBUOdKP`efo%3h~q^6b>!y1+vfX0N=ola zB{xcPC4uO*s1$i8Vn?=w&xO7Y&4ucM_l$V3K9CKpGyXLe4by+s-{8CDZT~*^wlCuU zT++4uQwtllOzfze98zlBe}2quavN^u=7PZwq=7m;6`M-Avt3q|``gW2(rBGpsL>L! zcK6SDv%+0o$!##&rxxn8RP5y1s>xftmHS&ZLYJkC*dAWpPK&KDAe;~ez2%jYjrEH9 z$y=(~S+3pn{qEc8E7Mo>k99|H(avfCb@94s9#kXRB@vl+X8J{Bwix-dYR27wW-{oX zluq;&A{&d(f25ghM#7mnA|5_ajGXtI>y16mOrMC%uC3ypqnrQ9M&zQD7TccHttYma zQ{+3Ydc_=&|M1K!=C~YHDFE5nK|f99R;u+nlwnHKqN&Qe6=XA1eX?k}BItuf#%g*7{7yI-71HoLpKtc<4j zNJH+$F3U7poFz@Xm2i(`t*yo`XDKM+SN}tcH`;C8ku~3DDLLJnwS-e%Z`SrIjmV|& zSK)Zbb1O&eFO|@T-t7^4IT#K9D(SlA8p9l~^B1EJS=|lz*Chj5bB{GRDBAd96*hl0L zxkMfjA?_#gi2@=@JU|o@MMN=CLX;9^L^<&wQ9(RJJWT8-Dv1L`6;VwbBx;CSqK>F1 z9w8194aB2FBXO8$BASU7;xQsdJWjL{M~I_D8_`a55S_#m#4+MYqKi0AJVkU9Jwz|j zM?6jR6VDI>#IwX8ae^2khKZBJbHoUt_8BFfCr%M#*AajBhdS@FBj$MDk$xjRp6*M# zmgWe(7fOU`g69I?2G#<_{@ebK{3X7AU(|cYd(-oUXWdio{@JeoG5(fY?^)g`lj7^v zLV4$xc!d$ItvpmG%YTip`9;(6MzPTvUT&3FdaXS9+E%6Y$4CvqKhW5Sofi~k>aZR}l=M8(d+v;$7+r?%`Rq0DsDUiE8Rzc|Q+T&s~ zs3*b+`Q_PIwQTOSI(1PYHsz&W%ak9^$6`KrWva*iRF60MtbKa2hdtA0?K<@)v8k^N z^;^mrd#FEQ=X!&G2EPfG20oU#(}}NKp-=6d>BLWd-?Z49GCISeC^hHr=Mx?2cQc5H z*qbyGVKI`Yt3WPfoeY{SJrYu$BD$kyN6L#YDt=Ozc^D vL)f}|w4#obNo7izR%Vo0 Date: Sun, 24 Dec 2023 09:30:58 +0100 Subject: [PATCH 29/48] Test C# version of RScript NuGet package --- instat/Model/Options/OutputFont.vb | 76 ++++++++---------- instat/Model/Output/clsOutputElement.vb | 11 +-- instat/Model/Output/clsRScriptElement.vb | 4 +- instat/UserControl/ucrOutputPage.vb | 5 +- instat/clsInstatOptions.vb | 2 - instat/clsRLink.vb | 17 ++-- instat/instat.vbproj | 4 +- instat/packages.config | 2 +- instat/ucrScript.vb | 11 +-- packages/RInsightF461.1.0.0/.signature.p7s | Bin 0 -> 11515 bytes .../lib/net461/RInsightF461.dll | Bin 0 -> 31232 bytes 11 files changed, 61 insertions(+), 71 deletions(-) create mode 100644 packages/RInsightF461.1.0.0/.signature.p7s create mode 100644 packages/RInsightF461.1.0.0/lib/net461/RInsightF461.dll diff --git a/instat/Model/Options/OutputFont.vb b/instat/Model/Options/OutputFont.vb index 7ab76143eb1..b545364c6d9 100644 --- a/instat/Model/Options/OutputFont.vb +++ b/instat/Model/Options/OutputFont.vb @@ -14,7 +14,7 @@ ' You should have received a copy of the GNU General Public License ' along with this program. If not, see . -Imports RScript +Imports RInsightF461 ''' ''' Fonts and Colours for all text within the output screen @@ -27,8 +27,6 @@ Public Class OutputFont Public Shared Property RCommentFont As Font = clsInstatOptionsDefaults.DEFAULTfntComment Public Shared Property RConstantStringColour As Color = clsInstatOptionsDefaults.DEFAULTclrScript Public Shared Property RConstantStringFont As Font = clsInstatOptionsDefaults.DEFAULTfntScript - Public Shared Property REndScriptColour As Color = clsInstatOptionsDefaults.DEFAULTclrScript - Public Shared Property REndScriptFont As Font = clsInstatOptionsDefaults.DEFAULTfntScript Public Shared Property REndStatementColour As Color = clsInstatOptionsDefaults.DEFAULTclrScript Public Shared Property REndStatementFont As Font = clsInstatOptionsDefaults.DEFAULTfntScript Public Shared Property RFunctionNameColour As Color = clsInstatOptionsDefaults.DEFAULTclrScript @@ -62,42 +60,38 @@ Public Class OutputFont ''' ''' ''' - Public Shared Function GetColourForScriptType(scriptType As clsRToken.typToken) As Color + Public Shared Function GetColourForScriptType(scriptType As RToken.TokenTypes) As Color Select Case scriptType - Case clsRToken.typToken.RSyntacticName + Case RToken.TokenTypes.RSyntacticName Return RSyntacticNameColour - Case clsRToken.typToken.RFunctionName + Case RToken.TokenTypes.RFunctionName Return RFunctionNameColour - Case clsRToken.typToken.RKeyWord + Case RToken.TokenTypes.RKeyWord Return RKeyWordColour - Case clsRToken.typToken.RConstantString + Case RToken.TokenTypes.RConstantString Return RConstantStringColour - Case clsRToken.typToken.RComment + Case RToken.TokenTypes.RComment Return RCommentColour - Case clsRToken.typToken.RSpace + Case RToken.TokenTypes.RSpace Return RSpaceColour - Case clsRToken.typToken.RBracket + Case RToken.TokenTypes.RBracket Return RBracketColour - Case clsRToken.typToken.RSeparator + Case RToken.TokenTypes.RSeparator Return RSeparatorColour - Case clsRToken.typToken.REndStatement + Case RToken.TokenTypes.REndStatement Return REndStatementColour - Case clsRToken.typToken.REndScript - Return REndScriptColour - Case clsRToken.typToken.RNewLine + Case RToken.TokenTypes.RNewLine Return RNewLineColour - Case clsRToken.typToken.ROperatorUnaryLeft + Case RToken.TokenTypes.ROperatorUnaryLeft Return ROperatorUnaryLeftColour - Case clsRToken.typToken.ROperatorUnaryRight + Case RToken.TokenTypes.ROperatorUnaryRight Return ROperatorUnaryRightColour - Case clsRToken.typToken.ROperatorBinary + Case RToken.TokenTypes.ROperatorBinary Return ROperatorBinaryColour - Case clsRToken.typToken.ROperatorBracket + Case RToken.TokenTypes.ROperatorBracket Return ROperatorBracketColour - Case clsRToken.typToken.RPresentation + Case RToken.TokenTypes.RPresentation Return RPresentationColour - Case clsRToken.typToken.RInvalid - Return RInvalidColour Case Else Return Color.Black End Select @@ -108,42 +102,38 @@ Public Class OutputFont ''' ''' ''' - Public Shared Function GetFontForScriptType(scriptType As clsRToken.typToken) As Font + Public Shared Function GetFontForScriptType(scriptType As RToken.TokenTypes) As Font Select Case scriptType - Case clsRToken.typToken.RSyntacticName + Case RToken.TokenTypes.RSyntacticName Return RSyntacticNameFont - Case clsRToken.typToken.RFunctionName + Case RToken.TokenTypes.RFunctionName Return RFunctionNameFont - Case clsRToken.typToken.RKeyWord + Case RToken.TokenTypes.RKeyWord Return RKeyWordFont - Case clsRToken.typToken.RConstantString + Case RToken.TokenTypes.RConstantString Return RConstantStringFont - Case clsRToken.typToken.RComment + Case RToken.TokenTypes.RComment Return RCommentFont - Case clsRToken.typToken.RSpace + Case RToken.TokenTypes.RSpace Return RSpaceFont - Case clsRToken.typToken.RBracket + Case RToken.TokenTypes.RBracket Return RBracketFont - Case clsRToken.typToken.RSeparator + Case RToken.TokenTypes.RSeparator Return RSeparatorFont - Case clsRToken.typToken.REndStatement + Case RToken.TokenTypes.REndStatement Return REndStatementFont - Case clsRToken.typToken.REndScript - Return REndScriptFont - Case clsRToken.typToken.RNewLine + Case RToken.TokenTypes.RNewLine Return RNewLineFont - Case clsRToken.typToken.ROperatorUnaryLeft + Case RToken.TokenTypes.ROperatorUnaryLeft Return ROperatorUnaryLeftFont - Case clsRToken.typToken.ROperatorUnaryRight + Case RToken.TokenTypes.ROperatorUnaryRight Return ROperatorUnaryRightFont - Case clsRToken.typToken.ROperatorBinary + Case RToken.TokenTypes.ROperatorBinary Return ROperatorBinaryFont - Case clsRToken.typToken.ROperatorBracket + Case RToken.TokenTypes.ROperatorBracket Return ROperatorBracketFont - Case clsRToken.typToken.RPresentation + Case RToken.TokenTypes.RPresentation Return RPresentationFont - Case clsRToken.typToken.RInvalid - Return RInvalidFont Case Else Return New Font("Ariel", 12, FontStyle.Bold) End Select diff --git a/instat/Model/Output/clsOutputElement.vb b/instat/Model/Output/clsOutputElement.vb index f7666ab51c8..da880a8aa29 100644 --- a/instat/Model/Output/clsOutputElement.vb +++ b/instat/Model/Output/clsOutputElement.vb @@ -14,7 +14,7 @@ ' You should have received a copy of the GNU General Public License ' along with this program. If not, see . Imports System.IO -Imports RScript +Imports RInsightF461 ''' ''' Output element for an R script. @@ -97,14 +97,15 @@ Public Class clsOutputElement Get Dim _lstRScriptElements As New List(Of clsRScriptElement) Try - Dim rScript As New clsRScript("") - Dim lstTokens As List(Of clsRToken) = rScript.GetLstTokens(rScript.GetLstLexemes(_strScript)) 'rScript.lstTokens + Dim rScript As New RScript("") + Dim lstTokens As List(Of RToken) = New RTokenList(_strScript).Tokens + 'todo Dim lstTokens As List(Of RToken) = rScript.GetLstTokens(rScript.GetLstLexemes(_strScript)) 'rScript.lstTokens If lstTokens IsNot Nothing Then For Each rToken In lstTokens _lstRScriptElements.Add(New clsRScriptElement With { - .Text = rToken.strTxt, - .Type = rToken.enuToken + .Text = rToken.Lexeme.Text, + .Type = rToken.TokenType }) Next End If diff --git a/instat/Model/Output/clsRScriptElement.vb b/instat/Model/Output/clsRScriptElement.vb index c817f819498..5b2e77124cc 100644 --- a/instat/Model/Output/clsRScriptElement.vb +++ b/instat/Model/Output/clsRScriptElement.vb @@ -14,12 +14,12 @@ ' You should have received a copy of the GNU General Public License ' along with this program. If not, see . -Imports RScript +Imports RInsightF461 ''' ''' R script element containing the text and type token of the text ''' Public Class clsRScriptElement Public Property Text As String - Public Property Type As clsRToken.typToken + Public Property Type As RToken.TokenTypes End Class \ No newline at end of file diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index 50d49de8c82..7a3534d8e42 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -15,7 +15,6 @@ ' along with this program. If not, see . Imports System.Runtime.InteropServices -Imports RScript ''' ''' Output page for R outputs ''' @@ -192,7 +191,7 @@ Public Class ucrOutputPage If frmMain.clsInstatOptions.bIncludeCommentDefault Then 'show comments only For Each line As clsRScriptElement In formattedRScript - If line.Type = clsRToken.typToken.RComment Then + If line.Type = RInsightF461.RToken.TokenTypes.RComment Then AddFormatedTextToRichTextBox(richTextBox, line.Text, OutputFont.GetFontForScriptType(line.Type), OutputFont.GetColourForScriptType(line.Type)) End If Next @@ -200,7 +199,7 @@ Public Class ucrOutputPage ElseIf frmMain.clsInstatOptions.bCommandsinOutput Then 'show command lines that are not comments For Each line As clsRScriptElement In formattedRScript - If Not (line.Type = clsRToken.typToken.RComment) Then + If Not (line.Type = RInsightF461.RToken.TokenTypes.RComment) Then AddFormatedTextToRichTextBox(richTextBox, line.Text, OutputFont.GetFontForScriptType(line.Type), OutputFont.GetColourForScriptType(line.Type)) End If Next diff --git a/instat/clsInstatOptions.vb b/instat/clsInstatOptions.vb index 52516d13d5b..1bd05535f48 100644 --- a/instat/clsInstatOptions.vb +++ b/instat/clsInstatOptions.vb @@ -384,7 +384,6 @@ Imports RDotNet OutputFont.RBracketFont = fntNew OutputFont.RSeparatorFont = fntNew OutputFont.REndStatementFont = fntNew - OutputFont.REndScriptFont = fntNew OutputFont.RNewLineFont = fntNew OutputFont.ROperatorUnaryLeftFont = fntNew OutputFont.ROperatorUnaryRightFont = fntNew @@ -401,7 +400,6 @@ Imports RDotNet OutputFont.RBracketColour = clrNew OutputFont.RSeparatorColour = clrNew OutputFont.REndStatementColour = clrNew - OutputFont.REndScriptColour = clrNew OutputFont.RNewLineColour = clrNew OutputFont.ROperatorUnaryLeftColour = clrNew OutputFont.ROperatorUnaryRightColour = clrNew diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index 39b67124550..61d77e8fb54 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -18,7 +18,8 @@ Imports System.Runtime.InteropServices Imports RDotNet Imports unvell.ReoGrid Imports System.IO -Imports RScript +'Imports RScript +Imports RInsightF461 '''-------------------------------------------------------------------------------------------- ''' An object of this class represents an R interface. @@ -724,7 +725,7 @@ Public Class RLink ''' ''' The R code statement to execute '''-------------------------------------------------------------------------------------------- - Public Sub RunRStatement(clsRStatement As clsRStatement) + Public Sub RunRStatement(clsRStatement As RInsightF461.RStatement) Dim strRStatement = clsRStatement.GetAsExecutableScript() @@ -2218,7 +2219,7 @@ Public Class RLink ''' ''' The list of clsRParameters. '''-------------------------------------------------------------------------------------------- - Private Function GetRFunctionDefinitionParameters(strFunctionName As String) As List(Of clsRParameter) + Private Function GetRFunctionDefinitionParameters(strFunctionName As String) As List(Of RInsightF461.RParameter) 'Note: this function is not currently called but it will be used in future ' functionality to populate dialogs from script. ' Please do not delete this function. (@lloyddewit 24/11/21) @@ -2227,7 +2228,7 @@ Public Class RLink Dim strTempAssignTo As String = ".temp_func" Dim expTemp As SymbolicExpression Dim clsFormalsFunction As New RFunction - Dim lstRParameters As New List(Of clsRParameter) + Dim lstRParameters As New List(Of RInsightF461.RParameter) Dim clsAsListFunction As New RFunction clsAsListFunction.SetRCommand("as.list") @@ -2261,7 +2262,7 @@ Public Class RLink 'parameter value position Dim iParameterValue As Integer = 1 While (iParameterName < expTemp.AsCharacter().Length) - Dim clsNewRParameter As New clsRParameter + Dim clsNewRParameter As New RInsightF461.RParameter 'Assign the parameter Name clsNewRParameter.strArgName = expTemp.AsCharacter(iParameterName).TrimStart("$") @@ -2269,13 +2270,13 @@ Public Class RLink 'check to remove the [1] notation before some parameter values If expTemp.AsCharacter(iParameterValue).Contains("[1]") Then Dim strcleanArgument As String = expTemp.AsCharacter(iParameterValue).Remove(expTemp.AsCharacter(iParameterValue).IndexOf("["), 3) - clsNewRParameter.clsArgValueDefault = New clsRScript(strcleanArgument).dctRStatements(0).clsElement + clsNewRParameter.clsArgValueDefault = New RInsightF461.RScript(strcleanArgument).statements(0).clsElement Else 'Empty String are Not accepted hence the modification below If String.IsNullOrEmpty(expTemp.AsCharacter(iParameterValue)) Then - clsNewRParameter.clsArgValueDefault = New clsRScript("NODEFAULTVALUE").dctRStatements(0).clsElement + clsNewRParameter.clsArgValueDefault = New RInsightF461.RScript("NODEFAULTVALUE").statements(0).clsElement Else - clsNewRParameter.clsArgValueDefault = New clsRScript(expTemp.AsCharacter(iParameterValue)).dctRStatements(0).clsElement + clsNewRParameter.clsArgValueDefault = New RInsightF461.RScript(expTemp.AsCharacter(iParameterValue)).statements(0).clsElement End If End If diff --git a/instat/instat.vbproj b/instat/instat.vbproj index eb03c008b07..79809aa90df 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -155,8 +155,8 @@ ..\packages\R.NET.1.8.2\lib\netstandard2.0\RDotNet.dll - - ..\packages\RScript.1.0.11\lib\net461\RScript.dll + + ..\packages\RInsightF461.1.0.0\lib\net461\RInsightF461.dll ..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll diff --git a/instat/packages.config b/instat/packages.config index e6ea1174ecd..93ee0c027b9 100644 --- a/instat/packages.config +++ b/instat/packages.config @@ -11,7 +11,7 @@ - + diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb index b61537e146f..7d0436590a8 100644 --- a/instat/ucrScript.vb +++ b/instat/ucrScript.vb @@ -17,7 +17,8 @@ Imports System.Collections.Specialized Imports System.IO Imports System.Windows.Controls -Imports RScript +'Imports RScript +Imports RInsightF461 Imports ScintillaNET Public Class ucrScript @@ -642,7 +643,7 @@ Public Class ucrScript Try Dim dctRStatements As OrderedDictionary Try - dctRStatements = New clsRScript(clsScriptActive.Text).dctRStatements + dctRStatements = New RScript(clsScriptActive.Text).statements Catch ex As Exception MsgBox("R script parsing failed with message:" & Environment.NewLine _ & Environment.NewLine & ex.Message & Environment.NewLine & Environment.NewLine _ @@ -657,7 +658,7 @@ Public Class ucrScript Dim iCaretPos As Integer = clsScriptActive.CurrentPosition Dim iNextStatementPos As Integer = 0 - Dim clsRStatement As clsRStatement = Nothing + Dim clsRStatement As RStatement = Nothing For Each kvpDictEntry As DictionaryEntry In dctRStatements If kvpDictEntry.Key > iCaretPos Then @@ -708,8 +709,8 @@ Public Class ucrScript Dim dctRStatements As OrderedDictionary Try - dctRStatements = New clsRScript(frmMain.clsRLink.GetFormattedComment(strComment) _ - & Environment.NewLine & strScript).dctRStatements + dctRStatements = New RScript(frmMain.clsRLink.GetFormattedComment(strComment) _ + & Environment.NewLine & strScript).statements Catch ex As Exception MsgBox("R script parsing failed with message:" & Environment.NewLine _ & Environment.NewLine & ex.Message & Environment.NewLine & Environment.NewLine _ diff --git a/packages/RInsightF461.1.0.0/.signature.p7s b/packages/RInsightF461.1.0.0/.signature.p7s new file mode 100644 index 0000000000000000000000000000000000000000..f018365e79bd2e0acdd74ad744061c062defcb8d GIT binary patch literal 11515 zcmeI2Wmr^g*Y}wLDe0CRx?#`IAV>)!Djgyz-7$oO#DJiPB1(&NgGeYKA&mmkjkJW6 zl!Ac5yHW8%FW>v}IiBOV?k~@LfphPD?&F-j&-MGS^8P{;{1!0fLJA;~%zTH59=NNYz2aX2n6f)6gtCn^Z= z!TI0-oKJvHkPke>d(H%DC63VX6c$mF)wST)L~41cx>(wZy34w_Yv`z)Rd;c76Vx^p zKCgG#L(ASqR1z0A8ATuqpwP7Tx)uf|DO5`XP7aVB4sc2F?XE>c?22+xUsXIEl!sKKCdP;mi7!HR6-#&Vj_yXYQ z$MD};1`5J-`~iS31|0<O<-Z3NRuU{0hS!TTBOp;MB$`*Mu_d~}= zm>7qyG2SQtksR_Ugvse=MI1q)p`%H-c!88&;rH@G=RGy_;Xzzmgs})=_t)cNr?XR6 zZT1*9)J-OmV1o?PMZ^14W<4ZVjCORXgsK$VQ-pVH{rU<;rRr!J!UTqg_^I|e2urd8 z2O1pYYfXfrDfTZX+;+DgTu)WT=RP>;GLmTAb@!f7^EIsySW4%tJ?<+dA9$>Q9n(Tc z7eX(!f)qu(B1ZWrPTVDBZa00npAzm?aN{~t!5N4`@D_*XtD=z^9m+;uT7tr-_cOIi zs*7V*a6Hvr zI;$HaWKEr|xTxLinMX2Y84xt#hjTh|uAGerRxMe=ackS?fN44=h+)BeHDq$4&Qhtw zV5t~~Yl&^;+KcOFxHrq#gzSxOK}wabBtcF*%#&oTdtK^RzwQ{^ylZB)6u=v~BwMx{ zMn86S{e`M!nO*hfI)g2qFcyWMh)>QHd#`m81>?X$c8nLw9WgH&EV-a z=~QRe-r2Y!@i+1x{bsWty+I5*FS%oZe?0;;Y>9Bh>=*7f!38)TNDx6bzQrlc+0 z$k4P#|q!ZwpqkFMJwB>B*Em#{AN z9go^Jva0$<(bYht3<_&T^tKHW)IGxZvudvoEYWh^?Q*BbBeZkf9g=>CtG2?F3NGo_aC z^;k+anYzhe@%XTEx@XfF(DI5?H?9IEgT5z?zcfe^Ha@xiWtD3JrX^B1wbgy!jZp2W zL&jabX+xHPOGN4K&p6*TB_LIPJZL2ExhYJB8M>XIa7q8*UJ(rzK?M0;#gk`h^>VZrKu_~Uq}8$#PbZKmrg&LdJ$aa=57QrZF2W11%>L9wVwKb>-6k!c zLAo|)hR2F6izpTjWr6PVyZF)$DxHmfcbRTs*VW9nc*#O;q@*yce*u4N3j*tigPTfX zQ&W`$JXC3ZK!o`jD`5Bb$PP+r`>I2V#x6-D)eXM;5sOxK@`z%KlzFQ3cr&$CkeMnV zGey2L6H=1rEqP8`=LS#B{#9J$*00R`Z@>!7eGnip;le+1AA}$v1Q$XG2#E=a=>Y*@ zKNFM`AO<%c1~w_K4wwRh#B+6YfD?UcXC8pyE?jf!mfJ4E?S$qI3gV_T#v3r|ATA)k*)9jDuPp*xK2csty;)0VrG)n zVR+j4*x51@Z0>pr;@q~ElFsEaQdDm|W<-iz`UuuSYZpJnl-r(f@asB3WG3eVkE*3IY^vnit| z&+~iQ>mE{QxfMu$DyzkvQB^!)dFGvc4ZoZOwo31;P&|Fbfmp5&lGLRQL9B(YZuizL zH$9G5y+|U!oitKSqz6^#WV(V!|1!dtbsKo!^2CRAOuI*$ca+gzq1b2%Dnf{x~Za&irD|3f*sbTkWq2Fo6O@BbtxhsnbaNjc0Mz9$afl?CtcJAG9{D1i10 zAHE`W2>orVS7#F=-H!OE2es++c|ZMp1!H=oXDj{5LX^UL%!B5elw8ZJA8EA1hYO~2 zMMF=&5b%b_v0{imog&2)Vcxr+&nTa2q3(BIdo?n=ll(RrrcE&Q`O?9Ht%dm7=$J0f zgvEYU7_If2$a%ju_UXzBi%RO(YhyWx!YMK={JVAqWKaBzh^Ta9#Q?5n_tNC}3at96 zD&LJ=X&@}0Ia90%jfT4r?-sX@ytzf4{kgTYJP6l0oXzoh6xno!ZF3V5>lJJ*v1pc2 zvuqee{)hKvc`u5%&9?+`B$N`VlUSQ=azZ;M@pQ9ew0Tg4d9V0a2hn_s`d(nJa6K<* z_}m3Y(Zc`~JuO(r`jh>3)BarBCZizb0M(DO5(gcA^2Y!R0?_^#;GBRHf-Dq(BR~L( z!UY9D_|apY{9caY5J8E)*3Ew%z=VS5@xXKh1A-FKghC)tI01l%hihl&=xJtV?qTf; zrjAGDEDi>o2?Lh8o$={yWLg|EJDqO@!{fUb$3|BP$L%s+Sd|)FPvBqygnqgq1kOsq ze5BtdPS$)5ZkFFz%I_|~Z|z`aevQut>F59i^dDa+KRlob2&e}FYJh+$0Q|Z?N_`BN z9w%hraauRZ_<8fhH0kN6LFL3%o5|TxfeS&J-HO*g00E(Zd%Ej?BX5Qh{U?0{t6>Zj z1TDLJqu&(ZzmqGv8v)-}92 z>JgvpDls~(rVL#)6=`%nc}I$Itd(KIt*fP6mEf3J%?G>(82I6Kg-N38w`C$FJ3MXg z8Nt(XZW!@o@fo~=VGU_>i*F$7db@^I2GVT=GW#qw^b|vsE;i<_2>SYxG%c1)5!}mE zNeeL#QvT59rDM`YWV!9q*RmUh$V=ja$O*ieD>6Elf|-zlxiM`Z|Gqdh9PeTBWSLS5 ziiQzD(a;@#-vn?J4IX$9`^RoOw0o#`02KAd-`YI^3CE^GFp>kpFamA?0m0xN{=rc& zHsFW+`LTDv=MR&Lcw>?oIN9)yM5J=AIP!X21&i^W09WQ#PN&dGl^`xCk&{>R%{Yg7 zt`nkU8dvyn45T;=@Foo2?b$u{T{Q5_ivFijUXq$}t&e~nv3 zLD2X9yT1!P^mn14zYE$PHFNinR^yd32Io%$On|k(a(xynUkjt;M(EJx`YFyVN!>j6 z`1S&Cnjri}fMJs+U6f);yE(?5F0a^gqm{U4#%SQgX>~$%hUP@_4BrHFWy4Fa9(-anc__Ga zqS|OJ{q&ptMnum&JRJSLd=Vbaaw5b?@SFm#Jg{!`km#y$#+zZc#Cu6`F^) zjXW?My&LX7QW_B}eb2Mu+RM_S#%DHEqUc0-hWbR(`A%HF`4J^W6ycPog_1!GzQI6p zIYdBw7%%iy70{r&8Cs59%qU*U#l7TaKl(SEZn?fOK-N9vR*bdRxwXku5*mwm*Vb`m`gsD=g1Nrc`}f5YB}dU_&a&Prjh8>g z?OPl9w8zALNnp5XLKy??^>x~)hVX61;$q^mO23W%Fee@vYVk?In>snvyo31`CRg4-F>Wk#b$n3}C)QC{$EmHL6RMvq{hQ|Oy&!&8fVaoOTN z&RFxu((!&A&MBswr8)A&#KGE4_&<5t%Y$!GJ zH2*L9XJ@~aj8eeq|CI%H=tO`P7%l)hhnN`Pzduz>AYHyzOisx)a{5~HqDIMSt~8RR z6ocC}I#|{5`6(eh%Qp;js4JO1g-}~-GOeWF^suj{Ci_5o-ix2NOmy|bf&cSQDcc(^ z<1AI`=&vqyagFctYIp8@*v<#M;%^rl_H}m4$v>21T#9x{IrlWK?U70rCOWAHyL{ig z-@D7%Yc>2QGZ!`lPcLtyzYNLlxgdQ?NWsQhv#>lx`|fgjzvR23(J!<^A3XH*HNzZN zQ&c5CyW>~|B{{aff!z@@riG%n!3y(rlL@3vn_`*jiZ6fEvh8HgvvcooWajukep z%XC0euF1>pJ0w25RvHrhID5nZ}d=IryeQGl}4ctvrW~ zKR&nwAa-~HofL6&;sm47(NGw+gGED7eGMnhyh4JX9x0?ey>%CZUQR0%Vt;9KrE6V}nOk~3-u9x>~lE>dlr6PCd8T9NTH`JquxpiHo zIr5Nl9TVqMXl+HCI5%5!qmi;!Nu>%UkHpjZ(I;!xQct(aj#8cTBNOcGxsbQ|P;#H3 z+>C42je|vIMYiTdf`yX0>Ibz=VWo?=VLd!LLY~~&n`e!ynD6LrkD81>*cYqaDF!kw z3@*f;*Olr;zqwx$-fO7rPNMdpB@9pEN+?ry9UJxz84(HkbtC3Vv$v*`nNw0*^{&Nd z=yBYa^9&T+rj65daUdLM1VNhbI~ELH83H8L3W?8p-Jkam*v8@Y2s~{sI>NC5h~vw@ zZBzW^o>fo`+h4rFkK}ZZ=XVRUfrTf&a{P(NzeV=1ME*^i0~_!-a+pA0$`-KxLtjef zXcp*83H^yL^*vcR%vBTxzcxAKzCjv9Gyrxuk_CeiNB42D`^DEgioRcOVh6y!AsTGa z14mvP^vIF`-8!(!Jl1Oc+BN_aq3f6L);=h8jLnf}g7{ht3^B@16;kmLT_o)UG&*Xi z_Fk$QOe=HlIfdfqa$0}3uIr@3T97h+HFR=T|H`0!$ZimfRS<63UP=<}*r#g%OEAWtQf$1CqfyPVOAacQnfghe7x;$&$4?3b`A zGqw=B`_+$px}0!*R{x*I=h>Xyk2ujW8ST0N68n&vD4(S z(6iN*jdLw+B^G(c1*B;Q=i#1hnP|L|JRiHam-)!$N#o19IveNVW>SBg#?qwrkPwzi zl{BU29u^VnE(r_DQ1vVk-v=7`5_H%~gpuuHUSkKWrg7{%l4oqQ)-4)j+Eq%WA2KpZ zca@Q{w2#tV6Q4$35h`q43C!hn}5>?TsV3H~p#G!sQS8<~AtfF1I?ZiPXfRO~5Er z*!PSrDN-yd#UX-B{m@R%xI@{7*Ua5zGdV+W6uIa8sMBu{evXaa($eH+@ZYW7AmE-I*vsLU zCqF+=N4ZlhjtZ6GW~c^ibhcq-0#>bovLm1Ua9ASK zQPd+g6+;rO2IHrwZtR_1#5b{fwC`-#h#7x+t%=W*kj6s&?W+MPqY=5@ppRWIx6bhz zo^^|M+aDuJp$V)jpHq)|rZ{+wQ_Obq+U1zH^4#b9qdHcxDHl;@7Y~@k;m_xed66{p#TzMwc&{$F z*H^jJm&_yh@a?#R*(od$NCYA6Gqv{I3l@Plt*%y9$V~!3%RsXMxAt%nckK+8-N8m%#)@|gg0cMKi?)!$?LDsGWp8!SoLHO`=VCkO zCsO5((fw0Ir28g{xMBNir7!zmj@z-U)ySe+lbt0K?mxhIYVE|1uTu6*xVyy&JKZU5 z8F!tS&up@diMw^3gOpK8%@@<6SK`I)QiSM`8dhs$*|ciPrg(2?V4Jk}kuKc^bt&X; zEt;Pj2o#6-Wj*|1%<HKPYmsv``c8)nbZM^@j5}@}@ zJv0C{KqdKNvU0G}pQ?wV;P=GsTi$j&ZTs3Ju>%6`9jP0ri2;E?fd3z=qVCZ=P!%s6 zt>-^=YrYHGKP}1i7bKw{mh%DB1LMg#&tfU7obITEp0-LDVm)Z%nQ31%V7k8?#stkN z@AS_eo`2i4!iEZU=BFCFR61@qIAxr`y|N;C?rynlg^xjXy@`mGl1JLoyFx5SjXKbmCXZRa7ZSKO&tZEUwp;&hn?dR(CrH@2&0_N>y z^uw&XpK~`hdv_-6UYmYE?Vf7w)~h-rPx1nWpO_=x^=Veg16z-=>1k(d6t!l>^Qt=Q zQx%;Q8-XH%4uvvoW8-=;Dgt-Ro-=B#AC*K*xD5zf>fQRZmGyE~Md&nI^@{{9J5R{y zi2R)RxTpk{p_uLmA0%8W*`K(L49~ZqYCnC+(>&K|fT>ktDIO)H!$Hwzy@7}??ims< zFH#7$t)TqU=wU~0SCIDvDgI7Lp{(EUb*X6W&@%1E(v)&Jo{38ruG3pN)q3FeK_~T% zD>)8CXVvuv@+p~^FMU|?pJ&(a`E<92L$Fcns1 z=-1YaCf^J{zUMFh#Ggne6pli72YqZ8&{YRK{uPme68%mpk2(0s0o?%gk1he&3&a1Z z5%3S)Fz#a)L-F9W05t&qf)0bsVvQS7U*AHAGU&(+ZE03HmCz~ux7OE7h}qaRhc9lG zSXc%zPguRjMsK+;pGwVQ<0}*-45aY^M2_E`AI<@=0pPDUFwvL?DgHt!qs4JuvQ%KHr}!v5He8M>tLykSzT)vNGMgX!qOH6v;p$vx)iAv=lZy}75ODTSJA8=@_W=L$)4 z=NDo)QM?``urAu5TC2C?cY-RIw>ic(Tnwj-{i$^WomXdIhG=rfjdb)SN8Hr&%8fo( z+I+RD+XJdnYCdX5o49B|soTHQwFWO*j%8un84u{+vI+W}zTMKO%z62B`8eUpHzzU6 zKhq62pX%0<#N58JhI?w5C-8Q+hkS3f>U+n^R?IX7N$1j?08gW<;KB|_mXf{w|?%<#ZRx%amIu>CiXi`?&~kcNKy)>cJf(l zBsFczUm?>EA(LZW3XeI*lj@UjRgWzp0mtxa%FLZK7V0F4Z2FIxtCyS7Z`Q`W7&4Fa zPn2V@XWjh}U!_dDzWI4Z1*dsC=X?X&3nGQ&yOY@}J+$ec3Ha7E)#~wXCMlPgl&>|q fZ?p$~x(bO+8{0nVjQMa!tb-dbBTgcUFYEsS3;#(} literal 0 HcmV?d00001 diff --git a/packages/RInsightF461.1.0.0/lib/net461/RInsightF461.dll b/packages/RInsightF461.1.0.0/lib/net461/RInsightF461.dll new file mode 100644 index 0000000000000000000000000000000000000000..cebeef4295f478cb8482db6d1db6754fa64a8927 GIT binary patch literal 31232 zcmeHw3z%HRb>_K`zPBIKt-0N!c}OEo>oL+u-93yRz-SN;y%Cm>m=O=z0x_CtNn>WZ zhub|MA%vy%2e#uEWNim0j(Hd-AxqZw2Z?b$d%@UV$Nn6L#3aOtL)b4SFFWz~IV4VY zW3m4^RrmJod0?As1i>_Oz>eQ)I=bSoqs_OQz|E>3vMMO5fuf0a}G@ksqO48R) z&Y?Qf^V=DED)GB3o;LRV?utVvCu;d=zk0$Soyw1mRw~tc{#ZHh&s6dgmHf^FBl)T7 zc)35FPOjFZ5AGt`XIS*U9n((+y}e8;^C@G1$VZ8zN}szQ&pf^l<4e>kc~kMt1saX$ zWdJDWk43lM%c%Tc%gwV>=9A0!%_UH5u$o+uuvj|09s z0{7R;r|N)zXBr9WWUQKRK=R2G-P-Th{4qen+r!APqPSt?a~0Ip@0Ta5KxAI&S$vt+ zDSRWJtBAHoK*>IW@$-jyGbu(-A0leIjL4AEH=pDN?66zY2bJlwkg9F=c|=KcVO58q ztg4ITENX4jJ_}B5GiFsGUZ^34rn-bJADib&n|xvKa-Bx$NFZ87E%Rr*9#q!Fk&`Sk5s)6 zWl#5YLRQHFdgs1Ox_lN62CQ&Ot92`|tV^=GWJ6F=Fgi3Tp#>oX{jt1CIkS()T}mnW zwqGy`Mtj(|O~-&Q1czq2fP}dR7Mm%}K)!ze^KZp$YZMbBVuBo=g3b zJiGl3@?7R$D$nKqmGbOK_-bJe@|sr`rlHSRsM^dSy0A%16%42M63qep~u>(neNhT zEYXCQzAoLlbN0``#q2pddtU$5JUE3}w#pXH-Y!`TX7N7;t-?vk{$O^y*8;3k&~EPR z&ke-rCKw#NRN!l>aHvU4_@q;eQ+sOgGE}QM(h@K3(+)|wllCg6PBNXf`rvev{wkBE z=dIX=iaxlfq=*BwQ-iPYAjS9j*KsZTw&D_9!gIL~ekd8t&SK!vZVqt6F--&|n87*Q zvlY|#33>QGr&KZf*u|HQn|&+zd5hV{F1~bw?(8%Zkj{3R{B%lNbFlDt(*786}k(IOCbFo3V0rG4wCZf+d#)(kcRCr>3BF zfY{Y3XbqsS&r)Y$H@O|vRp^cimyz49vje1=xnSo~UaHtZ{<|Px$A5;!3?(INScH>z zxmB!1$u$KS%sTMm$SA8&Zj$uiljOxZZeq!Mwute{Z(n%rHHFv`7hzzaxfZXb*iC-g zqUpF2ObOXYPpX5sqP_lF9jPFE3ZgW%K3i0P7GkW&8p46(S%gmk23gExQYjJgA*;3n zO!sX=l62a@1sf?8{5{CEJyiq6WXs?;0FdLVpbjgklZ&|>H>sEp(qY9cLVd?gf&sM` zI+b;ZEO_usYKR9MHV8$ki50W%s74Q|1nR^B{YqwpnShdA# zD6UJ+fNi^41P<%H*wtKt<|S@Ug^oED=n)k}Zpb5;utGV?=dkJ)^o>M zxNh5QJIfLaX0Ijj_wr4xkqEuxg2`Ul*|HQuBvlcq?mR3SOwFn2P!%nm!J?!Vx(>C@ zMfL^~E0*#d0iG;>v+FUTVS$5Wnr^IJ#34yrAB5qkF_`grYT(apDjW-$Q0s4pT7GAD zB9?p!`k0TB$Z6i*r4ML6us!yd`R0Ydl8znqjmAkU= z!}0G42{##4q%~^<>yH~WO$1Fb_dgrXeJq5mn)L*ZStzpbA=o>^dctT}gKz;7HSxwb z2_G289FMc?mO^$3$T7jPv*24G8&GEnqz8Y9C`htNrlX`{ok5|Ua;!7(1YvPZwsop! zt9l7~kp-&Z}we^vc5qirPyE!q{ymsc`oIcRvjM2wAs5kn)wJhFLeeBi#TO0 zS6luYtE@ejCS6|L!kuNr9KDSA%Q`%+nZxqnr31EOzQisv{El2YbioHQxvpSb%3PKdc6&=Awz3qq(iPZBi>sIrZWYTNxh{-%>74NrsK{#i z8EAXSeA;%RgY4Lp&;tOL?Mk(DFQF z9<4A79s(depw$pGpIOYFyA6AE(gjMeUofzNG3oR4p@Rn82M)~6swy0YAraFe|2M3R!0mt=Pp@_2g9u!8gYWDYtkK{z0m%2;!10 zgq61=?`97lr=B3V^~YWNf*&+(#eTql5t9mbDTCl zNSOWX577$F5PU0th+QB2VF^y4b`@yfr9zyRc*@;{rX2Iq`(a`y(d=D#^7m0)#^pbP zqCNzqZ(|aiM4roj2;88};JZZ~seLl7TN8d$7WQWm_i_Z-Tb?m2Ni|rUkE;)EFSji^)b}*EJ z_t!_gh+EQL8e1hVp38WdBId{~{s)~PFgCrE-G_L=;k^zA_KUnl#VtTC0+#uVHIKJ? ztzK)<;~fB$WqU2vo#+QPFbl?(keS$p%AqPd`9;~}g?0!oFf`AF*q(*|U08EkPFXL@ za_V*$kkeaH5s?$(w;EV;a#&5oL+fxbsty$~+q{T4Y5<-Gb~d~bcHobhokj5l*g1fT zCU!a$J6Jy61Uosf^C*T9l};yo|6*@3_wFPX=zS|HqP;if3!jIJ9rJp@Ylw0PJb_9K ziSJ=(=r$Pj;IAN2F-@*hHS3bo^xTs9qHBu}0&+{erMd2ioI4NamJPlHI(igdx7vg* z_qx5Mn^t8DVS7d->u?@|O2u)8#afa$P3MHnW;LkrVsZ59I>1hUe^H zdP^;kLNc)W+zM}rx1ze6ZMd)jlEE%Bg3SM&~UA6opXg;lfKTb=7| z>LItLu-01@HA$~m)YCLAdNIIWuh(0n2DsK+Tl%`U3Y^Ed=h_|!u2;f~>ea}u>6O?* z<#T;rU&LQm_W~hT@Cw*cw1L2v;p8I>vG|H!k=Kyl4~4z(c-BRldh5`(vH{r2!VqBynbbd7kPc&MGc!$3~ul?@EOZDfh}e)$0QbqUQU-fC>cN_tieuC z8r^R6Hg35Wxa9SF>pE^i$tG`8v6H;@O0wQSRGfsStZH>5cfrhU_BI!H2c^y1K{cf= zj<)bFMw3gtON!Z`iFdIY$^bYhI4I2xEZB8FRN3$KM+66da;bOe&?`9c^43EoxB$TA zvx-TIZU$#g7EkLf-j?EGvNDdWZ#6hcUh-@pQ|UFV^+9itmy{uI zsMt=HH>l28YOnyN^xNpw(nTQ3MZb!o+17EHcUf`G0!nFWU6_oFu>&gE>TSj8UDTMG z@wbxirWbIi8&DB(sBF3g*x5T#tRe**0jcw!_ZtuPni3oFdF?$I0Kzuxv$1Zf*yyX= z<|@eJF0)|;of}&tkP221*R3PJkinsN1F;1`+cq@zCr}>YNTEa!^+AyiQ2Bg+6ujWB zQN?K>4*oNX0$!AhNji<5a8<0JW`orGmG-8(Q2i|h();8D{SCB;gXw5oct@kZhRK9W z5=V)08>0?^dtJ2)mDPw(LS3~J6u1+xoMlJtgO^4=4Z_m+GJ1;WKgY-1+gNVxtxa-M zI1$W1ZZ#ZnI=zVon`e2u%SToVJL);B##zL?Xpv}=s)FX1YExY()w9?PfK1LE{0MZ& zON9zcRix(r**TQ0A>laZzBB{tbPH7l_u|rheztgD6dCtV^=5!#EROCF`UU#~qU(&s z$Bh(jCXA)9yZgZ%WEY(SFG2}w4v;okj#^WNomoR7))tEEc(uP*W`2B)2mJLg1Bbomwq3}~c5T#SQh!3l5r|jZ^!)YUXz!o%4sm6sVJtC16d)gu*eQB1B zRlylIk2RX}_K=$=b@P5(L|%&9RroBq&g7jU2C-aYVAa_b+Sq!&(-{Z9;Fj-?+2fgK z#A^FExROu{mcl2YPF4Ac?$Af5B`99Kk}LOtSJ2UO|4--4eRWi$*61~~?m%#UVbZne zANGR&rRQ1Qbu_w*SFb`(ef!Z94o`GXFE7wja38doR&P;#Vb12E8JX0Q!Ob%46I{ce z!(%yph>e{-jMCBP^cLZ?3^z*bk4(LzxxmU(bM@X(j;5t=_Cyx?MIgR^@-Qo5d>9*F z6gq4OxJ9gD$b54vrjsU_;W!h11-7bVd7S4=2eCZQ;UEv24fA}wsLE5i6ml<+6<5-t;@8Bh9nq^lVFfJF$1bA=(a$f*|C+AC_j%XUG{ zr2>~p$JisI%xlZVa82apxGl~MM4%mq)$Rxz>(XbuB(5REImm{hBys#re99l6TYi|! zahR8D1*f=!c0AW>!I65rb_EYM0YKAQf+5`mzmSmSk#C`J^eaP#u2U#h(?AA=xv3aK zRMh2l4L!pFekzy2TAhJ0U_G$t9E1v=?frCmPySSTPl;Yz+S7yI2Nz@})aJ!bbljA7 zFwijUQCl&%{Vh*1B2+#2V6=tHEj$O(n$;$dHr56B_<1W2^P<61fSo#aOIUW4A7M|^ zhm!z@kG`>&QulD6((p3aG0#&<2{lC_ZJg;1-GBoCTyJZtN-Yfx=zGWnMm&ef>ZRn} zjwgAHq6=QilX!LJy)s&LAK!w@`;?A~u;s*J`W7nS@>JFGvf0><@=A$=y>)SkJDYf5 zD&#ht35%ihIf`p9Dx=>Mj^1fzi?N;9^Ro~cfM5k z#v2@}|4vL8S?{qXd@1y0YMji79$Q56&3xjlL2Idr&*%`#=6Q&tT0^OkrFclm+WVZ17?rh@_Hjsdk>n zf6J~}&tvH-=iGzK6WjVlFLGL^UOZ^G?pcYdO^1RijuVQz0kO)Z$Ku6+Sjs(#{`Jv{ zj!m5!Y}!3VUqOOpZsENl-pLRWJQrD0%Mb6eQMwjiK2Lod-^2J0{y7rh0$b$BJh**W z9<^b0vkjV;-@{L~F=a=}(y#(zXxLW7u!$(#)}Ahmz^a516$@~dO za^QEY_Va2a{WDc~hT@HpQ?`UU^-KlU(g>mwae2)|zdwez0vBQ=Xv!WCV|HZC`vb@c zyG-1R!i2DcfVL>F7U3vf+j7FpIc9XA~+96+qC zilGp_WNvEXWjds%cZljeOiapt)pTBZWL={To-QW zXmje^&}9bg8)NKAh(nVT4Xlra6aEK6k(f=6uV13dl*^}^Y?h0$X3kj^_)4KMJFuv# z9^J#$>v&}lrxo7t=5U{jw}a)g-Q5 zoqiOVu!8TIxuRE9bcPkLVPhaaXiybh;mbhlRKb!Eb4rtt*Q+1xZM-&wx0krH?y%{r z5D*HMg$0i*jO8J%vZghvDtZ!OjZg=p(%YlGJ;`Okn{n!m^$z{QdZ+)-+zWnsaaw3C z(XXv9)o-nLtC!Y6Ar-PAZ?B`I@m8LCjlDy?#g3YE$j3vP!%t`qGa(h;i(_;>i$dHd zHSXthO>0>5MP2h%UE_sRsdQKv3!&YzAJw)g5d>UJ?RU>tOqH?0f7=xJ59LTP^euM@$tKWpJ+H?J0 zENOH#;BVmSVAb}?>M=&f2hoIaC=EiP@22Hu9! zKSJ$R!8zf+2%LRsPV*+Wy~g5nKg##u7J|>sR}1Ffq1d6cq#ueoPKFkni$OUfG=HV# zX;4_iUPePytG4#Of!q#x1s+*fxaV{d6bw?=FQOBdFrKu=+SN2Y&-OabSctr zNpmdn@vH zCpo3WEl9uRaH@Lwjl?MOT^7^)fYAJ7>HYhX-jd>0kE5+Y_ZekSUTI7r9Wri5Njx!w zw1V;tc>DMkq|XqiZ`4F!DE?`@_WTNcW^Ty(1=Rn$y2Ya{7qL>E}T6hI6LH z>3XSsNm}&?&Phot4%cpXIsI$FKZv#m^K1+Ebw1{v1wSu@(7m=ze-lCH1vZ+(&(VaG;}b<&=VTEFUHVQ8v3OqL!Z~s za|T0S)=d0j+zX$X{cQ|>sAmX*ox5(2y~u)h~7Ktl!ity+D`hIhTenGcG6#K=;PqJ zlRB}ovPFLdG&||t8p?o|PWl}U;XDA)KWpe}f%x{1+kI5}o7T`@U__ntLa(ap!e~1Q z7p8*wYf^VmLuaLjx`zG)qwS<8G;|E3?WFH&=sAI|?qe$V#jlHh-tMG>3X-vRlEDjy z*b-(1b%szYpo8ql={|Ze^%WcY%3^@|b$cm2*x#sIPA^=<(0TgZ|C%*^l5?4 z(;7Dw>!-`MbKQOMd*WTO0oozZJL4aSuLQJD*L~J3#x~F)4HZ%w03FfLMb^cD#uWrf z3<0`7gm%O>(`xKQc^v0P zM^7oJ^Vi)^$M_uGpf0Di)udf5t*sV4f$$+H`G}Nox!qK*Fh_KGYio@BNUL25`E zh-`Y7sd{N`<&{H?t~oV9dH$09!o%;I%tHb=7F}*J<^Z@g=@hudxfJp?{T*;(^v6gY zDx<`uv%rtjQ{dbnMMsV9*W%pv<4A+?a*09F^i`3A!aOLvMQc?#Q?TeVk((;HtR+E@ zVZHW{@|=DQk<2=zt@tf1r&}c5Ch1;Duaoq!q@zd|(}d)2m-Mux4OXxL|&Y{spzIDEX1|81O%Uv!Krie!@7L{sY=9`Ol#I&yoM9 zmRFGeIQBiHAE566^RR0e|AQt|j`20RH0B`R)si%RpWbFUp#O)lrAET|rC8oLPkXFe zjc?NxW*O;`^pvs9IPA_CZ8Fj}8FjZ#54-O+wu0tkh!2_CUV}NjPDa;)9^Y;3l-f4o zcBkNUOMahlyASzSXditl&fLBlv&85#q=^tx}=1|coT6J*RDf8LnXo4AUIo4ZXzP%beE*p3Fh^J$!BXO^uH0c zrzJfv>3byoFfilvAn0W1qri;Q$LJO0e_8Sm)8ATI*vQLPoF1beApJFZ73mZ7FGxR4 z7mz+h7AQQ8*gcN7uG2`L#ko(MzDylRe}}q}euGvZeV*1JeSr#gKVsDH#QJg9_X^Ub zWIO$|3bA!R;?W+YnxKVKO*@@B>zRpe^K&=%{Ye5IQbao$>lUJ=~a@RQzdaOze>_wbTgg6 z4Einl2b^WEF*X`^84nssGi!F4>&!v(3Uk;THS6YG=9A_hnSXCu)>iAJ^`ESVtlxt4 z4Cp)yjpv|K-aV~pc?!Pi9}-U^J(S|~=VF{bl;rfkWAEn{WM=<}?<&rT|YK6k}alGVAKOg@J(yyD}M0!!`TSzxqFCu*e2>I zG>NAP&EX0eULuV&jU9vu&T%M*Tn=d~?A8R_fiw&2HBq`0X&cU#Ow{!tZKoATJD_nB z*4&G95Iac&erzrBLnt%pGFXC%IaorvjV?m%cBFZ_6ye4%(8uXTdcgQ6W$KljSSu zj?u}P^3kJov^ot+^{QVxG%-0oN>jD5sy{h#j7Cn^>gB2a9o5OnvJj~C?b71T63iIyJQ?t^o*pWSr0 zjJ9{6cpe@`rpsd!qmvVNg{^J?G)`Ohl~0wY%2(WW^yqd_#lgewiSi`M4^?j~R}P(? zo~KGRsV&fEp7I?hAtNC;Pvs%}iJ3X1hTl>?ePh)RMi@ZDyC%VGr5?aLCaab5{xS`Z zOplJ0S-``il@n!=vSfk=+iEa_3Tr-U1+;hPL~XiSlk(x2N_}Fg%tO9;>^Tk z*_YXYCga=cIQTj?gQ`6<6A?)Dz&dJR%;~jJ1-ds()FztHq5ksJvB}eiChActVX;3t zUY;8DZ);FFH0nbdyLqDCS&dc%ZFYnA8_IqSE~3#YsN7Ml9G^Hb0|zm0_0Do_%%7NU zu2k}n7Q^Mq(NmJE&822Exo%=*T$0jBx>XBNu z16bWmnZ_n-FjbYmLrS!7(FFRn2;ev9P*t5=(lCZ!tB+Rd8djz^t8irI7^VfcJGQqn zHaRn1-d**lM(cGh+FRQ{S|2+}2WM(03E7i+N>olDyQ?x@W2>cu89?3;q39NGtkboKvHhC%=4eMfe6IMrJj3#vlwo(g>g^ntJ1G|wCu-0odS&OJ$z%VeWHPH)HRm1CMVVoij z4jg+sf}Cb-J!c>ZUI~KW8UasO9OBn#9R4k|6p_o=Xq{AVG^|_DaKKnl zpa?fZA&$(~aD@BH$LkFO*YjMKqGP)!{90Ym4pfHOn`&!YfQ~{5IT1ptEaEybSx09k z>oU=F1f!`25RijxD2Biqf{H!m`iLwWLBa4yAYr(P%6J13b80F9{YEti!4d%b@X%UE z!jB?9w+;?{iWRAu4j>+3s3ob}G2_Ec)^#WnK&+M>RfJdYCNcmP#J1Y5Q{}OlIGyJd@4d1y&j)9 z#X{0O=>qOrRW*6iM%l>Bac&qG4x;4f7J_a3KxOi@)?#4LVzP~?uwCW}9q`A?etEp% z*dzO)U6s0jnyS-BcildNO+;Ptdn<6q3L4%uHI2f(wQFZ4ClB}v3RVMzFWBjz8pBiC z*5({m@V?E!-|oRN8qP|vzbES~-y31S+0SqDBDXTkt(BaCvRhSIY=Vvh2jMVI70URT zj*oO2-%Epm~f}unOSf`}bF_bce+rSG> zcPtzp#?shNQ}5eQTB5tK$1UO3X#nXKI!Z^t%Q~btE)8H;M7`y?;6ys!LMV;x*NH>Nu_9I z-2=FUoxS05iYMrRs=HNA01S&M;Khm9m4pQ%Z*2f1EIiOciQFLJA1PhK}eT9E0o zKG3)uGOIw+>!}Zvan=v`2w++it;HBqd@{wjpsw>i=NC0NU<@8VOQMMHWki?mfTiHq zKO(gg;EwHJ6c%$Etf3BgT%HJ%0hIye!3R!4_OAsGdAbwr>ae#w`mG`z6YFA2!b*yK z1ua+~Ot~sHT0yS458UDQ>=vw1@RAqHJp~F=`0Cy^soo|)RrSQ2jpBO;(n+*szS!b} zcA$CvA@Ic%n1jX)7{&NbqqGdJ>N>Be%n0@vC|2;VDx*IpWfjb#N&Lh0Q#GK9^E_a( zOqfrmwN|(rMat4VfwG_`7&}Y0E)vQEgU7;sX_m{3OK;wx@mC0<7Ylt#}yvcMF$qpO%yK=dGhG;MCX3Ys#b1h zT$o`peC5u=SxC`&bUyGWeuZRNKB7MJLg#uh$#;b z-t3v1Nz5mx4gW?$ks+OX@7ys>LyBy&Y*1`!EHR#JN`pMrm85xsE7#C4XVxm4aKmjZ ztRG&;8fFXmUVc3&1{0O*j-&s;uA-BuVZ>46d~#u_zfr>f?()Af%9$_zpRD08Ej-v`KY`$ULu6;6)(`e?oZpCV!vU$8`+v?2$&8x_ zRuZ0Oyxxvt&0vQ!R|sn*B3g^Ozyqt*R;@Kvw4OlgV11rFos4qOQx(qa?Rrwq-_L5S zVn1as=TjqeJDeKN+qr&ozV7Cmy+If;-`X+trHY`;w!v7BmYF%KPyqrwoACGiC!=UTt&PX2ZUYW1+seK?+d-KW} zti!Y;=zG5YUT-OD#Ah_t9GNlgIwpY+4RUzFT5F!&?Cf|!W-|>ukErX9KqeO1uH!t#c9OZ=9>(ykhpYo2}r1y)tB6h=U-r z%O>+ic5i%;bdLm_>M$f2QX~9{n(!N=%BzWSAh64ZSR0c_4VtM%k6h+1rIBfJcGsNU zEc2>tQ*q6P#m8Y)jDAuk4y%KYVOb)|QfG%Y%pEIXT<{eX$bgTg*i<3lv0yYmX=@V% ziz>pJD!Qb&KiA$TZHD*j`@Fj_83=I{T;Za25Mb|QchFor}TA#FDgx=V!hyf7h2HqZY+ExQ?tWxGpY9Q*|5 z;Ek(Hb0sSueCtH2!7*4zr9$s;6S^G=Bjs%_3?pa|AP>4qhC!bSW1&=7P?dSNRb{w$ z-7~UEZH$+M&B}zxQCHA&FrYvtX1ALTsALiWnSe&Ss|De0g*{<_8r9YF5^_-`=u2{# zp>a&c_-F4razoeVm)~Raq_+)DOiuVUM*MULNsJSR6a18o@cJ#11ShzB!XHED1aF!X zeoKTT!^t8f_)VH&IvEqcv~{urnvFi>i#m^)E*#}i7B`(Z9)|;Nkw-C%+DX{XvSk@J zZ$YdOf5k$0?uVJK~BMVLsn%pVwS8Z+zN(Un^EA1p#ofBX7DxReR}*sX0zSL z9QJ|3KIV{r4#=P7{7b?^X8Vo)=rmpo3SZ|rbdq1KGl1u^g^-8e2sXXfN--(#Fen?o z1D1d8@qB*cz{X94SNm!8*!af5(PIObls0eNh~(n&OH0SLjBhGkJh){;`I3Rr!ScX3 zexiylHsBYk_(!xKKU(a+cGscs9k`-?*XwfpiuIEI4d6A?7FP1>fRm%A`8CEiZj}#f z@`4TSBcI=#+WTV$+1MxWweQCl7q8JzYZO3!cx30um+WI#|K*WixcbArUpjy9=s)gY zqC19;@Y}JqBY5w2`s9&Xb;chnAMwk0SLH}lOwB;`*xQfDON33u{nO*e=)+(p_HP=v1|`71YL&l_bFR4o z&mY1aJk2R*ysPoO>0zR+@{Tx{aGrk(cLVkmN0IKr53)vZW_AF7$LuJc*V1m}`SS() z2N&3@sxOyt9$QRFVY_&;Ek{2)0T`gl!9L&MazMEkAtvup__JDC9YQS!-FTe}&)`~4 z5a`qP$3WBoPaN>7UDaGlrvzsJ<5vGRBcO&1@ONie9y`z*pB$=-KlxEP>Q+YTI25j6 z9~PXVsJ;pB>!*Pg^tTffqB|u0#srXuWmM``mv3cu<99Qc&;}th0N2)_aRX@hpwei& z0U`WA_~kx5;Iov}l^SoACL^3J)K@_z#u%?*rKz0nV1{Ri8l>Z@- z`$5pEVpKEOmDVE?SeOQneY42Bx$SJJ&zAY1wAqHy@Gg1^)}v0>e^NW{@89inzxw+L OUuMJpkI(;i68PV4%Cuns literal 0 HcmV?d00001 From 1e14958f4a7f9879a4bdc4bc75c6a525e6764dc3 Mon Sep 17 00:00:00 2001 From: Stephen Lloyd Date: Sun, 24 Dec 2023 11:30:53 +0100 Subject: [PATCH 30/48] upgraded to RInsightF461 0.0.2 --- .gitignore | 2 +- instat/Model/Output/clsOutputElement.vb | 2 +- instat/instat.vbproj | 4 ++-- instat/packages.config | 2 +- packages/RInsightF461.1.0.0/.signature.p7s | Bin 11515 -> 0 bytes .../lib/net461/RInsightF461.dll | Bin 31232 -> 0 bytes 6 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 packages/RInsightF461.1.0.0/.signature.p7s delete mode 100644 packages/RInsightF461.1.0.0/lib/net461/RInsightF461.dll diff --git a/.gitignore b/.gitignore index 1ed6e973e09..a0831e0af12 100644 --- a/.gitignore +++ b/.gitignore @@ -254,5 +254,5 @@ installer/Output/ /packages/Newtonsoft.Json.*/ # RScript package and dependencies -/packages/RScript.*/ +/packages/RInsightF461.*/ /packages/System.Collections.Specialized.*/ diff --git a/instat/Model/Output/clsOutputElement.vb b/instat/Model/Output/clsOutputElement.vb index da880a8aa29..bb40bef7452 100644 --- a/instat/Model/Output/clsOutputElement.vb +++ b/instat/Model/Output/clsOutputElement.vb @@ -98,7 +98,7 @@ Public Class clsOutputElement Dim _lstRScriptElements As New List(Of clsRScriptElement) Try Dim rScript As New RScript("") - Dim lstTokens As List(Of RToken) = New RTokenList(_strScript).Tokens + Dim lstTokens As List(Of RToken) = New RTokenList(_strScript).TokensFlat 'todo Dim lstTokens As List(Of RToken) = rScript.GetLstTokens(rScript.GetLstLexemes(_strScript)) 'rScript.lstTokens If lstTokens IsNot Nothing Then For Each rToken In lstTokens diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 79809aa90df..1d7fbb1645a 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -155,8 +155,8 @@ ..\packages\R.NET.1.8.2\lib\netstandard2.0\RDotNet.dll - - ..\packages\RInsightF461.1.0.0\lib\net461\RInsightF461.dll + + ..\packages\RInsightF461.0.0.2\lib\net461\RInsightF461.dll ..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll diff --git a/instat/packages.config b/instat/packages.config index 93ee0c027b9..473c05d53f0 100644 --- a/instat/packages.config +++ b/instat/packages.config @@ -11,7 +11,7 @@ - + diff --git a/packages/RInsightF461.1.0.0/.signature.p7s b/packages/RInsightF461.1.0.0/.signature.p7s deleted file mode 100644 index f018365e79bd2e0acdd74ad744061c062defcb8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11515 zcmeI2Wmr^g*Y}wLDe0CRx?#`IAV>)!Djgyz-7$oO#DJiPB1(&NgGeYKA&mmkjkJW6 zl!Ac5yHW8%FW>v}IiBOV?k~@LfphPD?&F-j&-MGS^8P{;{1!0fLJA;~%zTH59=NNYz2aX2n6f)6gtCn^Z= z!TI0-oKJvHkPke>d(H%DC63VX6c$mF)wST)L~41cx>(wZy34w_Yv`z)Rd;c76Vx^p zKCgG#L(ASqR1z0A8ATuqpwP7Tx)uf|DO5`XP7aVB4sc2F?XE>c?22+xUsXIEl!sKKCdP;mi7!HR6-#&Vj_yXYQ z$MD};1`5J-`~iS31|0<O<-Z3NRuU{0hS!TTBOp;MB$`*Mu_d~}= zm>7qyG2SQtksR_Ugvse=MI1q)p`%H-c!88&;rH@G=RGy_;Xzzmgs})=_t)cNr?XR6 zZT1*9)J-OmV1o?PMZ^14W<4ZVjCORXgsK$VQ-pVH{rU<;rRr!J!UTqg_^I|e2urd8 z2O1pYYfXfrDfTZX+;+DgTu)WT=RP>;GLmTAb@!f7^EIsySW4%tJ?<+dA9$>Q9n(Tc z7eX(!f)qu(B1ZWrPTVDBZa00npAzm?aN{~t!5N4`@D_*XtD=z^9m+;uT7tr-_cOIi zs*7V*a6Hvr zI;$HaWKEr|xTxLinMX2Y84xt#hjTh|uAGerRxMe=ackS?fN44=h+)BeHDq$4&Qhtw zV5t~~Yl&^;+KcOFxHrq#gzSxOK}wabBtcF*%#&oTdtK^RzwQ{^ylZB)6u=v~BwMx{ zMn86S{e`M!nO*hfI)g2qFcyWMh)>QHd#`m81>?X$c8nLw9WgH&EV-a z=~QRe-r2Y!@i+1x{bsWty+I5*FS%oZe?0;;Y>9Bh>=*7f!38)TNDx6bzQrlc+0 z$k4P#|q!ZwpqkFMJwB>B*Em#{AN z9go^Jva0$<(bYht3<_&T^tKHW)IGxZvudvoEYWh^?Q*BbBeZkf9g=>CtG2?F3NGo_aC z^;k+anYzhe@%XTEx@XfF(DI5?H?9IEgT5z?zcfe^Ha@xiWtD3JrX^B1wbgy!jZp2W zL&jabX+xHPOGN4K&p6*TB_LIPJZL2ExhYJB8M>XIa7q8*UJ(rzK?M0;#gk`h^>VZrKu_~Uq}8$#PbZKmrg&LdJ$aa=57QrZF2W11%>L9wVwKb>-6k!c zLAo|)hR2F6izpTjWr6PVyZF)$DxHmfcbRTs*VW9nc*#O;q@*yce*u4N3j*tigPTfX zQ&W`$JXC3ZK!o`jD`5Bb$PP+r`>I2V#x6-D)eXM;5sOxK@`z%KlzFQ3cr&$CkeMnV zGey2L6H=1rEqP8`=LS#B{#9J$*00R`Z@>!7eGnip;le+1AA}$v1Q$XG2#E=a=>Y*@ zKNFM`AO<%c1~w_K4wwRh#B+6YfD?UcXC8pyE?jf!mfJ4E?S$qI3gV_T#v3r|ATA)k*)9jDuPp*xK2csty;)0VrG)n zVR+j4*x51@Z0>pr;@q~ElFsEaQdDm|W<-iz`UuuSYZpJnl-r(f@asB3WG3eVkE*3IY^vnit| z&+~iQ>mE{QxfMu$DyzkvQB^!)dFGvc4ZoZOwo31;P&|Fbfmp5&lGLRQL9B(YZuizL zH$9G5y+|U!oitKSqz6^#WV(V!|1!dtbsKo!^2CRAOuI*$ca+gzq1b2%Dnf{x~Za&irD|3f*sbTkWq2Fo6O@BbtxhsnbaNjc0Mz9$afl?CtcJAG9{D1i10 zAHE`W2>orVS7#F=-H!OE2es++c|ZMp1!H=oXDj{5LX^UL%!B5elw8ZJA8EA1hYO~2 zMMF=&5b%b_v0{imog&2)Vcxr+&nTa2q3(BIdo?n=ll(RrrcE&Q`O?9Ht%dm7=$J0f zgvEYU7_If2$a%ju_UXzBi%RO(YhyWx!YMK={JVAqWKaBzh^Ta9#Q?5n_tNC}3at96 zD&LJ=X&@}0Ia90%jfT4r?-sX@ytzf4{kgTYJP6l0oXzoh6xno!ZF3V5>lJJ*v1pc2 zvuqee{)hKvc`u5%&9?+`B$N`VlUSQ=azZ;M@pQ9ew0Tg4d9V0a2hn_s`d(nJa6K<* z_}m3Y(Zc`~JuO(r`jh>3)BarBCZizb0M(DO5(gcA^2Y!R0?_^#;GBRHf-Dq(BR~L( z!UY9D_|apY{9caY5J8E)*3Ew%z=VS5@xXKh1A-FKghC)tI01l%hihl&=xJtV?qTf; zrjAGDEDi>o2?Lh8o$={yWLg|EJDqO@!{fUb$3|BP$L%s+Sd|)FPvBqygnqgq1kOsq ze5BtdPS$)5ZkFFz%I_|~Z|z`aevQut>F59i^dDa+KRlob2&e}FYJh+$0Q|Z?N_`BN z9w%hraauRZ_<8fhH0kN6LFL3%o5|TxfeS&J-HO*g00E(Zd%Ej?BX5Qh{U?0{t6>Zj z1TDLJqu&(ZzmqGv8v)-}92 z>JgvpDls~(rVL#)6=`%nc}I$Itd(KIt*fP6mEf3J%?G>(82I6Kg-N38w`C$FJ3MXg z8Nt(XZW!@o@fo~=VGU_>i*F$7db@^I2GVT=GW#qw^b|vsE;i<_2>SYxG%c1)5!}mE zNeeL#QvT59rDM`YWV!9q*RmUh$V=ja$O*ieD>6Elf|-zlxiM`Z|Gqdh9PeTBWSLS5 ziiQzD(a;@#-vn?J4IX$9`^RoOw0o#`02KAd-`YI^3CE^GFp>kpFamA?0m0xN{=rc& zHsFW+`LTDv=MR&Lcw>?oIN9)yM5J=AIP!X21&i^W09WQ#PN&dGl^`xCk&{>R%{Yg7 zt`nkU8dvyn45T;=@Foo2?b$u{T{Q5_ivFijUXq$}t&e~nv3 zLD2X9yT1!P^mn14zYE$PHFNinR^yd32Io%$On|k(a(xynUkjt;M(EJx`YFyVN!>j6 z`1S&Cnjri}fMJs+U6f);yE(?5F0a^gqm{U4#%SQgX>~$%hUP@_4BrHFWy4Fa9(-anc__Ga zqS|OJ{q&ptMnum&JRJSLd=Vbaaw5b?@SFm#Jg{!`km#y$#+zZc#Cu6`F^) zjXW?My&LX7QW_B}eb2Mu+RM_S#%DHEqUc0-hWbR(`A%HF`4J^W6ycPog_1!GzQI6p zIYdBw7%%iy70{r&8Cs59%qU*U#l7TaKl(SEZn?fOK-N9vR*bdRxwXku5*mwm*Vb`m`gsD=g1Nrc`}f5YB}dU_&a&Prjh8>g z?OPl9w8zALNnp5XLKy??^>x~)hVX61;$q^mO23W%Fee@vYVk?In>snvyo31`CRg4-F>Wk#b$n3}C)QC{$EmHL6RMvq{hQ|Oy&!&8fVaoOTN z&RFxu((!&A&MBswr8)A&#KGE4_&<5t%Y$!GJ zH2*L9XJ@~aj8eeq|CI%H=tO`P7%l)hhnN`Pzduz>AYHyzOisx)a{5~HqDIMSt~8RR z6ocC}I#|{5`6(eh%Qp;js4JO1g-}~-GOeWF^suj{Ci_5o-ix2NOmy|bf&cSQDcc(^ z<1AI`=&vqyagFctYIp8@*v<#M;%^rl_H}m4$v>21T#9x{IrlWK?U70rCOWAHyL{ig z-@D7%Yc>2QGZ!`lPcLtyzYNLlxgdQ?NWsQhv#>lx`|fgjzvR23(J!<^A3XH*HNzZN zQ&c5CyW>~|B{{aff!z@@riG%n!3y(rlL@3vn_`*jiZ6fEvh8HgvvcooWajukep z%XC0euF1>pJ0w25RvHrhID5nZ}d=IryeQGl}4ctvrW~ zKR&nwAa-~HofL6&;sm47(NGw+gGED7eGMnhyh4JX9x0?ey>%CZUQR0%Vt;9KrE6V}nOk~3-u9x>~lE>dlr6PCd8T9NTH`JquxpiHo zIr5Nl9TVqMXl+HCI5%5!qmi;!Nu>%UkHpjZ(I;!xQct(aj#8cTBNOcGxsbQ|P;#H3 z+>C42je|vIMYiTdf`yX0>Ibz=VWo?=VLd!LLY~~&n`e!ynD6LrkD81>*cYqaDF!kw z3@*f;*Olr;zqwx$-fO7rPNMdpB@9pEN+?ry9UJxz84(HkbtC3Vv$v*`nNw0*^{&Nd z=yBYa^9&T+rj65daUdLM1VNhbI~ELH83H8L3W?8p-Jkam*v8@Y2s~{sI>NC5h~vw@ zZBzW^o>fo`+h4rFkK}ZZ=XVRUfrTf&a{P(NzeV=1ME*^i0~_!-a+pA0$`-KxLtjef zXcp*83H^yL^*vcR%vBTxzcxAKzCjv9Gyrxuk_CeiNB42D`^DEgioRcOVh6y!AsTGa z14mvP^vIF`-8!(!Jl1Oc+BN_aq3f6L);=h8jLnf}g7{ht3^B@16;kmLT_o)UG&*Xi z_Fk$QOe=HlIfdfqa$0}3uIr@3T97h+HFR=T|H`0!$ZimfRS<63UP=<}*r#g%OEAWtQf$1CqfyPVOAacQnfghe7x;$&$4?3b`A zGqw=B`_+$px}0!*R{x*I=h>Xyk2ujW8ST0N68n&vD4(S z(6iN*jdLw+B^G(c1*B;Q=i#1hnP|L|JRiHam-)!$N#o19IveNVW>SBg#?qwrkPwzi zl{BU29u^VnE(r_DQ1vVk-v=7`5_H%~gpuuHUSkKWrg7{%l4oqQ)-4)j+Eq%WA2KpZ zca@Q{w2#tV6Q4$35h`q43C!hn}5>?TsV3H~p#G!sQS8<~AtfF1I?ZiPXfRO~5Er z*!PSrDN-yd#UX-B{m@R%xI@{7*Ua5zGdV+W6uIa8sMBu{evXaa($eH+@ZYW7AmE-I*vsLU zCqF+=N4ZlhjtZ6GW~c^ibhcq-0#>bovLm1Ua9ASK zQPd+g6+;rO2IHrwZtR_1#5b{fwC`-#h#7x+t%=W*kj6s&?W+MPqY=5@ppRWIx6bhz zo^^|M+aDuJp$V)jpHq)|rZ{+wQ_Obq+U1zH^4#b9qdHcxDHl;@7Y~@k;m_xed66{p#TzMwc&{$F z*H^jJm&_yh@a?#R*(od$NCYA6Gqv{I3l@Plt*%y9$V~!3%RsXMxAt%nckK+8-N8m%#)@|gg0cMKi?)!$?LDsGWp8!SoLHO`=VCkO zCsO5((fw0Ir28g{xMBNir7!zmj@z-U)ySe+lbt0K?mxhIYVE|1uTu6*xVyy&JKZU5 z8F!tS&up@diMw^3gOpK8%@@<6SK`I)QiSM`8dhs$*|ciPrg(2?V4Jk}kuKc^bt&X; zEt;Pj2o#6-Wj*|1%<HKPYmsv``c8)nbZM^@j5}@}@ zJv0C{KqdKNvU0G}pQ?wV;P=GsTi$j&ZTs3Ju>%6`9jP0ri2;E?fd3z=qVCZ=P!%s6 zt>-^=YrYHGKP}1i7bKw{mh%DB1LMg#&tfU7obITEp0-LDVm)Z%nQ31%V7k8?#stkN z@AS_eo`2i4!iEZU=BFCFR61@qIAxr`y|N;C?rynlg^xjXy@`mGl1JLoyFx5SjXKbmCXZRa7ZSKO&tZEUwp;&hn?dR(CrH@2&0_N>y z^uw&XpK~`hdv_-6UYmYE?Vf7w)~h-rPx1nWpO_=x^=Veg16z-=>1k(d6t!l>^Qt=Q zQx%;Q8-XH%4uvvoW8-=;Dgt-Ro-=B#AC*K*xD5zf>fQRZmGyE~Md&nI^@{{9J5R{y zi2R)RxTpk{p_uLmA0%8W*`K(L49~ZqYCnC+(>&K|fT>ktDIO)H!$Hwzy@7}??ims< zFH#7$t)TqU=wU~0SCIDvDgI7Lp{(EUb*X6W&@%1E(v)&Jo{38ruG3pN)q3FeK_~T% zD>)8CXVvuv@+p~^FMU|?pJ&(a`E<92L$Fcns1 z=-1YaCf^J{zUMFh#Ggne6pli72YqZ8&{YRK{uPme68%mpk2(0s0o?%gk1he&3&a1Z z5%3S)Fz#a)L-F9W05t&qf)0bsVvQS7U*AHAGU&(+ZE03HmCz~ux7OE7h}qaRhc9lG zSXc%zPguRjMsK+;pGwVQ<0}*-45aY^M2_E`AI<@=0pPDUFwvL?DgHt!qs4JuvQ%KHr}!v5He8M>tLykSzT)vNGMgX!qOH6v;p$vx)iAv=lZy}75ODTSJA8=@_W=L$)4 z=NDo)QM?``urAu5TC2C?cY-RIw>ic(Tnwj-{i$^WomXdIhG=rfjdb)SN8Hr&%8fo( z+I+RD+XJdnYCdX5o49B|soTHQwFWO*j%8un84u{+vI+W}zTMKO%z62B`8eUpHzzU6 zKhq62pX%0<#N58JhI?w5C-8Q+hkS3f>U+n^R?IX7N$1j?08gW<;KB|_mXf{w|?%<#ZRx%amIu>CiXi`?&~kcNKy)>cJf(l zBsFczUm?>EA(LZW3XeI*lj@UjRgWzp0mtxa%FLZK7V0F4Z2FIxtCyS7Z`Q`W7&4Fa zPn2V@XWjh}U!_dDzWI4Z1*dsC=X?X&3nGQ&yOY@}J+$ec3Ha7E)#~wXCMlPgl&>|q fZ?p$~x(bO+8{0nVjQMa!tb-dbBTgcUFYEsS3;#(} diff --git a/packages/RInsightF461.1.0.0/lib/net461/RInsightF461.dll b/packages/RInsightF461.1.0.0/lib/net461/RInsightF461.dll deleted file mode 100644 index cebeef4295f478cb8482db6d1db6754fa64a8927..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31232 zcmeHw3z%HRb>_K`zPBIKt-0N!c}OEo>oL+u-93yRz-SN;y%Cm>m=O=z0x_CtNn>WZ zhub|MA%vy%2e#uEWNim0j(Hd-AxqZw2Z?b$d%@UV$Nn6L#3aOtL)b4SFFWz~IV4VY zW3m4^RrmJod0?As1i>_Oz>eQ)I=bSoqs_OQz|E>3vMMO5fuf0a}G@ksqO48R) z&Y?Qf^V=DED)GB3o;LRV?utVvCu;d=zk0$Soyw1mRw~tc{#ZHh&s6dgmHf^FBl)T7 zc)35FPOjFZ5AGt`XIS*U9n((+y}e8;^C@G1$VZ8zN}szQ&pf^l<4e>kc~kMt1saX$ zWdJDWk43lM%c%Tc%gwV>=9A0!%_UH5u$o+uuvj|09s z0{7R;r|N)zXBr9WWUQKRK=R2G-P-Th{4qen+r!APqPSt?a~0Ip@0Ta5KxAI&S$vt+ zDSRWJtBAHoK*>IW@$-jyGbu(-A0leIjL4AEH=pDN?66zY2bJlwkg9F=c|=KcVO58q ztg4ITENX4jJ_}B5GiFsGUZ^34rn-bJADib&n|xvKa-Bx$NFZ87E%Rr*9#q!Fk&`Sk5s)6 zWl#5YLRQHFdgs1Ox_lN62CQ&Ot92`|tV^=GWJ6F=Fgi3Tp#>oX{jt1CIkS()T}mnW zwqGy`Mtj(|O~-&Q1czq2fP}dR7Mm%}K)!ze^KZp$YZMbBVuBo=g3b zJiGl3@?7R$D$nKqmGbOK_-bJe@|sr`rlHSRsM^dSy0A%16%42M63qep~u>(neNhT zEYXCQzAoLlbN0``#q2pddtU$5JUE3}w#pXH-Y!`TX7N7;t-?vk{$O^y*8;3k&~EPR z&ke-rCKw#NRN!l>aHvU4_@q;eQ+sOgGE}QM(h@K3(+)|wllCg6PBNXf`rvev{wkBE z=dIX=iaxlfq=*BwQ-iPYAjS9j*KsZTw&D_9!gIL~ekd8t&SK!vZVqt6F--&|n87*Q zvlY|#33>QGr&KZf*u|HQn|&+zd5hV{F1~bw?(8%Zkj{3R{B%lNbFlDt(*786}k(IOCbFo3V0rG4wCZf+d#)(kcRCr>3BF zfY{Y3XbqsS&r)Y$H@O|vRp^cimyz49vje1=xnSo~UaHtZ{<|Px$A5;!3?(INScH>z zxmB!1$u$KS%sTMm$SA8&Zj$uiljOxZZeq!Mwute{Z(n%rHHFv`7hzzaxfZXb*iC-g zqUpF2ObOXYPpX5sqP_lF9jPFE3ZgW%K3i0P7GkW&8p46(S%gmk23gExQYjJgA*;3n zO!sX=l62a@1sf?8{5{CEJyiq6WXs?;0FdLVpbjgklZ&|>H>sEp(qY9cLVd?gf&sM` zI+b;ZEO_usYKR9MHV8$ki50W%s74Q|1nR^B{YqwpnShdA# zD6UJ+fNi^41P<%H*wtKt<|S@Ug^oED=n)k}Zpb5;utGV?=dkJ)^o>M zxNh5QJIfLaX0Ijj_wr4xkqEuxg2`Ul*|HQuBvlcq?mR3SOwFn2P!%nm!J?!Vx(>C@ zMfL^~E0*#d0iG;>v+FUTVS$5Wnr^IJ#34yrAB5qkF_`grYT(apDjW-$Q0s4pT7GAD zB9?p!`k0TB$Z6i*r4ML6us!yd`R0Ydl8znqjmAkU= z!}0G42{##4q%~^<>yH~WO$1Fb_dgrXeJq5mn)L*ZStzpbA=o>^dctT}gKz;7HSxwb z2_G289FMc?mO^$3$T7jPv*24G8&GEnqz8Y9C`htNrlX`{ok5|Ua;!7(1YvPZwsop! zt9l7~kp-&Z}we^vc5qirPyE!q{ymsc`oIcRvjM2wAs5kn)wJhFLeeBi#TO0 zS6luYtE@ejCS6|L!kuNr9KDSA%Q`%+nZxqnr31EOzQisv{El2YbioHQxvpSb%3PKdc6&=Awz3qq(iPZBi>sIrZWYTNxh{-%>74NrsK{#i z8EAXSeA;%RgY4Lp&;tOL?Mk(DFQF z9<4A79s(depw$pGpIOYFyA6AE(gjMeUofzNG3oR4p@Rn82M)~6swy0YAraFe|2M3R!0mt=Pp@_2g9u!8gYWDYtkK{z0m%2;!10 zgq61=?`97lr=B3V^~YWNf*&+(#eTql5t9mbDTCl zNSOWX577$F5PU0th+QB2VF^y4b`@yfr9zyRc*@;{rX2Iq`(a`y(d=D#^7m0)#^pbP zqCNzqZ(|aiM4roj2;88};JZZ~seLl7TN8d$7WQWm_i_Z-Tb?m2Ni|rUkE;)EFSji^)b}*EJ z_t!_gh+EQL8e1hVp38WdBId{~{s)~PFgCrE-G_L=;k^zA_KUnl#VtTC0+#uVHIKJ? ztzK)<;~fB$WqU2vo#+QPFbl?(keS$p%AqPd`9;~}g?0!oFf`AF*q(*|U08EkPFXL@ za_V*$kkeaH5s?$(w;EV;a#&5oL+fxbsty$~+q{T4Y5<-Gb~d~bcHobhokj5l*g1fT zCU!a$J6Jy61Uosf^C*T9l};yo|6*@3_wFPX=zS|HqP;if3!jIJ9rJp@Ylw0PJb_9K ziSJ=(=r$Pj;IAN2F-@*hHS3bo^xTs9qHBu}0&+{erMd2ioI4NamJPlHI(igdx7vg* z_qx5Mn^t8DVS7d->u?@|O2u)8#afa$P3MHnW;LkrVsZ59I>1hUe^H zdP^;kLNc)W+zM}rx1ze6ZMd)jlEE%Bg3SM&~UA6opXg;lfKTb=7| z>LItLu-01@HA$~m)YCLAdNIIWuh(0n2DsK+Tl%`U3Y^Ed=h_|!u2;f~>ea}u>6O?* z<#T;rU&LQm_W~hT@Cw*cw1L2v;p8I>vG|H!k=Kyl4~4z(c-BRldh5`(vH{r2!VqBynbbd7kPc&MGc!$3~ul?@EOZDfh}e)$0QbqUQU-fC>cN_tieuC z8r^R6Hg35Wxa9SF>pE^i$tG`8v6H;@O0wQSRGfsStZH>5cfrhU_BI!H2c^y1K{cf= zj<)bFMw3gtON!Z`iFdIY$^bYhI4I2xEZB8FRN3$KM+66da;bOe&?`9c^43EoxB$TA zvx-TIZU$#g7EkLf-j?EGvNDdWZ#6hcUh-@pQ|UFV^+9itmy{uI zsMt=HH>l28YOnyN^xNpw(nTQ3MZb!o+17EHcUf`G0!nFWU6_oFu>&gE>TSj8UDTMG z@wbxirWbIi8&DB(sBF3g*x5T#tRe**0jcw!_ZtuPni3oFdF?$I0Kzuxv$1Zf*yyX= z<|@eJF0)|;of}&tkP221*R3PJkinsN1F;1`+cq@zCr}>YNTEa!^+AyiQ2Bg+6ujWB zQN?K>4*oNX0$!AhNji<5a8<0JW`orGmG-8(Q2i|h();8D{SCB;gXw5oct@kZhRK9W z5=V)08>0?^dtJ2)mDPw(LS3~J6u1+xoMlJtgO^4=4Z_m+GJ1;WKgY-1+gNVxtxa-M zI1$W1ZZ#ZnI=zVon`e2u%SToVJL);B##zL?Xpv}=s)FX1YExY()w9?PfK1LE{0MZ& zON9zcRix(r**TQ0A>laZzBB{tbPH7l_u|rheztgD6dCtV^=5!#EROCF`UU#~qU(&s z$Bh(jCXA)9yZgZ%WEY(SFG2}w4v;okj#^WNomoR7))tEEc(uP*W`2B)2mJLg1Bbomwq3}~c5T#SQh!3l5r|jZ^!)YUXz!o%4sm6sVJtC16d)gu*eQB1B zRlylIk2RX}_K=$=b@P5(L|%&9RroBq&g7jU2C-aYVAa_b+Sq!&(-{Z9;Fj-?+2fgK z#A^FExROu{mcl2YPF4Ac?$Af5B`99Kk}LOtSJ2UO|4--4eRWi$*61~~?m%#UVbZne zANGR&rRQ1Qbu_w*SFb`(ef!Z94o`GXFE7wja38doR&P;#Vb12E8JX0Q!Ob%46I{ce z!(%yph>e{-jMCBP^cLZ?3^z*bk4(LzxxmU(bM@X(j;5t=_Cyx?MIgR^@-Qo5d>9*F z6gq4OxJ9gD$b54vrjsU_;W!h11-7bVd7S4=2eCZQ;UEv24fA}wsLE5i6ml<+6<5-t;@8Bh9nq^lVFfJF$1bA=(a$f*|C+AC_j%XUG{ zr2>~p$JisI%xlZVa82apxGl~MM4%mq)$Rxz>(XbuB(5REImm{hBys#re99l6TYi|! zahR8D1*f=!c0AW>!I65rb_EYM0YKAQf+5`mzmSmSk#C`J^eaP#u2U#h(?AA=xv3aK zRMh2l4L!pFekzy2TAhJ0U_G$t9E1v=?frCmPySSTPl;Yz+S7yI2Nz@})aJ!bbljA7 zFwijUQCl&%{Vh*1B2+#2V6=tHEj$O(n$;$dHr56B_<1W2^P<61fSo#aOIUW4A7M|^ zhm!z@kG`>&QulD6((p3aG0#&<2{lC_ZJg;1-GBoCTyJZtN-Yfx=zGWnMm&ef>ZRn} zjwgAHq6=QilX!LJy)s&LAK!w@`;?A~u;s*J`W7nS@>JFGvf0><@=A$=y>)SkJDYf5 zD&#ht35%ihIf`p9Dx=>Mj^1fzi?N;9^Ro~cfM5k z#v2@}|4vL8S?{qXd@1y0YMji79$Q56&3xjlL2Idr&*%`#=6Q&tT0^OkrFclm+WVZ17?rh@_Hjsdk>n zf6J~}&tvH-=iGzK6WjVlFLGL^UOZ^G?pcYdO^1RijuVQz0kO)Z$Ku6+Sjs(#{`Jv{ zj!m5!Y}!3VUqOOpZsENl-pLRWJQrD0%Mb6eQMwjiK2Lod-^2J0{y7rh0$b$BJh**W z9<^b0vkjV;-@{L~F=a=}(y#(zXxLW7u!$(#)}Ahmz^a516$@~dO za^QEY_Va2a{WDc~hT@HpQ?`UU^-KlU(g>mwae2)|zdwez0vBQ=Xv!WCV|HZC`vb@c zyG-1R!i2DcfVL>F7U3vf+j7FpIc9XA~+96+qC zilGp_WNvEXWjds%cZljeOiapt)pTBZWL={To-QW zXmje^&}9bg8)NKAh(nVT4Xlra6aEK6k(f=6uV13dl*^}^Y?h0$X3kj^_)4KMJFuv# z9^J#$>v&}lrxo7t=5U{jw}a)g-Q5 zoqiOVu!8TIxuRE9bcPkLVPhaaXiybh;mbhlRKb!Eb4rtt*Q+1xZM-&wx0krH?y%{r z5D*HMg$0i*jO8J%vZghvDtZ!OjZg=p(%YlGJ;`Okn{n!m^$z{QdZ+)-+zWnsaaw3C z(XXv9)o-nLtC!Y6Ar-PAZ?B`I@m8LCjlDy?#g3YE$j3vP!%t`qGa(h;i(_;>i$dHd zHSXthO>0>5MP2h%UE_sRsdQKv3!&YzAJw)g5d>UJ?RU>tOqH?0f7=xJ59LTP^euM@$tKWpJ+H?J0 zENOH#;BVmSVAb}?>M=&f2hoIaC=EiP@22Hu9! zKSJ$R!8zf+2%LRsPV*+Wy~g5nKg##u7J|>sR}1Ffq1d6cq#ueoPKFkni$OUfG=HV# zX;4_iUPePytG4#Of!q#x1s+*fxaV{d6bw?=FQOBdFrKu=+SN2Y&-OabSctr zNpmdn@vH zCpo3WEl9uRaH@Lwjl?MOT^7^)fYAJ7>HYhX-jd>0kE5+Y_ZekSUTI7r9Wri5Njx!w zw1V;tc>DMkq|XqiZ`4F!DE?`@_WTNcW^Ty(1=Rn$y2Ya{7qL>E}T6hI6LH z>3XSsNm}&?&Phot4%cpXIsI$FKZv#m^K1+Ebw1{v1wSu@(7m=ze-lCH1vZ+(&(VaG;}b<&=VTEFUHVQ8v3OqL!Z~s za|T0S)=d0j+zX$X{cQ|>sAmX*ox5(2y~u)h~7Ktl!ity+D`hIhTenGcG6#K=;PqJ zlRB}ovPFLdG&||t8p?o|PWl}U;XDA)KWpe}f%x{1+kI5}o7T`@U__ntLa(ap!e~1Q z7p8*wYf^VmLuaLjx`zG)qwS<8G;|E3?WFH&=sAI|?qe$V#jlHh-tMG>3X-vRlEDjy z*b-(1b%szYpo8ql={|Ze^%WcY%3^@|b$cm2*x#sIPA^=<(0TgZ|C%*^l5?4 z(;7Dw>!-`MbKQOMd*WTO0oozZJL4aSuLQJD*L~J3#x~F)4HZ%w03FfLMb^cD#uWrf z3<0`7gm%O>(`xKQc^v0P zM^7oJ^Vi)^$M_uGpf0Di)udf5t*sV4f$$+H`G}Nox!qK*Fh_KGYio@BNUL25`E zh-`Y7sd{N`<&{H?t~oV9dH$09!o%;I%tHb=7F}*J<^Z@g=@hudxfJp?{T*;(^v6gY zDx<`uv%rtjQ{dbnMMsV9*W%pv<4A+?a*09F^i`3A!aOLvMQc?#Q?TeVk((;HtR+E@ zVZHW{@|=DQk<2=zt@tf1r&}c5Ch1;Duaoq!q@zd|(}d)2m-Mux4OXxL|&Y{spzIDEX1|81O%Uv!Krie!@7L{sY=9`Ol#I&yoM9 zmRFGeIQBiHAE566^RR0e|AQt|j`20RH0B`R)si%RpWbFUp#O)lrAET|rC8oLPkXFe zjc?NxW*O;`^pvs9IPA_CZ8Fj}8FjZ#54-O+wu0tkh!2_CUV}NjPDa;)9^Y;3l-f4o zcBkNUOMahlyASzSXditl&fLBlv&85#q=^tx}=1|coT6J*RDf8LnXo4AUIo4ZXzP%beE*p3Fh^J$!BXO^uH0c zrzJfv>3byoFfilvAn0W1qri;Q$LJO0e_8Sm)8ATI*vQLPoF1beApJFZ73mZ7FGxR4 z7mz+h7AQQ8*gcN7uG2`L#ko(MzDylRe}}q}euGvZeV*1JeSr#gKVsDH#QJg9_X^Ub zWIO$|3bA!R;?W+YnxKVKO*@@B>zRpe^K&=%{Ye5IQbao$>lUJ=~a@RQzdaOze>_wbTgg6 z4Einl2b^WEF*X`^84nssGi!F4>&!v(3Uk;THS6YG=9A_hnSXCu)>iAJ^`ESVtlxt4 z4Cp)yjpv|K-aV~pc?!Pi9}-U^J(S|~=VF{bl;rfkWAEn{WM=<}?<&rT|YK6k}alGVAKOg@J(yyD}M0!!`TSzxqFCu*e2>I zG>NAP&EX0eULuV&jU9vu&T%M*Tn=d~?A8R_fiw&2HBq`0X&cU#Ow{!tZKoATJD_nB z*4&G95Iac&erzrBLnt%pGFXC%IaorvjV?m%cBFZ_6ye4%(8uXTdcgQ6W$KljSSu zj?u}P^3kJov^ot+^{QVxG%-0oN>jD5sy{h#j7Cn^>gB2a9o5OnvJj~C?b71T63iIyJQ?t^o*pWSr0 zjJ9{6cpe@`rpsd!qmvVNg{^J?G)`Ohl~0wY%2(WW^yqd_#lgewiSi`M4^?j~R}P(? zo~KGRsV&fEp7I?hAtNC;Pvs%}iJ3X1hTl>?ePh)RMi@ZDyC%VGr5?aLCaab5{xS`Z zOplJ0S-``il@n!=vSfk=+iEa_3Tr-U1+;hPL~XiSlk(x2N_}Fg%tO9;>^Tk z*_YXYCga=cIQTj?gQ`6<6A?)Dz&dJR%;~jJ1-ds()FztHq5ksJvB}eiChActVX;3t zUY;8DZ);FFH0nbdyLqDCS&dc%ZFYnA8_IqSE~3#YsN7Ml9G^Hb0|zm0_0Do_%%7NU zu2k}n7Q^Mq(NmJE&822Exo%=*T$0jBx>XBNu z16bWmnZ_n-FjbYmLrS!7(FFRn2;ev9P*t5=(lCZ!tB+Rd8djz^t8irI7^VfcJGQqn zHaRn1-d**lM(cGh+FRQ{S|2+}2WM(03E7i+N>olDyQ?x@W2>cu89?3;q39NGtkboKvHhC%=4eMfe6IMrJj3#vlwo(g>g^ntJ1G|wCu-0odS&OJ$z%VeWHPH)HRm1CMVVoij z4jg+sf}Cb-J!c>ZUI~KW8UasO9OBn#9R4k|6p_o=Xq{AVG^|_DaKKnl zpa?fZA&$(~aD@BH$LkFO*YjMKqGP)!{90Ym4pfHOn`&!YfQ~{5IT1ptEaEybSx09k z>oU=F1f!`25RijxD2Biqf{H!m`iLwWLBa4yAYr(P%6J13b80F9{YEti!4d%b@X%UE z!jB?9w+;?{iWRAu4j>+3s3ob}G2_Ec)^#WnK&+M>RfJdYCNcmP#J1Y5Q{}OlIGyJd@4d1y&j)9 z#X{0O=>qOrRW*6iM%l>Bac&qG4x;4f7J_a3KxOi@)?#4LVzP~?uwCW}9q`A?etEp% z*dzO)U6s0jnyS-BcildNO+;Ptdn<6q3L4%uHI2f(wQFZ4ClB}v3RVMzFWBjz8pBiC z*5({m@V?E!-|oRN8qP|vzbES~-y31S+0SqDBDXTkt(BaCvRhSIY=Vvh2jMVI70URT zj*oO2-%Epm~f}unOSf`}bF_bce+rSG> zcPtzp#?shNQ}5eQTB5tK$1UO3X#nXKI!Z^t%Q~btE)8H;M7`y?;6ys!LMV;x*NH>Nu_9I z-2=FUoxS05iYMrRs=HNA01S&M;Khm9m4pQ%Z*2f1EIiOciQFLJA1PhK}eT9E0o zKG3)uGOIw+>!}Zvan=v`2w++it;HBqd@{wjpsw>i=NC0NU<@8VOQMMHWki?mfTiHq zKO(gg;EwHJ6c%$Etf3BgT%HJ%0hIye!3R!4_OAsGdAbwr>ae#w`mG`z6YFA2!b*yK z1ua+~Ot~sHT0yS458UDQ>=vw1@RAqHJp~F=`0Cy^soo|)RrSQ2jpBO;(n+*szS!b} zcA$CvA@Ic%n1jX)7{&NbqqGdJ>N>Be%n0@vC|2;VDx*IpWfjb#N&Lh0Q#GK9^E_a( zOqfrmwN|(rMat4VfwG_`7&}Y0E)vQEgU7;sX_m{3OK;wx@mC0<7Ylt#}yvcMF$qpO%yK=dGhG;MCX3Ys#b1h zT$o`peC5u=SxC`&bUyGWeuZRNKB7MJLg#uh$#;b z-t3v1Nz5mx4gW?$ks+OX@7ys>LyBy&Y*1`!EHR#JN`pMrm85xsE7#C4XVxm4aKmjZ ztRG&;8fFXmUVc3&1{0O*j-&s;uA-BuVZ>46d~#u_zfr>f?()Af%9$_zpRD08Ej-v`KY`$ULu6;6)(`e?oZpCV!vU$8`+v?2$&8x_ zRuZ0Oyxxvt&0vQ!R|sn*B3g^Ozyqt*R;@Kvw4OlgV11rFos4qOQx(qa?Rrwq-_L5S zVn1as=TjqeJDeKN+qr&ozV7Cmy+If;-`X+trHY`;w!v7BmYF%KPyqrwoACGiC!=UTt&PX2ZUYW1+seK?+d-KW} zti!Y;=zG5YUT-OD#Ah_t9GNlgIwpY+4RUzFT5F!&?Cf|!W-|>ukErX9KqeO1uH!t#c9OZ=9>(ykhpYo2}r1y)tB6h=U-r z%O>+ic5i%;bdLm_>M$f2QX~9{n(!N=%BzWSAh64ZSR0c_4VtM%k6h+1rIBfJcGsNU zEc2>tQ*q6P#m8Y)jDAuk4y%KYVOb)|QfG%Y%pEIXT<{eX$bgTg*i<3lv0yYmX=@V% ziz>pJD!Qb&KiA$TZHD*j`@Fj_83=I{T;Za25Mb|QchFor}TA#FDgx=V!hyf7h2HqZY+ExQ?tWxGpY9Q*|5 z;Ek(Hb0sSueCtH2!7*4zr9$s;6S^G=Bjs%_3?pa|AP>4qhC!bSW1&=7P?dSNRb{w$ z-7~UEZH$+M&B}zxQCHA&FrYvtX1ALTsALiWnSe&Ss|De0g*{<_8r9YF5^_-`=u2{# zp>a&c_-F4razoeVm)~Raq_+)DOiuVUM*MULNsJSR6a18o@cJ#11ShzB!XHED1aF!X zeoKTT!^t8f_)VH&IvEqcv~{urnvFi>i#m^)E*#}i7B`(Z9)|;Nkw-C%+DX{XvSk@J zZ$YdOf5k$0?uVJK~BMVLsn%pVwS8Z+zN(Un^EA1p#ofBX7DxReR}*sX0zSL z9QJ|3KIV{r4#=P7{7b?^X8Vo)=rmpo3SZ|rbdq1KGl1u^g^-8e2sXXfN--(#Fen?o z1D1d8@qB*cz{X94SNm!8*!af5(PIObls0eNh~(n&OH0SLjBhGkJh){;`I3Rr!ScX3 zexiylHsBYk_(!xKKU(a+cGscs9k`-?*XwfpiuIEI4d6A?7FP1>fRm%A`8CEiZj}#f z@`4TSBcI=#+WTV$+1MxWweQCl7q8JzYZO3!cx30um+WI#|K*WixcbArUpjy9=s)gY zqC19;@Y}JqBY5w2`s9&Xb;chnAMwk0SLH}lOwB;`*xQfDON33u{nO*e=)+(p_HP=v1|`71YL&l_bFR4o z&mY1aJk2R*ysPoO>0zR+@{Tx{aGrk(cLVkmN0IKr53)vZW_AF7$LuJc*V1m}`SS() z2N&3@sxOyt9$QRFVY_&;Ek{2)0T`gl!9L&MazMEkAtvup__JDC9YQS!-FTe}&)`~4 z5a`qP$3WBoPaN>7UDaGlrvzsJ<5vGRBcO&1@ONie9y`z*pB$=-KlxEP>Q+YTI25j6 z9~PXVsJ;pB>!*Pg^tTffqB|u0#srXuWmM``mv3cu<99Qc&;}th0N2)_aRX@hpwei& z0U`WA_~kx5;Iov}l^SoACL^3J)K@_z#u%?*rKz0nV1{Ri8l>Z@- z`$5pEVpKEOmDVE?SeOQneY42Bx$SJJ&zAY1wAqHy@Gg1^)}v0>e^NW{@89inzxw+L OUuMJpkI(;i68PV4%Cuns From c07d46311ed413cca341cb9d4db276958b40ae58 Mon Sep 17 00:00:00 2001 From: Stephen Lloyd Date: Sun, 24 Dec 2023 11:41:45 +0100 Subject: [PATCH 31/48] Refactored --- instat/Model/Output/clsOutputElement.vb | 1 - instat/UserControl/ucrOutputPage.vb | 6 ++++-- instat/clsRLink.vb | 8 ++++---- instat/ucrScript.vb | 1 - 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/instat/Model/Output/clsOutputElement.vb b/instat/Model/Output/clsOutputElement.vb index bb40bef7452..b566dd0ecb6 100644 --- a/instat/Model/Output/clsOutputElement.vb +++ b/instat/Model/Output/clsOutputElement.vb @@ -99,7 +99,6 @@ Public Class clsOutputElement Try Dim rScript As New RScript("") Dim lstTokens As List(Of RToken) = New RTokenList(_strScript).TokensFlat - 'todo Dim lstTokens As List(Of RToken) = rScript.GetLstTokens(rScript.GetLstLexemes(_strScript)) 'rScript.lstTokens If lstTokens IsNot Nothing Then For Each rToken In lstTokens _lstRScriptElements.Add(New clsRScriptElement With diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index 7a3534d8e42..bed07629c36 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -15,6 +15,8 @@ ' along with this program. If not, see . Imports System.Runtime.InteropServices +Imports RInsightF461 + ''' ''' Output page for R outputs ''' @@ -191,7 +193,7 @@ Public Class ucrOutputPage If frmMain.clsInstatOptions.bIncludeCommentDefault Then 'show comments only For Each line As clsRScriptElement In formattedRScript - If line.Type = RInsightF461.RToken.TokenTypes.RComment Then + If line.Type = RToken.TokenTypes.RComment Then AddFormatedTextToRichTextBox(richTextBox, line.Text, OutputFont.GetFontForScriptType(line.Type), OutputFont.GetColourForScriptType(line.Type)) End If Next @@ -199,7 +201,7 @@ Public Class ucrOutputPage ElseIf frmMain.clsInstatOptions.bCommandsinOutput Then 'show command lines that are not comments For Each line As clsRScriptElement In formattedRScript - If Not (line.Type = RInsightF461.RToken.TokenTypes.RComment) Then + If Not (line.Type = RToken.TokenTypes.RComment) Then AddFormatedTextToRichTextBox(richTextBox, line.Text, OutputFont.GetFontForScriptType(line.Type), OutputFont.GetColourForScriptType(line.Type)) End If Next diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index 61d77e8fb54..b19eff22cf3 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -725,7 +725,7 @@ Public Class RLink ''' ''' The R code statement to execute '''-------------------------------------------------------------------------------------------- - Public Sub RunRStatement(clsRStatement As RInsightF461.RStatement) + Public Sub RunRStatement(clsRStatement As RStatement) Dim strRStatement = clsRStatement.GetAsExecutableScript() @@ -2270,13 +2270,13 @@ Public Class RLink 'check to remove the [1] notation before some parameter values If expTemp.AsCharacter(iParameterValue).Contains("[1]") Then Dim strcleanArgument As String = expTemp.AsCharacter(iParameterValue).Remove(expTemp.AsCharacter(iParameterValue).IndexOf("["), 3) - clsNewRParameter.clsArgValueDefault = New RInsightF461.RScript(strcleanArgument).statements(0).clsElement + clsNewRParameter.clsArgValueDefault = New RScript(strcleanArgument).statements(0).clsElement Else 'Empty String are Not accepted hence the modification below If String.IsNullOrEmpty(expTemp.AsCharacter(iParameterValue)) Then - clsNewRParameter.clsArgValueDefault = New RInsightF461.RScript("NODEFAULTVALUE").statements(0).clsElement + clsNewRParameter.clsArgValueDefault = New RScript("NODEFAULTVALUE").statements(0).clsElement Else - clsNewRParameter.clsArgValueDefault = New RInsightF461.RScript(expTemp.AsCharacter(iParameterValue)).statements(0).clsElement + clsNewRParameter.clsArgValueDefault = New RScript(expTemp.AsCharacter(iParameterValue)).statements(0).clsElement End If End If diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb index 7d0436590a8..aceeef13e56 100644 --- a/instat/ucrScript.vb +++ b/instat/ucrScript.vb @@ -17,7 +17,6 @@ Imports System.Collections.Specialized Imports System.IO Imports System.Windows.Controls -'Imports RScript Imports RInsightF461 Imports ScintillaNET From b2c0dae1292d70a7a9f0dedb0016799422e6dcd9 Mon Sep 17 00:00:00 2001 From: Stephen Lloyd Date: Wed, 27 Dec 2023 09:59:32 +0100 Subject: [PATCH 32/48] Added RScript to ignore file to avoid commit problems during transition to RInsight --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a0831e0af12..b9e574c6471 100644 --- a/.gitignore +++ b/.gitignore @@ -254,5 +254,6 @@ installer/Output/ /packages/Newtonsoft.Json.*/ # RScript package and dependencies +/packages/RScript.*/ /packages/RInsightF461.*/ /packages/System.Collections.Specialized.*/ From ff96adf86f1c889ff1b01f6d5d2d65442eb26099 Mon Sep 17 00:00:00 2001 From: Stephen Lloyd Date: Thu, 28 Dec 2023 15:03:22 +0100 Subject: [PATCH 33/48] small refactoring --- instat/Model/Output/clsOutputElement.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/Model/Output/clsOutputElement.vb b/instat/Model/Output/clsOutputElement.vb index b566dd0ecb6..acf74f951ef 100644 --- a/instat/Model/Output/clsOutputElement.vb +++ b/instat/Model/Output/clsOutputElement.vb @@ -97,7 +97,6 @@ Public Class clsOutputElement Get Dim _lstRScriptElements As New List(Of clsRScriptElement) Try - Dim rScript As New RScript("") Dim lstTokens As List(Of RToken) = New RTokenList(_strScript).TokensFlat If lstTokens IsNot Nothing Then For Each rToken In lstTokens From aacfc000efc32939dbb088f304db1cc25e763438 Mon Sep 17 00:00:00 2001 From: Stephen Lloyd Date: Sun, 31 Dec 2023 11:21:42 +0100 Subject: [PATCH 34/48] ensured that script window code, executed in non-strict mode, is displayed in output window --- instat/Model/Output/clsOutputElement.vb | 6 +----- instat/UserControl/ucrOutputPage.vb | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/instat/Model/Output/clsOutputElement.vb b/instat/Model/Output/clsOutputElement.vb index acf74f951ef..f8ea0e051e0 100644 --- a/instat/Model/Output/clsOutputElement.vb +++ b/instat/Model/Output/clsOutputElement.vb @@ -108,11 +108,7 @@ Public Class clsOutputElement Next End If Catch ex As Exception - MessageBox.Show("Unable to parse the following R Script: '" & _strScript & "'." & - Environment.NewLine & ex.Message, - "Developer Error", - MessageBoxButtons.OK, - MessageBoxIcon.Error) + Return New List(Of clsRScriptElement) End Try Return _lstRScriptElements End Get diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index bed07629c36..0d8972109b5 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -165,8 +165,13 @@ Public Class ucrOutputPage .BorderStyle = BorderStyle.None } + Dim formattedRScript As List(Of clsRScriptElement) = outputElement.FormattedRScript 'if settings are not available or both show commands and comments settings are enabled then just show the whole script - FillRichTextWithRScriptBasedOnSettings(richTextBox, outputElement.FormattedRScript) + If formattedRScript.Count > 0 Then + FillRichTextWithRScriptBasedOnSettings(richTextBox, formattedRScript) + Else + AddFormatedTextToRichTextBox(richTextBox, outputElement.Script, OutputFont.RPresentationFont, OutputFont.RPresentationColour) + End If 'if no contents added just exit sub If richTextBox.TextLength = 0 Then @@ -419,7 +424,13 @@ Public Class ucrOutputPage Private Sub AddElementToRichTextBox(element As clsOutputElement, richText As RichTextBox) Select Case element.OutputType Case OutputType.Script - FillRichTextWithRScriptBasedOnSettings(richText, element.FormattedRScript) + Dim formattedRScript As List(Of clsRScriptElement) = element.FormattedRScript + 'if settings are not available or both show commands and comments settings are enabled then just show the whole script + If formattedRScript.Count > 0 Then + FillRichTextWithRScriptBasedOnSettings(richText, formattedRScript) + Else + AddFormatedTextToRichTextBox(richText, element.Script, OutputFont.RPresentationFont, OutputFont.RPresentationColour) + End If Case OutputType.TextOutput Dim strOutput As String = "" If element.IsFile Then From 522cfa16f8c88fa4c1efba5f16c007ed691d78c8 Mon Sep 17 00:00:00 2001 From: Stephen Lloyd Date: Fri, 5 Jan 2024 15:42:19 +0100 Subject: [PATCH 35/48] upgraded to RInsightF461 0.0.4 --- instat/instat.vbproj | 2 +- instat/packages.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 1d7fbb1645a..457f5ffaa8c 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -156,7 +156,7 @@ ..\packages\R.NET.1.8.2\lib\netstandard2.0\RDotNet.dll - ..\packages\RInsightF461.0.0.2\lib\net461\RInsightF461.dll + ..\packages\RInsightF461.0.0.4\lib\net461\RInsightF461.dll ..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll diff --git a/instat/packages.config b/instat/packages.config index 473c05d53f0..c0347fd7db6 100644 --- a/instat/packages.config +++ b/instat/packages.config @@ -11,7 +11,7 @@ - + From 097f26f070b132343df2527b42c1240c6cca7688 Mon Sep 17 00:00:00 2001 From: Stephen Lloyd Date: Mon, 8 Jan 2024 09:34:01 +0100 Subject: [PATCH 36/48] upgraded to RInsightF461 0.0.7 --- instat/clsRLink.vb | 127 ++++------------------------------------- instat/instat.vbproj | 4 +- instat/packages.config | 2 +- 3 files changed, 14 insertions(+), 119 deletions(-) diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index b19eff22cf3..751ffea0ff3 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -727,10 +727,8 @@ Public Class RLink '''-------------------------------------------------------------------------------------------- Public Sub RunRStatement(clsRStatement As RStatement) - Dim strRStatement = clsRStatement.GetAsExecutableScript() - 'if there is no script to run then just ignore and exit sub - If String.IsNullOrWhiteSpace(strRStatement) Then + If String.IsNullOrWhiteSpace(clsRStatement.Text) Then Exit Sub End If @@ -738,30 +736,28 @@ Public Class RLink Dim strOutput As String = "" 'if not an assignment operation, then capture the output - Dim strRStatementNoFormatting As String = - clsRStatement.GetAsExecutableScript(bIncludeFormatting:=False) - If IsStatementViewObject(strRStatementNoFormatting) Then - strOutput = GetFileOutput(strRStatementNoFormatting, bSilent:=False, + If IsStatementViewObject(clsRStatement.TextNoFormatting) Then + strOutput = GetFileOutput(clsRStatement.TextNoFormatting, bSilent:=False, bSeparateThread:=False, bShowWaitDialogOverride:=Nothing) - ElseIf clsRStatement.clsAssignment Is Nothing _ - AndAlso Not String.IsNullOrWhiteSpace(strRStatementNoFormatting) Then + ElseIf Not clsRStatement.IsAssignment _ + AndAlso Not String.IsNullOrWhiteSpace(clsRStatement.TextNoFormatting) Then strOutput = GetFileOutput("view_object_data(object = " _ - & strRStatementNoFormatting _ + & clsRStatement.TextNoFormatting _ & " , object_format = 'text' )", bSilent:=False, bSeparateThread:=False, bShowWaitDialogOverride:=Nothing) Else - Evaluate(strRStatement, bSilent:=False, bSeparateThread:=False, + Evaluate(clsRStatement.Text, bSilent:=False, bSeparateThread:=False, bShowWaitDialogOverride:=Nothing) End If - clsOutputLogger.AddOutput(strRStatement, strOutput, bAsFile:=True, - bDisplayOutputInExternalViewer:=strRStatementNoFormatting.StartsWith("view_object_data")) - LogScript(strRStatement.TrimEnd(vbCr, vbLf)) + clsOutputLogger.AddOutput(clsRStatement.Text, strOutput, bAsFile:=True, + bDisplayOutputInExternalViewer:=clsRStatement.TextNoFormatting.StartsWith("view_object_data")) + LogScript(clsRStatement.Text.TrimEnd(vbCr, vbLf)) Catch e As Exception MsgBox(e.Message & Environment.NewLine & "The error occurred in attempting to run the following R command:" & - Environment.NewLine & strRStatement, MsgBoxStyle.Critical, + Environment.NewLine & clsRStatement.Text, MsgBoxStyle.Critical, "Error running R command") End Try End Sub @@ -2197,107 +2193,6 @@ Public Class RLink Return strReconstructedComment End Function - '''-------------------------------------------------------------------------------------------- - ''' - ''' Gets the list of clsRParameters from the function - ''' definition. - ''' For example, the function "str_split(string, pattern, n = Inf, simplify = FALSE)" returns - ''' the following parameters: - ''' - ''' - ''' clsParameter 1: Argument Name ="string" , Parameter position = 0 , Default value = NOTHING - ''' - ''' clsParameter 2: Argument Name = "patterm" , Parameter position = 1 , Default value = NOTHING - ''' - ''' clsParameter 3: Argument Name="n" , Parameter position = 2 , Default value = "Inf" - ''' - ''' clsParameter 4: Argument Name="simplify" , Parameter position = 3 , Default value = "FALSE") - ''' - ''' - ''' - ''' The function name provided. - ''' - ''' The list of clsRParameters. - '''-------------------------------------------------------------------------------------------- - Private Function GetRFunctionDefinitionParameters(strFunctionName As String) As List(Of RInsightF461.RParameter) - 'Note: this function is not currently called but it will be used in future - ' functionality to populate dialogs from script. - ' Please do not delete this function. (@lloyddewit 24/11/21) - - 'temporary object that retrieves the output from the environment - Dim strTempAssignTo As String = ".temp_func" - Dim expTemp As SymbolicExpression - Dim clsFormalsFunction As New RFunction - Dim lstRParameters As New List(Of RInsightF461.RParameter) - Dim clsAsListFunction As New RFunction - - clsAsListFunction.SetRCommand("as.list") - clsAsListFunction.AddParameter(clsRFunctionParameter:=clsFormalsFunction, bIncludeArgumentName:=False, iPosition:=0) - - 'The 'formals' function returns the parameters for a specified function. - 'for example, for the function "str_split(string, pattern, n = Inf, simplify = FALSE)", formals returns - ' $string - ' $pattern - ' $n - ' [1] Inf - ' $simplify - ' [1] FALSE - clsFormalsFunction.SetRCommand("formals") - clsFormalsFunction.AddParameter(strParameterValue:=strFunctionName, bIncludeArgumentName:=False, iPosition:=0) - - 'TODO check that the fuction name provided has no pening and closing brackets at the end - '?QUESTION /CLARIFICATION Parameters value fror the function ?gt::cols_merge() are being split into different parts - If Not Evaluate(strTempAssignTo & " <- " & "capture.output(" & clsAsListFunction.ToScript() & ")", bSilent:=True) Then - 'Error getting the parameters either the function name provided is incorrect/package containing the function isn't loaded - Return Nothing - End If - expTemp = GetSymbol(strTempAssignTo) - Evaluate("rm(" & strTempAssignTo & ")", bSilent:=True) - If expTemp Is Nothing Then - Return Nothing - End If - Dim iNewArgPosition As Integer = 0 - 'parameter name position - Dim iParameterName As Integer = 0 - 'parameter value position - Dim iParameterValue As Integer = 1 - While (iParameterName < expTemp.AsCharacter().Length) - Dim clsNewRParameter As New RInsightF461.RParameter - - 'Assign the parameter Name - clsNewRParameter.strArgName = expTemp.AsCharacter(iParameterName).TrimStart("$") - 'Adding the parameter value - 'check to remove the [1] notation before some parameter values - If expTemp.AsCharacter(iParameterValue).Contains("[1]") Then - Dim strcleanArgument As String = expTemp.AsCharacter(iParameterValue).Remove(expTemp.AsCharacter(iParameterValue).IndexOf("["), 3) - clsNewRParameter.clsArgValueDefault = New RScript(strcleanArgument).statements(0).clsElement - Else - 'Empty String are Not accepted hence the modification below - If String.IsNullOrEmpty(expTemp.AsCharacter(iParameterValue)) Then - clsNewRParameter.clsArgValueDefault = New RScript("NODEFAULTVALUE").statements(0).clsElement - Else - clsNewRParameter.clsArgValueDefault = New RScript(expTemp.AsCharacter(iParameterValue)).statements(0).clsElement - End If - - End If - 'Assign the parameter Value - clsNewRParameter.iArgPosDefinition = iNewArgPosition - - 'TEMPORARY FUNCTIONALITY FOR PRESENTATION - Console.WriteLine("PARAMETER" & clsNewRParameter.iArgPosDefinition) - Console.WriteLine("..strArgumentName:" & clsNewRParameter.strArgName) - Console.WriteLine("..strArgumentValue:" & clsNewRParameter.clsArgValueDefault.strTxt) - Console.WriteLine("..ArgumentPosition:" & clsNewRParameter.iArgPosDefinition) - - iNewArgPosition += 1 - iParameterName += 3 - iParameterValue += 3 - lstRParameters.Add(clsNewRParameter) - End While - - Return lstRParameters - End Function - Private Function IsStatementAssignment(strRStatement As String) As Boolean Return strRStatement.Contains("<-") End Function diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 457f5ffaa8c..7715943d2db 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -155,8 +155,8 @@ ..\packages\R.NET.1.8.2\lib\netstandard2.0\RDotNet.dll - - ..\packages\RInsightF461.0.0.4\lib\net461\RInsightF461.dll + + ..\packages\RInsightF461.0.0.7\lib\net461\RInsightF461.dll ..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll diff --git a/instat/packages.config b/instat/packages.config index c0347fd7db6..82fa6c86ff3 100644 --- a/instat/packages.config +++ b/instat/packages.config @@ -11,7 +11,7 @@ - + From 6d1c555a3797ab09b85575cc9fc63106fa921b5b Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 8 Jan 2024 10:13:24 +0100 Subject: [PATCH 37/48] Fixed bug on added facet controls on General Graphics dialog. --- instat/dlgGeneralForGraphics.Designer.vb | 380 +++++++++++++---------- instat/dlgGeneralForGraphics.resx | 6 +- instat/dlgGeneralForGraphics.vb | 222 ++++++++++++- 3 files changed, 434 insertions(+), 174 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index c05ec37485a..7a387eaae89 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -40,17 +40,11 @@ Partial Class dlgGeneralForGraphics Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.grpAethetics = New System.Windows.Forms.GroupBox() - Me.ucrChkUseasNumeric = New instat.ucrCheck() - Me.ucrReceiverY = New instat.ucrReceiverSingle() Me.lblYVariable = New System.Windows.Forms.Label() Me.lblXVariable = New System.Windows.Forms.Label() - Me.ucrReceiverX = New instat.ucrReceiverSingle() Me.lblLabel = New System.Windows.Forms.Label() - Me.ucrLabelReceiver = New instat.ucrReceiverSingle() Me.lblColour = New System.Windows.Forms.Label() - Me.ucrColourReceiver = New instat.ucrReceiverSingle() Me.lblFill = New System.Windows.Forms.Label() - Me.ucrFillReceiver = New instat.ucrReceiverSingle() Me.ContextMenuPackagesList = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ListBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GeomtextpathToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -76,14 +70,6 @@ Partial Class dlgGeneralForGraphics Me.GgtextToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GgthemesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GgwordbuildToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.cmdRHelp = New instat.ucrSplitButton() - Me.ucrInputLegendPosition = New instat.ucrInputComboBox() - Me.ucrChkFlipCoordinates = New instat.ucrCheck() - Me.ucrChkLegend = New instat.ucrCheck() - Me.ucrSave = New instat.ucrSave() - Me.ucrGraphicsSelector = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrAdditionalLayers = New instat.ucrAdditionalLayers() - Me.ucrBase = New instat.ucrButtons() Me.contextMenuStripOptions = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.toolStripMenuItemPlotOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemFacets = New System.Windows.Forms.ToolStripMenuItem() @@ -96,6 +82,23 @@ Partial Class dlgGeneralForGraphics Me.toolStripMenuItemColour = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemAnnotation = New System.Windows.Forms.ToolStripMenuItem() Me.cmdOptions = New instat.ucrSplitButton() + Me.cmdRHelp = New instat.ucrSplitButton() + Me.ucrChkUseasNumeric = New instat.ucrCheck() + Me.ucrReceiverY = New instat.ucrReceiverSingle() + Me.ucrReceiverX = New instat.ucrReceiverSingle() + Me.ucrLabelReceiver = New instat.ucrReceiverSingle() + Me.ucrColourReceiver = New instat.ucrReceiverSingle() + Me.ucrFillReceiver = New instat.ucrReceiverSingle() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrChkFlipCoordinates = New instat.ucrCheck() + Me.ucrChkLegend = New instat.ucrCheck() + Me.ucrSave = New instat.ucrSave() + Me.ucrGraphicsSelector = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrAdditionalLayers = New instat.ucrAdditionalLayers() + Me.ucrBase = New instat.ucrButtons() + Me.ucrInputStation = New instat.ucrInputComboBox() + Me.ucrReceiverFacetBy = New instat.ucrReceiverSingle() + Me.lblFacetBy = New System.Windows.Forms.Label() Me.grpAethetics.SuspendLayout() Me.ContextMenuPackagesList.SuspendLayout() Me.contextMenuStripOptions.SuspendLayout() @@ -121,28 +124,6 @@ Partial Class dlgGeneralForGraphics Me.grpAethetics.TabStop = False Me.grpAethetics.Text = "Aethetics:" ' - 'ucrChkUseasNumeric - ' - Me.ucrChkUseasNumeric.AutoSize = True - Me.ucrChkUseasNumeric.Checked = False - Me.ucrChkUseasNumeric.Location = New System.Drawing.Point(24, 107) - Me.ucrChkUseasNumeric.Name = "ucrChkUseasNumeric" - Me.ucrChkUseasNumeric.Size = New System.Drawing.Size(126, 24) - Me.ucrChkUseasNumeric.TabIndex = 4 - ' - 'ucrReceiverY - ' - Me.ucrReceiverY.AutoSize = True - Me.ucrReceiverY.frmParent = Me - Me.ucrReceiverY.Location = New System.Drawing.Point(24, 36) - Me.ucrReceiverY.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverY.Name = "ucrReceiverY" - Me.ucrReceiverY.Selector = Nothing - Me.ucrReceiverY.Size = New System.Drawing.Size(125, 20) - Me.ucrReceiverY.strNcFilePath = "" - Me.ucrReceiverY.TabIndex = 1 - Me.ucrReceiverY.ucrSelector = Nothing - ' 'lblYVariable ' Me.lblYVariable.AutoSize = True @@ -165,19 +146,6 @@ Partial Class dlgGeneralForGraphics Me.lblXVariable.Tag = "X_Variable:" Me.lblXVariable.Text = "X Variable:" ' - 'ucrReceiverX - ' - Me.ucrReceiverX.AutoSize = True - Me.ucrReceiverX.frmParent = Me - Me.ucrReceiverX.Location = New System.Drawing.Point(24, 81) - Me.ucrReceiverX.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverX.Name = "ucrReceiverX" - Me.ucrReceiverX.Selector = Nothing - Me.ucrReceiverX.Size = New System.Drawing.Size(125, 27) - Me.ucrReceiverX.strNcFilePath = "" - Me.ucrReceiverX.TabIndex = 3 - Me.ucrReceiverX.ucrSelector = Nothing - ' 'lblLabel ' Me.lblLabel.AutoSize = True @@ -189,19 +157,6 @@ Partial Class dlgGeneralForGraphics Me.lblLabel.Tag = "Label:" Me.lblLabel.Text = "Label:" ' - 'ucrLabelReceiver - ' - Me.ucrLabelReceiver.AutoSize = True - Me.ucrLabelReceiver.frmParent = Me - Me.ucrLabelReceiver.Location = New System.Drawing.Point(25, 229) - Me.ucrLabelReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrLabelReceiver.Name = "ucrLabelReceiver" - Me.ucrLabelReceiver.Selector = Nothing - Me.ucrLabelReceiver.Size = New System.Drawing.Size(125, 25) - Me.ucrLabelReceiver.strNcFilePath = "" - Me.ucrLabelReceiver.TabIndex = 9 - Me.ucrLabelReceiver.ucrSelector = Nothing - ' 'lblColour ' Me.lblColour.AutoSize = True @@ -213,19 +168,6 @@ Partial Class dlgGeneralForGraphics Me.lblColour.Tag = "Fill_Colour:" Me.lblColour.Text = "Colour:" ' - 'ucrColourReceiver - ' - Me.ucrColourReceiver.AutoSize = True - Me.ucrColourReceiver.frmParent = Me - Me.ucrColourReceiver.Location = New System.Drawing.Point(25, 189) - Me.ucrColourReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrColourReceiver.Name = "ucrColourReceiver" - Me.ucrColourReceiver.Selector = Nothing - Me.ucrColourReceiver.Size = New System.Drawing.Size(125, 25) - Me.ucrColourReceiver.strNcFilePath = "" - Me.ucrColourReceiver.TabIndex = 7 - Me.ucrColourReceiver.ucrSelector = Nothing - ' 'lblFill ' Me.lblFill.AutoSize = True @@ -237,19 +179,6 @@ Partial Class dlgGeneralForGraphics Me.lblFill.Tag = "Fill_Colour:" Me.lblFill.Text = "Fill:" ' - 'ucrFillReceiver - ' - Me.ucrFillReceiver.AutoSize = True - Me.ucrFillReceiver.frmParent = Me - Me.ucrFillReceiver.Location = New System.Drawing.Point(25, 150) - Me.ucrFillReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrFillReceiver.Name = "ucrFillReceiver" - Me.ucrFillReceiver.Selector = Nothing - Me.ucrFillReceiver.Size = New System.Drawing.Size(125, 25) - Me.ucrFillReceiver.strNcFilePath = "" - Me.ucrFillReceiver.TabIndex = 5 - Me.ucrFillReceiver.ucrSelector = Nothing - ' 'ContextMenuPackagesList ' Me.ContextMenuPackagesList.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -401,11 +330,90 @@ Partial Class dlgGeneralForGraphics Me.GgwordbuildToolStripMenuItem.Size = New System.Drawing.Size(149, 22) Me.GgwordbuildToolStripMenuItem.Text = " ggwordbuild" ' + 'contextMenuStripOptions + ' + Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemFacets, Me.toolStripMenuItemLayers, Me.toolStripMenuItemTitles, Me.toolStripMenuItemXaxis, Me.toolStripMenuItemYaxis, Me.toolStripMenuItemThemes, Me.toolStripMenuItemCoordinates, Me.toolStripMenuItemColour, Me.toolStripMenuItemAnnotation}) + Me.contextMenuStripOptions.Name = "contextMenuStripOk" + Me.contextMenuStripOptions.Size = New System.Drawing.Size(141, 224) + ' + 'toolStripMenuItemPlotOptions + ' + Me.toolStripMenuItemPlotOptions.Name = "toolStripMenuItemPlotOptions" + Me.toolStripMenuItemPlotOptions.Size = New System.Drawing.Size(140, 22) + Me.toolStripMenuItemPlotOptions.Text = "Plot Options" + ' + 'toolStripMenuItemFacets + ' + Me.toolStripMenuItemFacets.Name = "toolStripMenuItemFacets" + Me.toolStripMenuItemFacets.Size = New System.Drawing.Size(140, 22) + Me.toolStripMenuItemFacets.Text = "Facets" + ' + 'toolStripMenuItemLayers + ' + Me.toolStripMenuItemLayers.Name = "toolStripMenuItemLayers" + Me.toolStripMenuItemLayers.Size = New System.Drawing.Size(140, 22) + Me.toolStripMenuItemLayers.Text = "Layers" + ' + 'toolStripMenuItemTitles + ' + Me.toolStripMenuItemTitles.Name = "toolStripMenuItemTitles" + Me.toolStripMenuItemTitles.Size = New System.Drawing.Size(140, 22) + Me.toolStripMenuItemTitles.Text = "Titles" + ' + 'toolStripMenuItemXaxis + ' + Me.toolStripMenuItemXaxis.Name = "toolStripMenuItemXaxis" + Me.toolStripMenuItemXaxis.Size = New System.Drawing.Size(140, 22) + Me.toolStripMenuItemXaxis.Text = "X-Axis" + ' + 'toolStripMenuItemYaxis + ' + Me.toolStripMenuItemYaxis.Name = "toolStripMenuItemYaxis" + Me.toolStripMenuItemYaxis.Size = New System.Drawing.Size(140, 22) + Me.toolStripMenuItemYaxis.Text = "Y-Axis" + ' + 'toolStripMenuItemThemes + ' + Me.toolStripMenuItemThemes.Name = "toolStripMenuItemThemes" + Me.toolStripMenuItemThemes.Size = New System.Drawing.Size(140, 22) + Me.toolStripMenuItemThemes.Text = "Themes" + ' + 'toolStripMenuItemCoordinates + ' + Me.toolStripMenuItemCoordinates.Name = "toolStripMenuItemCoordinates" + Me.toolStripMenuItemCoordinates.Size = New System.Drawing.Size(140, 22) + Me.toolStripMenuItemCoordinates.Text = "Coordinates" + ' + 'toolStripMenuItemColour + ' + Me.toolStripMenuItemColour.Name = "toolStripMenuItemColour" + Me.toolStripMenuItemColour.Size = New System.Drawing.Size(140, 22) + Me.toolStripMenuItemColour.Text = "Colour" + ' + 'toolStripMenuItemAnnotation + ' + Me.toolStripMenuItemAnnotation.Name = "toolStripMenuItemAnnotation" + Me.toolStripMenuItemAnnotation.Size = New System.Drawing.Size(140, 22) + Me.toolStripMenuItemAnnotation.Text = "Annotation" + ' + 'cmdOptions + ' + Me.cmdOptions.AutoSize = True + Me.cmdOptions.ContextMenuStrip = Me.contextMenuStripOptions + Me.cmdOptions.Location = New System.Drawing.Point(6, 411) + Me.cmdOptions.Name = "cmdOptions" + Me.cmdOptions.Size = New System.Drawing.Size(122, 25) + Me.cmdOptions.SplitMenuStrip = Me.contextMenuStripOptions + Me.cmdOptions.TabIndex = 216 + Me.cmdOptions.Tag = "Plot Options" + Me.cmdOptions.Text = "Plot Options" + Me.cmdOptions.UseVisualStyleBackColor = True + ' 'cmdRHelp ' Me.cmdRHelp.AutoSize = True Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuPackagesList - Me.cmdRHelp.Location = New System.Drawing.Point(371, 439) + Me.cmdRHelp.Location = New System.Drawing.Point(371, 442) Me.cmdRHelp.Name = "cmdRHelp" Me.cmdRHelp.Size = New System.Drawing.Size(91, 30) Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuPackagesList @@ -413,6 +421,80 @@ Partial Class dlgGeneralForGraphics Me.cmdRHelp.Text = "R Help" Me.cmdRHelp.UseVisualStyleBackColor = True ' + 'ucrChkUseasNumeric + ' + Me.ucrChkUseasNumeric.AutoSize = True + Me.ucrChkUseasNumeric.Checked = False + Me.ucrChkUseasNumeric.Location = New System.Drawing.Point(24, 107) + Me.ucrChkUseasNumeric.Name = "ucrChkUseasNumeric" + Me.ucrChkUseasNumeric.Size = New System.Drawing.Size(126, 24) + Me.ucrChkUseasNumeric.TabIndex = 4 + ' + 'ucrReceiverY + ' + Me.ucrReceiverY.AutoSize = True + Me.ucrReceiverY.frmParent = Nothing + Me.ucrReceiverY.Location = New System.Drawing.Point(24, 36) + Me.ucrReceiverY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverY.Name = "ucrReceiverY" + Me.ucrReceiverY.Selector = Nothing + Me.ucrReceiverY.Size = New System.Drawing.Size(125, 20) + Me.ucrReceiverY.strNcFilePath = "" + Me.ucrReceiverY.TabIndex = 1 + Me.ucrReceiverY.ucrSelector = Nothing + ' + 'ucrReceiverX + ' + Me.ucrReceiverX.AutoSize = True + Me.ucrReceiverX.frmParent = Nothing + Me.ucrReceiverX.Location = New System.Drawing.Point(24, 81) + Me.ucrReceiverX.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverX.Name = "ucrReceiverX" + Me.ucrReceiverX.Selector = Nothing + Me.ucrReceiverX.Size = New System.Drawing.Size(125, 27) + Me.ucrReceiverX.strNcFilePath = "" + Me.ucrReceiverX.TabIndex = 3 + Me.ucrReceiverX.ucrSelector = Nothing + ' + 'ucrLabelReceiver + ' + Me.ucrLabelReceiver.AutoSize = True + Me.ucrLabelReceiver.frmParent = Nothing + Me.ucrLabelReceiver.Location = New System.Drawing.Point(25, 229) + Me.ucrLabelReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrLabelReceiver.Name = "ucrLabelReceiver" + Me.ucrLabelReceiver.Selector = Nothing + Me.ucrLabelReceiver.Size = New System.Drawing.Size(125, 25) + Me.ucrLabelReceiver.strNcFilePath = "" + Me.ucrLabelReceiver.TabIndex = 9 + Me.ucrLabelReceiver.ucrSelector = Nothing + ' + 'ucrColourReceiver + ' + Me.ucrColourReceiver.AutoSize = True + Me.ucrColourReceiver.frmParent = Nothing + Me.ucrColourReceiver.Location = New System.Drawing.Point(25, 189) + Me.ucrColourReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrColourReceiver.Name = "ucrColourReceiver" + Me.ucrColourReceiver.Selector = Nothing + Me.ucrColourReceiver.Size = New System.Drawing.Size(125, 25) + Me.ucrColourReceiver.strNcFilePath = "" + Me.ucrColourReceiver.TabIndex = 7 + Me.ucrColourReceiver.ucrSelector = Nothing + ' + 'ucrFillReceiver + ' + Me.ucrFillReceiver.AutoSize = True + Me.ucrFillReceiver.frmParent = Nothing + Me.ucrFillReceiver.Location = New System.Drawing.Point(25, 150) + Me.ucrFillReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrFillReceiver.Name = "ucrFillReceiver" + Me.ucrFillReceiver.Selector = Nothing + Me.ucrFillReceiver.Size = New System.Drawing.Size(125, 25) + Me.ucrFillReceiver.strNcFilePath = "" + Me.ucrFillReceiver.TabIndex = 5 + Me.ucrFillReceiver.ucrSelector = Nothing + ' 'ucrInputLegendPosition ' Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True @@ -445,7 +527,7 @@ Partial Class dlgGeneralForGraphics 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(6, 443) + Me.ucrSave.Location = New System.Drawing.Point(6, 446) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(282, 24) @@ -480,84 +562,40 @@ Partial Class dlgGeneralForGraphics Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 9 ' - 'contextMenuStripOptions - ' - Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemFacets, Me.toolStripMenuItemLayers, Me.toolStripMenuItemTitles, Me.toolStripMenuItemXaxis, Me.toolStripMenuItemYaxis, Me.toolStripMenuItemThemes, Me.toolStripMenuItemCoordinates, Me.toolStripMenuItemColour, Me.toolStripMenuItemAnnotation}) - Me.contextMenuStripOptions.Name = "contextMenuStripOk" - Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 246) - ' - 'toolStripMenuItemPlotOptions - ' - Me.toolStripMenuItemPlotOptions.Name = "toolStripMenuItemPlotOptions" - Me.toolStripMenuItemPlotOptions.Size = New System.Drawing.Size(180, 22) - Me.toolStripMenuItemPlotOptions.Text = "Plot Options" - ' - 'toolStripMenuItemFacets - ' - Me.toolStripMenuItemFacets.Name = "toolStripMenuItemFacets" - Me.toolStripMenuItemFacets.Size = New System.Drawing.Size(180, 22) - Me.toolStripMenuItemFacets.Text = "Facets" - ' - 'toolStripMenuItemLayers - ' - Me.toolStripMenuItemLayers.Name = "toolStripMenuItemLayers" - Me.toolStripMenuItemLayers.Size = New System.Drawing.Size(180, 22) - Me.toolStripMenuItemLayers.Text = "Layers" - ' - 'toolStripMenuItemTitles - ' - Me.toolStripMenuItemTitles.Name = "toolStripMenuItemTitles" - Me.toolStripMenuItemTitles.Size = New System.Drawing.Size(180, 22) - Me.toolStripMenuItemTitles.Text = "Titles" - ' - 'toolStripMenuItemXaxis - ' - Me.toolStripMenuItemXaxis.Name = "toolStripMenuItemXaxis" - Me.toolStripMenuItemXaxis.Size = New System.Drawing.Size(180, 22) - Me.toolStripMenuItemXaxis.Text = "X-Axis" - ' - 'toolStripMenuItemYaxis - ' - Me.toolStripMenuItemYaxis.Name = "toolStripMenuItemYaxis" - Me.toolStripMenuItemYaxis.Size = New System.Drawing.Size(180, 22) - Me.toolStripMenuItemYaxis.Text = "Y-Axis" - ' - 'toolStripMenuItemThemes - ' - Me.toolStripMenuItemThemes.Name = "toolStripMenuItemThemes" - Me.toolStripMenuItemThemes.Size = New System.Drawing.Size(180, 22) - Me.toolStripMenuItemThemes.Text = "Themes" - ' - 'toolStripMenuItemCoordinates - ' - Me.toolStripMenuItemCoordinates.Name = "toolStripMenuItemCoordinates" - Me.toolStripMenuItemCoordinates.Size = New System.Drawing.Size(180, 22) - Me.toolStripMenuItemCoordinates.Text = "Coordinates" - ' - 'toolStripMenuItemColour - ' - Me.toolStripMenuItemColour.Name = "toolStripMenuItemColour" - Me.toolStripMenuItemColour.Size = New System.Drawing.Size(180, 22) - Me.toolStripMenuItemColour.Text = "Colour" - ' - 'toolStripMenuItemAnnotation - ' - Me.toolStripMenuItemAnnotation.Name = "toolStripMenuItemAnnotation" - Me.toolStripMenuItemAnnotation.Size = New System.Drawing.Size(180, 22) - Me.toolStripMenuItemAnnotation.Text = "Annotation" - ' - 'cmdOptions - ' - Me.cmdOptions.AutoSize = True - Me.cmdOptions.ContextMenuStrip = Me.contextMenuStripOptions - Me.cmdOptions.Location = New System.Drawing.Point(6, 401) - Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Size = New System.Drawing.Size(122, 25) - Me.cmdOptions.SplitMenuStrip = Me.contextMenuStripOptions - Me.cmdOptions.TabIndex = 216 - Me.cmdOptions.Tag = "Plot Options" - Me.cmdOptions.Text = "Plot Options" - Me.cmdOptions.UseVisualStyleBackColor = True + 'ucrInputStation + ' + Me.ucrInputStation.AddQuotesIfUnrecognised = True + Me.ucrInputStation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputStation.GetSetSelectedIndex = -1 + Me.ucrInputStation.IsReadOnly = False + Me.ucrInputStation.Location = New System.Drawing.Point(404, 410) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(71, 21) + Me.ucrInputStation.TabIndex = 14 + ' + 'ucrReceiverFacetBy + ' + Me.ucrReceiverFacetBy.AutoSize = True + Me.ucrReceiverFacetBy.frmParent = Me + Me.ucrReceiverFacetBy.Location = New System.Drawing.Point(277, 410) + Me.ucrReceiverFacetBy.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverFacetBy.Name = "ucrReceiverFacetBy" + Me.ucrReceiverFacetBy.Selector = Nothing + Me.ucrReceiverFacetBy.Size = New System.Drawing.Size(125, 26) + Me.ucrReceiverFacetBy.strNcFilePath = "" + Me.ucrReceiverFacetBy.TabIndex = 13 + Me.ucrReceiverFacetBy.ucrSelector = Nothing + ' + 'lblFacetBy + ' + Me.lblFacetBy.AutoSize = True + Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBy.Location = New System.Drawing.Point(277, 395) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(100, 13) + Me.lblFacetBy.TabIndex = 12 + Me.lblFacetBy.Tag = "" + Me.lblFacetBy.Text = "Facet By (Optional):" ' 'dlgGeneralForGraphics ' @@ -565,6 +603,9 @@ Partial Class dlgGeneralForGraphics Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(478, 547) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucrReceiverFacetBy) + Me.Controls.Add(Me.lblFacetBy) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.cmdRHelp) Me.Controls.Add(Me.grpAethetics) @@ -648,4 +689,7 @@ Partial Class dlgGeneralForGraphics Friend WithEvents toolStripMenuItemCoordinates As ToolStripMenuItem Friend WithEvents toolStripMenuItemColour As ToolStripMenuItem Friend WithEvents toolStripMenuItemAnnotation As ToolStripMenuItem + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucrReceiverFacetBy As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label End Class diff --git a/instat/dlgGeneralForGraphics.resx b/instat/dlgGeneralForGraphics.resx index 1b8bf479b35..ec550b4454c 100644 --- a/instat/dlgGeneralForGraphics.resx +++ b/instat/dlgGeneralForGraphics.resx @@ -117,10 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 415, 13 - 217, 12 + + 415, 13 + \ No newline at end of file diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index edfb1e0537f..22cb15277cb 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -50,6 +50,20 @@ Public Class dlgGeneralForGraphics Private clsYScaleDiscreteFunction As New RFunction Private clsXScaleDiscreteFunction As New RFunction Private clsDummyFunction As New RFunction + Private clsFacetFunction As New RFunction + Private clsFacetOperator As New ROperator + Private clsFacetRowOp As New ROperator + Private clsFacetColOp As New ROperator + Private clsPipeOperator As New ROperator + Private clsGroupByFunction As New RFunction + + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + Private ReadOnly strNone As String = "None" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False Private strPackageName As String Private Sub dlgGeneralForGraphics_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -137,6 +151,17 @@ Public Class dlgGeneralForGraphics ucrChkLegend.AddParameterPresentCondition(True, "legend.position") ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False) + ucrReceiverFacetBy.SetParameter(New RParameter("")) + ucrReceiverFacetBy.Selector = ucrGraphicsSelector + ucrReceiverFacetBy.SetIncludedDataTypes({"factor"}) + ucrReceiverFacetBy.strSelectorHeading = "Factors" + ucrReceiverFacetBy.bWithQuotes = False + ucrReceiverFacetBy.SetParameterIsString() + ucrReceiverFacetBy.SetValuesToIgnore({"."}) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + ucrSave.SetPrefix("graph") ucrSave.SetIsComboBox() ucrSave.SetSaveTypeAsGraph() @@ -153,9 +178,17 @@ Public Class dlgGeneralForGraphics clsDummyFunction = New RFunction clsScaleContinuousFunction = New RFunction clsLevelsFunction = New RFunction + clsFacetFunction = New RFunction + clsFacetOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + clsGroupByFunction = New RFunction ucrSave.Reset() + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True ucrGraphicsSelector.Reset() ucrGraphicsSelector.SetGgplotFunction(clsBaseOperator) ucrReceiverY.SetMeAsReceiver() @@ -177,6 +210,22 @@ Public Class dlgGeneralForGraphics clsGlobalAesFunction.SetPackageName("ggplot2") clsGlobalAesFunction.SetRCommand("aes") + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetOperator.SetOperation("~") + clsFacetOperator.bForceIncludeOperation = True + clsFacetOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") + clsLevelsFunction.SetPackageName("base") clsLevelsFunction.SetRCommand("levels") clsLevelsFunction.AddParameter("y", ucrReceiverX.GetVariableNames(False), bIncludeArgumentName:=False, iPosition:=0) @@ -425,13 +474,19 @@ Public Class dlgGeneralForGraphics ucrChkUseasNumeric.Visible = False If Not ucrReceiverX.IsEmpty Then clsGlobalAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) - ucrChkUseasNumeric.Visible = ucrReceiverX.strCurrDataType = "factor" OrElse ucrReceiverX.strCurrDataType = "ordered,factor" - If ucrChkUseasNumeric.Checked Then - clsGlobalAesFunction.AddParameter("group", "1", iPosition:=2) + If ucrReceiverX.strCurrDataType = "factor" OrElse ucrReceiverX.strCurrDataType = "ordered,factor" Then + ucrChkUseasNumeric.Visible = True + If ucrChkUseasNumeric.Checked Then + clsGlobalAesFunction.AddParameter("group", "1", iPosition:=2) + Else + clsGlobalAesFunction.RemoveParameterByName("group") + End If Else + ucrChkUseasNumeric.Visible = False clsGlobalAesFunction.RemoveParameterByName("group") End If Else + clsGlobalAesFunction.RemoveParameterByName("group") clsGlobalAesFunction.RemoveParameterByName("x") End If End Sub @@ -565,4 +620,165 @@ Public Class dlgGeneralForGraphics Private Sub ucrReceiverX_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverX.ControlValueChanged, ucrChkUseasNumeric.ControlValueChanged VariableXType() End Sub + + Private Sub AutoFacetStation() + Dim ucrCurrentReceiver As ucrReceiver = Nothing + + If ucrGraphicsSelector.CurrentReceiver IsNot Nothing Then + ucrCurrentReceiver = ucrGraphicsSelector.CurrentReceiver + End If + ucrReceiverFacetBy.AddItemsWithMetadataProperty(ucrGraphicsSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + If ucrCurrentReceiver IsNot Nothing Then + ucrCurrentReceiver.SetMeAsReceiver() + End If + AddRemoveGroupBy() + End Sub + + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged + If Not bUpdateComboOptions Then + Exit Sub + End If + Dim strChangedText As String = ucrChangedControl.GetText() + If strChangedText <> strNone Then + If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso + Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then + bUpdateComboOptions = False + ucrInputStation.SetName(strNone) + bUpdateComboOptions = True + End If + If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso + ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso + ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then + ucrInputStation.SetName(strNone) + End If + End If + UpdateParameters() + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub UpdateParameters() + clsFacetOperator.RemoveParameterByName("wrap" & ucrInputStation.Name) + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucrReceiverFacetBy.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucrReceiverFacetBy.ChangeParameterName("wrap" & ucrInputStation.Name) + ucrReceiverFacetBy.SetRCode(clsFacetOperator) + Case strFacetCol + ucrReceiverFacetBy.ChangeParameterName("col" & ucrInputStation.Name) + ucrReceiverFacetBy.SetRCode(clsFacetColOp) + Case strFacetRow + ucrReceiverFacetBy.ChangeParameterName("row" & ucrInputStation.Name) + ucrReceiverFacetBy.SetRCode(clsFacetRowOp) + End Select + If Not clsGlobalAesFunction.ContainsParameter("x") Then + clsGlobalAesFunction.AddParameter("x", Chr(34) & Chr(34)) + End If + bUpdatingParameters = False + End Sub + + Private Sub AddRemoveFacets() + Dim bWrap As Boolean = False + Dim bCol As Boolean = False + Dim bRow As Boolean = False + + If bUpdatingParameters Then + Exit Sub + End If + + clsBaseOperator.RemoveParameterByName("facets") + If Not ucrReceiverFacetBy.IsEmpty Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + bWrap = True + Case strFacetCol + bCol = True + Case strFacetRow + bRow = True + End Select + End If + + If bWrap OrElse bRow OrElse bCol Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + End If + If bWrap Then + clsFacetFunction.SetRCommand("facet_wrap") + End If + If bRow OrElse bCol Then + clsFacetFunction.SetRCommand("facet_grid") + End If + If bRow Then + clsFacetOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucrReceiverFacetBy_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFacetBy.ControlValueChanged, ucrReceiverX.ControlValueChanged + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + Private Sub GetParameterValue(clsOperator As ROperator) + Dim i As Integer = 0 + For Each clsTempParam As RParameter In clsOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End Sub + + Private Sub AddRemoveGroupBy() + + If clsPipeOperator.ContainsParameter("mutate") Then + clsGroupByFunction.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + GetParameterValue(clsFacetOperator) + Case strFacetCol + GetParameterValue(clsFacetColOp) + Case strFacetRow + GetParameterValue(clsFacetRowOp) + End Select + End If + + If clsGroupByFunction.iParameterCount > 0 Then + clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + + SetPipeAssignTo() + End Sub + + Private Sub SetPipeAssignTo() + If ucrGraphicsSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrGraphicsSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() + End If + End Sub + + Private Sub ucrGraphicsSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrGraphicsSelector.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + End Sub End Class \ No newline at end of file From d9147ab41c0b8277a6e2c291750b4434d88c4b43 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Mon, 8 Jan 2024 14:51:19 +0300 Subject: [PATCH 38/48] Changes to the code --- instat/sdgPlots.Designer.vb | 102 +- instat/sdgPlots.vb | 2165 ++++++++++++++++++----------------- 2 files changed, 1189 insertions(+), 1078 deletions(-) diff --git a/instat/sdgPlots.Designer.vb b/instat/sdgPlots.Designer.vb index 83692d9ec53..098aefc6814 100644 --- a/instat/sdgPlots.Designer.vb +++ b/instat/sdgPlots.Designer.vb @@ -126,6 +126,7 @@ Partial Class sdgPlots Me.ucrChkSameScale = New instat.ucrCheck() Me.ucrChkHorizontalPlot = New instat.ucrCheck() Me.tbpColour = New System.Windows.Forms.TabPage() + Me.ucrChkColour = New instat.ucrCheck() Me.lblCanvasFillPalette = New System.Windows.Forms.Label() Me.ucrInputCanvasFillPalette = New instat.ucrInputComboBox() Me.lblCanvasColorPalette = New System.Windows.Forms.Label() @@ -607,51 +608,51 @@ Partial Class sdgPlots Me.ucrReceiverY = New instat.ucrReceiverSingle() Me.ttCaptionTitle = New System.Windows.Forms.ToolTip(Me.components) Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.tbpPlotsOptions.SuspendLayout - Me.tbpFacet.SuspendLayout - Me.tbpLayers.SuspendLayout - Me.tbpTitles.SuspendLayout - Me.grpLegendTitle.SuspendLayout - Me.tbpXAxis.SuspendLayout - Me.tbpYAxis.SuspendLayout - Me.tbpTheme.SuspendLayout - Me.grpCommonOptions.SuspendLayout - Me.tbpCoordinates.SuspendLayout - Me.grpPolarCordinates.SuspendLayout - Me.tbpColour.SuspendLayout - Me.grpScalefillw.SuspendLayout - Me.grpColourScale.SuspendLayout - Me.grpScaleColorw.SuspendLayout - Me.grpScalecolorcal.SuspendLayout - Me.grpScalecolorhc.SuspendLayout - Me.grpScalecolorfew.SuspendLayout - Me.grpScalecolorsol.SuspendLayout - Me.grpScalecolorpan.SuspendLayout - Me.grpScalecolorg.SuspendLayout - Me.grpColourScaleGgthemes.SuspendLayout - Me.grpScalecolorEx.SuspendLayout - Me.grpScalecolorEcon.SuspendLayout - Me.grpScalecolorst.SuspendLayout - Me.grpScalecolorExn.SuspendLayout - Me.grpScaleColorfiv.SuspendLayout - Me.grpScalecolorpt.SuspendLayout - Me.grpScalefillg.SuspendLayout - Me.grpScaleFillfiv.SuspendLayout - Me.grpScalefillpt.SuspendLayout - Me.grpScalefillst.SuspendLayout - Me.grpScalefillpan.SuspendLayout - Me.grpScalefillCal.SuspendLayout - Me.grpScalefillEx.SuspendLayout - Me.grpScalefillEcon.SuspendLayout - Me.grpScalefillExn.SuspendLayout - Me.grpScalefillsol.SuspendLayout - Me.grpFillScaleggthemes.SuspendLayout - Me.grpScalefillfew.SuspendLayout - Me.grpScalefillhc.SuspendLayout - Me.grpFillScale.SuspendLayout - Me.tbpAnnotation.SuspendLayout - Me.grpAnnotation.SuspendLayout - Me.SuspendLayout + Me.tbpPlotsOptions.SuspendLayout() + Me.tbpFacet.SuspendLayout() + Me.tbpLayers.SuspendLayout() + Me.tbpTitles.SuspendLayout() + Me.grpLegendTitle.SuspendLayout() + Me.tbpXAxis.SuspendLayout() + Me.tbpYAxis.SuspendLayout() + Me.tbpTheme.SuspendLayout() + Me.grpCommonOptions.SuspendLayout() + Me.tbpCoordinates.SuspendLayout() + Me.grpPolarCordinates.SuspendLayout() + Me.tbpColour.SuspendLayout() + Me.grpScalefillw.SuspendLayout() + Me.grpColourScale.SuspendLayout() + Me.grpScaleColorw.SuspendLayout() + Me.grpScalecolorcal.SuspendLayout() + Me.grpScalecolorhc.SuspendLayout() + Me.grpScalecolorfew.SuspendLayout() + Me.grpScalecolorsol.SuspendLayout() + Me.grpScalecolorpan.SuspendLayout() + Me.grpScalecolorg.SuspendLayout() + Me.grpColourScaleGgthemes.SuspendLayout() + Me.grpScalecolorEx.SuspendLayout() + Me.grpScalecolorEcon.SuspendLayout() + Me.grpScalecolorst.SuspendLayout() + Me.grpScalecolorExn.SuspendLayout() + Me.grpScaleColorfiv.SuspendLayout() + Me.grpScalecolorpt.SuspendLayout() + Me.grpScalefillg.SuspendLayout() + Me.grpScaleFillfiv.SuspendLayout() + Me.grpScalefillpt.SuspendLayout() + Me.grpScalefillst.SuspendLayout() + Me.grpScalefillpan.SuspendLayout() + Me.grpScalefillCal.SuspendLayout() + Me.grpScalefillEx.SuspendLayout() + Me.grpScalefillEcon.SuspendLayout() + Me.grpScalefillExn.SuspendLayout() + Me.grpScalefillsol.SuspendLayout() + Me.grpFillScaleggthemes.SuspendLayout() + Me.grpScalefillfew.SuspendLayout() + Me.grpScalefillhc.SuspendLayout() + Me.grpFillScale.SuspendLayout() + Me.tbpAnnotation.SuspendLayout() + Me.grpAnnotation.SuspendLayout() + Me.SuspendLayout() ' 'tbpPlotsOptions ' @@ -1638,6 +1639,7 @@ Partial Class sdgPlots ' 'tbpColour ' + Me.tbpColour.Controls.Add(Me.ucrChkColour) Me.tbpColour.Controls.Add(Me.lblCanvasFillPalette) Me.tbpColour.Controls.Add(Me.ucrInputCanvasFillPalette) Me.tbpColour.Controls.Add(Me.lblCanvasColorPalette) @@ -1702,6 +1704,15 @@ Partial Class sdgPlots Me.tbpColour.Text = "Colour" Me.tbpColour.UseVisualStyleBackColor = True ' + 'ucrChkColour + ' + Me.ucrChkColour.AutoSize = True + Me.ucrChkColour.Checked = False + Me.ucrChkColour.Location = New System.Drawing.Point(7, 10) + Me.ucrChkColour.Name = "ucrChkColour" + Me.ucrChkColour.Size = New System.Drawing.Size(121, 23) + Me.ucrChkColour.TabIndex = 328 + ' 'lblCanvasFillPalette ' Me.lblCanvasFillPalette.AutoSize = True @@ -7685,6 +7696,7 @@ Partial Class sdgPlots Friend WithEvents ucrChkBreaksw As ucrCheck Friend WithEvents ucrChkNaValuew As ucrCheck Friend WithEvents ucrChkDropUnusedLevelsw As ucrCheck + Friend WithEvents ucrChkColour As ucrCheck End Class diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 38f83c1c661..885f4fe1d2b 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -159,6 +159,10 @@ Public Class sdgPlots ucrChkIncludeFacets.AddParameterPresentCondition(True, "facets", True) ucrChkIncludeFacets.AddParameterPresentCondition(False, "facets", False) + ucrChkColour.SetText("Include Colour") + ucrChkColour.AddParameterPresentCondition(True, "colour", True) + ucrChkColour.AddParameterPresentCondition(False, "colour", False) + ucrChkIncludeTitles.SetText("Include Titles") ucrChkIncludeTitles.AddParameterPresentCondition(True, "titles", True) ucrChkIncludeTitles.AddParameterPresentCondition(False, "titles", False) @@ -225,6 +229,11 @@ Public Class sdgPlots ucrChkIncludeFacets.AddToLinkedControls(ucrChkFreeSpace, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkIncludeFacets.AddToLinkedControls(ucrChkLabeler, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkIncludeFacets.AddToLinkedControls(ucrChkDrop, {True}, bNewLinkedHideIfParameterMissing:=True) + + ucrChkColour.AddToLinkedControls(ucrInputAxisType, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkColour.AddToLinkedControls(ucrPnlScale, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkColour.AddToLinkedControls(ucrPnlColourPalette, {True}, bNewLinkedHideIfParameterMissing:=True) + 'layers tab 'titles tab @@ -730,6 +739,9 @@ Public Class sdgPlots ucrInputAxisType.SetItems({"continuous", "discrete"}) ucrInputAxisType.SetDropDownStyleAsNonEditable() + ucrInputAxisType.AddToLinkedControls(ucrInputPaletteContinuous, {"continuous"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrInputAxisType.AddToLinkedControls(ucrInputPalettes, {"discrete"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + 'ucrInputAxisType.SetRDefault("discrete") ucrChkPositionColor.SetText("Position") @@ -2433,6 +2445,7 @@ Public Class sdgPlots ucrChkFillDiscrete.SetRCode(clsScaleFillViridisFunction, bReset, bCloneIfNeeded:=True) ucrChkColourDiscrete.SetRCode(clsScaleColourViridisFunction, bReset, bCloneIfNeeded:=True) If bReset Then + ucrChkColour.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) ucrPnlScale.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) ucrPnlColourPalette.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) ucrInputPalettes.SetRCode(clsFillPaletteFunction, bReset, bCloneIfNeeded:=True) @@ -3365,288 +3378,176 @@ Public Class sdgPlots End Sub Private Sub AddRemovePaletteDiscrete() - Select Case ucrInputAxisType.GetText - Case "discrete" - clsBaseOperator.RemoveParameterByName("scale_color_gradient_tableau") - clsBaseOperator.RemoveParameterByName("scale_fill_gradient_tableau") - clsBaseOperator.RemoveParameterByName("scale_color_distiller") - clsBaseOperator.RemoveParameterByName("scale_fill_distiller") - If rdoDiverging.Checked OrElse rdoVertical.Checked OrElse rdoSequential.Checked Then - If rdoColour.Checked AndAlso Not ucrInputPalettes.IsEmpty Then - clsColourPaletteFunction.AddParameter("palette", Chr(34) & ucrInputPalettes.GetText & Chr(34), iPosition:=0) - clsBaseOperator.AddParameter("scale_colour_brewer", clsRFunctionParameter:=clsColourPaletteFunction, iPosition:=15) - Else - clsBaseOperator.RemoveParameterByName("scale_colour_brewer") - End If - If rdoFill.Checked AndAlso Not ucrInputPalettes.IsEmpty Then - clsFillPaletteFunction.AddParameter("palette", Chr(34) & ucrInputPalettes.GetText & Chr(34), iPosition:=0) - clsBaseOperator.AddParameter("scale_fill_brewer", clsRFunctionParameter:=clsFillPaletteFunction, iPosition:=16) - Else - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - End If - End If - Case "continuous" - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_colour_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - If rdoDiverging.Checked OrElse rdoQualitative.Checked OrElse rdoSequential.Checked Then - If rdoColour.Checked AndAlso Not ucrInputPaletteContinuous.IsEmpty Then - clsScaleColorDistillerFunction.AddParameter("palette", Chr(34) & ucrInputPaletteContinuous.GetText & Chr(34), iPosition:=0) - clsBaseOperator.AddParameter("scale_color_distiller", clsRFunctionParameter:=clsScaleColorDistillerFunction, iPosition:=15) - Else - clsBaseOperator.RemoveParameterByName("scale_color_distiller") - End If - If rdoFill.Checked AndAlso Not ucrInputPaletteContinuous.IsEmpty Then - clsScaleFillDistillerFunction.AddParameter("palette", Chr(34) & ucrInputPaletteContinuous.GetText & Chr(34), iPosition:=0) - clsBaseOperator.AddParameter("scale_fill_distiller", clsRFunctionParameter:=clsScaleFillDistillerFunction, iPosition:=16) - Else - clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + If ucrChkColour.Checked Then + Select Case ucrInputAxisType.GetText + Case "discrete" + clsBaseOperator.RemoveParameterByName("scale_color_gradient_tableau") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient_tableau") + clsBaseOperator.RemoveParameterByName("scale_color_distiller") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + If rdoDiverging.Checked OrElse rdoVertical.Checked OrElse rdoSequential.Checked Then + If rdoColour.Checked AndAlso Not ucrInputPalettes.IsEmpty Then + clsColourPaletteFunction.AddParameter("palette", Chr(34) & ucrInputPalettes.GetText & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("scale_colour_brewer", clsRFunctionParameter:=clsColourPaletteFunction, iPosition:=15) + Else + clsBaseOperator.RemoveParameterByName("scale_colour_brewer") + End If + If rdoFill.Checked AndAlso Not ucrInputPalettes.IsEmpty Then + clsFillPaletteFunction.AddParameter("palette", Chr(34) & ucrInputPalettes.GetText & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("scale_fill_brewer", clsRFunctionParameter:=clsFillPaletteFunction, iPosition:=16) + Else + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + End If End If - End If - End Select - End Sub - - Private Sub ucrPnlColourPalette_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlColourPalette.ControlValueChanged, ucrPnlScale.ControlValueChanged - HideShowCanvaFill() - HideShowCanvacolor() - SetComboBoxItems() - SetComboBoxItemsContinuous() - GroupeColorScale() - End Sub - - Private Sub ucrInputAxisType_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputAxisType.ControlValueChanged - HideShowCanvaFill() - HideShowCanvacolor() - GroupeColorScale() - AddRemovePaletteDiscrete() - End Sub - - Private Sub GroupeColorScale() - Select Case ucrInputAxisType.GetText - Case "discrete" - ucrInputPaletteContinuous.Hide() - ucrInputcontinuouscolor.Hide() - ucrInputContinousfill.Hide() - If rdoColour.Checked AndAlso (rdoSequential.Checked OrElse rdoQualitative.Checked OrElse rdoDiverging.Checked) Then - clsColourPaletteFunction.AddParameter("palette", Chr(34) & ucrInputPalettes.GetText & Chr(34), iPosition:=0) - clsBaseOperator.AddParameter("scale_colour_brewer", clsRFunctionParameter:=clsColourPaletteFunction, iPosition:=15) + Case "continuous" clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") clsBaseOperator.RemoveParameterByName("scale_color_stata") clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill") - clsBaseOperator.RemoveParameterByName("scale_colour") - ucrInputColorFunctions.Hide() - ucrInputFillFunction.Hide() - grpFillScale.Hide() - grpColourScale.Hide() - grpFillScaleggthemes.Hide() - grpColourScaleGgthemes.Hide() - grpScalefillCal.Hide() - grpScalecolorcal.Hide() - grpScalefillEcon.Hide() - grpScalecolorEcon.Hide() - grpScalefillEx.Hide() - grpScalecolorEx.Hide() - grpScalefillExn.Hide() - grpScalecolorExn.Hide() - grpScalefillfew.Hide() - grpScaleFillfiv.Hide() - grpScaleColorfiv.Hide() - grpScalecolorfew.Hide() - grpScalefillg.Hide() - grpScalecolorg.Hide() - grpScalefillpan.Hide() - grpScalecolorpan.Hide() - grpScalefillpt.Hide() - grpScalecolorpt.Hide() - grpScalefillsol.Hide() - grpScalecolorsol.Hide() - grpScalefillst.Hide() - grpScalecolorst.Hide() - grpScalefillw.Hide() - grpScaleColorw.Hide() - grpScalefillhc.Hide() - grpScalecolorhc.Hide() - ucrInputPalettes.Show() - ElseIf rdoColour.Checked AndAlso rdoViridis.Checked Then - clsBaseOperator.AddParameter("scale_colour", clsRFunctionParameter:=clsScaleColourViridisFunction, iPosition:=3) - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_fill_few") clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") clsBaseOperator.RemoveParameterByName("scale_color_ptol") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill") - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_color_brewer") - ucrInputColorFunctions.Hide() - ucrInputFillFunction.Hide() - grpFillScale.Hide() - grpColourScale.Show() - grpFillScaleggthemes.Hide() - grpColourScaleGgthemes.Hide() - grpScalefillCal.Hide() - grpScalecolorcal.Hide() - grpScalefillEcon.Hide() - grpScalecolorEcon.Hide() - grpScalefillEx.Hide() - grpScalecolorEx.Hide() - grpScalefillExn.Hide() - grpScalecolorExn.Hide() - grpScalefillfew.Hide() - grpScaleFillfiv.Hide() - grpScaleColorfiv.Hide() - grpScalecolorfew.Hide() - grpScalefillg.Hide() - grpScalecolorg.Hide() - grpScalefillpan.Hide() - grpScalecolorpan.Hide() - grpScalefillpt.Hide() - grpScalecolorpt.Hide() - grpScalefillsol.Hide() - grpScalecolorsol.Hide() - grpScalefillst.Hide() - grpScalecolorst.Hide() - grpScalefillw.Hide() - grpScaleColorw.Hide() - grpScalefillhc.Hide() - grpScalecolorhc.Hide() - ucrInputPalettes.Hide() - ElseIf rdoColour.Checked AndAlso rdoGgthemes.Checked Then - clsBaseOperator.RemoveParameterByName("scale_fill") - clsBaseOperator.RemoveParameterByName("scale_colour") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_colour_brewer") clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_color_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") clsBaseOperator.RemoveParameterByName("scale_fill_pander") clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") clsBaseOperator.RemoveParameterByName("scale_fill_excel") clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - ucrInputColorFunctions.Show() - ucrInputFillFunction.Hide() - grpFillScale.Hide() - grpColourScale.Hide() - grpFillScaleggthemes.Hide() - grpColourScaleGgthemes.Hide() - grpScalefillCal.Hide() - grpScalecolorcal.Hide() - grpScalefillEcon.Hide() - grpScalecolorEcon.Hide() - grpScalefillEx.Hide() - grpScalecolorEx.Hide() - grpScalefillExn.Hide() - grpScalecolorExn.Hide() - grpScalefillfew.Hide() - grpScaleFillfiv.Hide() - grpScaleColorfiv.Hide() - grpScalecolorfew.Hide() - grpScalefillg.Hide() - grpScalecolorg.Hide() - grpScalefillpan.Hide() - grpScalecolorpan.Hide() - grpScalefillpt.Hide() - grpScalecolorpt.Hide() - grpScalefillsol.Hide() - grpScalecolorsol.Hide() - grpScalefillst.Hide() - grpScalecolorst.Hide() - grpScalefillw.Hide() - grpScaleColorw.Hide() - grpScalefillhc.Hide() - grpScalecolorhc.Hide() - ucrInputPalettes.Hide() - If ucrInputColorFunctions.GetText = "" Then + If rdoDiverging.Checked OrElse rdoQualitative.Checked OrElse rdoSequential.Checked Then + If rdoColour.Checked AndAlso Not ucrInputPaletteContinuous.IsEmpty Then + clsScaleColorDistillerFunction.AddParameter("palette", Chr(34) & ucrInputPaletteContinuous.GetText & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("scale_color_distiller", clsRFunctionParameter:=clsScaleColorDistillerFunction, iPosition:=15) + Else + clsBaseOperator.RemoveParameterByName("scale_color_distiller") + End If + If rdoFill.Checked AndAlso Not ucrInputPaletteContinuous.IsEmpty Then + clsScaleFillDistillerFunction.AddParameter("palette", Chr(34) & ucrInputPaletteContinuous.GetText & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("scale_fill_distiller", clsRFunctionParameter:=clsScaleFillDistillerFunction, iPosition:=16) + Else + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + End If + End If + End Select + Else + clsBaseOperator.RemoveParameterByName("scale_color_gradient_tableau") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient_tableau") + clsBaseOperator.RemoveParameterByName("scale_color_distiller") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_colour_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + End If + End Sub + + Private Sub ucrPnlColourPalette_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlColourPalette.ControlValueChanged, ucrPnlScale.ControlValueChanged + HideShowCanvaFill() + HideShowCanvacolor() + SetComboBoxItems() + SetComboBoxItemsContinuous() + GroupeColorScale() + End Sub + + Private Sub ucrInputAxisType_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputAxisType.ControlValueChanged + HideShowCanvaFill() + HideShowCanvacolor() + GroupeColorScale() + AddRemovePaletteDiscrete() + SetComboBoxItemsContinuous() + SetComboBoxItems() + End Sub + + Private Sub GroupeColorScale() + If ucrChkColour.Checked Then + Select Case ucrInputAxisType.GetText + Case "discrete" + ucrInputPaletteContinuous.Hide() + ucrInputcontinuouscolor.Hide() + ucrInputContinousfill.Hide() + If rdoColour.Checked AndAlso (rdoSequential.Checked OrElse rdoQualitative.Checked OrElse rdoDiverging.Checked) Then + clsColourPaletteFunction.AddParameter("palette", Chr(34) & ucrInputPalettes.GetText & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("scale_colour_brewer", clsRFunctionParameter:=clsColourPaletteFunction, iPosition:=15) + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill") + clsBaseOperator.RemoveParameterByName("scale_colour") + ucrInputColorFunctions.Hide() ucrInputFillFunction.Hide() grpFillScale.Hide() grpColourScale.Hide() @@ -3678,471 +3579,46 @@ Public Class sdgPlots grpScaleColorw.Hide() grpScalefillhc.Hide() grpScalecolorhc.Hide() - ucrInputPalettes.Hide() + ucrInputPalettes.Show() + ElseIf rdoColour.Checked AndAlso rdoViridis.Checked Then + clsBaseOperator.AddParameter("scale_colour", clsRFunctionParameter:=clsScaleColourViridisFunction, iPosition:=3) clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - ElseIf ucrInputColorFunctions.GetText = "scale_color_calc" Then - clsBaseOperator.AddParameter("scale_color_calc", clsRFunctionParameter:=clsScalecolorcalcFunction, iPosition:=3) - grpScalecolorcal.Show() - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - ElseIf ucrInputColorFunctions.GetText = "scale_color_colorblind" Then - clsBaseOperator.AddParameter("scale_color_colorblind", clsRFunctionParameter:=clsScaleColorColorblindFunction, iPosition:=3) - grpColourScaleGgthemes.Show() - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - ElseIf ucrInputColorFunctions.GetText = "scale_color_canva" AndAlso Not ucrInputCanvasColorPalette.IsEmpty Then - clsScalecolorcanvaFunction.AddParameter("palette", Chr(34) & ucrInputCanvasColorPalette.GetText() & Chr(34), iPosition:=0) - clsBaseOperator.AddParameter("scale_color_canva", clsRFunctionParameter:=clsScalecolorcanvaFunction, iPosition:=3) - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - ElseIf ucrInputColorFunctions.GetText = "scale_color_economist" Then - clsBaseOperator.AddParameter("scale_color_economist", clsRFunctionParameter:=clsScalecoloreconomistFunction, iPosition:=3) - grpScalecolorEcon.Show() - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - ElseIf ucrInputColorFunctions.GetText = "scale_color_excel" Then - clsBaseOperator.AddParameter("scale_color_excel", clsRFunctionParameter:=clsScalecolorexcelFunction, iPosition:=3) - grpScalecolorEx.Show() - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - ElseIf ucrInputColorFunctions.GetText = "scale_color_excel_new" Then - clsBaseOperator.AddParameter("scale_color_excel_new", clsRFunctionParameter:=clsScalecolorexcelnewFunction, iPosition:=3) - grpScalecolorExn.Show() - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - ElseIf ucrInputColorFunctions.GetText = "scale_color_few" Then - grpScalecolorfew.Show() - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - ElseIf ucrInputColorFunctions.GetText = "scale_color_fivethirtyeight" Then - clsBaseOperator.AddParameter("scale_color_fivethirtyeight", clsRFunctionParameter:=clsScalecolorfivethirtyeightFunction, iPosition:=3) - grpScaleColorfiv.Show() - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - ElseIf ucrInputColorFunctions.GetText = "scale_color_gdocs" Then - clsBaseOperator.AddParameter("scale_color_gdocs", clsRFunctionParameter:=clsScalecolorgdocsFunction, iPosition:=3) - grpScalecolorg.Show() - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - ElseIf ucrInputColorFunctions.GetText = "scale_color_hc" Then - clsBaseOperator.AddParameter("scale_color_hc", clsRFunctionParameter:=clsScalecolorhcFunction, iPosition:=3) - grpScalecolorhc.Show() - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - ElseIf ucrInputColorFunctions.GetText = "scale_color_pander" Then - clsBaseOperator.AddParameter("scale_color_pander", clsRFunctionParameter:=clsScalecolorpanderFunction, iPosition:=3) - grpScalecolorpan.Show() - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - ElseIf ucrInputColorFunctions.GetText = "scale_color_ptol" Then - clsBaseOperator.AddParameter("scale_color_ptol", clsRFunctionParameter:=clsScalecolorptolFunction, iPosition:=3) - grpScalecolorpt.Show() - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - ElseIf ucrInputColorFunctions.GetText = "scale_color_solarized" Then - clsBaseOperator.AddParameter("scale_color_solarized", clsRFunctionParameter:=clsScalecolorsolarizedFunction, iPosition:=3) - grpScalecolorsol.Show() - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - ElseIf ucrInputColorFunctions.GetText = "scale_color_stata" Then - clsBaseOperator.AddParameter("scale_color_stata", clsRFunctionParameter:=clsScalecolorstataFunction, iPosition:=3) - grpScalecolorst.Show() - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - ElseIf ucrInputColorFunctions.GetText = "scale_color_wsj" Then - clsBaseOperator.AddParameter("scale_color_wsj", clsRFunctionParameter:=clsScalecolorwsjFunction, iPosition:=3) - grpScaleColorw.Show() - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - End If - ElseIf rdoFill.Checked AndAlso (rdoSequential.Checked OrElse rdoDiverging.Checked OrElse rdoQualitative.Checked) Then - clsFillPaletteFunction.AddParameter("palette", Chr(34) & ucrInputPalettes.GetText & Chr(34), iPosition:=0) - clsBaseOperator.AddParameter("scale_fill_brewer", clsRFunctionParameter:=clsFillPaletteFunction, iPosition:=15) - clsBaseOperator.RemoveParameterByName("scale_color_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill") - clsBaseOperator.RemoveParameterByName("scale_colour") - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fillr_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - ucrInputColorFunctions.Hide() - ucrInputFillFunction.Hide() - grpFillScale.Hide() - grpColourScale.Hide() - grpFillScaleggthemes.Hide() - grpColourScaleGgthemes.Hide() - grpScalefillCal.Hide() - grpScalecolorcal.Hide() - grpScalefillEcon.Hide() - grpScalecolorEcon.Hide() - grpScalefillEx.Hide() - grpScalecolorEx.Hide() - grpScalefillExn.Hide() - grpScalecolorExn.Hide() - grpScalefillfew.Hide() - grpScaleFillfiv.Hide() - grpScaleColorfiv.Hide() - grpScalecolorfew.Hide() - grpScalefillg.Hide() - grpScalecolorg.Hide() - grpScalefillpan.Hide() - grpScalecolorpan.Hide() - grpScalefillpt.Hide() - grpScalecolorpt.Hide() - grpScalefillsol.Hide() - grpScalecolorsol.Hide() - grpScalefillst.Hide() - grpScalecolorst.Hide() - grpScalefillw.Hide() - grpScaleColorw.Hide() - grpScalefillhc.Hide() - grpScalecolorhc.Hide() - ucrInputPalettes.Show() - ElseIf rdoFill.Checked AndAlso rdoViridis.Checked Then - clsBaseOperator.AddParameter("scale_fill", clsRFunctionParameter:=clsScaleFillViridisFunction, iPosition:=3) - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_color_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_colour") - ucrInputColorFunctions.Hide() - ucrInputFillFunction.Hide() - grpFillScale.Show() - grpColourScale.Hide() - grpFillScaleggthemes.Hide() - grpColourScaleGgthemes.Hide() - grpScalefillCal.Hide() - grpScalecolorcal.Hide() - grpScalefillEcon.Hide() - grpScalecolorEcon.Hide() - grpScalefillEx.Hide() - grpScalecolorEx.Hide() - grpScalefillExn.Hide() - grpScalecolorExn.Hide() - grpScalefillfew.Hide() - grpScaleFillfiv.Hide() - grpScaleColorfiv.Hide() - grpScalecolorfew.Hide() - grpScalefillg.Hide() - grpScalecolorg.Hide() - grpScalefillpan.Hide() - grpScalecolorpan.Hide() - grpScalefillpt.Hide() - grpScalecolorpt.Hide() - grpScalefillsol.Hide() - grpScalecolorsol.Hide() - grpScalefillst.Hide() - grpScalecolorst.Hide() - grpScalefillw.Hide() - grpScaleColorw.Hide() - grpScalefillhc.Hide() - grpScalecolorhc.Hide() - ucrInputPalettes.Hide() - ElseIf rdoFill.Checked AndAlso rdoGgthemes.Checked Then - clsBaseOperator.RemoveParameterByName("scale_color_solarized") - clsBaseOperator.RemoveParameterByName("scale_color_stata") - clsBaseOperator.RemoveParameterByName("scale_color_hc") - clsBaseOperator.RemoveParameterByName("scale_color_pander") - clsBaseOperator.RemoveParameterByName("scale_color_colorblind") - clsBaseOperator.RemoveParameterByName("scale_color_wsj") - clsBaseOperator.RemoveParameterByName("scale_color_canva") - clsBaseOperator.RemoveParameterByName("scale_color_economist") - clsBaseOperator.RemoveParameterByName("scale_color_excel") - clsBaseOperator.RemoveParameterByName("scale_color_excel_new") - clsBaseOperator.RemoveParameterByName("scale_color_few") - clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_color_gdocs") - clsBaseOperator.RemoveParameterByName("scale_color_ptol") - clsBaseOperator.RemoveParameterByName("scale_color_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_color_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill") - clsBaseOperator.RemoveParameterByName("scale_colour") - ucrInputColorFunctions.Hide() - ucrInputFillFunction.Show() - grpFillScale.Hide() - grpColourScale.Hide() - grpFillScaleggthemes.Hide() - grpColourScaleGgthemes.Hide() - grpScalefillCal.Hide() - grpScalecolorcal.Hide() - grpScalefillEcon.Hide() - grpScalecolorEcon.Hide() - grpScalefillEx.Hide() - grpScalecolorEx.Hide() - grpScalefillExn.Hide() - grpScalecolorExn.Hide() - grpScalefillfew.Hide() - grpScaleFillfiv.Hide() - grpScaleColorfiv.Hide() - grpScalecolorfew.Hide() - grpScalefillg.Hide() - grpScalecolorg.Hide() - grpScalefillpan.Hide() - grpScalecolorpan.Hide() - grpScalefillpt.Hide() - grpScalecolorpt.Hide() - grpScalefillsol.Hide() - grpScalecolorsol.Hide() - grpScalefillst.Hide() - grpScalecolorst.Hide() - grpScalefillw.Hide() - grpScaleColorw.Hide() - grpScalefillhc.Hide() - grpScalecolorhc.Hide() - ucrInputPalettes.Hide() - If ucrInputFillFunction.GetText = "" Then + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_color_brewer") ucrInputColorFunctions.Hide() + ucrInputFillFunction.Hide() grpFillScale.Hide() - grpColourScale.Hide() + grpColourScale.Show() grpFillScaleggthemes.Hide() grpColourScaleGgthemes.Hide() grpScalefillCal.Hide() @@ -4172,183 +3648,17 @@ Public Class sdgPlots grpScalefillhc.Hide() grpScalecolorhc.Hide() ucrInputPalettes.Hide() + ElseIf rdoColour.Checked AndAlso rdoGgthemes.Checked Then + clsBaseOperator.RemoveParameterByName("scale_fill") + clsBaseOperator.RemoveParameterByName("scale_colour") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_color_brewer") clsBaseOperator.RemoveParameterByName("scale_fill_solarized") clsBaseOperator.RemoveParameterByName("scale_fill_stata") clsBaseOperator.RemoveParameterByName("scale_fill_hc") clsBaseOperator.RemoveParameterByName("scale_fill_pander") clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - ElseIf ucrInputFillFunction.GetText = "scale_fill_calc" Then - clsBaseOperator.AddParameter("scale_fill_calc", clsRFunctionParameter:=clsScalefillcalcFunction, iPosition:=3) - grpScalefillCal.Show() - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - ElseIf ucrInputFillFunction.GetText = "scale_fill_colorblind" Then - clsBaseOperator.AddParameter("scale_fill_colorblind", clsRFunctionParameter:=clsScaleFillColorblindFunction, iPosition:=3) - grpColourScaleGgthemes.Show() - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - ElseIf ucrInputFillFunction.GetText = "scale_fill_canva" AndAlso Not ucrInputCanvasFillPalette.IsEmpty Then - clsScalefillcanvaFunction.AddParameter("palette", Chr(34) & ucrInputCanvasFillPalette.GetText() & Chr(34), iPosition:=0) - clsBaseOperator.AddParameter("scale_fill_canva", clsRFunctionParameter:=clsScalefillcanvaFunction, iPosition:=3) - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - ElseIf ucrInputFillFunction.GetText = "scale_fill_economist" Then - clsBaseOperator.AddParameter("scale_fill_economist", clsRFunctionParameter:=clsScalefilleconomistFunction, iPosition:=3) - grpScalefillEcon.Show() - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - ElseIf ucrInputFillFunction.GetText = "scale_fill_excel" Then - clsBaseOperator.AddParameter("scale_fill_excel", clsRFunctionParameter:=clsScalefillexcelFunction, iPosition:=3) - grpScalefillEx.Show() - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - ElseIf ucrInputFillFunction.GetText = "scale_fill_excel_new" Then - clsBaseOperator.AddParameter("scale_fill_excel_new", clsRFunctionParameter:=clsScalefillexcelnewFunction, iPosition:=3) - grpScalefillExn.Show() - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - ElseIf ucrInputFillFunction.GetText = "scale_fill_few" Then - clsBaseOperator.AddParameter("scale_fill_few", clsRFunctionParameter:=clsScalefillfewFunction, iPosition:=3) - grpScalefillfew.Show() - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - ElseIf ucrInputFillFunction.GetText = "scale_fill_fivethirtyeight" Then - clsBaseOperator.AddParameter("scale_fill_fivethirtyeight", clsRFunctionParameter:=clsScalefillfivethirtyeightFunction, iPosition:=3) - grpScaleFillfiv.Show() - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - ElseIf ucrInputFillFunction.GetText = "scale_fill_gdocs" Then - clsBaseOperator.AddParameter("scale_fill_gdocs", clsRFunctionParameter:=clsScalefillgdocsFunction, iPosition:=3) - grpScalefillg.Show() - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - ElseIf ucrInputFillFunction.GetText = "scale_fill_hc" Then - clsBaseOperator.AddParameter("scale_fill_hc", clsRFunctionParameter:=clsScalefillhcFunction, iPosition:=3) - grpScalefillhc.Show() - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") clsBaseOperator.RemoveParameterByName("scale_fill_canva") clsBaseOperator.RemoveParameterByName("scale_fill_economist") clsBaseOperator.RemoveParameterByName("scale_fill_excel") @@ -4357,47 +3667,369 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - ElseIf ucrInputFillFunction.GetText = "scale_fill_pander" Then - clsBaseOperator.AddParameter("scale_fill_pander", clsRFunctionParameter:=clsScalefillpanderFunction, iPosition:=3) - grpScalefillpan.Show() - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - ElseIf ucrInputFillFunction.GetText = "scale_fill_ptol" Then - clsBaseOperator.AddParameter("scale_fill_ptol", clsRFunctionParameter:=clsScalefillptolFunction, iPosition:=3) - grpScalefillpt.Show() + ucrInputColorFunctions.Show() + ucrInputFillFunction.Hide() + grpFillScale.Hide() + grpColourScale.Hide() + grpFillScaleggthemes.Hide() + grpColourScaleGgthemes.Hide() + grpScalefillCal.Hide() + grpScalecolorcal.Hide() + grpScalefillEcon.Hide() + grpScalecolorEcon.Hide() + grpScalefillEx.Hide() + grpScalecolorEx.Hide() + grpScalefillExn.Hide() + grpScalecolorExn.Hide() + grpScalefillfew.Hide() + grpScaleFillfiv.Hide() + grpScaleColorfiv.Hide() + grpScalecolorfew.Hide() + grpScalefillg.Hide() + grpScalecolorg.Hide() + grpScalefillpan.Hide() + grpScalecolorpan.Hide() + grpScalefillpt.Hide() + grpScalecolorpt.Hide() + grpScalefillsol.Hide() + grpScalecolorsol.Hide() + grpScalefillst.Hide() + grpScalecolorst.Hide() + grpScalefillw.Hide() + grpScaleColorw.Hide() + grpScalefillhc.Hide() + grpScalecolorhc.Hide() + ucrInputPalettes.Hide() + If ucrInputColorFunctions.GetText = "" Then + ucrInputFillFunction.Hide() + grpFillScale.Hide() + grpColourScale.Hide() + grpFillScaleggthemes.Hide() + grpColourScaleGgthemes.Hide() + grpScalefillCal.Hide() + grpScalecolorcal.Hide() + grpScalefillEcon.Hide() + grpScalecolorEcon.Hide() + grpScalefillEx.Hide() + grpScalecolorEx.Hide() + grpScalefillExn.Hide() + grpScalecolorExn.Hide() + grpScalefillfew.Hide() + grpScaleFillfiv.Hide() + grpScaleColorfiv.Hide() + grpScalecolorfew.Hide() + grpScalefillg.Hide() + grpScalecolorg.Hide() + grpScalefillpan.Hide() + grpScalecolorpan.Hide() + grpScalefillpt.Hide() + grpScalecolorpt.Hide() + grpScalefillsol.Hide() + grpScalecolorsol.Hide() + grpScalefillst.Hide() + grpScalecolorst.Hide() + grpScalefillw.Hide() + grpScaleColorw.Hide() + grpScalefillhc.Hide() + grpScalecolorhc.Hide() + ucrInputPalettes.Hide() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + ElseIf ucrInputColorFunctions.GetText = "scale_color_calc" Then + clsBaseOperator.AddParameter("scale_color_calc", clsRFunctionParameter:=clsScalecolorcalcFunction, iPosition:=3) + grpScalecolorcal.Show() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + ElseIf ucrInputColorFunctions.GetText = "scale_color_colorblind" Then + clsBaseOperator.AddParameter("scale_color_colorblind", clsRFunctionParameter:=clsScaleColorColorblindFunction, iPosition:=3) + grpColourScaleGgthemes.Show() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + ElseIf ucrInputColorFunctions.GetText = "scale_color_canva" AndAlso Not ucrInputCanvasColorPalette.IsEmpty Then + clsScalecolorcanvaFunction.AddParameter("palette", Chr(34) & ucrInputCanvasColorPalette.GetText() & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("scale_color_canva", clsRFunctionParameter:=clsScalecolorcanvaFunction, iPosition:=3) + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + ElseIf ucrInputColorFunctions.GetText = "scale_color_economist" Then + clsBaseOperator.AddParameter("scale_color_economist", clsRFunctionParameter:=clsScalecoloreconomistFunction, iPosition:=3) + grpScalecolorEcon.Show() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + ElseIf ucrInputColorFunctions.GetText = "scale_color_excel" Then + clsBaseOperator.AddParameter("scale_color_excel", clsRFunctionParameter:=clsScalecolorexcelFunction, iPosition:=3) + grpScalecolorEx.Show() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + ElseIf ucrInputColorFunctions.GetText = "scale_color_excel_new" Then + clsBaseOperator.AddParameter("scale_color_excel_new", clsRFunctionParameter:=clsScalecolorexcelnewFunction, iPosition:=3) + grpScalecolorExn.Show() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + ElseIf ucrInputColorFunctions.GetText = "scale_color_few" Then + grpScalecolorfew.Show() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + ElseIf ucrInputColorFunctions.GetText = "scale_color_fivethirtyeight" Then + clsBaseOperator.AddParameter("scale_color_fivethirtyeight", clsRFunctionParameter:=clsScalecolorfivethirtyeightFunction, iPosition:=3) + grpScaleColorfiv.Show() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + ElseIf ucrInputColorFunctions.GetText = "scale_color_gdocs" Then + clsBaseOperator.AddParameter("scale_color_gdocs", clsRFunctionParameter:=clsScalecolorgdocsFunction, iPosition:=3) + grpScalecolorg.Show() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + ElseIf ucrInputColorFunctions.GetText = "scale_color_hc" Then + clsBaseOperator.AddParameter("scale_color_hc", clsRFunctionParameter:=clsScalecolorhcFunction, iPosition:=3) + grpScalecolorhc.Show() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + ElseIf ucrInputColorFunctions.GetText = "scale_color_pander" Then + clsBaseOperator.AddParameter("scale_color_pander", clsRFunctionParameter:=clsScalecolorpanderFunction, iPosition:=3) + grpScalecolorpan.Show() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + ElseIf ucrInputColorFunctions.GetText = "scale_color_ptol" Then + clsBaseOperator.AddParameter("scale_color_ptol", clsRFunctionParameter:=clsScalecolorptolFunction, iPosition:=3) + grpScalecolorpt.Show() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + ElseIf ucrInputColorFunctions.GetText = "scale_color_solarized" Then + clsBaseOperator.AddParameter("scale_color_solarized", clsRFunctionParameter:=clsScalecolorsolarizedFunction, iPosition:=3) + grpScalecolorsol.Show() + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + ElseIf ucrInputColorFunctions.GetText = "scale_color_stata" Then + clsBaseOperator.AddParameter("scale_color_stata", clsRFunctionParameter:=clsScalecolorstataFunction, iPosition:=3) + grpScalecolorst.Show() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + ElseIf ucrInputColorFunctions.GetText = "scale_color_wsj" Then + clsBaseOperator.AddParameter("scale_color_wsj", clsRFunctionParameter:=clsScalecolorwsjFunction, iPosition:=3) + grpScaleColorw.Show() + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + End If + ElseIf rdoFill.Checked AndAlso (rdoSequential.Checked OrElse rdoDiverging.Checked OrElse rdoQualitative.Checked) Then + clsFillPaletteFunction.AddParameter("palette", Chr(34) & ucrInputPalettes.GetText & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("scale_fill_brewer", clsRFunctionParameter:=clsFillPaletteFunction, iPosition:=15) + clsBaseOperator.RemoveParameterByName("scale_color_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill") + clsBaseOperator.RemoveParameterByName("scale_colour") + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") clsBaseOperator.RemoveParameterByName("scale_fill_solarized") clsBaseOperator.RemoveParameterByName("scale_fill_stata") clsBaseOperator.RemoveParameterByName("scale_fill_hc") clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - ElseIf ucrInputFillFunction.GetText = "scale_fill_solarized" Then - grpScalefillsol.Show() - clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_stata") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fillr_colorblind") clsBaseOperator.RemoveParameterByName("scale_fill_calc") clsBaseOperator.RemoveParameterByName("scale_fill_canva") clsBaseOperator.RemoveParameterByName("scale_fill_economist") @@ -4407,139 +4039,600 @@ Public Class sdgPlots clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - ElseIf ucrInputFillFunction.GetText = "scale_fill_stata" Then - clsBaseOperator.AddParameter("scale_fill_stata", clsRFunctionParameter:=clsScalefillstataFunction, iPosition:=3) - grpScalefillst.Show() - clsBaseOperator.RemoveParameterByName("scale_fill_solarized") clsBaseOperator.RemoveParameterByName("scale_fill_wsj") - clsBaseOperator.RemoveParameterByName("scale_fill_hc") - clsBaseOperator.RemoveParameterByName("scale_fill_pander") - clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") - clsBaseOperator.RemoveParameterByName("scale_fill_canva") - clsBaseOperator.RemoveParameterByName("scale_fill_economist") - clsBaseOperator.RemoveParameterByName("scale_fill_excel") - clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") - clsBaseOperator.RemoveParameterByName("scale_fill_few") - clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") - clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") - clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - ElseIf ucrInputFillFunction.GetText = "scale_fill_wsj" Then - clsBaseOperator.AddParameter("scale_fill_wsj", clsRFunctionParameter:=clsScalefillwsjFunction, iPosition:=3) - grpScalefillw.Show() + ucrInputColorFunctions.Hide() + ucrInputFillFunction.Hide() + grpFillScale.Hide() + grpColourScale.Hide() + grpFillScaleggthemes.Hide() + grpColourScaleGgthemes.Hide() + grpScalefillCal.Hide() + grpScalecolorcal.Hide() + grpScalefillEcon.Hide() + grpScalecolorEcon.Hide() + grpScalefillEx.Hide() + grpScalecolorEx.Hide() + grpScalefillExn.Hide() + grpScalecolorExn.Hide() + grpScalefillfew.Hide() + grpScaleFillfiv.Hide() + grpScaleColorfiv.Hide() + grpScalecolorfew.Hide() + grpScalefillg.Hide() + grpScalecolorg.Hide() + grpScalefillpan.Hide() + grpScalecolorpan.Hide() + grpScalefillpt.Hide() + grpScalecolorpt.Hide() + grpScalefillsol.Hide() + grpScalecolorsol.Hide() + grpScalefillst.Hide() + grpScalecolorst.Hide() + grpScalefillw.Hide() + grpScaleColorw.Hide() + grpScalefillhc.Hide() + grpScalecolorhc.Hide() + ucrInputPalettes.Show() + ElseIf rdoFill.Checked AndAlso rdoViridis.Checked Then + clsBaseOperator.AddParameter("scale_fill", clsRFunctionParameter:=clsScaleFillViridisFunction, iPosition:=3) + clsBaseOperator.RemoveParameterByName("scale_color_solarized") clsBaseOperator.RemoveParameterByName("scale_fill_solarized") clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") - clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_canva") clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") clsBaseOperator.RemoveParameterByName("scale_fill_ptol") - End If - End If - Case "continuous" - ucrInputColorFunctions.Hide() - ucrInputFillFunction.Hide() - grpFillScale.Hide() - grpColourScale.Hide() - grpFillScaleggthemes.Hide() - grpColourScaleGgthemes.Hide() - grpScalefillCal.Hide() - grpScalecolorcal.Hide() - grpScalefillEcon.Hide() - grpScalecolorEcon.Hide() - grpScalefillEx.Hide() - grpScalecolorEx.Hide() - grpScalefillExn.Hide() - grpScalecolorExn.Hide() - grpScalefillfew.Hide() - grpScaleFillfiv.Hide() - grpScaleColorfiv.Hide() - grpScalecolorfew.Hide() - grpScalefillg.Hide() - grpScalecolorg.Hide() - grpScalefillpan.Hide() - grpScalecolorpan.Hide() - grpScalefillpt.Hide() - grpScalecolorpt.Hide() - grpScalefillsol.Hide() - grpScalecolorsol.Hide() - grpScalefillst.Hide() - grpScalecolorst.Hide() - grpScalefillw.Hide() - grpScaleColorw.Hide() - grpScalefillhc.Hide() - grpScalecolorhc.Hide() - ucrInputPalettes.Hide() - If rdoSequential.Checked OrElse rdoDiverging.Checked OrElse rdoQualitative.Checked Then - grpColourScale.Hide() - grpFillScale.Hide() - ucrInputContinousfill.Hide() - ucrInputcontinuouscolor.Hide() - If rdoFill.Checked Or rdoColour.Checked Then - ucrInputPaletteContinuous.Show() - Else - ucrInputPaletteContinuous.Hide() - End If - clsBaseOperator.RemoveParameterByName("scale_color_gradient_tableau") - clsBaseOperator.RemoveParameterByName("scale_fill_gradient_tableau") - clsBaseOperator.RemoveParameterByName("scale_colour") - clsBaseOperator.RemoveParameterByName("scale_fill") - ElseIf rdoViridis.Checked Then - ucrInputcontinuouscolor.Hide() - ucrInputPaletteContinuous.Hide() - ucrInputContinousfill.Hide() - ucrInputPalettes.Hide() - clsBaseOperator.RemoveParameterByName("scale_color_gradient_tableau") - clsBaseOperator.RemoveParameterByName("scale_fill_gradient_tableau") - clsBaseOperator.RemoveParameterByName("scale_color_distiller") - clsBaseOperator.RemoveParameterByName("scale_fill_distiller") - If rdoColour.Checked Then - grpColourScale.Show() - clsBaseOperator.AddParameter("scale_colour", clsRFunctionParameter:=clsScaleColourViridisFunction, iPosition:=3) - Else + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_color_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") clsBaseOperator.RemoveParameterByName("scale_colour") - grpColourScale.Hide() - End If - If rdoFill.Checked Then - clsBaseOperator.AddParameter("scale_fill", clsRFunctionParameter:=clsScaleFillViridisFunction, iPosition:=3) + ucrInputColorFunctions.Hide() + ucrInputFillFunction.Hide() grpFillScale.Show() - Else + grpColourScale.Hide() + grpFillScaleggthemes.Hide() + grpColourScaleGgthemes.Hide() + grpScalefillCal.Hide() + grpScalecolorcal.Hide() + grpScalefillEcon.Hide() + grpScalecolorEcon.Hide() + grpScalefillEx.Hide() + grpScalecolorEx.Hide() + grpScalefillExn.Hide() + grpScalecolorExn.Hide() + grpScalefillfew.Hide() + grpScaleFillfiv.Hide() + grpScaleColorfiv.Hide() + grpScalecolorfew.Hide() + grpScalefillg.Hide() + grpScalecolorg.Hide() + grpScalefillpan.Hide() + grpScalecolorpan.Hide() + grpScalefillpt.Hide() + grpScalecolorpt.Hide() + grpScalefillsol.Hide() + grpScalecolorsol.Hide() + grpScalefillst.Hide() + grpScalecolorst.Hide() + grpScalefillw.Hide() + grpScaleColorw.Hide() + grpScalefillhc.Hide() + grpScalecolorhc.Hide() + ucrInputPalettes.Hide() + ElseIf rdoFill.Checked AndAlso rdoGgthemes.Checked Then + clsBaseOperator.RemoveParameterByName("scale_color_solarized") + clsBaseOperator.RemoveParameterByName("scale_color_stata") + clsBaseOperator.RemoveParameterByName("scale_color_hc") + clsBaseOperator.RemoveParameterByName("scale_color_pander") + clsBaseOperator.RemoveParameterByName("scale_color_colorblind") + clsBaseOperator.RemoveParameterByName("scale_color_wsj") + clsBaseOperator.RemoveParameterByName("scale_color_canva") + clsBaseOperator.RemoveParameterByName("scale_color_economist") + clsBaseOperator.RemoveParameterByName("scale_color_excel") + clsBaseOperator.RemoveParameterByName("scale_color_excel_new") + clsBaseOperator.RemoveParameterByName("scale_color_few") + clsBaseOperator.RemoveParameterByName("scale_color_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_color_gdocs") + clsBaseOperator.RemoveParameterByName("scale_color_ptol") + clsBaseOperator.RemoveParameterByName("scale_color_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_color_brewer") clsBaseOperator.RemoveParameterByName("scale_fill") + clsBaseOperator.RemoveParameterByName("scale_colour") + ucrInputColorFunctions.Hide() + ucrInputFillFunction.Show() grpFillScale.Hide() + grpColourScale.Hide() + grpFillScaleggthemes.Hide() + grpColourScaleGgthemes.Hide() + grpScalefillCal.Hide() + grpScalecolorcal.Hide() + grpScalefillEcon.Hide() + grpScalecolorEcon.Hide() + grpScalefillEx.Hide() + grpScalecolorEx.Hide() + grpScalefillExn.Hide() + grpScalecolorExn.Hide() + grpScalefillfew.Hide() + grpScaleFillfiv.Hide() + grpScaleColorfiv.Hide() + grpScalecolorfew.Hide() + grpScalefillg.Hide() + grpScalecolorg.Hide() + grpScalefillpan.Hide() + grpScalecolorpan.Hide() + grpScalefillpt.Hide() + grpScalecolorpt.Hide() + grpScalefillsol.Hide() + grpScalecolorsol.Hide() + grpScalefillst.Hide() + grpScalecolorst.Hide() + grpScalefillw.Hide() + grpScaleColorw.Hide() + grpScalefillhc.Hide() + grpScalecolorhc.Hide() + ucrInputPalettes.Hide() + If ucrInputFillFunction.GetText = "" Then + ucrInputColorFunctions.Hide() + grpFillScale.Hide() + grpColourScale.Hide() + grpFillScaleggthemes.Hide() + grpColourScaleGgthemes.Hide() + grpScalefillCal.Hide() + grpScalecolorcal.Hide() + grpScalefillEcon.Hide() + grpScalecolorEcon.Hide() + grpScalefillEx.Hide() + grpScalecolorEx.Hide() + grpScalefillExn.Hide() + grpScalecolorExn.Hide() + grpScalefillfew.Hide() + grpScaleFillfiv.Hide() + grpScaleColorfiv.Hide() + grpScalecolorfew.Hide() + grpScalefillg.Hide() + grpScalecolorg.Hide() + grpScalefillpan.Hide() + grpScalecolorpan.Hide() + grpScalefillpt.Hide() + grpScalecolorpt.Hide() + grpScalefillsol.Hide() + grpScalecolorsol.Hide() + grpScalefillst.Hide() + grpScalecolorst.Hide() + grpScalefillw.Hide() + grpScaleColorw.Hide() + grpScalefillhc.Hide() + grpScalecolorhc.Hide() + ucrInputPalettes.Hide() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + ElseIf ucrInputFillFunction.GetText = "scale_fill_calc" Then + clsBaseOperator.AddParameter("scale_fill_calc", clsRFunctionParameter:=clsScalefillcalcFunction, iPosition:=3) + grpScalefillCal.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + ElseIf ucrInputFillFunction.GetText = "scale_fill_colorblind" Then + clsBaseOperator.AddParameter("scale_fill_colorblind", clsRFunctionParameter:=clsScaleFillColorblindFunction, iPosition:=3) + grpColourScaleGgthemes.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + ElseIf ucrInputFillFunction.GetText = "scale_fill_canva" AndAlso Not ucrInputCanvasFillPalette.IsEmpty Then + clsScalefillcanvaFunction.AddParameter("palette", Chr(34) & ucrInputCanvasFillPalette.GetText() & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("scale_fill_canva", clsRFunctionParameter:=clsScalefillcanvaFunction, iPosition:=3) + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + ElseIf ucrInputFillFunction.GetText = "scale_fill_economist" Then + clsBaseOperator.AddParameter("scale_fill_economist", clsRFunctionParameter:=clsScalefilleconomistFunction, iPosition:=3) + grpScalefillEcon.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + ElseIf ucrInputFillFunction.GetText = "scale_fill_excel" Then + clsBaseOperator.AddParameter("scale_fill_excel", clsRFunctionParameter:=clsScalefillexcelFunction, iPosition:=3) + grpScalefillEx.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + ElseIf ucrInputFillFunction.GetText = "scale_fill_excel_new" Then + clsBaseOperator.AddParameter("scale_fill_excel_new", clsRFunctionParameter:=clsScalefillexcelnewFunction, iPosition:=3) + grpScalefillExn.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + ElseIf ucrInputFillFunction.GetText = "scale_fill_few" Then + clsBaseOperator.AddParameter("scale_fill_few", clsRFunctionParameter:=clsScalefillfewFunction, iPosition:=3) + grpScalefillfew.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + ElseIf ucrInputFillFunction.GetText = "scale_fill_fivethirtyeight" Then + clsBaseOperator.AddParameter("scale_fill_fivethirtyeight", clsRFunctionParameter:=clsScalefillfivethirtyeightFunction, iPosition:=3) + grpScaleFillfiv.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + ElseIf ucrInputFillFunction.GetText = "scale_fill_gdocs" Then + clsBaseOperator.AddParameter("scale_fill_gdocs", clsRFunctionParameter:=clsScalefillgdocsFunction, iPosition:=3) + grpScalefillg.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + ElseIf ucrInputFillFunction.GetText = "scale_fill_hc" Then + clsBaseOperator.AddParameter("scale_fill_hc", clsRFunctionParameter:=clsScalefillhcFunction, iPosition:=3) + grpScalefillhc.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + ElseIf ucrInputFillFunction.GetText = "scale_fill_pander" Then + clsBaseOperator.AddParameter("scale_fill_pander", clsRFunctionParameter:=clsScalefillpanderFunction, iPosition:=3) + grpScalefillpan.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + ElseIf ucrInputFillFunction.GetText = "scale_fill_ptol" Then + clsBaseOperator.AddParameter("scale_fill_ptol", clsRFunctionParameter:=clsScalefillptolFunction, iPosition:=3) + grpScalefillpt.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + ElseIf ucrInputFillFunction.GetText = "scale_fill_solarized" Then + grpScalefillsol.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + ElseIf ucrInputFillFunction.GetText = "scale_fill_stata" Then + clsBaseOperator.AddParameter("scale_fill_stata", clsRFunctionParameter:=clsScalefillstataFunction, iPosition:=3) + grpScalefillst.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_wsj") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + ElseIf ucrInputFillFunction.GetText = "scale_fill_wsj" Then + clsBaseOperator.AddParameter("scale_fill_wsj", clsRFunctionParameter:=clsScalefillwsjFunction, iPosition:=3) + grpScalefillw.Show() + clsBaseOperator.RemoveParameterByName("scale_fill_solarized") + clsBaseOperator.RemoveParameterByName("scale_fill_stata") + clsBaseOperator.RemoveParameterByName("scale_fill_hc") + clsBaseOperator.RemoveParameterByName("scale_fill_pander") + clsBaseOperator.RemoveParameterByName("scale_fill_colorblind") + clsBaseOperator.RemoveParameterByName("scale_fill_calc") + clsBaseOperator.RemoveParameterByName("scale_fill_canva") + clsBaseOperator.RemoveParameterByName("scale_fill_economist") + clsBaseOperator.RemoveParameterByName("scale_fill_excel") + clsBaseOperator.RemoveParameterByName("scale_fill_excel_new") + clsBaseOperator.RemoveParameterByName("scale_fill_few") + clsBaseOperator.RemoveParameterByName("scale_fill_fivethirtyeight") + clsBaseOperator.RemoveParameterByName("scale_fill_gdocs") + clsBaseOperator.RemoveParameterByName("scale_fill_ptol") + End If End If - ElseIf rdoGgthemes.Checked Then + Case "continuous" + ucrInputColorFunctions.Hide() + ucrInputFillFunction.Hide() grpFillScale.Hide() grpColourScale.Hide() - ucrInputPaletteContinuous.Hide() - clsBaseOperator.RemoveParameterByName("scale_fill") - clsBaseOperator.RemoveParameterByName("scale_colour") - clsBaseOperator.RemoveParameterByName("scale_color_distiller") - clsBaseOperator.RemoveParameterByName("scale_fill_distiller") - If rdoColour.Checked Then - ucrInputcontinuouscolor.Show() - clsScalecolorgradienttableauFunction.AddParameter("palette", Chr(34) & ucrInputcontinuouscolor.GetText() & Chr(34), iPosition:=0) - clsBaseOperator.AddParameter("scale_color_gradient_tableau", clsRFunctionParameter:=clsScalecolorgradienttableauFunction, iPosition:=3) - Else - clsBaseOperator.RemoveParameterByName("scale_color_gradient_tableau") + grpFillScaleggthemes.Hide() + grpColourScaleGgthemes.Hide() + grpScalefillCal.Hide() + grpScalecolorcal.Hide() + grpScalefillEcon.Hide() + grpScalecolorEcon.Hide() + grpScalefillEx.Hide() + grpScalecolorEx.Hide() + grpScalefillExn.Hide() + grpScalecolorExn.Hide() + grpScalefillfew.Hide() + grpScaleFillfiv.Hide() + grpScaleColorfiv.Hide() + grpScalecolorfew.Hide() + grpScalefillg.Hide() + grpScalecolorg.Hide() + grpScalefillpan.Hide() + grpScalecolorpan.Hide() + grpScalefillpt.Hide() + grpScalecolorpt.Hide() + grpScalefillsol.Hide() + grpScalecolorsol.Hide() + grpScalefillst.Hide() + grpScalecolorst.Hide() + grpScalefillw.Hide() + grpScaleColorw.Hide() + grpScalefillhc.Hide() + grpScalecolorhc.Hide() + ucrInputPalettes.Hide() + If rdoSequential.Checked OrElse rdoDiverging.Checked OrElse rdoQualitative.Checked Then + grpColourScale.Hide() + grpFillScale.Hide() + ucrInputContinousfill.Hide() ucrInputcontinuouscolor.Hide() - End If - If rdoFill.Checked Then - clsScalefillgradienttableauFunction.AddParameter("palette", Chr(34) & ucrInputContinousfill.GetText & Chr(34), iPosition:=0) - clsBaseOperator.AddParameter("scale_fill_gradient_tableau", clsRFunctionParameter:=clsScalefillgradienttableauFunction, iPosition:=4) - ucrInputContinousfill.Show() - Else + If rdoFill.Checked Or rdoColour.Checked Then + ucrInputPaletteContinuous.Show() + Else + ucrInputPaletteContinuous.Hide() + End If + clsBaseOperator.RemoveParameterByName("scale_color_gradient_tableau") clsBaseOperator.RemoveParameterByName("scale_fill_gradient_tableau") + clsBaseOperator.RemoveParameterByName("scale_colour") + clsBaseOperator.RemoveParameterByName("scale_fill") + ElseIf rdoViridis.Checked Then + ucrInputcontinuouscolor.Hide() + ucrInputPaletteContinuous.Hide() ucrInputContinousfill.Hide() + ucrInputPalettes.Hide() + clsBaseOperator.RemoveParameterByName("scale_color_gradient_tableau") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient_tableau") + clsBaseOperator.RemoveParameterByName("scale_color_distiller") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + If rdoColour.Checked Then + grpColourScale.Show() + clsBaseOperator.AddParameter("scale_colour", clsRFunctionParameter:=clsScaleColourViridisFunction, iPosition:=3) + Else + clsBaseOperator.RemoveParameterByName("scale_colour") + grpColourScale.Hide() + End If + If rdoFill.Checked Then + clsBaseOperator.AddParameter("scale_fill", clsRFunctionParameter:=clsScaleFillViridisFunction, iPosition:=3) + grpFillScale.Show() + Else + clsBaseOperator.RemoveParameterByName("scale_fill") + grpFillScale.Hide() + End If + ElseIf rdoGgthemes.Checked Then + grpFillScale.Hide() + grpColourScale.Hide() + ucrInputPaletteContinuous.Hide() + clsBaseOperator.RemoveParameterByName("scale_fill") + clsBaseOperator.RemoveParameterByName("scale_colour") + clsBaseOperator.RemoveParameterByName("scale_color_distiller") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + If rdoColour.Checked Then + ucrInputcontinuouscolor.Show() + clsScalecolorgradienttableauFunction.AddParameter("palette", Chr(34) & ucrInputcontinuouscolor.GetText() & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("scale_color_gradient_tableau", clsRFunctionParameter:=clsScalecolorgradienttableauFunction, iPosition:=3) + Else + clsBaseOperator.RemoveParameterByName("scale_color_gradient_tableau") + ucrInputcontinuouscolor.Hide() + End If + If rdoFill.Checked Then + clsScalefillgradienttableauFunction.AddParameter("palette", Chr(34) & ucrInputContinousfill.GetText & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("scale_fill_gradient_tableau", clsRFunctionParameter:=clsScalefillgradienttableauFunction, iPosition:=4) + ucrInputContinousfill.Show() + Else + clsBaseOperator.RemoveParameterByName("scale_fill_gradient_tableau") + ucrInputContinousfill.Hide() + End If End If - End If - End Select + End Select + Else + ucrInputPaletteContinuous.Hide() + ucrInputcontinuouscolor.Hide() + ucrInputContinousfill.Hide() + ucrInputColorFunctions.Hide() + ucrInputFillFunction.Hide() + grpFillScale.Hide() + grpColourScale.Hide() + grpFillScaleggthemes.Hide() + grpColourScaleGgthemes.Hide() + grpScalefillCal.Hide() + grpScalecolorcal.Hide() + grpScalefillEcon.Hide() + grpScalecolorEcon.Hide() + grpScalefillEx.Hide() + grpScalecolorEx.Hide() + grpScalefillExn.Hide() + grpScalecolorExn.Hide() + grpScalefillfew.Hide() + grpScaleFillfiv.Hide() + grpScaleColorfiv.Hide() + grpScalecolorfew.Hide() + grpScalefillg.Hide() + grpScalecolorg.Hide() + grpScalefillpan.Hide() + grpScalecolorpan.Hide() + grpScalefillpt.Hide() + grpScalecolorpt.Hide() + grpScalefillsol.Hide() + grpScalecolorsol.Hide() + grpScalefillst.Hide() + grpScalecolorst.Hide() + grpScalefillw.Hide() + grpScaleColorw.Hide() + grpScalefillhc.Hide() + grpScalecolorhc.Hide() + ucrInputPalettes.Hide() + End If End Sub Private Sub ucrInputColorFunctions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputColorFunctions.ControlValueChanged, ucrInputCanvasColorPalette.ControlValueChanged @@ -5538,4 +5631,10 @@ Public Class sdgPlots GroupeColorScale() End Sub + Private Sub ucrChkColour_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkColour.ControlValueChanged + AddRemovePaletteDiscrete() + SetComboBoxItems() + SetComboBoxItemsContinuous() + GroupeColorScale() + End Sub End Class \ No newline at end of file From 4a41dabc6bda2e9719b619ac95d7f0560a26d5ef Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 8 Jan 2024 15:17:42 +0100 Subject: [PATCH 39/48] Added Add Code controls --- instat/dlgGeneralForGraphics.Designer.vb | 216 +++++++++++++---------- instat/dlgGeneralForGraphics.resx | 7 +- instat/dlgGeneralForGraphics.vb | 20 ++- 3 files changed, 145 insertions(+), 98 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index 7a387eaae89..961b69325b5 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -40,11 +40,17 @@ Partial Class dlgGeneralForGraphics Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.grpAethetics = New System.Windows.Forms.GroupBox() + Me.ucrChkUseasNumeric = New instat.ucrCheck() + Me.ucrReceiverY = New instat.ucrReceiverSingle() Me.lblYVariable = New System.Windows.Forms.Label() Me.lblXVariable = New System.Windows.Forms.Label() + Me.ucrReceiverX = New instat.ucrReceiverSingle() Me.lblLabel = New System.Windows.Forms.Label() + Me.ucrLabelReceiver = New instat.ucrReceiverSingle() Me.lblColour = New System.Windows.Forms.Label() + Me.ucrColourReceiver = New instat.ucrReceiverSingle() Me.lblFill = New System.Windows.Forms.Label() + Me.ucrFillReceiver = New instat.ucrReceiverSingle() Me.ContextMenuPackagesList = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ListBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GeomtextpathToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -83,12 +89,6 @@ Partial Class dlgGeneralForGraphics Me.toolStripMenuItemAnnotation = New System.Windows.Forms.ToolStripMenuItem() Me.cmdOptions = New instat.ucrSplitButton() Me.cmdRHelp = New instat.ucrSplitButton() - Me.ucrChkUseasNumeric = New instat.ucrCheck() - Me.ucrReceiverY = New instat.ucrReceiverSingle() - Me.ucrReceiverX = New instat.ucrReceiverSingle() - Me.ucrLabelReceiver = New instat.ucrReceiverSingle() - Me.ucrColourReceiver = New instat.ucrReceiverSingle() - Me.ucrFillReceiver = New instat.ucrReceiverSingle() Me.ucrInputLegendPosition = New instat.ucrInputComboBox() Me.ucrChkFlipCoordinates = New instat.ucrCheck() Me.ucrChkLegend = New instat.ucrCheck() @@ -99,6 +99,8 @@ Partial Class dlgGeneralForGraphics Me.ucrInputStation = New instat.ucrInputComboBox() Me.ucrReceiverFacetBy = New instat.ucrReceiverSingle() Me.lblFacetBy = New System.Windows.Forms.Label() + Me.ucrChkAddCode = New instat.ucrCheck() + Me.ucrInputAddCode = New instat.ucrInputComboBox() Me.grpAethetics.SuspendLayout() Me.ContextMenuPackagesList.SuspendLayout() Me.contextMenuStripOptions.SuspendLayout() @@ -124,6 +126,28 @@ Partial Class dlgGeneralForGraphics Me.grpAethetics.TabStop = False Me.grpAethetics.Text = "Aethetics:" ' + 'ucrChkUseasNumeric + ' + Me.ucrChkUseasNumeric.AutoSize = True + Me.ucrChkUseasNumeric.Checked = False + Me.ucrChkUseasNumeric.Location = New System.Drawing.Point(24, 107) + Me.ucrChkUseasNumeric.Name = "ucrChkUseasNumeric" + Me.ucrChkUseasNumeric.Size = New System.Drawing.Size(126, 24) + Me.ucrChkUseasNumeric.TabIndex = 4 + ' + 'ucrReceiverY + ' + Me.ucrReceiverY.AutoSize = True + Me.ucrReceiverY.frmParent = Me + Me.ucrReceiverY.Location = New System.Drawing.Point(24, 36) + Me.ucrReceiverY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverY.Name = "ucrReceiverY" + Me.ucrReceiverY.Selector = Nothing + Me.ucrReceiverY.Size = New System.Drawing.Size(125, 20) + Me.ucrReceiverY.strNcFilePath = "" + Me.ucrReceiverY.TabIndex = 1 + Me.ucrReceiverY.ucrSelector = Nothing + ' 'lblYVariable ' Me.lblYVariable.AutoSize = True @@ -146,6 +170,19 @@ Partial Class dlgGeneralForGraphics Me.lblXVariable.Tag = "X_Variable:" Me.lblXVariable.Text = "X Variable:" ' + 'ucrReceiverX + ' + Me.ucrReceiverX.AutoSize = True + Me.ucrReceiverX.frmParent = Me + Me.ucrReceiverX.Location = New System.Drawing.Point(24, 81) + Me.ucrReceiverX.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverX.Name = "ucrReceiverX" + Me.ucrReceiverX.Selector = Nothing + Me.ucrReceiverX.Size = New System.Drawing.Size(125, 27) + Me.ucrReceiverX.strNcFilePath = "" + Me.ucrReceiverX.TabIndex = 3 + Me.ucrReceiverX.ucrSelector = Nothing + ' 'lblLabel ' Me.lblLabel.AutoSize = True @@ -157,6 +194,19 @@ Partial Class dlgGeneralForGraphics Me.lblLabel.Tag = "Label:" Me.lblLabel.Text = "Label:" ' + 'ucrLabelReceiver + ' + Me.ucrLabelReceiver.AutoSize = True + Me.ucrLabelReceiver.frmParent = Me + Me.ucrLabelReceiver.Location = New System.Drawing.Point(25, 229) + Me.ucrLabelReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrLabelReceiver.Name = "ucrLabelReceiver" + Me.ucrLabelReceiver.Selector = Nothing + Me.ucrLabelReceiver.Size = New System.Drawing.Size(125, 25) + Me.ucrLabelReceiver.strNcFilePath = "" + Me.ucrLabelReceiver.TabIndex = 9 + Me.ucrLabelReceiver.ucrSelector = Nothing + ' 'lblColour ' Me.lblColour.AutoSize = True @@ -168,6 +218,19 @@ Partial Class dlgGeneralForGraphics Me.lblColour.Tag = "Fill_Colour:" Me.lblColour.Text = "Colour:" ' + 'ucrColourReceiver + ' + Me.ucrColourReceiver.AutoSize = True + Me.ucrColourReceiver.frmParent = Me + Me.ucrColourReceiver.Location = New System.Drawing.Point(25, 189) + Me.ucrColourReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrColourReceiver.Name = "ucrColourReceiver" + Me.ucrColourReceiver.Selector = Nothing + Me.ucrColourReceiver.Size = New System.Drawing.Size(125, 25) + Me.ucrColourReceiver.strNcFilePath = "" + Me.ucrColourReceiver.TabIndex = 7 + Me.ucrColourReceiver.ucrSelector = Nothing + ' 'lblFill ' Me.lblFill.AutoSize = True @@ -179,6 +242,19 @@ Partial Class dlgGeneralForGraphics Me.lblFill.Tag = "Fill_Colour:" Me.lblFill.Text = "Fill:" ' + 'ucrFillReceiver + ' + Me.ucrFillReceiver.AutoSize = True + Me.ucrFillReceiver.frmParent = Me + Me.ucrFillReceiver.Location = New System.Drawing.Point(25, 150) + Me.ucrFillReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrFillReceiver.Name = "ucrFillReceiver" + Me.ucrFillReceiver.Selector = Nothing + Me.ucrFillReceiver.Size = New System.Drawing.Size(125, 25) + Me.ucrFillReceiver.strNcFilePath = "" + Me.ucrFillReceiver.TabIndex = 5 + Me.ucrFillReceiver.ucrSelector = Nothing + ' 'ContextMenuPackagesList ' Me.ContextMenuPackagesList.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -400,7 +476,7 @@ Partial Class dlgGeneralForGraphics ' Me.cmdOptions.AutoSize = True Me.cmdOptions.ContextMenuStrip = Me.contextMenuStripOptions - Me.cmdOptions.Location = New System.Drawing.Point(6, 411) + Me.cmdOptions.Location = New System.Drawing.Point(6, 414) Me.cmdOptions.Name = "cmdOptions" Me.cmdOptions.Size = New System.Drawing.Size(122, 25) Me.cmdOptions.SplitMenuStrip = Me.contextMenuStripOptions @@ -413,95 +489,21 @@ Partial Class dlgGeneralForGraphics ' Me.cmdRHelp.AutoSize = True Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuPackagesList - Me.cmdRHelp.Location = New System.Drawing.Point(371, 442) + Me.cmdRHelp.Location = New System.Drawing.Point(371, 449) Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(91, 30) + Me.cmdRHelp.Size = New System.Drawing.Size(91, 26) Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuPackagesList Me.cmdRHelp.TabIndex = 213 Me.cmdRHelp.Text = "R Help" Me.cmdRHelp.UseVisualStyleBackColor = True ' - 'ucrChkUseasNumeric - ' - Me.ucrChkUseasNumeric.AutoSize = True - Me.ucrChkUseasNumeric.Checked = False - Me.ucrChkUseasNumeric.Location = New System.Drawing.Point(24, 107) - Me.ucrChkUseasNumeric.Name = "ucrChkUseasNumeric" - Me.ucrChkUseasNumeric.Size = New System.Drawing.Size(126, 24) - Me.ucrChkUseasNumeric.TabIndex = 4 - ' - 'ucrReceiverY - ' - Me.ucrReceiverY.AutoSize = True - Me.ucrReceiverY.frmParent = Nothing - Me.ucrReceiverY.Location = New System.Drawing.Point(24, 36) - Me.ucrReceiverY.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverY.Name = "ucrReceiverY" - Me.ucrReceiverY.Selector = Nothing - Me.ucrReceiverY.Size = New System.Drawing.Size(125, 20) - Me.ucrReceiverY.strNcFilePath = "" - Me.ucrReceiverY.TabIndex = 1 - Me.ucrReceiverY.ucrSelector = Nothing - ' - 'ucrReceiverX - ' - Me.ucrReceiverX.AutoSize = True - Me.ucrReceiverX.frmParent = Nothing - Me.ucrReceiverX.Location = New System.Drawing.Point(24, 81) - Me.ucrReceiverX.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverX.Name = "ucrReceiverX" - Me.ucrReceiverX.Selector = Nothing - Me.ucrReceiverX.Size = New System.Drawing.Size(125, 27) - Me.ucrReceiverX.strNcFilePath = "" - Me.ucrReceiverX.TabIndex = 3 - Me.ucrReceiverX.ucrSelector = Nothing - ' - 'ucrLabelReceiver - ' - Me.ucrLabelReceiver.AutoSize = True - Me.ucrLabelReceiver.frmParent = Nothing - Me.ucrLabelReceiver.Location = New System.Drawing.Point(25, 229) - Me.ucrLabelReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrLabelReceiver.Name = "ucrLabelReceiver" - Me.ucrLabelReceiver.Selector = Nothing - Me.ucrLabelReceiver.Size = New System.Drawing.Size(125, 25) - Me.ucrLabelReceiver.strNcFilePath = "" - Me.ucrLabelReceiver.TabIndex = 9 - Me.ucrLabelReceiver.ucrSelector = Nothing - ' - 'ucrColourReceiver - ' - Me.ucrColourReceiver.AutoSize = True - Me.ucrColourReceiver.frmParent = Nothing - Me.ucrColourReceiver.Location = New System.Drawing.Point(25, 189) - Me.ucrColourReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrColourReceiver.Name = "ucrColourReceiver" - Me.ucrColourReceiver.Selector = Nothing - Me.ucrColourReceiver.Size = New System.Drawing.Size(125, 25) - Me.ucrColourReceiver.strNcFilePath = "" - Me.ucrColourReceiver.TabIndex = 7 - Me.ucrColourReceiver.ucrSelector = Nothing - ' - 'ucrFillReceiver - ' - Me.ucrFillReceiver.AutoSize = True - Me.ucrFillReceiver.frmParent = Nothing - Me.ucrFillReceiver.Location = New System.Drawing.Point(25, 150) - Me.ucrFillReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrFillReceiver.Name = "ucrFillReceiver" - Me.ucrFillReceiver.Selector = Nothing - Me.ucrFillReceiver.Size = New System.Drawing.Size(125, 25) - Me.ucrFillReceiver.strNcFilePath = "" - Me.ucrFillReceiver.TabIndex = 5 - Me.ucrFillReceiver.ucrSelector = Nothing - ' 'ucrInputLegendPosition ' Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 Me.ucrInputLegendPosition.IsReadOnly = False - Me.ucrInputLegendPosition.Location = New System.Drawing.Point(302, 364) + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(302, 360) Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" Me.ucrInputLegendPosition.Size = New System.Drawing.Size(125, 21) Me.ucrInputLegendPosition.TabIndex = 15 @@ -510,7 +512,7 @@ Partial Class dlgGeneralForGraphics ' Me.ucrChkFlipCoordinates.AutoSize = True Me.ucrChkFlipCoordinates.Checked = False - Me.ucrChkFlipCoordinates.Location = New System.Drawing.Point(301, 308) + Me.ucrChkFlipCoordinates.Location = New System.Drawing.Point(301, 304) Me.ucrChkFlipCoordinates.Name = "ucrChkFlipCoordinates" Me.ucrChkFlipCoordinates.Size = New System.Drawing.Size(174, 24) Me.ucrChkFlipCoordinates.TabIndex = 13 @@ -519,7 +521,7 @@ Partial Class dlgGeneralForGraphics ' Me.ucrChkLegend.AutoSize = True Me.ucrChkLegend.Checked = False - Me.ucrChkLegend.Location = New System.Drawing.Point(301, 338) + Me.ucrChkLegend.Location = New System.Drawing.Point(301, 334) Me.ucrChkLegend.Name = "ucrChkLegend" Me.ucrChkLegend.Size = New System.Drawing.Size(125, 24) Me.ucrChkLegend.TabIndex = 14 @@ -527,7 +529,7 @@ Partial Class dlgGeneralForGraphics 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(6, 446) + Me.ucrSave.Location = New System.Drawing.Point(6, 449) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(282, 24) @@ -548,7 +550,7 @@ Partial Class dlgGeneralForGraphics 'ucrAdditionalLayers ' Me.ucrAdditionalLayers.AutoSize = True - Me.ucrAdditionalLayers.Location = New System.Drawing.Point(6, 213) + Me.ucrAdditionalLayers.Location = New System.Drawing.Point(6, 194) Me.ucrAdditionalLayers.Name = "ucrAdditionalLayers" Me.ucrAdditionalLayers.Size = New System.Drawing.Size(253, 182) Me.ucrAdditionalLayers.TabIndex = 8 @@ -568,20 +570,20 @@ Partial Class dlgGeneralForGraphics Me.ucrInputStation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputStation.GetSetSelectedIndex = -1 Me.ucrInputStation.IsReadOnly = False - Me.ucrInputStation.Location = New System.Drawing.Point(404, 410) + Me.ucrInputStation.Location = New System.Drawing.Point(389, 413) Me.ucrInputStation.Name = "ucrInputStation" - Me.ucrInputStation.Size = New System.Drawing.Size(71, 21) + Me.ucrInputStation.Size = New System.Drawing.Size(86, 21) Me.ucrInputStation.TabIndex = 14 ' 'ucrReceiverFacetBy ' Me.ucrReceiverFacetBy.AutoSize = True Me.ucrReceiverFacetBy.frmParent = Me - Me.ucrReceiverFacetBy.Location = New System.Drawing.Point(277, 410) + Me.ucrReceiverFacetBy.Location = New System.Drawing.Point(277, 413) Me.ucrReceiverFacetBy.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFacetBy.Name = "ucrReceiverFacetBy" Me.ucrReceiverFacetBy.Selector = Nothing - Me.ucrReceiverFacetBy.Size = New System.Drawing.Size(125, 26) + Me.ucrReceiverFacetBy.Size = New System.Drawing.Size(109, 26) Me.ucrReceiverFacetBy.strNcFilePath = "" Me.ucrReceiverFacetBy.TabIndex = 13 Me.ucrReceiverFacetBy.ucrSelector = Nothing @@ -590,12 +592,32 @@ Partial Class dlgGeneralForGraphics ' Me.lblFacetBy.AutoSize = True Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFacetBy.Location = New System.Drawing.Point(277, 395) + Me.lblFacetBy.Location = New System.Drawing.Point(277, 398) Me.lblFacetBy.Name = "lblFacetBy" - Me.lblFacetBy.Size = New System.Drawing.Size(100, 13) + Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) Me.lblFacetBy.TabIndex = 12 Me.lblFacetBy.Tag = "" - Me.lblFacetBy.Text = "Facet By (Optional):" + Me.lblFacetBy.Text = "Facet By:" + ' + 'ucrChkAddCode + ' + Me.ucrChkAddCode.AutoSize = True + Me.ucrChkAddCode.Checked = False + Me.ucrChkAddCode.Location = New System.Drawing.Point(6, 382) + Me.ucrChkAddCode.Name = "ucrChkAddCode" + Me.ucrChkAddCode.Size = New System.Drawing.Size(84, 24) + Me.ucrChkAddCode.TabIndex = 217 + ' + 'ucrInputAddCode + ' + Me.ucrInputAddCode.AddQuotesIfUnrecognised = True + Me.ucrInputAddCode.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputAddCode.GetSetSelectedIndex = -1 + Me.ucrInputAddCode.IsReadOnly = False + Me.ucrInputAddCode.Location = New System.Drawing.Point(96, 380) + Me.ucrInputAddCode.Name = "ucrInputAddCode" + Me.ucrInputAddCode.Size = New System.Drawing.Size(163, 21) + Me.ucrInputAddCode.TabIndex = 218 ' 'dlgGeneralForGraphics ' @@ -603,6 +625,8 @@ Partial Class dlgGeneralForGraphics Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(478, 547) + Me.Controls.Add(Me.ucrInputAddCode) + Me.Controls.Add(Me.ucrChkAddCode) Me.Controls.Add(Me.ucrInputStation) Me.Controls.Add(Me.ucrReceiverFacetBy) Me.Controls.Add(Me.lblFacetBy) @@ -692,4 +716,6 @@ Partial Class dlgGeneralForGraphics Friend WithEvents ucrInputStation As ucrInputComboBox Friend WithEvents ucrReceiverFacetBy As ucrReceiverSingle Friend WithEvents lblFacetBy As Label + Friend WithEvents ucrInputAddCode As ucrInputComboBox + Friend WithEvents ucrChkAddCode As ucrCheck End Class diff --git a/instat/dlgGeneralForGraphics.resx b/instat/dlgGeneralForGraphics.resx index ec550b4454c..90ae59b3ecc 100644 --- a/instat/dlgGeneralForGraphics.resx +++ b/instat/dlgGeneralForGraphics.resx @@ -117,10 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 217, 12 + + 55 415, 13 + + 217, 12 + \ No newline at end of file diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 22cb15277cb..5d10bdfdbc3 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -56,6 +56,7 @@ Public Class dlgGeneralForGraphics Private clsFacetColOp As New ROperator Private clsPipeOperator As New ROperator Private clsGroupByFunction As New RFunction + Private clsAddCodeOperator As New ROperator Private ReadOnly strFacetWrap As String = "Facet Wrap" Private ReadOnly strFacetRow As String = "Facet Row" @@ -162,6 +163,10 @@ Public Class dlgGeneralForGraphics ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) ucrInputStation.SetDropDownStyleAsNonEditable() + ucrChkAddCode.SetText("Add Code") + ucrChkAddCode.AddToLinkedControls({ucrInputAddCode}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="geom_hline(y = 20)") + ucrInputAddCode.SetItems({"geom_hline(y = 20)", "geom_vline(x=5)", "geom_vline(x=c(5,20))", "scale_x_binned()", "scale_x_binned(n.breaks=20)"}) + ucrSave.SetPrefix("graph") ucrSave.SetIsComboBox() ucrSave.SetSaveTypeAsGraph() @@ -184,6 +189,7 @@ Public Class dlgGeneralForGraphics clsFacetColOp = New ROperator clsPipeOperator = New ROperator clsGroupByFunction = New RFunction + clsAddCodeOperator = New ROperator ucrSave.Reset() @@ -235,6 +241,8 @@ Public Class dlgGeneralForGraphics clsScaleContinuousFunction.AddParameter("breaks", "1:12", iPosition:=1) clsScaleContinuousFunction.AddParameter("labels", clsRFunctionParameter:=clsLevelsFunction, iPosition:=2) + clsAddCodeOperator.SetOperation("", bBracketsTemp:=False) + clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabsFunction = GgplotDefaults.clsYlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() @@ -269,6 +277,8 @@ Public Class dlgGeneralForGraphics ucrReceiverX.SetRCode(clsGlobalAesFunction, bReset) If bReset Then ucrChkUseasNumeric.SetRCode(clsDummyFunction, bReset) + ucrChkAddCode.SetRCode(clsAddCodeOperator, bReset) + ucrInputAddCode.SetRCode(clsAddCodeOperator, bReset) End If ucrFillReceiver.SetRCode(clsGlobalAesFunction, bReset) ucrColourReceiver.SetRCode(clsGlobalAesFunction, bReset) @@ -743,7 +753,6 @@ Public Class dlgGeneralForGraphics End Sub Private Sub AddRemoveGroupBy() - If clsPipeOperator.ContainsParameter("mutate") Then clsGroupByFunction.ClearParameters() If clsBaseOperator.ContainsParameter("facets") Then @@ -781,4 +790,13 @@ Public Class dlgGeneralForGraphics AutoFacetStation() SetPipeAssignTo() End Sub + + Private Sub ucrChkAddCode_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddCode.ControlValueChanged, ucrInputAddCode.ControlValueChanged + If ucrChkAddCode.Checked AndAlso Not ucrInputAddCode.IsEmpty Then + clsAddCodeOperator.AddParameter("code1", ucrInputAddCode.GetText(), bIncludeArgumentName:=False, iPosition:=1) + clsBaseOperator.AddParameter("newcode", clsROperatorParameter:=clsAddCodeOperator, bIncludeArgumentName:=False) + Else + clsBaseOperator.RemoveParameterByName("newcode") + End If + End Sub End Class \ No newline at end of file From 123aeb22d28b152730bffcc93391884f21424c1b Mon Sep 17 00:00:00 2001 From: Stephen Lloyd Date: Wed, 10 Jan 2024 09:27:56 +0100 Subject: [PATCH 40/48] removed unnecessary comment - no impact on functionality --- instat/clsRLink.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index 751ffea0ff3..91b7e41a18d 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -18,7 +18,6 @@ Imports System.Runtime.InteropServices Imports RDotNet Imports unvell.ReoGrid Imports System.IO -'Imports RScript Imports RInsightF461 '''-------------------------------------------------------------------------------------------- From d16e6a23cd9e46cb46b2c11a30ea5400b2eb24cc Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 10 Jan 2024 14:42:52 +0100 Subject: [PATCH 41/48] Change made. Fixed part a), b) and d) --- instat/dlgGeneralForGraphics.Designer.vb | 81 +++++++++++---------- instat/dlgGeneralForGraphics.vb | 91 ++++++++++++------------ instat/sdgPlots.vb | 2 +- 3 files changed, 88 insertions(+), 86 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index 961b69325b5..c702269d00c 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -94,13 +94,13 @@ Partial Class dlgGeneralForGraphics Me.ucrChkLegend = New instat.ucrCheck() Me.ucrSave = New instat.ucrSave() Me.ucrGraphicsSelector = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrAdditionalLayers = New instat.ucrAdditionalLayers() Me.ucrBase = New instat.ucrButtons() Me.ucrInputStation = New instat.ucrInputComboBox() - Me.ucrReceiverFacetBy = New instat.ucrReceiverSingle() + Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() Me.lblFacetBy = New System.Windows.Forms.Label() Me.ucrChkAddCode = New instat.ucrCheck() Me.ucrInputAddCode = New instat.ucrInputComboBox() + Me.ucrAdditionalLayers = New instat.ucrAdditionalLayers() Me.grpAethetics.SuspendLayout() Me.ContextMenuPackagesList.SuspendLayout() Me.contextMenuStripOptions.SuspendLayout() @@ -119,7 +119,7 @@ Partial Class dlgGeneralForGraphics Me.grpAethetics.Controls.Add(Me.ucrColourReceiver) Me.grpAethetics.Controls.Add(Me.lblFill) Me.grpAethetics.Controls.Add(Me.ucrFillReceiver) - Me.grpAethetics.Location = New System.Drawing.Point(277, 41) + Me.grpAethetics.Location = New System.Drawing.Point(277, 31) Me.grpAethetics.Name = "grpAethetics" Me.grpAethetics.Size = New System.Drawing.Size(174, 257) Me.grpAethetics.TabIndex = 23 @@ -476,7 +476,7 @@ Partial Class dlgGeneralForGraphics ' Me.cmdOptions.AutoSize = True Me.cmdOptions.ContextMenuStrip = Me.contextMenuStripOptions - Me.cmdOptions.Location = New System.Drawing.Point(6, 414) + Me.cmdOptions.Location = New System.Drawing.Point(6, 426) Me.cmdOptions.Name = "cmdOptions" Me.cmdOptions.Size = New System.Drawing.Size(122, 25) Me.cmdOptions.SplitMenuStrip = Me.contextMenuStripOptions @@ -489,9 +489,9 @@ Partial Class dlgGeneralForGraphics ' Me.cmdRHelp.AutoSize = True Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuPackagesList - Me.cmdRHelp.Location = New System.Drawing.Point(371, 449) + Me.cmdRHelp.Location = New System.Drawing.Point(360, 426) Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(91, 26) + Me.cmdRHelp.Size = New System.Drawing.Size(91, 25) Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuPackagesList Me.cmdRHelp.TabIndex = 213 Me.cmdRHelp.Text = "R Help" @@ -503,7 +503,7 @@ Partial Class dlgGeneralForGraphics Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 Me.ucrInputLegendPosition.IsReadOnly = False - Me.ucrInputLegendPosition.Location = New System.Drawing.Point(302, 360) + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(107, 354) Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" Me.ucrInputLegendPosition.Size = New System.Drawing.Size(125, 21) Me.ucrInputLegendPosition.TabIndex = 15 @@ -521,15 +521,15 @@ Partial Class dlgGeneralForGraphics ' Me.ucrChkLegend.AutoSize = True Me.ucrChkLegend.Checked = False - Me.ucrChkLegend.Location = New System.Drawing.Point(301, 334) + Me.ucrChkLegend.Location = New System.Drawing.Point(6, 354) Me.ucrChkLegend.Name = "ucrChkLegend" - Me.ucrChkLegend.Size = New System.Drawing.Size(125, 24) + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) Me.ucrChkLegend.TabIndex = 14 ' 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(6, 449) + Me.ucrSave.Location = New System.Drawing.Point(6, 456) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(282, 24) @@ -541,20 +541,12 @@ Partial Class dlgGeneralForGraphics Me.ucrGraphicsSelector.bDropUnusedFilterLevels = False Me.ucrGraphicsSelector.bShowHiddenColumns = False Me.ucrGraphicsSelector.bUseCurrentFilter = True - Me.ucrGraphicsSelector.Location = New System.Drawing.Point(6, 14) + Me.ucrGraphicsSelector.Location = New System.Drawing.Point(6, 4) Me.ucrGraphicsSelector.Margin = New System.Windows.Forms.Padding(0) Me.ucrGraphicsSelector.Name = "ucrGraphicsSelector" - Me.ucrGraphicsSelector.Size = New System.Drawing.Size(226, 195) + Me.ucrGraphicsSelector.Size = New System.Drawing.Size(226, 185) Me.ucrGraphicsSelector.TabIndex = 0 ' - 'ucrAdditionalLayers - ' - Me.ucrAdditionalLayers.AutoSize = True - Me.ucrAdditionalLayers.Location = New System.Drawing.Point(6, 194) - Me.ucrAdditionalLayers.Name = "ucrAdditionalLayers" - Me.ucrAdditionalLayers.Size = New System.Drawing.Size(253, 182) - Me.ucrAdditionalLayers.TabIndex = 8 - ' 'ucrBase ' Me.ucrBase.AutoSize = True @@ -570,29 +562,29 @@ Partial Class dlgGeneralForGraphics Me.ucrInputStation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputStation.GetSetSelectedIndex = -1 Me.ucrInputStation.IsReadOnly = False - Me.ucrInputStation.Location = New System.Drawing.Point(389, 413) + Me.ucrInputStation.Location = New System.Drawing.Point(389, 352) Me.ucrInputStation.Name = "ucrInputStation" Me.ucrInputStation.Size = New System.Drawing.Size(86, 21) Me.ucrInputStation.TabIndex = 14 ' - 'ucrReceiverFacetBy + 'ucr1stFactorReceiver ' - Me.ucrReceiverFacetBy.AutoSize = True - Me.ucrReceiverFacetBy.frmParent = Me - Me.ucrReceiverFacetBy.Location = New System.Drawing.Point(277, 413) - Me.ucrReceiverFacetBy.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverFacetBy.Name = "ucrReceiverFacetBy" - Me.ucrReceiverFacetBy.Selector = Nothing - Me.ucrReceiverFacetBy.Size = New System.Drawing.Size(109, 26) - Me.ucrReceiverFacetBy.strNcFilePath = "" - Me.ucrReceiverFacetBy.TabIndex = 13 - Me.ucrReceiverFacetBy.ucrSelector = Nothing + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(277, 352) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(109, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 13 + Me.ucr1stFactorReceiver.ucrSelector = Nothing ' 'lblFacetBy ' Me.lblFacetBy.AutoSize = True Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFacetBy.Location = New System.Drawing.Point(277, 398) + Me.lblFacetBy.Location = New System.Drawing.Point(277, 337) Me.lblFacetBy.Name = "lblFacetBy" Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) Me.lblFacetBy.TabIndex = 12 @@ -603,9 +595,9 @@ Partial Class dlgGeneralForGraphics ' Me.ucrChkAddCode.AutoSize = True Me.ucrChkAddCode.Checked = False - Me.ucrChkAddCode.Location = New System.Drawing.Point(6, 382) + Me.ucrChkAddCode.Location = New System.Drawing.Point(6, 378) Me.ucrChkAddCode.Name = "ucrChkAddCode" - Me.ucrChkAddCode.Size = New System.Drawing.Size(84, 24) + Me.ucrChkAddCode.Size = New System.Drawing.Size(98, 24) Me.ucrChkAddCode.TabIndex = 217 ' 'ucrInputAddCode @@ -614,21 +606,28 @@ Partial Class dlgGeneralForGraphics Me.ucrInputAddCode.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputAddCode.GetSetSelectedIndex = -1 Me.ucrInputAddCode.IsReadOnly = False - Me.ucrInputAddCode.Location = New System.Drawing.Point(96, 380) + Me.ucrInputAddCode.Location = New System.Drawing.Point(6, 399) Me.ucrInputAddCode.Name = "ucrInputAddCode" - Me.ucrInputAddCode.Size = New System.Drawing.Size(163, 21) + Me.ucrInputAddCode.Size = New System.Drawing.Size(469, 21) Me.ucrInputAddCode.TabIndex = 218 ' + 'ucrAdditionalLayers + ' + Me.ucrAdditionalLayers.AutoSize = True + Me.ucrAdditionalLayers.Location = New System.Drawing.Point(6, 174) + Me.ucrAdditionalLayers.Name = "ucrAdditionalLayers" + Me.ucrAdditionalLayers.Size = New System.Drawing.Size(247, 181) + Me.ucrAdditionalLayers.TabIndex = 8 + ' 'dlgGeneralForGraphics ' 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(478, 547) Me.Controls.Add(Me.ucrInputAddCode) Me.Controls.Add(Me.ucrChkAddCode) Me.Controls.Add(Me.ucrInputStation) - Me.Controls.Add(Me.ucrReceiverFacetBy) + Me.Controls.Add(Me.ucr1stFactorReceiver) Me.Controls.Add(Me.lblFacetBy) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.cmdRHelp) @@ -657,7 +656,6 @@ Partial Class dlgGeneralForGraphics End Sub Friend WithEvents ucrBase As ucrButtons - Friend WithEvents ucrAdditionalLayers As ucrAdditionalLayers Friend WithEvents ucrGraphicsSelector As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrSave As ucrSave Friend WithEvents ucrChkLegend As ucrCheck @@ -714,8 +712,9 @@ Partial Class dlgGeneralForGraphics Friend WithEvents toolStripMenuItemColour As ToolStripMenuItem Friend WithEvents toolStripMenuItemAnnotation As ToolStripMenuItem Friend WithEvents ucrInputStation As ucrInputComboBox - Friend WithEvents ucrReceiverFacetBy As ucrReceiverSingle + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle Friend WithEvents lblFacetBy As Label Friend WithEvents ucrInputAddCode As ucrInputComboBox Friend WithEvents ucrChkAddCode As ucrCheck + Friend WithEvents ucrAdditionalLayers As ucrAdditionalLayers End Class diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 5d10bdfdbc3..e22bd2b3294 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -51,12 +51,13 @@ Public Class dlgGeneralForGraphics Private clsXScaleDiscreteFunction As New RFunction Private clsDummyFunction As New RFunction Private clsFacetFunction As New RFunction - Private clsFacetOperator As New ROperator + Private clsFacetVariablesOperator As New ROperator Private clsFacetRowOp As New ROperator Private clsFacetColOp As New ROperator Private clsPipeOperator As New ROperator Private clsGroupByFunction As New RFunction Private clsAddCodeOperator As New ROperator + Private bRCodeSet As Boolean = False Private ReadOnly strFacetWrap As String = "Facet Wrap" Private ReadOnly strFacetRow As String = "Facet Row" @@ -152,20 +153,20 @@ Public Class dlgGeneralForGraphics ucrChkLegend.AddParameterPresentCondition(True, "legend.position") ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False) - ucrReceiverFacetBy.SetParameter(New RParameter("")) - ucrReceiverFacetBy.Selector = ucrGraphicsSelector - ucrReceiverFacetBy.SetIncludedDataTypes({"factor"}) - ucrReceiverFacetBy.strSelectorHeading = "Factors" - ucrReceiverFacetBy.bWithQuotes = False - ucrReceiverFacetBy.SetParameterIsString() - ucrReceiverFacetBy.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameter(New RParameter("")) + ucr1stFactorReceiver.Selector = ucrGraphicsSelector + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) ucrInputStation.SetDropDownStyleAsNonEditable() ucrChkAddCode.SetText("Add Code") - ucrChkAddCode.AddToLinkedControls({ucrInputAddCode}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="geom_hline(y = 20)") - ucrInputAddCode.SetItems({"geom_hline(y = 20)", "geom_vline(x=5)", "geom_vline(x=c(5,20))", "scale_x_binned()", "scale_x_binned(n.breaks=20)"}) + ucrChkAddCode.AddToLinkedControls({ucrInputAddCode}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") + ucrInputAddCode.SetItems({"geom_hline(yintercept=20, y = 20)", "geom_vline(xintercept = 5, x=5)", "geom_vline(xintercept = 5, x=c(5,20))", "scale_x_binned()", "scale_x_binned(n.breaks=20)"}) ucrSave.SetPrefix("graph") ucrSave.SetIsComboBox() @@ -184,7 +185,7 @@ Public Class dlgGeneralForGraphics clsScaleContinuousFunction = New RFunction clsLevelsFunction = New RFunction clsFacetFunction = New RFunction - clsFacetOperator = New ROperator + clsFacetVariablesOperator = New ROperator clsFacetRowOp = New ROperator clsFacetColOp = New ROperator clsPipeOperator = New ROperator @@ -221,10 +222,10 @@ Public Class dlgGeneralForGraphics clsFacetRowOp.bBrackets = False clsFacetColOp.SetOperation("+") clsFacetColOp.bBrackets = False - clsFacetOperator.SetOperation("~") - clsFacetOperator.bForceIncludeOperation = True - clsFacetOperator.bBrackets = False - clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetOperator, iPosition:=0) + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) clsPipeOperator.SetOperation("%>%") SetPipeAssignTo() @@ -279,6 +280,7 @@ Public Class dlgGeneralForGraphics ucrChkUseasNumeric.SetRCode(clsDummyFunction, bReset) ucrChkAddCode.SetRCode(clsAddCodeOperator, bReset) ucrInputAddCode.SetRCode(clsAddCodeOperator, bReset) + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator, bReset) End If ucrFillReceiver.SetRCode(clsGlobalAesFunction, bReset) ucrColourReceiver.SetRCode(clsGlobalAesFunction, bReset) @@ -308,13 +310,13 @@ Public Class dlgGeneralForGraphics clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetSubdialog) sdgPlots.ShowDialog() ucrAdditionalLayers.SetRCodeForControl(clsNewBaseOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewAesFunc:=clsGlobalAesFunction, bReset:=True) bResetSubdialog = False End Sub - Private Sub ucrAdditionalLayers_NumberOfLayersChanged() Handles ucrAdditionalLayers.NumberOfLayersChanged + Private Sub ucrAdditionalLayers_NumberOfLayersChanged() Handles ucrAdditionalLayers.NumberOfLayersChanged, ucrAdditionalLayers.NumberOfLayersChanged 'When the number of Layers in the lstLayers on ucrAdditionalLayers need to check if OK is enabled on dlgGeneralForGraphics. 'TestOKEnabled() VariableXType() @@ -326,8 +328,9 @@ Public Class dlgGeneralForGraphics clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=ucrGraphicsSelector, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetOptionsSubdialog) + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetOptionsSubdialog) sdgPlots.tbpPlotsOptions.SelectedIndex = 0 + 'ucr1stFactorReceiver.SetRCode(clsNewBaseOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewFacetV) sdgPlots.ShowDialog() sdgPlots.EnableLayersTab() bResetOptionsSubdialog = False @@ -338,7 +341,7 @@ Public Class dlgGeneralForGraphics clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetSubdialog) sdgPlots.tbpPlotsOptions.SelectedIndex = 1 sdgPlots.ShowDialog() sdgPlots.tbpPlotsOptions.SelectedIndex = 0 @@ -353,7 +356,7 @@ Public Class dlgGeneralForGraphics clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetSubdialog) sdgPlots.tbpPlotsOptions.SelectedIndex = 2 sdgPlots.ShowDialog() sdgPlots.EnableLayersTab() @@ -366,7 +369,7 @@ Public Class dlgGeneralForGraphics clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetOptionsSubdialog) + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetOptionsSubdialog) sdgPlots.tbpPlotsOptions.SelectedIndex = 3 sdgPlots.ShowDialog() bResetOptionsSubdialog = False @@ -379,7 +382,7 @@ Public Class dlgGeneralForGraphics clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetOptionsSubdialog) + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetOptionsSubdialog) sdgPlots.tbpPlotsOptions.SelectedIndex = 4 sdgPlots.ShowDialog() bResetOptionsSubdialog = False @@ -392,7 +395,7 @@ Public Class dlgGeneralForGraphics clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetSubdialog) sdgPlots.tbpPlotsOptions.SelectedIndex = 5 sdgPlots.ShowDialog() sdgPlots.tbpPlotsOptions.SelectedIndex = 0 @@ -406,7 +409,7 @@ Public Class dlgGeneralForGraphics clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetSubdialog) sdgPlots.tbpPlotsOptions.SelectedIndex = 6 sdgPlots.ShowDialog() bResetOptionsSubdialog = False @@ -421,7 +424,7 @@ Public Class dlgGeneralForGraphics clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetOptionsSubdialog) + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetOptionsSubdialog) sdgPlots.tbpPlotsOptions.SelectedIndex = 7 sdgPlots.ShowDialog() bResetOptionsSubdialog = False @@ -434,7 +437,7 @@ Public Class dlgGeneralForGraphics clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetOptionsSubdialog) + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetOptionsSubdialog) sdgPlots.tbpPlotsOptions.SelectedIndex = 8 sdgPlots.ShowDialog() bResetOptionsSubdialog = False @@ -637,7 +640,7 @@ Public Class dlgGeneralForGraphics If ucrGraphicsSelector.CurrentReceiver IsNot Nothing Then ucrCurrentReceiver = ucrGraphicsSelector.CurrentReceiver End If - ucrReceiverFacetBy.AddItemsWithMetadataProperty(ucrGraphicsSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrGraphicsSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) If ucrCurrentReceiver IsNot Nothing Then ucrCurrentReceiver.SetMeAsReceiver() End If @@ -668,23 +671,23 @@ Public Class dlgGeneralForGraphics End Sub Private Sub UpdateParameters() - clsFacetOperator.RemoveParameterByName("wrap" & ucrInputStation.Name) + clsFacetVariablesOperator.RemoveParameterByName("wrap" & ucrInputStation.Name) clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) clsBaseOperator.RemoveParameterByName("facets") bUpdatingParameters = True - ucrReceiverFacetBy.SetRCode(Nothing) + ucr1stFactorReceiver.SetRCode(Nothing) Select Case ucrInputStation.GetText() Case strFacetWrap - ucrReceiverFacetBy.ChangeParameterName("wrap" & ucrInputStation.Name) - ucrReceiverFacetBy.SetRCode(clsFacetOperator) + ucr1stFactorReceiver.ChangeParameterName("wrap" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) Case strFacetCol - ucrReceiverFacetBy.ChangeParameterName("col" & ucrInputStation.Name) - ucrReceiverFacetBy.SetRCode(clsFacetColOp) + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) Case strFacetRow - ucrReceiverFacetBy.ChangeParameterName("row" & ucrInputStation.Name) - ucrReceiverFacetBy.SetRCode(clsFacetRowOp) + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) End Select If Not clsGlobalAesFunction.ContainsParameter("x") Then clsGlobalAesFunction.AddParameter("x", Chr(34) & Chr(34)) @@ -702,7 +705,7 @@ Public Class dlgGeneralForGraphics End If clsBaseOperator.RemoveParameterByName("facets") - If Not ucrReceiverFacetBy.IsEmpty Then + If Not ucr1stFactorReceiver.IsEmpty Then Select Case ucrInputStation.GetText() Case strFacetWrap bWrap = True @@ -723,22 +726,22 @@ Public Class dlgGeneralForGraphics clsFacetFunction.SetRCommand("facet_grid") End If If bRow Then - clsFacetOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) ElseIf bCol AndAlso bWrap = False Then - clsFacetOperator.AddParameter("left", ".", iPosition:=0) + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) Else - clsFacetOperator.RemoveParameterByName("left") + clsFacetVariablesOperator.RemoveParameterByName("left") End If If bCol Then - clsFacetOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) ElseIf bRow AndAlso bWrap = False Then - clsFacetOperator.AddParameter("right", ".", iPosition:=1) + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) Else - clsFacetOperator.RemoveParameterByName("right") + clsFacetVariablesOperator.RemoveParameterByName("right") End If End Sub - Private Sub ucrReceiverFacetBy_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFacetBy.ControlValueChanged, ucrReceiverX.ControlValueChanged + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged, ucrReceiverX.ControlValueChanged AddRemoveFacets() AddRemoveGroupBy() End Sub @@ -758,7 +761,7 @@ Public Class dlgGeneralForGraphics If clsBaseOperator.ContainsParameter("facets") Then Select Case ucrInputStation.GetText() Case strFacetWrap - GetParameterValue(clsFacetOperator) + GetParameterValue(clsFacetVariablesOperator) Case strFacetCol GetParameterValue(clsFacetColOp) Case strFacetRow diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 38f83c1c661..400bd060ced 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -2132,7 +2132,7 @@ Public Class sdgPlots Public Sub SetRCode(clsNewOperator As ROperator, clsNewCoordPolarFunction As RFunction, clsNewCoordPolarStartOperator As ROperator, clsNewYScalecontinuousFunction As RFunction, clsNewXScalecontinuousFunction As RFunction, clsNewLabsFunction As RFunction, clsNewXLabsTitleFunction As RFunction, clsNewYLabTitleFunction As RFunction, clsNewFacetFunction As RFunction, clsNewThemeFunction As RFunction, dctNewThemeFunctions As Dictionary(Of String, RFunction), ucrNewBaseSelector As ucrSelector, - bReset As Boolean, Optional clsNewGlobalAesFunction As RFunction = Nothing, Optional clsNewXScaleDateFunction As RFunction = Nothing, Optional clsNewYScaleDateFunction As RFunction = Nothing, + bReset As Boolean, Optional clsNewGlobalAesFunction As RFunction = Nothing, Optional clsNewXScaleDateFunction As RFunction = Nothing, Optional clsNewYScaleDateFunction As RFunction = Nothing, Optional clsNewFacetVariablesOperator As ROperator = Nothing, Optional clsNewScaleFillViridisFunction As RFunction = Nothing, Optional clsNewScaleColourViridisFunction As RFunction = Nothing, Optional strMainDialogGeomParameterNames() As String = Nothing, Optional clsNewAnnotateFunction As RFunction = Nothing, Optional bNewEnableFill As Boolean = True, Optional bNewChangeScales As Boolean = False, Optional bNewEnableColour As Boolean = True, Optional bNewEnableDiscrete As Boolean = True, Optional strNewAxisType As String = "discrete") Dim clsTempParam As RParameter From dc65e5bf89b14fe786b0c506b6816bb8d0dc7e33 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 11 Jan 2024 13:51:42 +0100 Subject: [PATCH 42/48] minor change --- instat/dlgGeneralForGraphics.Designer.vb | 150 +++++++++++------------ instat/dlgGeneralForGraphics.vb | 10 +- instat/sdgPlots.vb | 2 +- 3 files changed, 81 insertions(+), 81 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index c702269d00c..4a9601da290 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -87,6 +87,11 @@ Partial Class dlgGeneralForGraphics Me.toolStripMenuItemCoordinates = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemColour = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemAnnotation = New System.Windows.Forms.ToolStripMenuItem() + Me.lblFacetBy = New System.Windows.Forms.Label() + Me.ucrInputAddCode = New instat.ucrInputComboBox() + Me.ucrChkAddCode = New instat.ucrCheck() + Me.ucrInputStation = New instat.ucrInputComboBox() + Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() Me.cmdOptions = New instat.ucrSplitButton() Me.cmdRHelp = New instat.ucrSplitButton() Me.ucrInputLegendPosition = New instat.ucrInputComboBox() @@ -94,13 +99,8 @@ Partial Class dlgGeneralForGraphics Me.ucrChkLegend = New instat.ucrCheck() Me.ucrSave = New instat.ucrSave() Me.ucrGraphicsSelector = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrBase = New instat.ucrButtons() - Me.ucrInputStation = New instat.ucrInputComboBox() - Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() - Me.lblFacetBy = New System.Windows.Forms.Label() - Me.ucrChkAddCode = New instat.ucrCheck() - Me.ucrInputAddCode = New instat.ucrInputComboBox() Me.ucrAdditionalLayers = New instat.ucrAdditionalLayers() + Me.ucrBase = New instat.ucrButtons() Me.grpAethetics.SuspendLayout() Me.ContextMenuPackagesList.SuspendLayout() Me.contextMenuStripOptions.SuspendLayout() @@ -472,13 +472,68 @@ Partial Class dlgGeneralForGraphics Me.toolStripMenuItemAnnotation.Size = New System.Drawing.Size(140, 22) Me.toolStripMenuItemAnnotation.Text = "Annotation" ' + 'lblFacetBy + ' + Me.lblFacetBy.AutoSize = True + Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBy.Location = New System.Drawing.Point(277, 396) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) + Me.lblFacetBy.TabIndex = 12 + Me.lblFacetBy.Tag = "" + Me.lblFacetBy.Text = "Facet By:" + ' + 'ucrInputAddCode + ' + Me.ucrInputAddCode.AddQuotesIfUnrecognised = True + Me.ucrInputAddCode.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputAddCode.GetSetSelectedIndex = -1 + Me.ucrInputAddCode.IsReadOnly = False + Me.ucrInputAddCode.Location = New System.Drawing.Point(274, 365) + Me.ucrInputAddCode.Name = "ucrInputAddCode" + Me.ucrInputAddCode.Size = New System.Drawing.Size(201, 21) + Me.ucrInputAddCode.TabIndex = 218 + ' + 'ucrChkAddCode + ' + Me.ucrChkAddCode.AutoSize = True + Me.ucrChkAddCode.Checked = False + Me.ucrChkAddCode.Location = New System.Drawing.Point(159, 365) + Me.ucrChkAddCode.Name = "ucrChkAddCode" + Me.ucrChkAddCode.Size = New System.Drawing.Size(109, 24) + Me.ucrChkAddCode.TabIndex = 217 + ' + 'ucrInputStation + ' + Me.ucrInputStation.AddQuotesIfUnrecognised = True + Me.ucrInputStation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputStation.GetSetSelectedIndex = -1 + Me.ucrInputStation.IsReadOnly = False + Me.ucrInputStation.Location = New System.Drawing.Point(389, 411) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(86, 21) + Me.ucrInputStation.TabIndex = 14 + ' + 'ucr1stFactorReceiver + ' + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(277, 411) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(109, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 13 + Me.ucr1stFactorReceiver.ucrSelector = Nothing + ' 'cmdOptions ' Me.cmdOptions.AutoSize = True Me.cmdOptions.ContextMenuStrip = Me.contextMenuStripOptions - Me.cmdOptions.Location = New System.Drawing.Point(6, 426) + Me.cmdOptions.Location = New System.Drawing.Point(6, 361) Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Size = New System.Drawing.Size(122, 25) + Me.cmdOptions.Size = New System.Drawing.Size(128, 25) Me.cmdOptions.SplitMenuStrip = Me.contextMenuStripOptions Me.cmdOptions.TabIndex = 216 Me.cmdOptions.Tag = "Plot Options" @@ -489,7 +544,7 @@ Partial Class dlgGeneralForGraphics ' Me.cmdRHelp.AutoSize = True Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuPackagesList - Me.cmdRHelp.Location = New System.Drawing.Point(360, 426) + Me.cmdRHelp.Location = New System.Drawing.Point(368, 449) Me.cmdRHelp.Name = "cmdRHelp" Me.cmdRHelp.Size = New System.Drawing.Size(91, 25) Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuPackagesList @@ -503,7 +558,7 @@ Partial Class dlgGeneralForGraphics Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 Me.ucrInputLegendPosition.IsReadOnly = False - Me.ucrInputLegendPosition.Location = New System.Drawing.Point(107, 354) + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(107, 411) Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" Me.ucrInputLegendPosition.Size = New System.Drawing.Size(125, 21) Me.ucrInputLegendPosition.TabIndex = 15 @@ -521,7 +576,7 @@ Partial Class dlgGeneralForGraphics ' Me.ucrChkLegend.AutoSize = True Me.ucrChkLegend.Checked = False - Me.ucrChkLegend.Location = New System.Drawing.Point(6, 354) + Me.ucrChkLegend.Location = New System.Drawing.Point(6, 411) Me.ucrChkLegend.Name = "ucrChkLegend" Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) Me.ucrChkLegend.TabIndex = 14 @@ -529,7 +584,7 @@ Partial Class dlgGeneralForGraphics 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(6, 456) + Me.ucrSave.Location = New System.Drawing.Point(6, 450) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(282, 24) @@ -547,6 +602,14 @@ Partial Class dlgGeneralForGraphics Me.ucrGraphicsSelector.Size = New System.Drawing.Size(226, 185) Me.ucrGraphicsSelector.TabIndex = 0 ' + 'ucrAdditionalLayers + ' + Me.ucrAdditionalLayers.AutoSize = True + Me.ucrAdditionalLayers.Location = New System.Drawing.Point(6, 174) + Me.ucrAdditionalLayers.Name = "ucrAdditionalLayers" + Me.ucrAdditionalLayers.Size = New System.Drawing.Size(247, 181) + Me.ucrAdditionalLayers.TabIndex = 8 + ' 'ucrBase ' Me.ucrBase.AutoSize = True @@ -556,69 +619,6 @@ Partial Class dlgGeneralForGraphics Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 9 ' - 'ucrInputStation - ' - Me.ucrInputStation.AddQuotesIfUnrecognised = True - Me.ucrInputStation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputStation.GetSetSelectedIndex = -1 - Me.ucrInputStation.IsReadOnly = False - Me.ucrInputStation.Location = New System.Drawing.Point(389, 352) - Me.ucrInputStation.Name = "ucrInputStation" - Me.ucrInputStation.Size = New System.Drawing.Size(86, 21) - Me.ucrInputStation.TabIndex = 14 - ' - 'ucr1stFactorReceiver - ' - Me.ucr1stFactorReceiver.AutoSize = True - Me.ucr1stFactorReceiver.frmParent = Me - Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(277, 352) - Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" - Me.ucr1stFactorReceiver.Selector = Nothing - Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(109, 26) - Me.ucr1stFactorReceiver.strNcFilePath = "" - Me.ucr1stFactorReceiver.TabIndex = 13 - Me.ucr1stFactorReceiver.ucrSelector = Nothing - ' - 'lblFacetBy - ' - Me.lblFacetBy.AutoSize = True - Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFacetBy.Location = New System.Drawing.Point(277, 337) - Me.lblFacetBy.Name = "lblFacetBy" - Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) - Me.lblFacetBy.TabIndex = 12 - Me.lblFacetBy.Tag = "" - Me.lblFacetBy.Text = "Facet By:" - ' - 'ucrChkAddCode - ' - Me.ucrChkAddCode.AutoSize = True - Me.ucrChkAddCode.Checked = False - Me.ucrChkAddCode.Location = New System.Drawing.Point(6, 378) - Me.ucrChkAddCode.Name = "ucrChkAddCode" - Me.ucrChkAddCode.Size = New System.Drawing.Size(98, 24) - Me.ucrChkAddCode.TabIndex = 217 - ' - 'ucrInputAddCode - ' - Me.ucrInputAddCode.AddQuotesIfUnrecognised = True - Me.ucrInputAddCode.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputAddCode.GetSetSelectedIndex = -1 - Me.ucrInputAddCode.IsReadOnly = False - Me.ucrInputAddCode.Location = New System.Drawing.Point(6, 399) - Me.ucrInputAddCode.Name = "ucrInputAddCode" - Me.ucrInputAddCode.Size = New System.Drawing.Size(469, 21) - Me.ucrInputAddCode.TabIndex = 218 - ' - 'ucrAdditionalLayers - ' - Me.ucrAdditionalLayers.AutoSize = True - Me.ucrAdditionalLayers.Location = New System.Drawing.Point(6, 174) - Me.ucrAdditionalLayers.Name = "ucrAdditionalLayers" - Me.ucrAdditionalLayers.Size = New System.Drawing.Size(247, 181) - Me.ucrAdditionalLayers.TabIndex = 8 - ' 'dlgGeneralForGraphics ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index e22bd2b3294..48d3c3088a3 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -153,20 +153,21 @@ Public Class dlgGeneralForGraphics ucrChkLegend.AddParameterPresentCondition(True, "legend.position") ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False) - ucr1stFactorReceiver.SetParameter(New RParameter("")) + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) ucr1stFactorReceiver.Selector = ucrGraphicsSelector ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) ucr1stFactorReceiver.strSelectorHeading = "Factors" ucr1stFactorReceiver.bWithQuotes = False ucr1stFactorReceiver.SetParameterIsString() ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(0) ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) ucrInputStation.SetDropDownStyleAsNonEditable() - ucrChkAddCode.SetText("Add Code") + ucrChkAddCode.SetText("Add Code:") ucrChkAddCode.AddToLinkedControls({ucrInputAddCode}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") - ucrInputAddCode.SetItems({"geom_hline(yintercept=20, y = 20)", "geom_vline(xintercept = 5, x=5)", "geom_vline(xintercept = 5, x=c(5,20))", "scale_x_binned()", "scale_x_binned(n.breaks=20)"}) + ucrInputAddCode.SetItems({"geom_hline(yintercept=20)", "geom_vline(xintercept = 5)", "geom_vline(xintercept = 5)", "scale_x_binned()", "scale_x_binned(n.breaks=20)"}) ucrSave.SetPrefix("graph") ucrSave.SetIsComboBox() @@ -330,7 +331,6 @@ Public Class dlgGeneralForGraphics clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=ucrGraphicsSelector, clsNewAnnotateFunction:=clsAnnotateFunction, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetOptionsSubdialog) sdgPlots.tbpPlotsOptions.SelectedIndex = 0 - 'ucr1stFactorReceiver.SetRCode(clsNewBaseOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewFacetV) sdgPlots.ShowDialog() sdgPlots.EnableLayersTab() bResetOptionsSubdialog = False @@ -680,7 +680,7 @@ Public Class dlgGeneralForGraphics ucr1stFactorReceiver.SetRCode(Nothing) Select Case ucrInputStation.GetText() Case strFacetWrap - ucr1stFactorReceiver.ChangeParameterName("wrap" & ucrInputStation.Name) + ucr1stFactorReceiver.ChangeParameterName("var1") ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) Case strFacetCol ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 400bd060ced..a6df3727587 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -2193,7 +2193,7 @@ Public Class sdgPlots If clsFacetFunction.ContainsParameter("facets") Then clsTempParam = clsFacetFunction.GetParameter("facets") If clsTempParam.bIsOperator AndAlso clsTempParam.clsArgumentCodeStructure IsNot Nothing Then - clsFacetVariablesOperator = clsTempParam.clsArgumentCodeStructure + clsFacetVariablesOperator = clsNewFacetVariablesOperator Else clsFacetVariablesOperator = New ROperator("~") End If From ce44253ae677e42c9d8b22d6cc5aaa2050518223 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 11 Jan 2024 15:04:28 +0100 Subject: [PATCH 43/48] minor design change --- instat/dlgGeneralForGraphics.Designer.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index 4a9601da290..e933d98d304 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -489,7 +489,7 @@ Partial Class dlgGeneralForGraphics Me.ucrInputAddCode.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputAddCode.GetSetSelectedIndex = -1 Me.ucrInputAddCode.IsReadOnly = False - Me.ucrInputAddCode.Location = New System.Drawing.Point(274, 365) + Me.ucrInputAddCode.Location = New System.Drawing.Point(159, 362) Me.ucrInputAddCode.Name = "ucrInputAddCode" Me.ucrInputAddCode.Size = New System.Drawing.Size(201, 21) Me.ucrInputAddCode.TabIndex = 218 @@ -498,7 +498,7 @@ Partial Class dlgGeneralForGraphics ' Me.ucrChkAddCode.AutoSize = True Me.ucrChkAddCode.Checked = False - Me.ucrChkAddCode.Location = New System.Drawing.Point(159, 365) + Me.ucrChkAddCode.Location = New System.Drawing.Point(159, 333) Me.ucrChkAddCode.Name = "ucrChkAddCode" Me.ucrChkAddCode.Size = New System.Drawing.Size(109, 24) Me.ucrChkAddCode.TabIndex = 217 From 70fb7cca688402de222e20a431d7a1d5042a5444 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 11 Jan 2024 15:09:20 +0100 Subject: [PATCH 44/48] minor change design --- instat/dlgGeneralForGraphics.Designer.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index e933d98d304..83bc3139f89 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -491,7 +491,7 @@ Partial Class dlgGeneralForGraphics Me.ucrInputAddCode.IsReadOnly = False Me.ucrInputAddCode.Location = New System.Drawing.Point(159, 362) Me.ucrInputAddCode.Name = "ucrInputAddCode" - Me.ucrInputAddCode.Size = New System.Drawing.Size(201, 21) + Me.ucrInputAddCode.Size = New System.Drawing.Size(267, 21) Me.ucrInputAddCode.TabIndex = 218 ' 'ucrChkAddCode @@ -500,7 +500,7 @@ Partial Class dlgGeneralForGraphics Me.ucrChkAddCode.Checked = False Me.ucrChkAddCode.Location = New System.Drawing.Point(159, 333) Me.ucrChkAddCode.Name = "ucrChkAddCode" - Me.ucrChkAddCode.Size = New System.Drawing.Size(109, 24) + Me.ucrChkAddCode.Size = New System.Drawing.Size(175, 24) Me.ucrChkAddCode.TabIndex = 217 ' 'ucrInputStation From 45a8533efab1fc3aa92a64efd0b5950c0f1f03b1 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Fri, 12 Jan 2024 10:20:52 +0100 Subject: [PATCH 45/48] minor code change --- instat/dlgGeneralForGraphics.vb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 48d3c3088a3..3db68c1e86d 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -160,7 +160,7 @@ Public Class dlgGeneralForGraphics ucr1stFactorReceiver.bWithQuotes = False ucr1stFactorReceiver.SetParameterIsString() ucr1stFactorReceiver.SetValuesToIgnore({"."}) - ucr1stFactorReceiver.SetParameterPosition(0) + ucr1stFactorReceiver.SetParameterPosition(1) ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) ucrInputStation.SetDropDownStyleAsNonEditable() @@ -281,7 +281,6 @@ Public Class dlgGeneralForGraphics ucrChkUseasNumeric.SetRCode(clsDummyFunction, bReset) ucrChkAddCode.SetRCode(clsAddCodeOperator, bReset) ucrInputAddCode.SetRCode(clsAddCodeOperator, bReset) - ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator, bReset) End If ucrFillReceiver.SetRCode(clsGlobalAesFunction, bReset) ucrColourReceiver.SetRCode(clsGlobalAesFunction, bReset) From 74df76b09b219912b1250e4cc4e1775609ad9abd Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 16 Jan 2024 11:46:31 +0100 Subject: [PATCH 46/48] Minor items order change on climatic menu --- instat/frmMain.Designer.vb | 1443 ++++++++++++++++++------------------ instat/frmMain.resx | 4 +- instat/frmMain.vb | 7 +- 3 files changed, 723 insertions(+), 731 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 6f9bcf51425..2fed866f349 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -190,8 +190,18 @@ Partial Class frmMain Me.mnuClimaticFileExportToCPT = New System.Windows.Forms.ToolStripMenuItem() Me.mnuExportToWWRToolStrip = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator18 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuExamineEditData = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticExamineEditDataVisualiseData = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuExamineEditDataPivotTable = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator27 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuExamineEditDataOneVariableSummarise = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuExamineEditDataOneVariableGraph = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuExamineEditDataOneVariableFrequencies = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator78 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuExamineEditDataSetupForDataEditing = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuExamineEditDataDailyDataEditing = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuExamineEditDataCompareColumns = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticTidyandExamine = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticTidyandExamineVisualiseData = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticTidyandExamineTidyDailyData = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator71 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticTidyandExamineReplaceValues = New System.Windows.Forms.ToolStripMenuItem() @@ -207,16 +217,6 @@ Partial Class frmMain Me.mnuClimaticTidyandExamineAppend = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator69 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticTidyDataKey = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuExamineEditData = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuExamineEditDataOneVariableSummarise = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuExamineEditDataOneVariableGraph = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuExamineEditDataOneVariableFrequencies = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator78 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuExamineEditDataPivotTable = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator79 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuExamineEditDataSetupForDataEditing = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuExamineEditDataDailyDataEditing = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuExamineEditDataCompareColumns = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticDates = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticDatesGenerateDates = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticDatesMakeDate = New System.Windows.Forms.ToolStripMenuItem() @@ -705,7 +705,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseTable, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" - Me.mnuDescribe.Size = New System.Drawing.Size(96, 29) + Me.mnuDescribe.Size = New System.Drawing.Size(64, 22) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -713,25 +713,25 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' 'mnuDescribeOneVariableVisualiseData ' Me.mnuDescribeOneVariableVisualiseData.Name = "mnuDescribeOneVariableVisualiseData" - Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableVisualiseData.Text = "Visualise Data..." ' 'ToolStripSeparator72 ' Me.ToolStripSeparator72.Name = "ToolStripSeparator72" - Me.ToolStripSeparator72.Size = New System.Drawing.Size(232, 6) + Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..." Me.mnuDescribeOneVariableSummarise.Text = "Summarise..." Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised" @@ -739,26 +739,26 @@ Partial Class frmMain 'mnuDescribeOneVariableGraph ' Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph" - Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableGraph.Tag = "Graph..." Me.mnuDescribeOneVariableGraph.Text = "Graph..." ' 'ToolStripSeparator33 ' Me.ToolStripSeparator33.Name = "ToolStripSeparator33" - Me.ToolStripSeparator33.Size = New System.Drawing.Size(232, 6) + Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableFrequencies.Text = "Frequencies..." Me.mnuDescribeOneVariableFrequencies.ToolTipText = "Table or Graph. Also Stem and Leaf Plots" ' 'mnuDescribeOneVariableRatingData ' Me.mnuDescribeOneVariableRatingData.Name = "mnuDescribeOneVariableRatingData" - Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -766,26 +766,26 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoThreeVariablesPivotTable ' Me.mnuDescribeTwoThreeVariablesPivotTable.Name = "mnuDescribeTwoThreeVariablesPivotTable" - Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator36 ' Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(305, 6) + Me.ToolStripSeparator36.Size = New System.Drawing.Size(203, 6) ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables" @@ -793,19 +793,19 @@ Partial Class frmMain 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(305, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' @@ -813,14 +813,14 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Name = "mnuDescribeTwoThreeVariablesTwoWayFrequencies" - Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Text = "Two-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.ToolTipText = "Table or Graph" ' 'mnuDescribeTwoThreeVariablesThreeWayFrequencies ' Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Name = "mnuDescribeTwoThreeVariablesThreeWayFrequencies" - Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Text = "Three-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.ToolTipText = "Table or Graph" ' @@ -828,25 +828,25 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneral, Me.ToolStripSeparator38, Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' 'mnuDescribeGeneral ' Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeGeneral.Text = "General..." ' 'ToolStripSeparator38 ' Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(309, 6) + Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) ' 'mnuDescribeSpecificBarPieChart ' Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart" - Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificBarPieChart.Tag = "Bar_Chart" Me.mnuDescribeSpecificBarPieChart.Text = "Bar Chart..." Me.mnuDescribeSpecificBarPieChart.ToolTipText = "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds" @@ -854,7 +854,7 @@ Partial Class frmMain 'mnuDescribeSpecificBoxplotJitterViolinPlot ' Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot" - Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Tag = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Text = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.ToolTipText = "Boxplot (including Tufte), Jitter and Violin Plots" @@ -862,7 +862,7 @@ Partial Class frmMain 'mnuDescribeSpecificHistogramDensityFrequencyPlot ' Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot" - Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Tag = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Text = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.ToolTipText = "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons" @@ -870,7 +870,7 @@ Partial Class frmMain 'mnuDescribeSpecificPointPlot ' Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot" - Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..." Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..." Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot" @@ -878,7 +878,7 @@ Partial Class frmMain 'mnuDescribeSpecificLineSmoothPlot ' Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot" - Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificLineSmoothPlot.Tag = "Line_Plot..." Me.mnuDescribeSpecificLineSmoothPlot.Text = "Line Plot..." Me.mnuDescribeSpecificLineSmoothPlot.ToolTipText = "Line Plots, Smoothed Plots, Dumbbell and Slope Plots" @@ -886,12 +886,12 @@ Partial Class frmMain 'ToolStripSeparator26 ' Me.ToolStripSeparator26.Name = "ToolStripSeparator26" - Me.ToolStripSeparator26.Size = New System.Drawing.Size(309, 6) + Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6) ' 'mnuDescribeSpecificMapPlot ' Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot" - Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..." Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map" ' @@ -899,7 +899,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificDotPlot.Enabled = False Me.mnuDescribeSpecificDotPlot.Name = "mnuDescribeSpecificDotPlot" - Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificDotPlot.Tag = "Dotplot..." Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False @@ -907,27 +907,27 @@ Partial Class frmMain 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" - Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificMosaic.Text = "Mosaic Plot..." Me.mnuDescribeSpecificMosaic.ToolTipText = "Mosaic Plot" ' 'mnuDescribeSpecificCummulativeDistribution ' Me.mnuDescribeSpecificCummulativeDistribution.Name = "mnuDescribeSpecificCummulativeDistribution" - Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificCummulativeDistribution.Text = "Cumulative Distribution..." Me.mnuDescribeSpecificCummulativeDistribution.ToolTipText = "Cumulative Graph and Exceedance Graph" ' 'mnuDescribeSpecificParallelCoordinatePlot ' Me.mnuDescribeSpecificParallelCoordinatePlot.Name = "mnuDescribeSpecificParallelCoordinatePlot" - Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" @@ -935,83 +935,83 @@ Partial Class frmMain 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(268, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(175, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations ' Me.mnuDescribeMultivariateCorrelations.Name = "mnuDescribeMultivariateCorrelations" - Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateCorrelations.Text = "Correlations..." Me.mnuDescribeMultivariateCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' 'mnuDescribeMultivariateprincipalComponents ' Me.mnuDescribeMultivariateprincipalComponents.Name = "mnuDescribeMultivariateprincipalComponents" - Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateprincipalComponents.Text = "Principal Components..." ' 'mnuDescribeMultivariateCanonicalCorrelations ' Me.mnuDescribeMultivariateCanonicalCorrelations.Name = "mnuDescribeMultivariateCanonicalCorrelations" - Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuDescribeMultivariateClusterAnalysis ' Me.mnuDescribeMultivariateClusterAnalysis.Name = "mnuDescribeMultivariateClusterAnalysis" - Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateClusterAnalysis.Text = "Cluster Analysis..." Me.mnuDescribeMultivariateClusterAnalysis.ToolTipText = "Partitioning or Hierarchical" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(268, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(175, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel ' Me.mnuModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributions, Me.ToolStripSeparator3, Me.mnuModelFitModel, Me.mnuModelCompareModels, Me.mnuModelUseModel, Me.mnuModelOtherOneVariable, Me.mnuModelOtherTwoVariables, Me.mnuModelOtherThreeVariables, Me.mnuModelOtherGeneral}) Me.mnuModel.Name = "mnuModel" - Me.mnuModel.Size = New System.Drawing.Size(79, 29) + Me.mnuModel.Size = New System.Drawing.Size(53, 22) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1019,168 +1019,168 @@ Partial Class frmMain ' Me.mnuModelProbabilityDistributions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributionsShowModel, Me.mnuModelProbabilityDistributionsCompareModels, Me.mnuModelProbabilityDistributionsRandomSamplesUseModel}) Me.mnuModelProbabilityDistributions.Name = "mnuModelProbabilityDistributions" - Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(305, 34) + Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(201, 22) Me.mnuModelProbabilityDistributions.Tag = "Probability_Distributions" Me.mnuModelProbabilityDistributions.Text = "Probability Distributions" ' 'mnuModelProbabilityDistributionsShowModel ' Me.mnuModelProbabilityDistributionsShowModel.Name = "mnuModelProbabilityDistributionsShowModel" - Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsShowModel.Text = "Show Model..." ' 'mnuModelProbabilityDistributionsCompareModels ' Me.mnuModelProbabilityDistributionsCompareModels.Enabled = False Me.mnuModelProbabilityDistributionsCompareModels.Name = "mnuModelProbabilityDistributionsCompareModels" - Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsCompareModels.Tag = "Show_Models..." Me.mnuModelProbabilityDistributionsCompareModels.Text = "Compare Models..." ' 'mnuModelProbabilityDistributionsRandomSamplesUseModel ' Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Name = "mnuModelProbabilityDistributionsRandomSamplesUseModel" - Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..." Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples ..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(302, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(198, 6) ' 'mnuModelFitModel ' Me.mnuModelFitModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelFitModelOneVariable, Me.mnuModelFitModelTwoVariables, Me.mnuModelFitModelThreeVariables, Me.mnuModelFitModelFourVariables, Me.ToolStripSeparator24, Me.mnuModelFitModelGeneral, Me.mnuModelFitModelMachineLearning, Me.ToolStripSeparator57, Me.mnuModelFitModelHypothesisTestsKeyboard, Me.mnuModelFitModelModelKeyboard}) Me.mnuModelFitModel.Name = "mnuModelFitModel" - Me.mnuModelFitModel.Size = New System.Drawing.Size(305, 34) + Me.mnuModelFitModel.Size = New System.Drawing.Size(201, 22) Me.mnuModelFitModel.Tag = "Fit_Model..." Me.mnuModelFitModel.Text = "Fit Model" ' 'mnuModelFitModelOneVariable ' Me.mnuModelFitModelOneVariable.Name = "mnuModelFitModelOneVariable" - Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelOneVariable.Text = "One Variable..." ' 'mnuModelFitModelTwoVariables ' Me.mnuModelFitModelTwoVariables.Name = "mnuModelFitModelTwoVariables" - Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelTwoVariables.Text = "Two Variables..." ' 'mnuModelFitModelThreeVariables ' Me.mnuModelFitModelThreeVariables.Name = "mnuModelFitModelThreeVariables" - Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelThreeVariables.Text = "Three Variables..." ' 'mnuModelFitModelFourVariables ' Me.mnuModelFitModelFourVariables.Name = "mnuModelFitModelFourVariables" - Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelFourVariables.Text = "Four Variables..." ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(344, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelGeneral ' Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral" - Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelGeneral.Text = "General..." ' 'mnuModelFitModelMachineLearning ' Me.mnuModelFitModelMachineLearning.Enabled = False Me.mnuModelFitModelMachineLearning.Name = "mnuModelFitModelMachineLearning" - Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelMachineLearning.Text = "Machine Learning (Caret)..." Me.mnuModelFitModelMachineLearning.Visible = False ' 'ToolStripSeparator57 ' Me.ToolStripSeparator57.Name = "ToolStripSeparator57" - Me.ToolStripSeparator57.Size = New System.Drawing.Size(344, 6) + Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelHypothesisTestsKeyboard ' Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard" - Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelHypothesisTestsKeyboard.Text = "Hypothesis Tests Keyboards..." ' 'mnuModelFitModelModelKeyboard ' Me.mnuModelFitModelModelKeyboard.Name = "mnuModelFitModelModelKeyboard" - Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelModelKeyboard.Text = "Fit Model Keyboards..." ' 'mnuModelCompareModels ' Me.mnuModelCompareModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelCompareModelsOneVariable}) Me.mnuModelCompareModels.Name = "mnuModelCompareModels" - Me.mnuModelCompareModels.Size = New System.Drawing.Size(305, 34) + Me.mnuModelCompareModels.Size = New System.Drawing.Size(201, 22) Me.mnuModelCompareModels.Text = "Compare Models" ' 'mnuModelCompareModelsOneVariable ' Me.mnuModelCompareModelsOneVariable.Name = "mnuModelCompareModelsOneVariable" - Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuModelCompareModelsOneVariable.Text = "One Variable..." ' 'mnuModelUseModel ' Me.mnuModelUseModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelUseModelOneVariable, Me.mnuModelUseModelTwoVariables, Me.ToolStripSeparator59, Me.mnuModelUseModelGlance, Me.mnuModelUseModelTidy, Me.mnuModelUseModelAugment, Me.ToolStripSeparator58, Me.mnuModelUseModelUseModelKeyboard}) Me.mnuModelUseModel.Name = "mnuModelUseModel" - Me.mnuModelUseModel.Size = New System.Drawing.Size(305, 34) + Me.mnuModelUseModel.Size = New System.Drawing.Size(201, 22) Me.mnuModelUseModel.Text = "Use Model" ' 'mnuModelUseModelOneVariable ' Me.mnuModelUseModelOneVariable.Name = "mnuModelUseModelOneVariable" - Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelOneVariable.Text = "One Variable..." ' 'mnuModelUseModelTwoVariables ' Me.mnuModelUseModelTwoVariables.Name = "mnuModelUseModelTwoVariables" - Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelTwoVariables.Text = "Two Variables..." ' 'ToolStripSeparator59 ' Me.ToolStripSeparator59.Name = "ToolStripSeparator59" - Me.ToolStripSeparator59.Size = New System.Drawing.Size(297, 6) + Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelGlance ' Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance" - Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelGlance.Text = "Glance..." ' 'mnuModelUseModelTidy ' Me.mnuModelUseModelTidy.Name = "mnuModelUseModelTidy" - Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelTidy.Text = "Tidy..." ' 'mnuModelUseModelAugment ' Me.mnuModelUseModelAugment.Name = "mnuModelUseModelAugment" - Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelAugment.Text = "Augment..." ' 'ToolStripSeparator58 ' Me.ToolStripSeparator58.Name = "ToolStripSeparator58" - Me.ToolStripSeparator58.Size = New System.Drawing.Size(297, 6) + Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelUseModelKeyboard ' Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard" - Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..." ' 'mnuModelOtherOneVariable @@ -1188,14 +1188,14 @@ Partial Class frmMain Me.mnuModelOtherOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherOneVariableExactResults, Me.mnuModelOtherOneVariableSampleSummaryData, Me.mnuModelOtherOneVariableNonParametric, Me.mnuModelOtherOneVariableGoodnessofFit}) Me.mnuModelOtherOneVariable.Enabled = False Me.mnuModelOtherOneVariable.Name = "mnuModelOtherOneVariable" - Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)" Me.mnuModelOtherOneVariable.Text = "Other (One Variable)" ' 'mnuModelOtherOneVariableExactResults ' Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults" - Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1203,7 +1203,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1211,7 +1211,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1219,7 +1219,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -1228,7 +1228,7 @@ Partial Class frmMain Me.mnuModelOtherTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherTwoVariablesTwoSamples, Me.mnuModelOtherTwoVariablesSummaryData, Me.mnuModelOtherTwoVariablesSimpleRegression, Me.mnuModelOtherTwoVariablesOneWayANOVA, Me.mnuModelOtherTwoVariablesNonParametricTwoSamples, Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA}) Me.mnuModelOtherTwoVariables.Enabled = False Me.mnuModelOtherTwoVariables.Name = "mnuModelOtherTwoVariables" - Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" ' @@ -1236,7 +1236,7 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples" - Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..." Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..." ' @@ -1244,21 +1244,21 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData" - Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherTwoVariablesSummaryData.Text = "Summary Data..." ' 'mnuModelOtherTwoVariablesSimpleRegression ' Me.mnuModelOtherTwoVariablesSimpleRegression.Name = "mnuModelOtherTwoVariablesSimpleRegression" - Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesSimpleRegression.Tag = "Simple_Regression..." Me.mnuModelOtherTwoVariablesSimpleRegression.Text = "Simple Regression..." ' 'mnuModelOtherTwoVariablesOneWayANOVA ' Me.mnuModelOtherTwoVariablesOneWayANOVA.Name = "mnuModelOtherTwoVariablesOneWayANOVA" - Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..." ' @@ -1266,14 +1266,14 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples" - Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Tag = "Non_Parameteric_Two_Samples..." Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Text = "Non Parametric Two Samples..." ' 'mnuModelOtherTwoVariablesNonParametricOneWayANOVA ' Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Name = "mnuModelOtherTwoVariablesNonParametricOneWayANOVA" - Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Tag = "Non_Parameteric_One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Text = "Non Parameteric One Way ANOVA..." ' @@ -1282,7 +1282,7 @@ Partial Class frmMain Me.mnuModelOtherThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherThreeVariablesSimpleWithGroups, Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA, Me.mnuModelOtherThreeVariablesChisquareTest}) Me.mnuModelOtherThreeVariables.Enabled = False Me.mnuModelOtherThreeVariables.Name = "mnuModelOtherThreeVariables" - Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" ' @@ -1290,21 +1290,21 @@ Partial Class frmMain ' Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups" - Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesSimpleWithGroups.Tag = "Simple_with_groups..." Me.mnuModelOtherThreeVariablesSimpleWithGroups.Text = "Simple With Groups..." ' 'mnuModelOtherThreeVariablesNonParametricTwoWayANOVA ' Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Name = "mnuModelOtherThreeVariablesNonParametricTwoWayANOVA" - Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Tag = "Non_Parametric_Two_Way_ANOVA..." Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Text = "Non Parametric Two Way ANOVA..." ' 'mnuModelOtherThreeVariablesChisquareTest ' Me.mnuModelOtherThreeVariablesChisquareTest.Name = "mnuModelOtherThreeVariablesChisquareTest" - Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test" Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..." ' @@ -1313,7 +1313,7 @@ Partial Class frmMain Me.mnuModelOtherGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherGeneralANOVAGeneral, Me.mnuModelOtherGeneralRegression, Me.mnuModelOtherGeneralLogLinear}) Me.mnuModelOtherGeneral.Enabled = False Me.mnuModelOtherGeneral.Name = "mnuModelOtherGeneral" - Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" ' @@ -1321,7 +1321,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral" - Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..." Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..." ' @@ -1329,7 +1329,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralRegression.Enabled = False Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression" - Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralRegression.Tag = "Regression..." Me.mnuModelOtherGeneralRegression.Text = "Regression..." ' @@ -1337,7 +1337,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralLogLinear.Enabled = False Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear" - Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' @@ -1345,7 +1345,7 @@ Partial Class frmMain ' Me.mnuClimaticExamine.Enabled = False Me.mnuClimaticExamine.Name = "mnuClimaticExamine" - Me.mnuClimaticExamine.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticExamine.Tag = "Examine" Me.mnuClimaticExamine.Text = "Examine..." Me.mnuClimaticExamine.Visible = False @@ -1354,7 +1354,7 @@ Partial Class frmMain ' Me.mnuClimaticProcess.Enabled = False Me.mnuClimaticProcess.Name = "mnuClimaticProcess" - Me.mnuClimaticProcess.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticProcess.Tag = "Process" Me.mnuClimaticProcess.Text = "Process..." Me.mnuClimaticProcess.Visible = False @@ -1363,7 +1363,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticEvaporationSite, Me.mnuClimaticEvaporationPenman}) Me.mnuClimaticEvaporation.Name = "mnuClimaticEvaporation" - Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticEvaporation.Tag = "Evaporation" Me.mnuClimaticEvaporation.Text = "Evaporation" Me.mnuClimaticEvaporation.Visible = False @@ -1372,7 +1372,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationSite.Enabled = False Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite" - Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(189, 34) + Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationSite.Tag = "Site" Me.mnuClimaticEvaporationSite.Text = "Site..." ' @@ -1380,7 +1380,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationPenman.Enabled = False Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman" - Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(189, 34) + Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationPenman.Tag = "Penman" Me.mnuClimaticEvaporationPenman.Text = "Penman..." ' @@ -1388,7 +1388,7 @@ Partial Class frmMain ' Me.mnuClimaticCrop.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCropCropCoefficients, Me.mnuClimaticCropWaterSatisfactionIndex}) Me.mnuClimaticCrop.Name = "mnuClimaticCrop" - Me.mnuClimaticCrop.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCrop.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCrop.Tag = "Crop" Me.mnuClimaticCrop.Text = "Crop" Me.mnuClimaticCrop.Visible = False @@ -1397,21 +1397,21 @@ Partial Class frmMain ' Me.mnuClimaticCropCropCoefficients.Enabled = False Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients" - Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCropCropCoefficients.Text = "Crop Coefficients..." ' 'mnuClimaticCropWaterSatisfactionIndex ' Me.mnuClimaticCropWaterSatisfactionIndex.Enabled = False Me.mnuClimaticCropWaterSatisfactionIndex.Name = "mnuClimaticCropWaterSatisfactionIndex" - Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCropWaterSatisfactionIndex.Text = "Water Satisfaction Index..." ' 'mnuClimaticHeatSum ' Me.mnuClimaticHeatSum.Enabled = False Me.mnuClimaticHeatSum.Name = "mnuClimaticHeatSum" - Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticHeatSum.Tag = "Heat_Sum" Me.mnuClimaticHeatSum.Text = "Heat Sum..." Me.mnuClimaticHeatSum.Visible = False @@ -1420,7 +1420,7 @@ Partial Class frmMain ' Me.mnuView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuViewDataView, Me.mnuViewOutput, Me.mnuViewLogScript, Me.mnuViewColumnMetadata, Me.mnuViewDataFrameMetadata, Me.mnuViewStructuredMenu, Me.ToolStripSeparator22, Me.mnuViewClimaticMenu, Me.mnuViewProcurementMenu, Me.mnuViewOptionsByContextMenu, Me.ToolStripSeparator39, Me.mnuViewResetToDefaultLayout, Me.mnuViewSwapDataAndMetadata, Me.mnuViewSwapDataAndScript}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(65, 29) + Me.mnuView.Size = New System.Drawing.Size(44, 22) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1428,7 +1428,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(326, 34) + Me.mnuViewDataView.Size = New System.Drawing.Size(213, 22) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1436,21 +1436,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(326, 34) + Me.mnuViewOutput.Size = New System.Drawing.Size(213, 22) Me.mnuViewOutput.Text = "Output" ' 'mnuViewLogScript ' Me.mnuViewLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewLogScript.Name = "mnuViewLogScript" - Me.mnuViewLogScript.Size = New System.Drawing.Size(326, 34) + Me.mnuViewLogScript.Size = New System.Drawing.Size(213, 22) Me.mnuViewLogScript.Text = "Log/Script" ' 'mnuViewColumnMetadata ' Me.mnuViewColumnMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewColumnMetadata.Name = "mnuViewColumnMetadata" - Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1458,7 +1458,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1466,19 +1466,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(323, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(210, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1486,7 +1486,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1494,137 +1494,137 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(323, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(210, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(326, 34) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(213, 22) Me.mnuViewResetToDefaultLayout.Text = "Reset to Default Layout" ' 'mnuViewSwapDataAndMetadata ' Me.mnuViewSwapDataAndMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndMetadata.Name = "mnuViewSwapDataAndMetadata" - Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuViewSwapDataAndScript ' Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript" - Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(326, 34) + Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22) Me.mnuViewSwapDataAndScript.Text = "Swap Data and Log/Script" ' 'mnuHelp ' Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpData, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(65, 29) + Me.mnuHelp.Size = New System.Drawing.Size(44, 22) Me.mnuHelp.Tag = "Help" Me.mnuHelp.Text = "Help" ' 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(209, 22) Me.mnuHelpHelpIntroduction.Text = "Introduction" ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpFAQ.Size = New System.Drawing.Size(209, 22) Me.mnuHelpFAQ.Text = "FAQ" ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(209, 22) Me.mnuHelpGetingStarted.Text = "Getting Started" ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(311, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(206, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpWindows.Size = New System.Drawing.Size(209, 22) Me.mnuHelpWindows.Text = "Windows" ' 'mnuHelpMenus ' Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpMenus.Size = New System.Drawing.Size(209, 22) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(209, 22) Me.mnuHelpAboutR.Text = "About R" Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(209, 22) Me.mnuHelpLearningStatistics.Text = "Learning Statistics" Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpRPackages.Size = New System.Drawing.Size(209, 22) Me.mnuHelpRPackages.Text = "R Packages" ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpGlossary.Size = New System.Drawing.Size(209, 22) Me.mnuHelpGlossary.Text = "Glossary" ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpData.Size = New System.Drawing.Size(209, 22) Me.mnuHelpData.Text = "Data" ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpLicence.Size = New System.Drawing.Size(209, 22) Me.mnuHelpLicence.Tag = "Licence..." Me.mnuHelpLicence.Text = "Licence" ' 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(311, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(206, 6) ' 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(209, 22) Me.mnuHelpPackagesDocumentation.Text = "Packages Documentation" ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(209, 6) ' 'mnuClimatic ' - Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuClimaticTidyandExamine, Me.mnuExamineEditData, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods}) + Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuExamineEditData, Me.mnuClimaticTidyandExamine, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods}) Me.mnuClimatic.Name = "mnuClimatic" - Me.mnuClimatic.Size = New System.Drawing.Size(90, 29) + Me.mnuClimatic.Size = New System.Drawing.Size(63, 22) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' @@ -1632,287 +1632,287 @@ Partial Class frmMain ' Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.ToolStripSeparator20, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimateFileImportfromClimSoftWizard, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip}) Me.mnuClimaticFile.Name = "mnuClimaticFile" - Me.mnuClimaticFile.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticFile.Text = "File" ' 'mnuClimaticFileImportSST ' Me.mnuClimaticFileImportSST.Name = "mnuClimaticFileImportSST" - Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportSST.Text = "Import SST..." ' 'mnuClimaticFileImportfromIRIDataLibrary ' Me.mnuClimaticFileImportfromIRIDataLibrary.Name = "mnuClimaticFileImportfromIRIDataLibrary" - Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromIRIDataLibrary.Text = "Import from IRI Data Library..." ' 'mnuClimaticFileImportfromClimateDataStore ' Me.mnuClimaticFileImportfromClimateDataStore.Name = "mnuClimaticFileImportfromClimateDataStore" - Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromClimateDataStore.Text = "Import from CDS (Climate Data Store)..." ' 'mnuClimaticFileImportandTidyNetCDF ' Me.mnuClimaticFileImportandTidyNetCDF.Name = "mnuClimaticFileImportandTidyNetCDF" - Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportandTidyNetCDF.Text = "Import and Tidy NetCDF..." ' 'mnuClimaticFileImportandTidyShapefile ' Me.mnuClimaticFileImportandTidyShapefile.Name = "mnuClimaticFileImportandTidyShapefile" - Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportandTidyShapefile.Text = "Import and Tidy Shapefile..." ' 'ToolStripSeparator20 ' Me.ToolStripSeparator20.Name = "ToolStripSeparator20" - Me.ToolStripSeparator20.Size = New System.Drawing.Size(423, 6) + Me.ToolStripSeparator20.Size = New System.Drawing.Size(279, 6) ' 'mnuClimateFileImportfromClimSoft ' Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft" - Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(426, 34) + Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(282, 22) Me.mnuClimateFileImportfromClimSoft.Text = "Import from Climsoft..." ' 'mnuClimateFileImportfromClimSoftWizard ' Me.mnuClimateFileImportfromClimSoftWizard.Name = "mnuClimateFileImportfromClimSoftWizard" - Me.mnuClimateFileImportfromClimSoftWizard.Size = New System.Drawing.Size(426, 34) + Me.mnuClimateFileImportfromClimSoftWizard.Size = New System.Drawing.Size(282, 22) Me.mnuClimateFileImportfromClimSoftWizard.Text = "Import from Climsoft Wizard..." ' 'mnuClimaticFileImportfromCliData ' Me.mnuClimaticFileImportfromCliData.Enabled = False Me.mnuClimaticFileImportfromCliData.Name = "mnuClimaticFileImportfromCliData" - Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..." Me.mnuClimaticFileImportfromCliData.Visible = False ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(423, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" - Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToClimsoft.Text = "Export to Climsoft..." ' 'mnuClimaticFileExportToCPT ' Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" - Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." ' 'mnuExportToWWRToolStrip ' Me.mnuExportToWWRToolStrip.Name = "mnuExportToWWRToolStrip" - Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(426, 34) + Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) + ' + '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.Text = "Examine/Edit Data" + ' + 'mnuClimaticExamineEditDataVisualiseData + ' + Me.mnuClimaticExamineEditDataVisualiseData.Name = "mnuClimaticExamineEditDataVisualiseData" + Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(215, 22) + Me.mnuClimaticExamineEditDataVisualiseData.Text = "Visualise Data..." + ' + 'mnuExamineEditDataPivotTable + ' + Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" + Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." + ' + 'ToolStripSeparator27 + ' + Me.ToolStripSeparator27.Name = "ToolStripSeparator27" + Me.ToolStripSeparator27.Size = New System.Drawing.Size(212, 6) + ' + 'mnuExamineEditDataOneVariableSummarise + ' + Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" + Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableSummarise.Text = "One Variable Summarise..." + ' + 'mnuExamineEditDataOneVariableGraph + ' + Me.mnuExamineEditDataOneVariableGraph.Name = "mnuExamineEditDataOneVariableGraph" + Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..." + ' + 'mnuExamineEditDataOneVariableFrequencies + ' + Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies" + Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableFrequencies.Text = "One Variable Frequencies..." + ' + 'ToolStripSeparator78 + ' + Me.ToolStripSeparator78.Name = "ToolStripSeparator78" + Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6) + ' + 'mnuExamineEditDataSetupForDataEditing + ' + Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" + Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataSetupForDataEditing.Text = "Setup for Data Editing..." + ' + 'mnuExamineEditDataDailyDataEditing + ' + Me.mnuExamineEditDataDailyDataEditing.Name = "mnuExamineEditDataDailyDataEditing" + Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..." + ' + 'mnuExamineEditDataCompareColumns + ' + Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns" + Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." ' 'mnuClimaticTidyandExamine ' - Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineVisualiseData, 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.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineTidyDailyData, Me.ToolStripSeparator71, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.mnuClimaticTidyandExamineNonNumericCases, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText, Me.ToolStripSeparator80, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyDataKey}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" - Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticTidyandExamine.Text = "Tidy Data" ' - 'mnuClimaticTidyandExamineVisualiseData - ' - Me.mnuClimaticTidyandExamineVisualiseData.Name = "mnuClimaticTidyandExamineVisualiseData" - Me.mnuClimaticTidyandExamineVisualiseData.Size = New System.Drawing.Size(295, 34) - Me.mnuClimaticTidyandExamineVisualiseData.Text = "Visualise Data..." - ' 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator80.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineMerge.Text = "Merge..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' - 'mnuExamineEditData - ' - Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator79, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns}) - Me.mnuExamineEditData.Name = "mnuExamineEditData" - Me.mnuExamineEditData.Size = New System.Drawing.Size(325, 34) - Me.mnuExamineEditData.Text = "Examine/Edit Data" - ' - 'mnuExamineEditDataOneVariableSummarise - ' - Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" - 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(324, 34) - Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..." - ' - 'mnuExamineEditDataOneVariableFrequencies - ' - Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies" - 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(321, 6) - ' - 'mnuExamineEditDataPivotTable - ' - Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" - Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(324, 34) - Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." - ' - 'ToolStripSeparator79 - ' - Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(321, 6) - ' - 'mnuExamineEditDataSetupForDataEditing - ' - Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" - 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(324, 34) - Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..." - ' - 'mnuExamineEditDataCompareColumns - ' - Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns" - Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(324, 34) - Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." - ' 'mnuClimaticDates ' Me.mnuClimaticDates.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDatesGenerateDates, Me.mnuClimaticDatesMakeDate, Me.mnuClimaticDatesInfillMissingDates, Me.mnuClimaticDatesUseDate, Me.mnuClimaticDatesMakeTime, Me.mnuClimaticDatesUseTime}) Me.mnuClimaticDates.Name = "mnuClimaticDates" - Me.mnuClimaticDates.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDates.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDates.Text = "Dates" ' 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -1920,169 +1920,169 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' 'mnuClimaticDefineClimaticData ' Me.mnuClimaticDefineClimaticData.Name = "mnuClimaticDefineClimaticData" - Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDefineClimaticData.Text = "Define Climatic Data..." ' 'mnuClimaticCheckData ' Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations}) Me.mnuClimaticCheckData.Name = "mnuClimaticCheckData" - Me.mnuClimaticCheckData.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCheckData.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCheckData.Text = "Check Data" ' 'mnuClimaticCheckDataInventory ' Me.mnuClimaticCheckDataInventory.Name = "mnuClimaticCheckDataInventory" - Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataInventory.Text = "Inventory..." ' 'mnuClimaticCheckDataDisplayDaily ' Me.mnuClimaticCheckDataDisplayDaily.Name = "mnuClimaticCheckDataDisplayDaily" - Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataDisplayDaily.Text = "Display Daily..." ' 'ToolStripSeparator65 ' Me.ToolStripSeparator65.Name = "ToolStripSeparator65" - Me.ToolStripSeparator65.Size = New System.Drawing.Size(310, 6) + Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataFillMissingValues ' Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues" - Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataFillMissingValues.Text = "Fill Missing Values..." ' 'mnuClimaticCheckDataBoxplot ' Me.mnuClimaticCheckDataBoxplot.Name = "mnuClimaticCheckDataBoxplot" - Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataBoxplot.Text = "Boxplot..." ' 'mnuClimaticCheckDataQCTemperatures ' Me.mnuClimaticCheckDataQCTemperatures.Name = "mnuClimaticCheckDataQCTemperatures" - Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataQCTemperatures.Text = "QC Temperatures..." ' 'mnuClimaticCheckDataQCRainfall ' Me.mnuClimaticCheckDataQCRainfall.Name = "mnuClimaticCheckDataQCRainfall" - Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataQCRainfall.Text = "QC Rainfall..." ' 'ToolStripSeparator70 ' Me.ToolStripSeparator70.Name = "ToolStripSeparator70" - Me.ToolStripSeparator70.Size = New System.Drawing.Size(310, 6) + Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataHomogenization ' Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization" - Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataHomogenization.Text = "Homogenization..." ' 'mnuClimaticCheckDataCheckStationLocations ' Me.mnuClimaticCheckDataCheckStationLocations.Name = "mnuClimaticCheckDataCheckStationLocations" - Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticPrepare ' Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareClimdex, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) Me.mnuClimaticPrepare.Name = "mnuClimaticPrepare" - Me.mnuClimaticPrepare.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticPrepare.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPrepare.Tag = "Prepare" Me.mnuClimaticPrepare.Text = "Prepare" ' 'mnuCimaticPrepareTransform ' Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" - Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(281, 34) + Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) Me.mnuCimaticPrepareTransform.Text = "Transform..." ' 'mnuClimaticPrepareConversions ' Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions" - Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareConversions.Text = "Conversions..." ' 'ToolStripSeparator37 ' Me.ToolStripSeparator37.Name = "ToolStripSeparator37" - Me.ToolStripSeparator37.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimaticSummaries ' Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." ' 'mnuClimaticPrepareStartoftheRains ' Me.mnuClimaticPrepareStartoftheRains.Name = "mnuClimaticPrepareStartoftheRains" - Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareStartoftheRains.Text = "Start of the Rains..." ' 'mnuClimaticPrepareEndOfRains ' Me.mnuClimaticPrepareEndOfRains.Name = "mnuClimaticPrepareEndOfRains" - Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareEndOfRains.Text = "End of Rains..." ' 'mnuClimaticPrepareLengthOfSeason ' Me.mnuClimaticPrepareLengthOfSeason.Name = "mnuClimaticPrepareLengthOfSeason" - Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareLengthOfSeason.Text = "Length of Season..." ' 'mnuClimaticPrepareSpells ' Me.mnuClimaticPrepareSpells.Name = "mnuClimaticPrepareSpells" - Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSpells.Text = "Spells..." ' 'mnuClimaticPrepareExtremes ' Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" - Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareExtremes.Text = "Extremes..." ' 'ToolStripSeparator64 ' Me.ToolStripSeparator64.Name = "ToolStripSeparator64" - Me.ToolStripSeparator64.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimdex ' Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex" - Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareClimdex.Text = "Climdex..." ' 'ToolStripSeparator51 ' Me.ToolStripSeparator51.Name = "ToolStripSeparator51" - Me.ToolStripSeparator51.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareEvapotranspiration ' Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration" - Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareEvapotranspiration.Text = "Evapotranspiration..." ' 'mnuClimaticPrepareSummary ' Me.mnuClimaticPrepareSummary.Enabled = False Me.mnuClimaticPrepareSummary.Name = "mnuClimaticPrepareSummary" - Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSummary.Text = "Summary..." Me.mnuClimaticPrepareSummary.Visible = False ' @@ -2090,7 +2090,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareNewWorksheet.Enabled = False Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet" - Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet" Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..." Me.mnuClimaticPrepareNewWorksheet.Visible = False @@ -2099,7 +2099,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareImportDailyData.Enabled = False Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData" - Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareImportDailyData.Tag = "Import_daily_data" Me.mnuClimaticPrepareImportDailyData.Text = "Import daily Data..." Me.mnuClimaticPrepareImportDailyData.Visible = False @@ -2108,7 +2108,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareMakeFactor.Enabled = False Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor" - Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor" Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..." Me.mnuClimaticPrepareMakeFactor.Visible = False @@ -2117,7 +2117,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareShiftDailyData.Enabled = False Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData" - Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareShiftDailyData.Tag = "Shift_Daily_data" Me.mnuClimaticPrepareShiftDailyData.Text = "Shift Daily Data..." Me.mnuClimaticPrepareShiftDailyData.Visible = False @@ -2126,7 +2126,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareUnstackDailyData.Enabled = False Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData" - Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareUnstackDailyData.Tag = "Unstack_Daily_data" Me.mnuClimaticPrepareUnstackDailyData.Text = "Unstack Daily Data..." Me.mnuClimaticPrepareUnstackDailyData.Visible = False @@ -2135,7 +2135,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareStackDailyData.Enabled = False Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData" - Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareStackDailyData.Tag = "Stack_Daily_data" Me.mnuClimaticPrepareStackDailyData.Text = "Stack Daily data..." Me.mnuClimaticPrepareStackDailyData.Visible = False @@ -2143,358 +2143,358 @@ Partial Class frmMain 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" - Me.ToolStripSeparator30.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" - Me.mnuClimaticDescribe.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDescribe.Text = "Describe" ' 'mnuClimaticDescribeSummarise23Variables ' Me.mnuClimaticDescribeSummarise23Variables.Name = "mnuClimaticDescribeSummarise23Variables" - Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSummarise23Variables.Text = "Summarise 2/3 Variables..." ' 'mnuClimaticDescribeGraph23Variables ' Me.mnuClimaticDescribeGraph23Variables.Name = "mnuClimaticDescribeGraph23Variables" - Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeGraph23Variables.Text = "Graph 2/3 Variables..." ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(318, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6) ' 'mnuClimaticDescribeSPISPEI ' Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI" - Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSPISPEI.Text = "SPI/SPEI..." ' 'mnuClimaticDescribeClimograph ' Me.mnuClimaticDescribeClimograph.Enabled = False Me.mnuClimaticDescribeClimograph.Name = "mnuClimaticDescribeClimograph" - Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeClimograph.Text = "Climograph..." ' 'mnuClimaticDescribeTrendGraph ' Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph" - Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..." ' 'mnuClimaticDescribeSeasonalGraph ' Me.mnuClimaticDescribeSeasonalGraph.Enabled = False Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" - Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." ' 'mnuClimaticDescribeIDF ' Me.mnuClimaticDescribeIDF.Enabled = False Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF" - Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeIDF.Text = "IDF..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(318, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) ' 'mnuClimaticDescribeWindRose ' Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose" - Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeWindPollutionRose ' Me.mnuClimaticDescribeWindPollutionRose.Name = "mnuClimaticDescribeWindPollutionRose" - Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuClimaticDescribeOtherRosePlots ' Me.mnuClimaticDescribeOtherRosePlots.Name = "mnuClimaticDescribeOtherRosePlots" - Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeOtherRosePlots.Text = "Other Rose Plots..." ' 'mnuClimaticNCMP ' Me.mnuClimaticNCMP.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticNCMPIndices, Me.mnuClimaticNCMPVariogram, Me.mnuClimaticNCMPRegionAverage, Me.mnuClimaticNCMPTrendGraphs, Me.mnuClimaticNCMPCountRecords, Me.mnuClimaticNCMPSummary}) Me.mnuClimaticNCMP.Name = "mnuClimaticNCMP" - Me.mnuClimaticNCMP.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticNCMP.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticNCMP.Text = "NCMP" ' 'mnuClimaticNCMPIndices ' Me.mnuClimaticNCMPIndices.Name = "mnuClimaticNCMPIndices" - Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPIndices.Text = "Indices..." ' 'mnuClimaticNCMPVariogram ' Me.mnuClimaticNCMPVariogram.Name = "mnuClimaticNCMPVariogram" - Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPVariogram.Text = "Variogram..." ' 'mnuClimaticNCMPRegionAverage ' Me.mnuClimaticNCMPRegionAverage.Name = "mnuClimaticNCMPRegionAverage" - Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPRegionAverage.Text = "Region Average..." ' 'mnuClimaticNCMPTrendGraphs ' Me.mnuClimaticNCMPTrendGraphs.Name = "mnuClimaticNCMPTrendGraphs" - Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPTrendGraphs.Text = "Trend Graphs..." ' 'mnuClimaticNCMPCountRecords ' Me.mnuClimaticNCMPCountRecords.Name = "mnuClimaticNCMPCountRecords" - Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPCountRecords.Text = "Count Records..." ' 'mnuClimaticNCMPSummary ' Me.mnuClimaticNCMPSummary.Name = "mnuClimaticNCMPSummary" - Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPSummary.Text = "Summary..." ' 'mnuClimaticPICSA ' Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" - Me.mnuClimaticPICSA.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPICSA.Text = "PICSA" ' 'mnuClimaticPICSARainfallGraph ' Me.mnuClimaticPICSARainfallGraph.Name = "mnuClimaticPICSARainfallGraph" - Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSARainfallGraph.Text = "Rainfall Graph..." ' 'mnuClimaticPICSATemperatureGraph ' Me.mnuClimaticPICSATemperatureGraph.Name = "mnuClimaticPICSATemperatureGraph" - Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" - Me.ToolStripSeparator73.Size = New System.Drawing.Size(361, 6) + Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticPICSACumExeedenceGraph ' Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph" - Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSACumExeedenceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticPICSACrops ' Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops" - Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSACrops.Text = "Crops..." ' 'mnuCMSAF ' Me.mnuCMSAF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCMSAFPlotRegion, Me.mnuClimaticCMSAFExporttoCMSAFRToolbox}) Me.mnuCMSAF.Name = "mnuCMSAF" - Me.mnuCMSAF.Size = New System.Drawing.Size(325, 34) + Me.mnuCMSAF.Size = New System.Drawing.Size(212, 22) Me.mnuCMSAF.Text = "CM SAF" ' 'mnuClimaticCMSAFPlotRegion ' Me.mnuClimaticCMSAFPlotRegion.Name = "mnuClimaticCMSAFPlotRegion" - Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(351, 34) + Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(231, 22) Me.mnuClimaticCMSAFPlotRegion.Text = "Plot Region..." ' 'mnuClimaticCMSAFExporttoCMSAFRToolbox ' Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Name = "mnuClimaticCMSAFExporttoCMSAFRToolbox" - Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(351, 34) + Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(231, 22) Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Text = "Export to CM SAF R Toolbox..." ' 'mnuClimaticCompare ' Me.mnuClimaticCompare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCompareCalculation, Me.mnuClimaticCompareSummary, Me.ToolStripSeparator66, Me.mnuClimaticCompareCorrelations, Me.mnuClimaticCompareScatterplot, Me.mnuClimaticCompareTimeSeriesPlot, Me.mnuClimaticCompareSeasonalPlot, Me.mnuClimaticCompareDensityPlot, Me.mnuClimaticCompareConditionalQuantiles, Me.mnuClimaticCompareTaylorDiagram}) Me.mnuClimaticCompare.Name = "mnuClimaticCompare" - Me.mnuClimaticCompare.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCompare.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCompare.Text = "Compare" ' 'mnuClimaticCompareCalculation ' Me.mnuClimaticCompareCalculation.Name = "mnuClimaticCompareCalculation" - Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareCalculation.Text = "Calculation..." ' 'mnuClimaticCompareSummary ' Me.mnuClimaticCompareSummary.Name = "mnuClimaticCompareSummary" - Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareSummary.Text = "Summary..." ' 'ToolStripSeparator66 ' Me.ToolStripSeparator66.Name = "ToolStripSeparator66" - Me.ToolStripSeparator66.Size = New System.Drawing.Size(293, 6) + Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6) ' 'mnuClimaticCompareCorrelations ' Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations" - Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareCorrelations.Text = "Correlations..." ' 'mnuClimaticCompareScatterplot ' Me.mnuClimaticCompareScatterplot.Name = "mnuClimaticCompareScatterplot" - Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareScatterplot.Text = "Scatterplot..." ' 'mnuClimaticCompareTimeSeriesPlot ' Me.mnuClimaticCompareTimeSeriesPlot.Name = "mnuClimaticCompareTimeSeriesPlot" - Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareTimeSeriesPlot.Text = "Time Series Plot..." ' 'mnuClimaticCompareSeasonalPlot ' Me.mnuClimaticCompareSeasonalPlot.Name = "mnuClimaticCompareSeasonalPlot" - Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareSeasonalPlot.Text = "Seasonal Plot..." ' 'mnuClimaticCompareDensityPlot ' Me.mnuClimaticCompareDensityPlot.Name = "mnuClimaticCompareDensityPlot" - Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareDensityPlot.Text = "Density Plot..." ' 'mnuClimaticCompareConditionalQuantiles ' Me.mnuClimaticCompareConditionalQuantiles.Name = "mnuClimaticCompareConditionalQuantiles" - Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareConditionalQuantiles.Text = "Conditional Quantiles..." ' 'mnuClimaticCompareTaylorDiagram ' Me.mnuClimaticCompareTaylorDiagram.Name = "mnuClimaticCompareTaylorDiagram" - Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareTaylorDiagram.Text = "Taylor Diagram..." ' 'mnuClimaticMapping ' Me.mnuClimaticMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticMappingMap, Me.mnuClimaticMappingCheckStationLocations}) Me.mnuClimaticMapping.Name = "mnuClimaticMapping" - Me.mnuClimaticMapping.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticMapping.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticMapping.Text = "Mapping" ' 'mnuClimaticMappingMap ' Me.mnuClimaticMappingMap.Name = "mnuClimaticMappingMap" - Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticMappingMap.Text = "Map..." ' 'mnuClimaticMappingCheckStationLocations ' Me.mnuClimaticMappingCheckStationLocations.Name = "mnuClimaticMappingCheckStationLocations" - Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticMappingCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticModel ' Me.mnuClimaticModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelCircular, Me.mnuClimaticModelMarkovModelling}) Me.mnuClimaticModel.Name = "mnuClimaticModel" - Me.mnuClimaticModel.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticModel.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticModel.Text = "Model" ' 'mnuClimaticModelsExtremes ' Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" - Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelsExtremes.Text = "Extremes..." ' 'mnuClimaticModelCircular ' Me.mnuClimaticModelCircular.Enabled = False Me.mnuClimaticModelCircular.Name = "mnuClimaticModelCircular" - Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelCircular.Text = "Circular..." Me.mnuClimaticModelCircular.Visible = False ' 'mnuClimaticModelMarkovModelling ' Me.mnuClimaticModelMarkovModelling.Name = "mnuClimaticModelMarkovModelling" - Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelMarkovModelling.Tag = "Markov_Modelling" Me.mnuClimaticModelMarkovModelling.Text = "Markov Modelling..." ' 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticSCF ' Me.mnuClimaticSCF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticSCFSupportOpenSST, Me.mnuClimaticSCFSupportExporttoCPT, Me.ToolStripSeparator32, Me.mnuClimaticSCFSupportCorrelations, Me.mnuClimaticSCFSupportPrincipalComponents, Me.mnuClimaticSCFSupportCanonicalCorrelations, Me.mnuClimaticSCFSupportCumulativeExceedanceGraph}) Me.mnuClimaticSCF.Name = "mnuClimaticSCF" - Me.mnuClimaticSCF.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticSCF.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticSCF.Text = "Seasonal Forecast Support" ' 'mnuClimaticSCFSupportOpenSST ' Me.mnuClimaticSCFSupportOpenSST.Name = "mnuClimaticSCFSupportOpenSST" - Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportOpenSST.Text = "Open SST..." ' 'mnuClimaticSCFSupportExporttoCPT ' Me.mnuClimaticSCFSupportExporttoCPT.Name = "mnuClimaticSCFSupportExporttoCPT" - Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportExporttoCPT.Tag = "Export_to_CPT" Me.mnuClimaticSCFSupportExporttoCPT.Text = "Export to CPT..." ' 'ToolStripSeparator32 ' Me.ToolStripSeparator32.Name = "ToolStripSeparator32" - Me.ToolStripSeparator32.Size = New System.Drawing.Size(361, 6) + Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticSCFSupportCorrelations ' Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations" - Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCorrelations.Text = "Correlations..." ' 'mnuClimaticSCFSupportPrincipalComponents ' Me.mnuClimaticSCFSupportPrincipalComponents.Name = "mnuClimaticSCFSupportPrincipalComponents" - Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportPrincipalComponents.Text = "Principal Components..." ' 'mnuClimaticSCFSupportCanonicalCorrelations ' Me.mnuClimaticSCFSupportCanonicalCorrelations.Name = "mnuClimaticSCFSupportCanonicalCorrelations" - Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuClimaticSCFSupportCumulativeExceedanceGraph ' Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Name = "mnuClimaticSCFSupportCumulativeExceedanceGraph" - Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticClimateMethods ' Me.mnuClimaticClimateMethods.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulation, Me.mnuClimaticClimateMethodsGraphics, Me.mnuClimaticClimateMethodsModel, Me.mnuClimaticClimateMethodsAdditional, Me.mnuClimateMethodsCreateClimateObject}) Me.mnuClimaticClimateMethods.Name = "mnuClimaticClimateMethods" - Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods" Me.mnuClimaticClimateMethods.Text = "Climate Methods" Me.mnuClimaticClimateMethods.Visible = False @@ -2503,7 +2503,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulationStartOfRain, Me.mnuClimaticClimateMethodsDataManipulationEndOfRain, Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth, Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular, Me.mnuClimaticClimateMethodsDataManipulationDayMonth, Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily, Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear, Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal, Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength, Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA, Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents, Me.mnuClimaticClimateMethodsDataManipulationMissingData, Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable, Me.mnuClimateMethodsDataManipulationMonthlySummaries, Me.mnuClimateMethodsDataManipulationOutputForCD}) Me.mnuClimaticClimateMethodsDataManipulation.Name = "mnuClimaticClimateMethodsDataManipulation" - Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation" Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation" ' @@ -2511,7 +2511,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain" - Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..." ' @@ -2519,7 +2519,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain" - Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..." ' @@ -2527,7 +2527,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month" Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..." ' @@ -2535,7 +2535,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular" - Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular" Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..." ' @@ -2543,7 +2543,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month" Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..." ' @@ -2551,7 +2551,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily" Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..." ' @@ -2559,7 +2559,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year" Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..." ' @@ -2567,7 +2567,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal" - Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total" Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..." ' @@ -2575,7 +2575,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength" - Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length" Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..." ' @@ -2583,7 +2583,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA" - Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA" Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..." ' @@ -2591,7 +2591,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents" - Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events" Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..." ' @@ -2599,7 +2599,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData" - Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data" Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..." ' @@ -2607,7 +2607,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable" - Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table" Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..." ' @@ -2615,7 +2615,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries" - Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(342, 34) + Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries" Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..." ' @@ -2623,7 +2623,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD" - Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(342, 34) + Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT" Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..." ' @@ -2631,7 +2631,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphics.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot, Me.mnuClimaticClimateMethodsGraphicsCliplot, Me.mnuClimaticClimateMethodsGraphicsMissingValues, Me.mnuClimaticClimateMethodsGraphicsHistogram, Me.mnuClimaticClimateMethodsGraphicsCumExceedance, Me.mnuClimaticClimateMethodsGraphicsBoxplot, Me.mnuClimaticClimateMethodsGraphicsInventory, Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall, Me.mnuClimaticClimateMethodsGraphicsRainCount, Me.mnuClimaticClimateMethodsGraphicsTimeseries, Me.mnuClimaticClimateMethodsGraphicsWindrose, Me.mnuClimateMethodsGraphicsMultipleLines, Me.mnuClmateMethodThreeSummaries}) Me.mnuClimaticClimateMethodsGraphics.Name = "mnuClimaticClimateMethodsGraphics" - Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics" Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics" ' @@ -2639,7 +2639,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot" - Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot" Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..." ' @@ -2647,7 +2647,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot" - Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot" Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..." ' @@ -2655,7 +2655,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues" - Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values" Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..." ' @@ -2663,7 +2663,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram" - Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram" Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..." ' @@ -2671,7 +2671,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance" - Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence" Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..." ' @@ -2679,7 +2679,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot" - Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot" Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..." ' @@ -2687,7 +2687,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory" - Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory" Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..." ' @@ -2695,7 +2695,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall" - Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall" Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..." ' @@ -2703,7 +2703,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount" - Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count" Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..." ' @@ -2711,7 +2711,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries" - Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries" Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..." ' @@ -2719,7 +2719,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose" - Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose" Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..." ' @@ -2727,7 +2727,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines" - Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(325, 34) + Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22) Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines" Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..." ' @@ -2735,7 +2735,7 @@ Partial Class frmMain ' Me.mnuClmateMethodThreeSummaries.Enabled = False Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries" - Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(325, 34) + Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22) Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries" Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..." ' @@ -2743,7 +2743,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsModel.Enabled = False Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel" - Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsModel.Tag = "Model" Me.mnuClimaticClimateMethodsModel.Text = "Model..." ' @@ -2751,7 +2751,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditional.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsAdditionalOutputForCPT, Me.mnuClimaticClimateMethodsAdditionalRainsStatistics, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain, Me.mnuClimaticClimateMethodsAdditionalWaterBalance}) Me.mnuClimaticClimateMethodsAdditional.Name = "mnuClimaticClimateMethodsAdditional" - Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional" Me.mnuClimaticClimateMethodsAdditional.Text = "Additional" ' @@ -2759,7 +2759,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT" - Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT" Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..." ' @@ -2767,7 +2767,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics" - Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics" Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..." ' @@ -2775,7 +2775,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..." ' @@ -2783,7 +2783,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..." ' @@ -2791,7 +2791,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance" - Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance" Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..." ' @@ -2799,7 +2799,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsCreateClimateObject.Enabled = False Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject" - Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(297, 34) + Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22) Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' @@ -2807,7 +2807,7 @@ Partial Class frmMain ' Me.mnuFileSave.Name = "mnuFileSave" Me.mnuFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys) - Me.mnuFileSave.Size = New System.Drawing.Size(351, 34) + Me.mnuFileSave.Size = New System.Drawing.Size(232, 22) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2815,32 +2815,32 @@ Partial Class frmMain ' Me.mnuFileSaveAs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileSaveAsDataAs, Me.mnuFileSaveAsOutputAs, Me.mnuFileSaveAsLogAs, Me.mnuFileSaveAsScriptAs}) Me.mnuFileSaveAs.Name = "mnuFileSaveAs" - Me.mnuFileSaveAs.Size = New System.Drawing.Size(351, 34) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(232, 22) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' 'mnuFileSaveAsDataAs ' Me.mnuFileSaveAsDataAs.Name = "mnuFileSaveAsDataAs" - Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsDataAs.Text = "Save Data As..." ' 'mnuFileSaveAsOutputAs ' Me.mnuFileSaveAsOutputAs.Name = "mnuFileSaveAsOutputAs" - Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsOutputAs.Text = "Save Output As..." ' 'mnuFileSaveAsLogAs ' Me.mnuFileSaveAsLogAs.Name = "mnuFileSaveAsLogAs" - Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsLogAs.Text = "Save Log As..." ' 'mnuFileSaveAsScriptAs ' Me.mnuFileSaveAsScriptAs.Name = "mnuFileSaveAsScriptAs" - Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsScriptAs.Text = "Save Script As..." ' 'mnuFilePrint @@ -2848,7 +2848,7 @@ Partial Class frmMain Me.mnuFilePrint.Enabled = False Me.mnuFilePrint.Name = "mnuFilePrint" Me.mnuFilePrint.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.P), System.Windows.Forms.Keys) - Me.mnuFilePrint.Size = New System.Drawing.Size(351, 34) + Me.mnuFilePrint.Size = New System.Drawing.Size(232, 22) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -2857,7 +2857,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(351, 34) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(232, 22) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -2865,12 +2865,12 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(348, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(229, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(351, 34) + Me.mnuFIleExit.Size = New System.Drawing.Size(232, 22) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' @@ -2878,7 +2878,7 @@ Partial Class frmMain ' Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(58, 29) + Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' @@ -2886,7 +2886,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(253, 34) + Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2894,7 +2894,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(253, 34) + Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2902,27 +2902,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(253, 34) + Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(253, 34) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(253, 34) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(253, 34) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -2930,18 +2930,17 @@ Partial Class frmMain ' Me.stsStrip.ImageScalingSize = New System.Drawing.Size(24, 24) Me.stsStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstatus}) - Me.stsStrip.Location = New System.Drawing.Point(0, 691) + Me.stsStrip.Location = New System.Drawing.Point(0, 460) Me.stsStrip.Name = "stsStrip" - Me.stsStrip.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0) Me.stsStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional - Me.stsStrip.Size = New System.Drawing.Size(1251, 32) + Me.stsStrip.Size = New System.Drawing.Size(834, 22) Me.stsStrip.TabIndex = 8 Me.stsStrip.Text = "Status" ' 'tstatus ' Me.tstatus.Name = "tstatus" - Me.tstatus.Size = New System.Drawing.Size(182, 25) + Me.tstatus.Size = New System.Drawing.Size(119, 17) Me.tstatus.Text = "No worksheet loaded" ' 'Tool_strip @@ -2950,12 +2949,12 @@ Partial Class frmMain Me.Tool_strip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.Tool_strip.ImageScalingSize = New System.Drawing.Size(30, 30) Me.Tool_strip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTbOpen, Me.mnuTbOpenFromLibrary, Me.mnuTbSave, Me.toolStripSeparator, Me.mnuTbLast10Dialogs, Me.separator2, Me.mnuTbDataView, Me.mnuTbOutput, Me.ToolStripSeparator74, Me.mnuLastGraph, Me.ToolStripSeparator75, Me.mnuTbLogScript, Me.mnuMetadata, Me.ToolStripSeparator76, Me.mnuTbResetLayout, Me.separator3, Me.mnuTbHelp, Me.ToolStripSeparator77, Me.mnuTbLan, Me.separator1}) - Me.Tool_strip.Location = New System.Drawing.Point(0, 33) + Me.Tool_strip.Location = New System.Drawing.Point(0, 24) Me.Tool_strip.Name = "Tool_strip" - Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0) + Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) Me.Tool_strip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional Me.Tool_strip.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.Tool_strip.Size = New System.Drawing.Size(1251, 39) + Me.Tool_strip.Size = New System.Drawing.Size(834, 37) Me.Tool_strip.TabIndex = 7 Me.Tool_strip.Text = "Tool" ' @@ -2967,7 +2966,7 @@ Partial Class frmMain Me.mnuTbOpen.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpen.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpen.Name = "mnuTbOpen" - Me.mnuTbOpen.Size = New System.Drawing.Size(53, 36) + Me.mnuTbOpen.Size = New System.Drawing.Size(53, 34) Me.mnuTbOpen.Text = "&Open" Me.mnuTbOpen.ToolTipText = "Import" ' @@ -2978,7 +2977,7 @@ Partial Class frmMain Me.mnuTbOpenFromLibrary.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpenFromLibrary.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpenFromLibrary.Name = "mnuTbOpenFromLibrary" - Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 36) + Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 34) Me.mnuTbOpenFromLibrary.ToolTipText = "Import From Library" ' 'mnuTbSave @@ -2990,40 +2989,40 @@ Partial Class frmMain Me.mnuTbSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbSave.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbSave.Name = "mnuTbSave" - Me.mnuTbSave.Size = New System.Drawing.Size(53, 36) + Me.mnuTbSave.Size = New System.Drawing.Size(53, 34) Me.mnuTbSave.Text = "&Save" ' 'mnuSaveData ' Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveData.Name = "mnuSaveData" - Me.mnuSaveData.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveData.Size = New System.Drawing.Size(139, 22) Me.mnuSaveData.Text = "Save Data" ' 'mnuSaveOutput ' Me.mnuSaveOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveOutput.Name = "mnuSaveOutput" - Me.mnuSaveOutput.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveOutput.Size = New System.Drawing.Size(139, 22) Me.mnuSaveOutput.Text = "Save Output" ' 'mnuSaveScript ' Me.mnuSaveScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveScript.Name = "mnuSaveScript" - Me.mnuSaveScript.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveScript.Size = New System.Drawing.Size(139, 22) Me.mnuSaveScript.Text = "Save Script" ' 'mnuSaveLog ' Me.mnuSaveLog.Name = "mnuSaveLog" - Me.mnuSaveLog.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22) Me.mnuSaveLog.Text = "Save Log" ' 'toolStripSeparator ' Me.toolStripSeparator.Name = "toolStripSeparator" - Me.toolStripSeparator.Size = New System.Drawing.Size(6, 39) + Me.toolStripSeparator.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLast10Dialogs ' @@ -3039,7 +3038,7 @@ Partial Class frmMain 'separator2 ' Me.separator2.Name = "separator2" - Me.separator2.Size = New System.Drawing.Size(6, 39) + Me.separator2.Size = New System.Drawing.Size(6, 37) ' 'mnuTbDataView ' @@ -3049,7 +3048,7 @@ Partial Class frmMain Me.mnuTbDataView.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbDataView.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbDataView.Name = "mnuTbDataView" - Me.mnuTbDataView.Size = New System.Drawing.Size(34, 36) + Me.mnuTbDataView.Size = New System.Drawing.Size(34, 34) Me.mnuTbDataView.ToolTipText = "Toggle Data view open and closed" ' 'mnuTbOutput @@ -3061,34 +3060,34 @@ Partial Class frmMain Me.mnuTbOutput.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOutput.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOutput.Name = "mnuTbOutput" - Me.mnuTbOutput.Size = New System.Drawing.Size(53, 36) + Me.mnuTbOutput.Size = New System.Drawing.Size(53, 34) Me.mnuTbOutput.ToolTipText = "Toggle Output window open and closed" ' 'mnuOutputWindow ' Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuOutputWindow.Name = "mnuOutputWindow" - Me.mnuOutputWindow.Size = New System.Drawing.Size(271, 34) + Me.mnuOutputWindow.Size = New System.Drawing.Size(178, 22) Me.mnuOutputWindow.Text = "Show Output" ' 'mnuShowRCommand ' Me.mnuShowRCommand.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuShowRCommand.Name = "mnuShowRCommand" - Me.mnuShowRCommand.Size = New System.Drawing.Size(271, 34) + Me.mnuShowRCommand.Size = New System.Drawing.Size(178, 22) Me.mnuShowRCommand.Text = "Show R Commands" ' 'mnuIncludeComments ' Me.mnuIncludeComments.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuIncludeComments.Name = "mnuIncludeComments" - Me.mnuIncludeComments.Size = New System.Drawing.Size(271, 34) + Me.mnuIncludeComments.Size = New System.Drawing.Size(178, 22) Me.mnuIncludeComments.Text = "Show Comments" ' 'ToolStripSeparator74 ' Me.ToolStripSeparator74.Name = "ToolStripSeparator74" - Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 37) ' 'mnuLastGraph ' @@ -3105,25 +3104,25 @@ Partial Class frmMain 'mnuNormalViewer ' Me.mnuNormalViewer.Name = "mnuNormalViewer" - Me.mnuNormalViewer.Size = New System.Drawing.Size(194, 34) + Me.mnuNormalViewer.Size = New System.Drawing.Size(128, 22) Me.mnuNormalViewer.Text = "Viewer..." ' 'mnuploty ' Me.mnuploty.Name = "mnuploty" - Me.mnuploty.Size = New System.Drawing.Size(194, 34) + Me.mnuploty.Size = New System.Drawing.Size(128, 22) Me.mnuploty.Text = "Plotly..." ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" - Me.mnuRViewer.Size = New System.Drawing.Size(194, 34) + Me.mnuRViewer.Size = New System.Drawing.Size(128, 22) Me.mnuRViewer.Text = "R Viewer..." ' 'ToolStripSeparator75 ' Me.ToolStripSeparator75.Name = "ToolStripSeparator75" - Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLogScript ' @@ -3141,7 +3140,7 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(196, 34) + Me.mnuLogScript.Size = New System.Drawing.Size(129, 22) Me.mnuLogScript.Text = "Log/Script" ' 'mnuMetadata @@ -3160,20 +3159,20 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(307, 34) + Me.mnuColumnMetadat.Size = New System.Drawing.Size(202, 22) Me.mnuColumnMetadat.Text = " Column Metadata..." ' 'mnuDataFrameMetadat ' Me.mnuDataFrameMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataFrameMetadat.Name = "mnuDataFrameMetadat" - Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(307, 34) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(202, 22) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' 'ToolStripSeparator76 ' Me.ToolStripSeparator76.Name = "ToolStripSeparator76" - Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 37) ' 'mnuTbResetLayout ' @@ -3182,13 +3181,13 @@ Partial Class frmMain Me.mnuTbResetLayout.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbResetLayout.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbResetLayout.Name = "mnuTbResetLayout" - Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 36) + Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 34) Me.mnuTbResetLayout.ToolTipText = "Reset to Default Layout" ' 'separator3 ' Me.separator3.Name = "separator3" - Me.separator3.Size = New System.Drawing.Size(6, 39) + Me.separator3.Size = New System.Drawing.Size(6, 37) ' 'mnuTbHelp ' @@ -3197,13 +3196,13 @@ Partial Class frmMain Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbHelp.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbHelp.Name = "mnuTbHelp" - Me.mnuTbHelp.Size = New System.Drawing.Size(34, 36) + Me.mnuTbHelp.Size = New System.Drawing.Size(34, 34) Me.mnuTbHelp.Text = "He&lp" ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" - Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLan ' @@ -3212,13 +3211,13 @@ Partial Class frmMain Me.mnuTbLan.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbLan.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbLan.Name = "mnuTbLan" - Me.mnuTbLan.Size = New System.Drawing.Size(34, 36) + Me.mnuTbLan.Size = New System.Drawing.Size(34, 34) Me.mnuTbLan.ToolTipText = "Changes the menu language to English, and from English" ' 'separator1 ' Me.separator1.Name = "separator1" - Me.separator1.Size = New System.Drawing.Size(6, 39) + Me.separator1.Size = New System.Drawing.Size(6, 37) ' 'mnuBar ' @@ -3230,9 +3229,10 @@ Partial Class frmMain Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" + Me.mnuBar.Padding = New System.Windows.Forms.Padding(4, 1, 0, 1) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True - Me.mnuBar.Size = New System.Drawing.Size(1251, 33) + Me.mnuBar.Size = New System.Drawing.Size(834, 24) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' @@ -3240,7 +3240,7 @@ Partial Class frmMain ' Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" - Me.mnuFile.Size = New System.Drawing.Size(54, 29) + Me.mnuFile.Size = New System.Drawing.Size(37, 22) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3248,7 +3248,7 @@ Partial Class frmMain ' Me.mnuFileNewDataFrame.Name = "mnuFileNewDataFrame" Me.mnuFileNewDataFrame.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) - Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(351, 34) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(232, 22) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3256,33 +3256,33 @@ Partial Class frmMain ' Me.mnuFileImportFromFile.Name = "mnuFileImportFromFile" Me.mnuFileImportFromFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) - Me.mnuFileImportFromFile.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(348, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(229, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3290,7 +3290,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3298,82 +3298,82 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(351, 34) + Me.mnuFileConvert.Size = New System.Drawing.Size(232, 22) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(348, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(229, 6) ' 'mnuFileExport ' Me.mnuFileExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExportExportDataSet, Me.mnuFileExportExportRObjectsToolStripMenuItem, Me.mnuFileExportExportRWorkspace, Me.mnuFileExportExportGraphAsImage}) Me.mnuFileExport.Name = "mnuFileExport" - Me.mnuFileExport.Size = New System.Drawing.Size(351, 34) + Me.mnuFileExport.Size = New System.Drawing.Size(232, 22) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet ' Me.mnuFileExportExportDataSet.Name = "mnuFileExportExportDataSet" - Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportDataSet.Text = "Export Dataset..." ' 'mnuFileExportExportRObjectsToolStripMenuItem ' Me.mnuFileExportExportRObjectsToolStripMenuItem.Name = "mnuFileExportExportRObjectsToolStripMenuItem" - Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportRObjectsToolStripMenuItem.Text = "Export R Objects..." ' 'mnuFileExportExportRWorkspace ' Me.mnuFileExportExportRWorkspace.Name = "mnuFileExportExportRWorkspace" - Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportRWorkspace.Text = "Export R Workspace..." ' 'mnuFileExportExportGraphAsImage ' Me.mnuFileExportExportGraphAsImage.Name = "mnuFileExportExportGraphAsImage" - Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportGraphAsImage.Text = "Export Graph As Image..." ' 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(351, 34) + Me.mnuFileCloseData.Size = New System.Drawing.Size(232, 22) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(348, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(229, 6) ' 'mnuPrepare ' Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) Me.mnuPrepare.Name = "mnuPrepare" - Me.mnuPrepare.Size = New System.Drawing.Size(88, 29) + Me.mnuPrepare.Size = New System.Drawing.Size(59, 22) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -3381,105 +3381,105 @@ Partial Class frmMain ' Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameHideColumns, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' 'mnuPrepareDataFrameViewData ' Me.mnuPrepareDataFrameViewData.Name = "mnuPrepareDataFrameViewData" - Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameViewData.Tag = "View_Data..." Me.mnuPrepareDataFrameViewData.Text = "View Data..." ' 'mnuPrepareDataFrameRenameColumn ' Me.mnuPrepareDataFrameRenameColumn.Name = "mnuPrepareDataFrameRenameColumn" - Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameRenameColumn.Tag = "Rename_Column..." Me.mnuPrepareDataFrameRenameColumn.Text = "Rename Columns..." ' 'mnuPrepareDataFrameDuplicateColumn ' Me.mnuPrepareDataFrameDuplicateColumn.Name = "mnuPrepareDataFrameDuplicateColumn" - Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameDuplicateColumn.Text = "Duplicate Column..." ' 'mnuPrepareDataFrameRowNumbersNames ' Me.mnuPrepareDataFrameRowNumbersNames.Name = "mnuPrepareDataFrameRowNumbersNames" - Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameRowNumbersNames.Tag = "Row_Numbers/Names..." Me.mnuPrepareDataFrameRowNumbersNames.Text = "Row Numbers/Names..." ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameSort ' Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort" - Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' 'mnuPrepareDataFrameFilterRows ' Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" - Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" - Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' Me.mnuPrepareDataFrameReplaceValues.Name = "mnuPrepareDataFrameReplaceValues" - Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameReplaceValues.Tag = "Replace_Values..." Me.mnuPrepareDataFrameReplaceValues.Text = "Replace Values..." ' 'mnuPrepareDataFrameConvertColumns ' Me.mnuPrepareDataFrameConvertColumns.Name = "mnuPrepareDataFrameConvertColumns" - Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameConvertColumns.Tag = "Convert_Columns..." Me.mnuPrepareDataFrameConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameReorderColumns ' Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns" - Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameReorderColumns.Tag = "Reorder_Columns..." Me.mnuPrepareDataFrameReorderColumns.Text = "Reorder Columns..." ' 'mnuPrepareDataFrameAddMergeColumns ' Me.mnuPrepareDataFrameAddMergeColumns.Name = "mnuPrepareDataFrameAddMergeColumns" - Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameAddMergeColumns.Text = "Add (Merge) Columns..." ' 'mnuPrepareDataFrameInsertColumnsRows ' Me.mnuPrepareDataFrameInsertColumnsRows.Name = "mnuPrepareDataFrameInsertColumnsRows" - Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameInsertColumnsRows.Tag = "Insert_Columns/Rows..." Me.mnuPrepareDataFrameInsertColumnsRows.Text = "Insert Columns/Rows..." ' 'mnuPrepareDataFrameDeleteColumnsRows ' Me.mnuPrepareDataFrameDeleteColumnsRows.Name = "mnuPrepareDataFrameDeleteColumnsRows" - Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..." Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..." ' @@ -3487,7 +3487,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameProtectColumn.Enabled = False Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn" - Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameProtectColumn.Tag = "..." Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False @@ -3495,7 +3495,7 @@ Partial Class frmMain 'mnuPrepareDataFrameHideColumns ' Me.mnuPrepareDataFrameHideColumns.Name = "mnuPrepareDataFrameHideColumns" - Me.mnuPrepareDataFrameHideColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameHideColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameHideColumns.Tag = "Hide_Columns..." Me.mnuPrepareDataFrameHideColumns.Text = "Hide/Show Columns..." ' @@ -3503,7 +3503,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns" - Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..." Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..." Me.mnuPrepareDataFrameFreezeColumns.Visible = False @@ -3511,7 +3511,7 @@ Partial Class frmMain 'mnuPrepareDataframeColourByProperty ' Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty" - Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..." ' 'mnuPrepareCheckData @@ -3519,107 +3519,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(275, 34) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData ' Me.mnuPrepareCheckDataVisualiseData.Name = "mnuPrepareCheckDataVisualiseData" - Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..." ' 'mnuPrepareCheckDataPivotTable ' Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable" - Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator50 ' Me.ToolStripSeparator50.Name = "ToolStripSeparator50" - Me.ToolStripSeparator50.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator50.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataDuplicates ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" - Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' Me.mnuPrepareCheckDataCompareColumns.Name = "mnuPrepareCheckDataCompareColumns" - Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataCompareColumns.Text = "Compare Columns..." ' 'mnuPrepareCheckDataNonNumericCases ' Me.mnuPrepareCheckDataNonNumericCases.Name = "mnuPrepareCheckDataNonNumericCases" - Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator49 ' Me.ToolStripSeparator49.Name = "ToolStripSeparator49" - Me.ToolStripSeparator49.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataBoxplot ' Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot" - Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataBoxplot.Text = "Boxplot..." ' 'mnuPrepareCheckDataOneVariableSummarise ' Me.mnuPrepareCheckDataOneVariableSummarise.Name = "mnuPrepareCheckDataOneVariableSummarise" - Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuPrepareCheckDataOneVariableGraph ' Me.mnuPrepareCheckDataOneVariableGraph.Name = "mnuPrepareCheckDataOneVariableGraph" - Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuPrepareCheckDataOneWayFrequencies ' Me.mnuPrepareCheckDataOneWayFrequencies.Name = "mnuPrepareCheckDataOneWayFrequencies" - Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..." ' 'mnuPrepareCheckDataViewDeleteLabels ' Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels" - Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..." ' 'ToolStripSeparator41 ' Me.ToolStripSeparator41.Name = "ToolStripSeparator41" - Me.ToolStripSeparator41.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataExportOpenRefine ' Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine" - Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataExportOpenRefine.Text = "Export To OpenRefine..." ' 'mnuPrepareCheckDataImportOpenRefine ' Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" - Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' Me.ToolStripSeparator40.Name = "ToolStripSeparator40" - Me.ToolStripSeparator40.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator40.Size = New System.Drawing.Size(242, 6) ' 'mnuPreparePrepareToShareJitter ' Me.mnuPreparePrepareToShareJitter.Enabled = False Me.mnuPreparePrepareToShareJitter.Name = "mnuPreparePrepareToShareJitter" - Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(370, 34) + Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22) Me.mnuPreparePrepareToShareJitter.Text = "Jitter..." Me.mnuPreparePrepareToShareJitter.Visible = False ' @@ -3627,25 +3627,25 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage" - Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Text = "Prepare to Share (sdc package)..." Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Visible = False ' 'mnuPrepareCheckDataAnonymiseIDColumn ' Me.mnuPrepareCheckDataAnonymiseIDColumn.Name = "mnuPrepareCheckDataAnonymiseIDColumn" - Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataAnonymiseIDColumn.Text = "Anonymise ID Column..." ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(272, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(183, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Column: Calculator..." ' @@ -3653,64 +3653,64 @@ Partial Class frmMain ' Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows}) Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate" - Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' 'mnuPrepareColumnNumericRegularSequence ' Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence" - Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRegularSequence.Tag = "Regular_Sequence..." Me.mnuPrepareColumnNumericRegularSequence.Text = "Regular Sequence..." ' 'mnuPrepareColumnNumericEnter ' Me.mnuPrepareColumnNumericEnter.Name = "mnuPrepareColumnNumericEnter" - Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericEnter.Text = "Enter..." ' 'ToolStripSeparator25 ' Me.ToolStripSeparator25.Name = "ToolStripSeparator25" - Me.ToolStripSeparator25.Size = New System.Drawing.Size(301, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRowSummaries.Text = "Row Summaries..." ' 'mnuPrepareColumnNumericTransform ' Me.mnuPrepareColumnNumericTransform.Name = "mnuPrepareColumnNumericTransform" - Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericTransform.Tag = "Rank..." Me.mnuPrepareColumnNumericTransform.Text = "Transform..." ' 'mnuPrepareColumnNumericPolynomials ' Me.mnuPrepareColumnNumericPolynomials.Name = "mnuPrepareColumnNumericPolynomials" - Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPolynomials.Tag = "Polynomials..." Me.mnuPrepareColumnNumericPolynomials.Text = "Polynomials..." ' 'ToolStripSeparator56 ' Me.ToolStripSeparator56.Name = "ToolStripSeparator56" - Me.ToolStripSeparator56.Size = New System.Drawing.Size(301, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRandomSamples.Tag = "Random_Samples..." Me.mnuPrepareColumnNumericRandomSamples.Text = "Random Samples..." ' 'mnuPrepareColumnNumericPermuteRows ' Me.mnuPrepareColumnNumericPermuteRows.Name = "mnuPrepareColumnNumericPermuteRows" - Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' @@ -3718,105 +3718,105 @@ Partial Class frmMain ' Me.mnuPrepareColumnFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnFactorConvertToFactor, Me.mnuPrepareColumnFactorRecodeNumeric, Me.mnuPrepareColumnFactorCountInFactor, Me.ToolStripSeparator12, Me.mnuPrepareColumnFactorRecodeFactor, Me.mnuPrepareColumnFactorCombineFactors, Me.mnuPrepareColumnFactorDummyVariables, Me.ToolStripSeparator14, Me.mnuPrepareColumnFactorLevelsLabels, Me.mnuPrepareColumnFactorReorderLevels, Me.mnuPrepareColumnFactorReferenceLevel, Me.mnuPrepareColumnFactorUnusedLevels, Me.mnuPrepareColumnFactorContrasts, Me.ToolStripSeparator19, Me.mnuPrepareColumnFactorFactorDataFrame}) Me.mnuPrepareColumnFactor.Name = "mnuPrepareColumnFactor" - Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' 'mnuPrepareColumnFactorConvertToFactor ' Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor" - Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor" Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..." ' 'mnuPrepareColumnFactorRecodeNumeric ' Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric" - Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..." Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..." ' 'mnuPrepareColumnFactorCountInFactor ' Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor" - Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorRecodeFactor ' Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor" - Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..." Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..." ' 'mnuPrepareColumnFactorCombineFactors ' Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors" - Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..." Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..." ' 'mnuPrepareColumnFactorDummyVariables ' Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables" - Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..." Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..." ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorLevelsLabels ' Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels" - Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..." Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..." ' 'mnuPrepareColumnFactorReorderLevels ' Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels" - Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..." Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..." ' 'mnuPrepareColumnFactorReferenceLevel ' Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel" - Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..." Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..." ' 'mnuPrepareColumnFactorUnusedLevels ' Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels" - Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..." Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..." ' 'mnuPrepareColumnFactorContrasts ' Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts" - Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..." Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..." ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorFactorDataFrame ' Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame" - Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame" Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..." ' @@ -3824,42 +3824,42 @@ Partial Class frmMain ' Me.mnuPrepareColumnText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnTextFindReplace, Me.mnuPrepareColumnTextSearch, Me.mnuPrepareColumnTextTransform, Me.mnuPrepareColumnTextSplit, Me.mnuPrepareColumnTextCombine, Me.mnuPrepareColumnTextMatch, Me.mnuPrepareColumnTextDistance}) Me.mnuPrepareColumnText.Name = "mnuPrepareColumnText" - Me.mnuPrepareColumnText.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' 'mnuPrepareColumnTextFindReplace ' Me.mnuPrepareColumnTextFindReplace.Name = "mnuPrepareColumnTextFindReplace" - Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextFindReplace.Tag = "Find/Replace..." Me.mnuPrepareColumnTextFindReplace.Text = "Find/Replace..." ' 'mnuPrepareColumnTextSearch ' Me.mnuPrepareColumnTextSearch.Name = "mnuPrepareColumnTextSearch" - Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextSearch.Text = "Search..." Me.mnuPrepareColumnTextSearch.Visible = False ' 'mnuPrepareColumnTextTransform ' Me.mnuPrepareColumnTextTransform.Name = "mnuPrepareColumnTextTransform" - Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextTransform.Tag = "Transform..." Me.mnuPrepareColumnTextTransform.Text = "Transform..." ' 'mnuPrepareColumnTextSplit ' Me.mnuPrepareColumnTextSplit.Name = "mnuPrepareColumnTextSplit" - Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextSplit.Tag = "Split..." Me.mnuPrepareColumnTextSplit.Text = "Split..." ' 'mnuPrepareColumnTextCombine ' Me.mnuPrepareColumnTextCombine.Name = "mnuPrepareColumnTextCombine" - Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextCombine.Tag = "Combine..." Me.mnuPrepareColumnTextCombine.Text = "Combine..." ' @@ -3867,7 +3867,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnTextMatch.Enabled = False Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch" - Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextMatch.Tag = "Match..." Me.mnuPrepareColumnTextMatch.Text = "Match..." Me.mnuPrepareColumnTextMatch.Visible = False @@ -3875,7 +3875,7 @@ Partial Class frmMain 'mnuPrepareColumnTextDistance ' Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance" - Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextDistance.Tag = "Distance..." Me.mnuPrepareColumnTextDistance.Text = "Distance..." ' @@ -3883,38 +3883,38 @@ Partial Class frmMain ' Me.mnuPrepareColumnDate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDateGenerateDate, Me.mnuPrepareColumnDateMakeDate, Me.mnuPrepareColumnDateInfillMissingDates, Me.mnuPrepareColumnDateUseDate, Me.mnuPrepareColumnDateMakeTime, Me.mnuPrepareColumnDateUseTime}) Me.mnuPrepareColumnDate.Name = "mnuPrepareColumnDate" - Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate ' Me.mnuPrepareColumnDateGenerateDate.Name = "mnuPrepareColumnDateGenerateDate" - Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateGenerateDate.Text = "Generate Dates..." ' 'mnuPrepareColumnDateMakeDate ' Me.mnuPrepareColumnDateMakeDate.Name = "mnuPrepareColumnDateMakeDate" - Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateMakeDate.Text = "Make Date..." ' 'mnuPrepareColumnDateInfillMissingDates ' Me.mnuPrepareColumnDateInfillMissingDates.Name = "mnuPrepareColumnDateInfillMissingDates" - Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuPrepareColumnDateUseDate ' Me.mnuPrepareColumnDateUseDate.Name = "mnuPrepareColumnDateUseDate" - Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateUseDate.Text = "Use Date..." ' 'mnuPrepareColumnDateMakeTime ' Me.mnuPrepareColumnDateMakeTime.Enabled = False Me.mnuPrepareColumnDateMakeTime.Name = "mnuPrepareColumnDateMakeTime" - Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..." Me.mnuPrepareColumnDateMakeTime.Visible = False ' @@ -3922,7 +3922,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDateUseTime.Enabled = False Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" - Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateUseTime.Text = "Use Time..." Me.mnuPrepareColumnDateUseTime.Visible = False ' @@ -3930,169 +3930,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(275, 34) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(263, 34) + Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22) Me.mnuPrepareColumnDefineConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator55 ' Me.ToolStripSeparator55.Name = "ToolStripSeparator55" - Me.ToolStripSeparator55.Size = New System.Drawing.Size(260, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(263, 34) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(272, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(183, 6) ' 'mnuPrepareDataReshape ' Me.mnuPrepareDataReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnReshapeColumnSummaries, Me.mnuPrepareColumnReshapeGeneralSummaries, Me.ToolStripSeparator10, Me.mnuPrepareColumnReshapeStack, Me.mnuPrepareColumnReshapeUnstack, Me.mnuPrepareColumnReshapeMerge, Me.ToolStripSeparator11, Me.mnuPrepareAppendDataFrame, Me.mnuPrepareColumnReshapeSubset, Me.mnuPrepareColumnReshapeRandomSubset, Me.mnuPrepareColumnReshapeTranspose, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" - Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' 'mnuPrepareColumnReshapeColumnSummaries ' Me.mnuPrepareColumnReshapeColumnSummaries.Name = "mnuPrepareColumnReshapeColumnSummaries" - Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeColumnSummaries.Tag = "Column_Summaries..." Me.mnuPrepareColumnReshapeColumnSummaries.Text = "Column Summaries..." ' 'mnuPrepareColumnReshapeGeneralSummaries ' Me.mnuPrepareColumnReshapeGeneralSummaries.Name = "mnuPrepareColumnReshapeGeneralSummaries" - Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeGeneralSummaries.Text = "General Summaries..." ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareColumnReshapeStack ' Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack" - Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeStack.Tag = "Stack..." Me.mnuPrepareColumnReshapeStack.Text = "Stack (Pivot Longer)..." ' 'mnuPrepareColumnReshapeUnstack ' Me.mnuPrepareColumnReshapeUnstack.Name = "mnuPrepareColumnReshapeUnstack" - Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeUnstack.Tag = "Unstack..." Me.mnuPrepareColumnReshapeUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuPrepareColumnReshapeMerge ' Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge" - Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..." Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..." ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareAppendDataFrame ' Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame" - Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareAppendDataFrame.Text = "Append (Bind Rows)..." ' 'mnuPrepareColumnReshapeSubset ' Me.mnuPrepareColumnReshapeSubset.Name = "mnuPrepareColumnReshapeSubset" - Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeSubset.Tag = "Subset..." Me.mnuPrepareColumnReshapeSubset.Text = "Subset..." ' 'mnuPrepareColumnReshapeRandomSubset ' Me.mnuPrepareColumnReshapeRandomSubset.Name = "mnuPrepareColumnReshapeRandomSubset" - Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeRandomSubset.Tag = "Random_Subset..." Me.mnuPrepareColumnReshapeRandomSubset.Text = "Random Subset..." ' 'mnuPrepareColumnReshapeTranspose ' Me.mnuPrepareColumnReshapeTranspose.Name = "mnuPrepareColumnReshapeTranspose" - Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeTranspose.Tag = "Transpose..." Me.mnuPrepareColumnReshapeTranspose.Text = "Transpose..." ' 'mnuPrepareDataReshapeScaleOrDistance ' Me.mnuPrepareDataReshapeScaleOrDistance.Name = "mnuPrepareDataReshapeScaleOrDistance" - Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..." ' 'mnuPrepareDataReshapeRandomSplit ' Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" - Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(272, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(183, 6) ' 'mnuPrepareKeysAndLinks ' Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment}) Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks" - Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey ' Me.mnuPrepareKeysAndLinksAddKey.Name = "mnuPrepareKeysAndLinksAddKey" - Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddKey.Text = "Add Key..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKey ' Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Name = "mnuPrepareKeysAndLinksViewAndRemoveKey" - Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Text = "View and Remove Keys..." ' 'mnuPrepareKeysAndLinksAddLink ' Me.mnuPrepareKeysAndLinksAddLink.Name = "mnuPrepareKeysAndLinksAddLink" - Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddLink.Text = "Add Link..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKeys ' Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Name = "mnuPrepareKeysAndLinksViewAndRemoveKeys" - Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Text = "View and Remove Links..." ' 'mnuPrepareKeysAndLinksAddComment ' Me.mnuPrepareKeysAndLinksAddComment.Name = "mnuPrepareKeysAndLinksAddComment" - Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddComment.Text = "Add Comment..." ' 'mnuPrepareDataBook ' Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata}) Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook" - Me.mnuPrepareDataBook.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4100,7 +4100,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata" - Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDataFrameMetadata.Tag = "Data_Frame_Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Text = "Data Frame Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Visible = False @@ -4108,46 +4108,46 @@ Partial Class frmMain 'mnuPrepareDataObjectRenameDataFrame ' Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame" - Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectRenameDataFrame.Tag = "ReName_Data_Frame..." Me.mnuPrepareDataObjectRenameDataFrame.Text = "Rename Data Frame..." ' 'mnuPrepareDataObjectReorderDataFrames ' Me.mnuPrepareDataObjectReorderDataFrames.Name = "mnuPrepareDataObjectReorderDataFrames" - Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectReorderDataFrames.Tag = "Reorder_Data_Frames..." Me.mnuPrepareDataObjectReorderDataFrames.Text = "Reorder Data Frames..." ' 'mnuPrepareDataObjectCopyDataFrame ' Me.mnuPrepareDataObjectCopyDataFrame.Name = "mnuPrepareDataObjectCopyDataFrame" - Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectCopyDataFrame.Tag = "Copy_Data_Frame..." Me.mnuPrepareDataObjectCopyDataFrame.Text = "Copy Data Frame..." ' 'mnuPrepareDataObjectDeleteDataFrame ' Me.mnuPrepareDataObjectDeleteDataFrame.Name = "mnuPrepareDataObjectDeleteDataFrame" - Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDeleteDataFrame.Tag = "Delete_Data_Frame..." Me.mnuPrepareDataObjectDeleteDataFrame.Text = "Delete Data Frames..." ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(315, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6) ' 'mnuPrepareDataObjectHideDataframes ' Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes" - Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectHideDataframes.Text = "Hide/Show Data Frames..." ' 'mnuPrepareDataObjectMetadata ' Me.mnuPrepareDataObjectMetadata.Name = "mnuPrepareDataObjectMetadata" - Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..." Me.mnuPrepareDataObjectMetadata.Text = "Metadata..." ' @@ -4155,7 +4155,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectRenameMetadata.Enabled = False Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata" - Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Visible = False @@ -4164,7 +4164,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectReorderMetadata.Enabled = False Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata" - Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Visible = False @@ -4173,7 +4173,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata" - Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Visible = False @@ -4182,35 +4182,35 @@ Partial Class frmMain ' Me.mnuPrepareRObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareRObjectsView, Me.mnuPrepareRObjectsRename, Me.mnuPrepareRObjectsReorder, Me.mnuPrepareRObjectsDelete}) Me.mnuPrepareRObjects.Name = "mnuPrepareRObjects" - Me.mnuPrepareRObjects.Size = New System.Drawing.Size(275, 34) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' 'mnuPrepareRObjectsView ' Me.mnuPrepareRObjectsView.Name = "mnuPrepareRObjectsView" - Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsView.Tag = "View..." Me.mnuPrepareRObjectsView.Text = "View..." ' 'mnuPrepareRObjectsRename ' Me.mnuPrepareRObjectsRename.Name = "mnuPrepareRObjectsRename" - Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsRename.Tag = "Rename..." Me.mnuPrepareRObjectsRename.Text = "Rename..." ' 'mnuPrepareRObjectsReorder ' Me.mnuPrepareRObjectsReorder.Name = "mnuPrepareRObjectsReorder" - Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsReorder.Tag = "Reorder" Me.mnuPrepareRObjectsReorder.Text = "Reorder..." ' 'mnuPrepareRObjectsDelete ' Me.mnuPrepareRObjectsDelete.Name = "mnuPrepareRObjectsDelete" - Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsDelete.Tag = "Delete..." Me.mnuPrepareRObjectsDelete.Text = "Delete..." ' @@ -4218,78 +4218,78 @@ Partial Class frmMain ' Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext, Me.mnuStructuredSurvey}) Me.mnuStructured.Name = "mnuStructured" - Me.mnuStructured.Size = New System.Drawing.Size(109, 29) + Me.mnuStructured.Size = New System.Drawing.Size(74, 22) Me.mnuStructured.Text = "Structured" ' 'mnuStructuredCircular ' Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine, Me.mnuStructuredCircularCalculator, Me.mnuStructuredCircularSummaries, Me.ToolStripSeparator46, Me.mnuStructuredCircularDensityPlot, Me.ToolStripSeparator67, Me.mnuStructuredCircularWindRose, Me.mnuStructuredCircularWindPollutionRose, Me.mnuStructuredCircularOtherRosePlots, Me.ToolStripSeparator68, Me.mnuStructuredCircularCirclize}) Me.mnuStructuredCircular.Name = "mnuStructuredCircular" - Me.mnuStructuredCircular.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredCircular.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredCircular.Text = "Circular" ' 'mnuStructuredCircularDefine ' Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" - Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularDefine.Text = "Define..." ' 'mnuStructuredCircularCalculator ' Me.mnuStructuredCircularCalculator.Name = "mnuStructuredCircularCalculator" - Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularCalculator.Text = "Calculator..." ' 'mnuStructuredCircularSummaries ' Me.mnuStructuredCircularSummaries.Name = "mnuStructuredCircularSummaries" - Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularSummaries.Text = "Summaries..." ' 'ToolStripSeparator46 ' Me.ToolStripSeparator46.Name = "ToolStripSeparator46" - Me.ToolStripSeparator46.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularDensityPlot ' Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot" - Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularDensityPlot.Text = "Circular Plots..." ' 'ToolStripSeparator67 ' Me.ToolStripSeparator67.Name = "ToolStripSeparator67" - Me.ToolStripSeparator67.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularWindRose ' Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose" - Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularWindRose.Text = "Wind Rose..." ' 'mnuStructuredCircularWindPollutionRose ' Me.mnuStructuredCircularWindPollutionRose.Name = "mnuStructuredCircularWindPollutionRose" - Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuStructuredCircularOtherRosePlots ' Me.mnuStructuredCircularOtherRosePlots.Name = "mnuStructuredCircularOtherRosePlots" - Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularOtherRosePlots.Text = "Other Rose Plots..." ' 'ToolStripSeparator68 ' Me.ToolStripSeparator68.Name = "ToolStripSeparator68" - Me.ToolStripSeparator68.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator68.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularCirclize ' Me.mnuStructuredCircularCirclize.Enabled = False Me.mnuStructuredCircularCirclize.Name = "mnuStructuredCircularCirclize" - Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularCirclize.Text = "Circlize..." Me.mnuStructuredCircularCirclize.Visible = False ' @@ -4297,126 +4297,126 @@ Partial Class frmMain ' Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" - Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredLow_Flow.Text = "Low_Flow" Me.mnuStructuredLow_Flow.Visible = False ' 'mnuStructuredLow_FlowDefine ' Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" - Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(177, 34) + Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(117, 22) Me.mnuStructuredLow_FlowDefine.Text = "Define..." ' 'mnuStructuredSurvival ' Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" - Me.mnuStructuredSurvival.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredSurvival.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredSurvival.Text = "Survival" ' 'mnuStructuredSurvivalDefine ' Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" - Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(177, 34) + Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(117, 22) Me.mnuStructuredSurvivalDefine.Text = "Define..." ' 'mnuStructuredTimeSeries ' Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" - Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredTimeSeries.Text = "Time Series" Me.mnuStructuredTimeSeries.Visible = False ' 'mnuStructuredTimeSeriesDefine ' Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" - Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesDefine.Text = "Define..." ' 'ToolStripSeparator60 ' Me.ToolStripSeparator60.Name = "ToolStripSeparator60" - Me.ToolStripSeparator60.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator60.Size = New System.Drawing.Size(116, 6) ' 'mnuStructuredTimeSeriesDescribe ' Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" - Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesDescribe.Text = "Describe" ' 'mnuStructuredTimeSeriesDescribeOneVariable ' Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" - Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesDescribeOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesDescribeGeneral ' Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" - Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesDescribeGeneral.Text = "General..." ' 'ToolStripSeparator61 ' Me.ToolStripSeparator61.Name = "ToolStripSeparator61" - Me.ToolStripSeparator61.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator61.Size = New System.Drawing.Size(116, 6) ' 'mnuStructuredTimeSeriesModel ' Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" - Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesModel.Text = "Model" ' 'mnuStructuredTimeSeriesModelOneVariable ' Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesModelOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesModelGeneral ' Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesModelGeneral.Text = "General..." ' 'ToolStripSeparator62 ' Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - Me.ToolStripSeparator62.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6) ' 'ToolStripSeparator63 ' Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - Me.ToolStripSeparator63.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6) ' 'mnuStructuredClimatic ' Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - Me.mnuStructuredClimatic.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredClimatic.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredClimatic.Text = "Climatic..." Me.mnuStructuredClimatic.Visible = False ' 'mnuStructuredProcurement ' Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - Me.mnuStructuredProcurement.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredProcurement.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredProcurement.Text = "Procurement..." Me.mnuStructuredProcurement.Visible = False ' 'mnuStructuredOptionByContext ' Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredOptionByContext.Text = "Options by Context..." Me.mnuStructuredOptionByContext.Visible = False ' 'mnuStructuredSurvey ' Me.mnuStructuredSurvey.Name = "mnuStructuredSurvey" - Me.mnuStructuredSurvey.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredSurvey.Text = "Survey" Me.mnuStructuredSurvey.Visible = False ' @@ -4424,424 +4424,424 @@ Partial Class frmMain ' Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI}) Me.mnuProcurement.Name = "mnuProcurement" - Me.mnuProcurement.Size = New System.Drawing.Size(129, 29) + Me.mnuProcurement.Size = New System.Drawing.Size(88, 22) Me.mnuProcurement.Text = "Procurement" ' 'mnuProcurementOpenFromLibrary ' Me.mnuProcurementOpenFromLibrary.Name = "mnuProcurementOpenFromLibrary" - Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementOpenFromLibrary.Text = "Open From Library..." ' 'mnuProcurementDefineData ' Me.mnuProcurementDefineData.Name = "mnuProcurementDefineData" - Me.mnuProcurementDefineData.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDefineData.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDefineData.Text = "Define Procurement Data..." ' 'mnuProcurementPrepare ' Me.mnuProcurementPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementPrepareFilterByCountry, Me.ToolStripSeparator42, Me.mnuProcurementPrepareDefineContractValueCategories, Me.mnuProcurementPrepareRecodeNumericIntoQuantiles, Me.mnuProcurementPrepareSetFactorReferenceLevel, Me.mnuProcurementPrepareUseAwardDate, Me.ToolStripSeparator43, Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther, Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther, Me.mnuProcurementPrepareMergeAdditionalData}) Me.mnuProcurementPrepare.Name = "mnuProcurementPrepare" - Me.mnuProcurementPrepare.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementPrepare.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementPrepare.Text = "Prepare" ' 'mnuProcurementPrepareFilterByCountry ' Me.mnuProcurementPrepareFilterByCountry.Name = "mnuProcurementPrepareFilterByCountry" - Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareFilterByCountry.Text = "Filter by Country (or other)..." ' 'ToolStripSeparator42 ' Me.ToolStripSeparator42.Name = "ToolStripSeparator42" - Me.ToolStripSeparator42.Size = New System.Drawing.Size(536, 6) + Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareDefineContractValueCategories ' Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories" - Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareDefineContractValueCategories.Text = "Define Contract Value Categories..." ' 'mnuProcurementPrepareRecodeNumericIntoQuantiles ' Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Name = "mnuProcurementPrepareRecodeNumericIntoQuantiles" - Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Text = "Recode Numeric into Quantiles..." ' 'mnuProcurementPrepareSetFactorReferenceLevel ' Me.mnuProcurementPrepareSetFactorReferenceLevel.Name = "mnuProcurementPrepareSetFactorReferenceLevel" - Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSetFactorReferenceLevel.Text = "Set Factor Reference Level..." ' 'mnuProcurementPrepareUseAwardDate ' Me.mnuProcurementPrepareUseAwardDate.Name = "mnuProcurementPrepareUseAwardDate" - Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareUseAwardDate.Text = "Use Award Date (or other)..." ' 'ToolStripSeparator43 ' Me.ToolStripSeparator43.Name = "ToolStripSeparator43" - Me.ToolStripSeparator43.Size = New System.Drawing.Size(536, 6) + Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareSummariseRedFlagsByCountryorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Text = "Summarise Red Flags by Country (or other)..." ' 'mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Text = "Summarise Red Flags by Country and Year (or other)..." ' 'mnuProcurementPrepareMergeAdditionalData ' Me.mnuProcurementPrepareMergeAdditionalData.Name = "mnuProcurementPrepareMergeAdditionalData" - Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuProcurementDescribe ' Me.mnuProcurementDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeOneVariableSummarise, Me.mnuProcurementDescribeOneVariableGraph, Me.ToolStripSeparator44, Me.mnuProcurementDescribeCategorical, Me.mnuProcurementDescribeNumeric}) Me.mnuProcurementDescribe.Name = "mnuProcurementDescribe" - Me.mnuProcurementDescribe.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDescribe.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDescribe.Text = "Describe" ' 'mnuProcurementDescribeOneVariableSummarise ' Me.mnuProcurementDescribeOneVariableSummarise.Name = "mnuProcurementDescribeOneVariableSummarise" - Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuProcurementDescribeOneVariableGraph ' Me.mnuProcurementDescribeOneVariableGraph.Name = "mnuProcurementDescribeOneVariableGraph" - Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeOneVariableGraph.Text = "One Variable Graph..." ' 'ToolStripSeparator44 ' Me.ToolStripSeparator44.Name = "ToolStripSeparator44" - Me.ToolStripSeparator44.Size = New System.Drawing.Size(316, 6) + Me.ToolStripSeparator44.Size = New System.Drawing.Size(208, 6) ' 'mnuProcurementDescribeCategorical ' Me.mnuProcurementDescribeCategorical.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeCategoricalOneVarFreq, Me.mnuProcurementDescribeCategoricalTwoVarFreq, Me.ToolStripSeparator52, Me.mnuProcurementDescribeCategoricalBarCharts, Me.mnuProcurementDescribeCategoricalMosaic, Me.mnuProcurementDescribeCategoricalTreemap, Me.DisplayTopNToolStripMenuItem}) Me.mnuProcurementDescribeCategorical.Name = "mnuProcurementDescribeCategorical" - Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeCategorical.Text = "Categorical" ' 'mnuProcurementDescribeCategoricalOneVarFreq ' Me.mnuProcurementDescribeCategoricalOneVarFreq.Name = "mnuProcurementDescribeCategoricalOneVarFreq" - Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalOneVarFreq.Text = "One Variable Frequencies..." ' 'mnuProcurementDescribeCategoricalTwoVarFreq ' Me.mnuProcurementDescribeCategoricalTwoVarFreq.Name = "mnuProcurementDescribeCategoricalTwoVarFreq" - Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalTwoVarFreq.Text = "Two Variable Frequencies by Sector (or other)..." ' 'ToolStripSeparator52 ' Me.ToolStripSeparator52.Name = "ToolStripSeparator52" - Me.ToolStripSeparator52.Size = New System.Drawing.Size(479, 6) + Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6) ' 'mnuProcurementDescribeCategoricalBarCharts ' Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts" - Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalBarCharts.Text = "Bar Chart..." ' 'mnuProcurementDescribeCategoricalMosaic ' Me.mnuProcurementDescribeCategoricalMosaic.Name = "mnuProcurementDescribeCategoricalMosaic" - Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalMosaic.Text = "Mosaic Plot..." ' 'mnuProcurementDescribeCategoricalTreemap ' Me.mnuProcurementDescribeCategoricalTreemap.Name = "mnuProcurementDescribeCategoricalTreemap" - Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalTreemap.Text = "Treemap..." ' 'DisplayTopNToolStripMenuItem ' Me.DisplayTopNToolStripMenuItem.Name = "DisplayTopNToolStripMenuItem" - Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(482, 34) + Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(319, 22) Me.DisplayTopNToolStripMenuItem.Text = "Display Top N..." ' 'mnuProcurementDescribeNumeric ' Me.mnuProcurementDescribeNumeric.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeNumericBoxplot, Me.HistogramToolStripMenuItem, Me.ToolStripSeparator53, Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers}) Me.mnuProcurementDescribeNumeric.Name = "mnuProcurementDescribeNumeric" - Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeNumeric.Text = "Numeric" ' 'mnuProcurementDescribeNumericBoxplot ' Me.mnuProcurementDescribeNumericBoxplot.Name = "mnuProcurementDescribeNumericBoxplot" - Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(389, 34) + Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(258, 22) Me.mnuProcurementDescribeNumericBoxplot.Text = "Boxplot..." ' 'HistogramToolStripMenuItem ' Me.HistogramToolStripMenuItem.Name = "HistogramToolStripMenuItem" - Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(389, 34) + Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(258, 22) Me.HistogramToolStripMenuItem.Text = "Histogram..." ' 'ToolStripSeparator53 ' Me.ToolStripSeparator53.Name = "ToolStripSeparator53" - Me.ToolStripSeparator53.Size = New System.Drawing.Size(386, 6) + Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6) ' 'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers ' Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers" - Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(389, 34) + Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(258, 22) Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Text = "Correlations (Red Flags or others)..." ' 'mnuProcurementMapping ' Me.mnuProcurementMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementMappingMapCountryValues}) Me.mnuProcurementMapping.Name = "mnuProcurementMapping" - Me.mnuProcurementMapping.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementMapping.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementMapping.Text = "Mapping" ' 'mnuProcurementMappingMapCountryValues ' Me.mnuProcurementMappingMapCountryValues.Name = "mnuProcurementMappingMapCountryValues" - Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(285, 34) + Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(189, 22) Me.mnuProcurementMappingMapCountryValues.Text = "Map Country Values..." ' 'mnuProcurementModel ' Me.mnuProcurementModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementModelDefineCorruption, Me.mnuProcurementModelFitModelToolStripMenuItem}) Me.mnuProcurementModel.Name = "mnuProcurementModel" - Me.mnuProcurementModel.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementModel.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementModel.Text = "Model" ' 'mnuProcurementModelDefineCorruption ' Me.mnuProcurementModelDefineCorruption.Name = "mnuProcurementModelDefineCorruption" - Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(351, 34) + Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(233, 22) Me.mnuProcurementModelDefineCorruption.Text = "Define Corruption Indicators..." ' 'mnuProcurementModelFitModelToolStripMenuItem ' Me.mnuProcurementModelFitModelToolStripMenuItem.Name = "mnuProcurementModelFitModelToolStripMenuItem" - Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(351, 34) + Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(233, 22) Me.mnuProcurementModelFitModelToolStripMenuItem.Text = "Fit Model..." ' 'ToolStripSeparator45 ' Me.ToolStripSeparator45.Name = "ToolStripSeparator45" - Me.ToolStripSeparator45.Size = New System.Drawing.Size(324, 6) + Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6) ' 'mnuProcurementDefineRedFlags ' Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags" - Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDefineRedFlags.Text = "Define Red Flag Variables..." ' 'mnuProcurementUseCRI ' Me.mnuProcurementUseCRI.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementCTFVCalculateCRI, Me.mnuProcurementUseCRISummariseCRIbyCountry}) Me.mnuProcurementUseCRI.Name = "mnuProcurementUseCRI" - Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementUseCRI.Text = "Corruption Risk Index (CRI)" ' 'mnuProcurementCTFVCalculateCRI ' Me.mnuProcurementCTFVCalculateCRI.Name = "mnuProcurementCTFVCalculateCRI" - Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(418, 34) + Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(278, 22) Me.mnuProcurementCTFVCalculateCRI.Text = "Define Corruption Risk Index (CRI)..." ' 'mnuProcurementUseCRISummariseCRIbyCountry ' Me.mnuProcurementUseCRISummariseCRIbyCountry.Name = "mnuProcurementUseCRISummariseCRIbyCountry" - Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(418, 34) + Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(278, 22) Me.mnuProcurementUseCRISummariseCRIbyCountry.Text = "Summarise CRI by Country (or other)..." ' 'mnuOptionsByContext ' Me.mnuOptionsByContext.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckData, Me.mnuOptionsByContextDefine, Me.mnuOptionsByContextPrepare, Me.mnuOptionsByContextDescribe, Me.mnuOptionsByContextModel, Me.mnuOptionsByContextCropModel}) Me.mnuOptionsByContext.Name = "mnuOptionsByContext" - Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 29) + Me.mnuOptionsByContext.Size = New System.Drawing.Size(84, 22) Me.mnuOptionsByContext.Text = "Experiments" ' 'mnuOptionsByContextCheckData ' Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" - Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows ' Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" - Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' Me.mnuOptionsByContextCheckDataCompareColumns.Name = "mnuOptionsByContextCheckDataCompareColumns" - Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataCompareColumns.Text = "Compare Columns..." ' 'ToolStripSeparator47 ' Me.ToolStripSeparator47.Name = "ToolStripSeparator47" - Me.ToolStripSeparator47.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6) ' 'mnuOptionsByContextCheckDataOneVariableSummarise ' Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise" - Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuOptionsByContextCheckDataOneVariableGraph ' Me.mnuOptionsByContextCheckDataOneVariableGraph.Name = "mnuOptionsByContextCheckDataOneVariableGraph" - Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuOptionsByContextCheckDataOneVariableFrequencies ' Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Name = "mnuOptionsByContextCheckDataOneVariableFrequencies" - Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'mnuOptionsByContextDefine ' Me.mnuOptionsByContextDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDefineOnStation, Me.mnuOptionsByContextDefineOnFarm}) Me.mnuOptionsByContextDefine.Name = "mnuOptionsByContextDefine" - Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation ' Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" - Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(222, 34) + Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(147, 22) Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..." ' 'mnuOptionsByContextDefineOnFarm ' Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm" - Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(222, 34) + Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(147, 22) Me.mnuOptionsByContextDefineOnFarm.Text = "On - Farm..." ' 'mnuOptionsByContextPrepare ' Me.mnuOptionsByContextPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions, Me.ToolStripSeparator48, Me.mnuOptionsByContextMergeAdditionalData, Me.mnuOptionsByContextPrepareStack, Me.mnuOptionsByContextPrepareUnstack}) Me.mnuOptionsByContextPrepare.Name = "mnuOptionsByContextPrepare" - Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions ' Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Name = "mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions" - Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Text = "Calculate Difference Between Options..." ' 'ToolStripSeparator48 ' Me.ToolStripSeparator48.Name = "ToolStripSeparator48" - Me.ToolStripSeparator48.Size = New System.Drawing.Size(418, 6) + Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6) ' 'mnuOptionsByContextMergeAdditionalData ' Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData" - Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuOptionsByContextPrepareStack ' Me.mnuOptionsByContextPrepareStack.Name = "mnuOptionsByContextPrepareStack" - Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareStack.Text = "Stack (Pivot Longer)..." ' 'mnuOptionsByContextPrepareUnstack ' Me.mnuOptionsByContextPrepareUnstack.Name = "mnuOptionsByContextPrepareUnstack" - Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuOptionsByContextDescribe ' Me.mnuOptionsByContextDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDescribeCompareTwoTreatments, Me.mnuOptionsByContextDescribeCompareMultipleTreatments, Me.mnuOptionsByContextDescribeBoxplot}) Me.mnuOptionsByContextDescribe.Name = "mnuOptionsByContextDescribe" - Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments ' Me.mnuOptionsByContextDescribeCompareTwoTreatments.Name = "mnuOptionsByContextDescribeCompareTwoTreatments" - Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeCompareTwoTreatments.Text = "Compare Two Options..." ' 'mnuOptionsByContextDescribeCompareMultipleTreatments ' Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Enabled = False Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Name = "mnuOptionsByContextDescribeCompareMultipleTreatments" - Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Text = "Compare Multiple Options..." ' 'mnuOptionsByContextDescribeBoxplot ' Me.mnuOptionsByContextDescribeBoxplot.Name = "mnuOptionsByContextDescribeBoxplot" - Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeBoxplot.Text = "Boxplot..." ' 'mnuOptionsByContextModel ' Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel}) Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel" - Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel ' Me.mnuOptionsByContextModelFitModel.Name = "mnuOptionsByContextModelFitModel" - Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(265, 34) + Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextModelFitModel.Text = "Fit Model..." ' 'mnuOptionsByContextGeneralFitModel ' Me.mnuOptionsByContextGeneralFitModel.Name = "mnuOptionsByContextGeneralFitModel" - Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(265, 34) + Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextGeneralFitModel.Text = "General Fit Model..." ' 'mnuOptionsByContextCropModel ' Me.mnuOptionsByContextCropModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCropModelApsimxExamples}) Me.mnuOptionsByContextCropModel.Name = "mnuOptionsByContextCropModel" - Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextCropModel.Text = "Crop Model" ' 'mnuOptionsByContextCropModelApsimxExamples ' Me.mnuOptionsByContextCropModelApsimxExamples.Name = "mnuOptionsByContextCropModelApsimxExamples" - Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(264, 34) + Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextCropModelApsimxExamples.Text = "Apsimx Examples..." ' 'mnuTools ' Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsLoadOptions, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" - Me.mnuTools.Size = New System.Drawing.Size(69, 29) + Me.mnuTools.Size = New System.Drawing.Size(46, 22) Me.mnuTools.Text = "Tools" ' 'mnuToolsRunRCode ' Me.mnuToolsRunRCode.Enabled = False Me.mnuToolsRunRCode.Name = "mnuToolsRunRCode" - Me.mnuToolsRunRCode.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRunRCode.Tag = "Run_R_Code..." Me.mnuToolsRunRCode.Text = "Run R Code..." ' @@ -4849,34 +4849,34 @@ Partial Class frmMain ' Me.mnuToolsRestartR.Enabled = False Me.mnuToolsRestartR.Name = "mnuToolsRestartR" - Me.mnuToolsRestartR.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRestartR.Tag = "Restart_R" Me.mnuToolsRestartR.Text = "Restart R" ' 'mnuToolsCheckForUpdates ' Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates" - Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(198, 22) Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates..." Me.mnuToolsCheckForUpdates.Text = "Check for Updates..." ' 'mnuToolsClearOutputWindow ' Me.mnuToolsClearOutputWindow.Name = "mnuToolsClearOutputWindow" - Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(198, 22) Me.mnuToolsClearOutputWindow.Tag = "Clear_Output_Window..." Me.mnuToolsClearOutputWindow.Text = "Clear Output Window..." ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(295, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(195, 6) ' 'mnuToolsSaveCurrentOptions ' Me.mnuToolsSaveCurrentOptions.Enabled = False Me.mnuToolsSaveCurrentOptions.Name = "mnuToolsSaveCurrentOptions" - Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' @@ -4884,20 +4884,20 @@ Partial Class frmMain ' Me.mnuToolsLoadOptions.Enabled = False Me.mnuToolsLoadOptions.Name = "mnuToolsLoadOptions" - Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsLoadOptions.Tag = "Load_Options..." Me.mnuToolsLoadOptions.Text = "Load Options..." ' 'mnuToolsInstallRPackage ' Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage" - Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(198, 22) Me.mnuToolsInstallRPackage.Text = "Install R Package..." ' 'mnuToolsOptions ' Me.mnuToolsOptions.Name = "mnuToolsOptions" - Me.mnuToolsOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' @@ -4911,8 +4911,7 @@ Partial Class frmMain ' Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill - Me.splOverall.Location = New System.Drawing.Point(0, 72) - Me.splOverall.Margin = New System.Windows.Forms.Padding(4) + Me.splOverall.Location = New System.Drawing.Point(0, 61) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -4925,9 +4924,9 @@ Partial Class frmMain ' Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) - Me.splOverall.Size = New System.Drawing.Size(1251, 619) - Me.splOverall.SplitterDistance = 255 - Me.splOverall.SplitterWidth = 8 + Me.splOverall.Size = New System.Drawing.Size(834, 399) + Me.splOverall.SplitterDistance = 164 + Me.splOverall.SplitterWidth = 5 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -4935,7 +4934,6 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) - Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -4947,9 +4945,9 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - Me.splExtraWindows.Size = New System.Drawing.Size(1251, 255) - Me.splExtraWindows.SplitterDistance = 381 - Me.splExtraWindows.SplitterWidth = 8 + Me.splExtraWindows.Size = New System.Drawing.Size(834, 164) + Me.splExtraWindows.SplitterDistance = 254 + Me.splExtraWindows.SplitterWidth = 5 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -4957,7 +4955,6 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) - Me.splMetadata.Margin = New System.Windows.Forms.Padding(4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -4968,9 +4965,9 @@ Partial Class frmMain ' Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) - Me.splMetadata.Size = New System.Drawing.Size(381, 255) - Me.splMetadata.SplitterDistance = 105 - Me.splMetadata.SplitterWidth = 8 + Me.splMetadata.Size = New System.Drawing.Size(254, 164) + Me.splMetadata.SplitterDistance = 70 + Me.splMetadata.SplitterWidth = 5 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -4980,9 +4977,9 @@ Partial Class frmMain Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrColumnMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(105, 255) + Me.ucrColumnMeta.Size = New System.Drawing.Size(70, 164) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -4991,9 +4988,9 @@ Partial Class frmMain Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataFrameMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(268, 255) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 164) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5002,9 +4999,9 @@ Partial Class frmMain Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrScriptWindow.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) - Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(862, 255) + Me.ucrScriptWindow.Size = New System.Drawing.Size(575, 164) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5014,7 +5011,6 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) - Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5026,9 +5022,9 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - Me.splDataOutput.Size = New System.Drawing.Size(1251, 356) - Me.splDataOutput.SplitterDistance = 576 - Me.splDataOutput.SplitterWidth = 8 + Me.splDataOutput.Size = New System.Drawing.Size(834, 230) + Me.splDataOutput.SplitterDistance = 384 + Me.splDataOutput.SplitterWidth = 5 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5038,9 +5034,9 @@ Partial Class frmMain Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) - Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(576, 356) + Me.ucrDataViewer.Size = New System.Drawing.Size(384, 230) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5050,9 +5046,9 @@ Partial Class frmMain Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrOutput.Location = New System.Drawing.Point(0, 0) - Me.ucrOutput.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(667, 356) + Me.ucrOutput.Size = New System.Drawing.Size(445, 230) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5092,9 +5088,9 @@ Partial Class frmMain ' 'frmMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(1251, 723) + Me.ClientSize = New System.Drawing.Size(834, 482) Me.Controls.Add(Me.splOverall) Me.Controls.Add(Me.stsStrip) Me.Controls.Add(Me.Tool_strip) @@ -5102,11 +5098,8 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar - Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "frmMain" - Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + - My.Application.Info.Version.Minor.ToString + "." + - My.Application.Info.Version.Build.ToString + Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() @@ -5656,7 +5649,6 @@ Partial Class frmMain Friend WithEvents mnuClimaticCheckDataFillMissingValues As ToolStripMenuItem Friend WithEvents ToolStripSeparator65 As ToolStripSeparator Friend WithEvents mnuPrepareCheckDataVisualiseData As ToolStripMenuItem - Friend WithEvents mnuClimaticTidyandExamineVisualiseData As ToolStripMenuItem Friend WithEvents mnuClimaticCompare As ToolStripMenuItem Friend WithEvents mnuClimaticCompareCalculation As ToolStripMenuItem Friend WithEvents mnuClimaticCompareSummary As ToolStripMenuItem @@ -5754,7 +5746,6 @@ Partial Class frmMain Friend WithEvents mnuExamineEditDataOneVariableFrequencies As ToolStripMenuItem Friend WithEvents ToolStripSeparator78 As ToolStripSeparator Friend WithEvents mnuExamineEditDataPivotTable As ToolStripMenuItem - Friend WithEvents ToolStripSeparator79 As ToolStripSeparator Friend WithEvents mnuExamineEditDataSetupForDataEditing As ToolStripMenuItem Friend WithEvents mnuExamineEditDataDailyDataEditing As ToolStripMenuItem Friend WithEvents mnuExamineEditDataCompareColumns As ToolStripMenuItem @@ -5787,4 +5778,6 @@ Partial Class frmMain Friend WithEvents mnuClimaticDescribeTrendGraph As ToolStripMenuItem Friend WithEvents mnuClimaticDescribeSeasonalGraph As ToolStripMenuItem Friend WithEvents mnuViewSwapDataAndScript As ToolStripMenuItem + Friend WithEvents mnuClimaticExamineEditDataVisualiseData As ToolStripMenuItem + Friend WithEvents ToolStripSeparator27 As ToolStripSeparator End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index e679779467e..c73bcdce42b 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S @@ -162,7 +162,7 @@ iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 UExQ92oSqkVXopsuEsymXbRYCkVtgkJtVfpY+Eh1YaWWdiOJWdgWbWmlG000kTxujMnp+cY5ZnLyu7nn NXPPuZkPPpLce+b7nd/3hXtn5p6ZW8VyBIs8vICRhxcw8vACRh5ewMjDCxh5eAEjDy9gGIU3OjrKmpub WXV1NauqqsppSPgHH+GnCbTDe/bsGauvrycnk9OM8PPp06exw+rQCm9kZITV1dWRE8hpR/g6PDwcO60G diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 5a12b4981de..4b8d4749022 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2280,10 +2280,6 @@ Public Class frmMain dlgInfillMissingValues.ShowDialog() End Sub - Private Sub mnuClimaticTidyandExamineVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineVisualiseData.Click - dlgVisualizeData.ShowDialog() - End Sub - Private Sub mnuPrepareCheckDataVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataVisualiseData.Click dlgVisualizeData.ShowDialog() End Sub @@ -2671,4 +2667,7 @@ Public Class frmMain dlgIDFCurves.ShowDialog() End Sub + Private Sub mnuClimaticExamineEditDataVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuClimaticExamineEditDataVisualiseData.Click + dlgVisualizeData.ShowDialog() + End Sub End Class From 038d9c3942b19dc98147700cc242e1fffe34fa82 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 18 Jan 2024 08:41:57 +0100 Subject: [PATCH 47/48] Fixed bug producing by Plot Options --- instat/sdgPlots.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 646a6dbef8e..de83d3ad2c9 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -2204,7 +2204,7 @@ Public Class sdgPlots If clsFacetFunction.ContainsParameter("facets") Then clsTempParam = clsFacetFunction.GetParameter("facets") - If clsTempParam.bIsOperator AndAlso clsTempParam.clsArgumentCodeStructure IsNot Nothing Then + If clsTempParam.bIsOperator AndAlso clsTempParam.clsArgumentCodeStructure IsNot Nothing AndAlso clsNewFacetVariablesOperator IsNot Nothing Then clsFacetVariablesOperator = clsNewFacetVariablesOperator Else clsFacetVariablesOperator = New ROperator("~") From c648e5728998e0e60c25de01435a31ac7213be78 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 18 Jan 2024 09:55:54 +0100 Subject: [PATCH 48/48] Minor code change --- instat/frmMain.Designer.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 2fed866f349..a9172782aa6 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -5099,7 +5099,9 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat .." + Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + + My.Application.Info.Version.Minor.ToString + "." + + My.Application.Info.Version.Build.ToString() Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout()