diff --git a/instat/dlgEvapotranspiration.Designer.vb b/instat/dlgEvapotranspiration.Designer.vb index 7d12c228773..144623d8381 100644 --- a/instat/dlgEvapotranspiration.Designer.vb +++ b/instat/dlgEvapotranspiration.Designer.vb @@ -29,24 +29,13 @@ Partial Class dlgEvapotranspiration Me.lblTimeStep = New System.Windows.Forms.Label() Me.lblCrop = New System.Windows.Forms.Label() Me.lblDate = New System.Windows.Forms.Label() - Me.grpMissingDataOpts = New System.Windows.Forms.GroupBox() - Me.ucrChkInterpMissingEntries = New instat.ucrCheck() - Me.ucrChkInterpMissingDays = New instat.ucrCheck() Me.lblMissingMethod = New System.Windows.Forms.Label() - Me.lblMaxMissingDays = New System.Windows.Forms.Label() - Me.lblMaxDurationMissingData = New System.Windows.Forms.Label() - Me.lblMaxPerctMissindData = New System.Windows.Forms.Label() Me.lblSolar = New System.Windows.Forms.Label() Me.lblRadiation = New System.Windows.Forms.Label() - Me.grpWindSpeed = New System.Windows.Forms.GroupBox() - Me.ucrChkWind = New instat.ucrCheck() - Me.ucrReceiverWindSpeed = New instat.ucrReceiverSingle() Me.rdoHargreavesSamani = New System.Windows.Forms.RadioButton() Me.rdoPenmanMonteith = New System.Windows.Forms.RadioButton() - Me.ucrNudMaxDurationMissingData = New instat.ucrNud() - Me.ucrNudMaxMissingDays = New instat.ucrNud() + Me.cmdEvapOptions = New System.Windows.Forms.Button() Me.ucrInputMissingMethod = New instat.ucrInputComboBox() - Me.ucrNudMaxMissingData = New instat.ucrNud() Me.ucrInputSolar = New instat.ucrInputComboBox() Me.ucrReceiverRadiation = New instat.ucrReceiverSingle() Me.ucrInputCrop = New instat.ucrInputComboBox() @@ -60,59 +49,59 @@ Partial Class dlgEvapotranspiration Me.ucrReceiverTmax = New instat.ucrReceiverSingle() Me.ucrSelectorEvapotranspiration = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() - Me.grpMissingDataOpts.SuspendLayout() - Me.grpWindSpeed.SuspendLayout() + 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(321, 154) + Me.lblTmax.Location = New System.Drawing.Point(311, 120) Me.lblTmax.Name = "lblTmax" - Me.lblTmax.Size = New System.Drawing.Size(44, 13) + 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(321, 107) + Me.lblTmin.Location = New System.Drawing.Point(311, 85) Me.lblTmin.Name = "lblTmin" - Me.lblTmin.Size = New System.Drawing.Size(39, 14) + 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(323, 195) + Me.lblHumidityMax.Location = New System.Drawing.Point(311, 156) Me.lblHumidityMax.Name = "lblHumidityMax" - Me.lblHumidityMax.Size = New System.Drawing.Size(121, 19) + 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(324, 240) + Me.lblHumidityMin.Location = New System.Drawing.Point(311, 197) Me.lblHumidityMin.Name = "lblHumidityMin" - Me.lblHumidityMin.Size = New System.Drawing.Size(120, 19) + 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(5, 336) + Me.lblTimeStep.Location = New System.Drawing.Point(2, 242) Me.lblTimeStep.Name = "lblTimeStep" - Me.lblTimeStep.Size = New System.Drawing.Size(134, 20) + 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(5, 523) + 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 @@ -121,81 +110,25 @@ Partial Class dlgEvapotranspiration 'lblDate ' Me.lblDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDate.Location = New System.Drawing.Point(323, 64) + Me.lblDate.Location = New System.Drawing.Point(311, 48) Me.lblDate.Name = "lblDate" - Me.lblDate.Size = New System.Drawing.Size(40, 14) + Me.lblDate.Size = New System.Drawing.Size(43, 14) Me.lblDate.TabIndex = 4 Me.lblDate.Text = "Date:" ' - 'grpMissingDataOpts - ' - Me.grpMissingDataOpts.Controls.Add(Me.ucrChkInterpMissingEntries) - Me.grpMissingDataOpts.Controls.Add(Me.ucrChkInterpMissingDays) - Me.grpMissingDataOpts.Location = New System.Drawing.Point(5, 362) - Me.grpMissingDataOpts.Name = "grpMissingDataOpts" - Me.grpMissingDataOpts.Size = New System.Drawing.Size(198, 98) - Me.grpMissingDataOpts.TabIndex = 24 - Me.grpMissingDataOpts.TabStop = False - Me.grpMissingDataOpts.Text = "Missing Data Options" - ' - 'ucrChkInterpMissingEntries - ' - Me.ucrChkInterpMissingEntries.AutoSize = True - Me.ucrChkInterpMissingEntries.Checked = False - Me.ucrChkInterpMissingEntries.Location = New System.Drawing.Point(6, 56) - Me.ucrChkInterpMissingEntries.Name = "ucrChkInterpMissingEntries" - Me.ucrChkInterpMissingEntries.Size = New System.Drawing.Size(188, 23) - Me.ucrChkInterpMissingEntries.TabIndex = 5 - ' - 'ucrChkInterpMissingDays - ' - Me.ucrChkInterpMissingDays.AutoSize = True - Me.ucrChkInterpMissingDays.Checked = False - Me.ucrChkInterpMissingDays.Location = New System.Drawing.Point(6, 31) - Me.ucrChkInterpMissingDays.Name = "ucrChkInterpMissingDays" - Me.ucrChkInterpMissingDays.Size = New System.Drawing.Size(168, 23) - Me.ucrChkInterpMissingDays.TabIndex = 6 - ' 'lblMissingMethod ' Me.lblMissingMethod.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMissingMethod.Location = New System.Drawing.Point(5, 496) + 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" ' - 'lblMaxMissingDays - ' - Me.lblMaxMissingDays.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxMissingDays.Location = New System.Drawing.Point(5, 262) - Me.lblMaxMissingDays.Name = "lblMaxMissingDays" - Me.lblMaxMissingDays.Size = New System.Drawing.Size(169, 20) - Me.lblMaxMissingDays.TabIndex = 16 - Me.lblMaxMissingDays.Text = "Max Missing Days" - ' - 'lblMaxDurationMissingData - ' - Me.lblMaxDurationMissingData.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxDurationMissingData.Location = New System.Drawing.Point(5, 285) - Me.lblMaxDurationMissingData.Name = "lblMaxDurationMissingData" - Me.lblMaxDurationMissingData.Size = New System.Drawing.Size(160, 20) - Me.lblMaxDurationMissingData.TabIndex = 18 - Me.lblMaxDurationMissingData.Text = "Max Duration Missing Data" - ' - 'lblMaxPerctMissindData - ' - Me.lblMaxPerctMissindData.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxPerctMissindData.Location = New System.Drawing.Point(5, 309) - Me.lblMaxPerctMissindData.Name = "lblMaxPerctMissindData" - Me.lblMaxPerctMissindData.Size = New System.Drawing.Size(169, 19) - Me.lblMaxPerctMissindData.TabIndex = 20 - Me.lblMaxPerctMissindData.Text = "Max Missing Data" - ' 'lblSolar ' Me.lblSolar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSolar.Location = New System.Drawing.Point(5, 469) + 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 @@ -204,44 +137,11 @@ Partial Class dlgEvapotranspiration 'lblRadiation ' Me.lblRadiation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRadiation.Location = New System.Drawing.Point(323, 285) + Me.lblRadiation.Location = New System.Drawing.Point(311, 237) Me.lblRadiation.Name = "lblRadiation" - Me.lblRadiation.Size = New System.Drawing.Size(117, 17) + Me.lblRadiation.Size = New System.Drawing.Size(120, 17) Me.lblRadiation.TabIndex = 14 - Me.lblRadiation.Text = "Radiation:" - ' - 'grpWindSpeed - ' - Me.grpWindSpeed.Controls.Add(Me.ucrChkWind) - Me.grpWindSpeed.Controls.Add(Me.ucrReceiverWindSpeed) - Me.grpWindSpeed.Location = New System.Drawing.Point(210, 363) - Me.grpWindSpeed.Name = "grpWindSpeed" - Me.grpWindSpeed.Size = New System.Drawing.Size(235, 97) - Me.grpWindSpeed.TabIndex = 25 - Me.grpWindSpeed.TabStop = False - Me.grpWindSpeed.Text = "Wind Speed" - ' - 'ucrChkWind - ' - Me.ucrChkWind.AutoSize = True - Me.ucrChkWind.Checked = False - Me.ucrChkWind.Location = New System.Drawing.Point(5, 31) - Me.ucrChkWind.Name = "ucrChkWind" - Me.ucrChkWind.Size = New System.Drawing.Size(103, 23) - Me.ucrChkWind.TabIndex = 0 - ' - 'ucrReceiverWindSpeed - ' - Me.ucrReceiverWindSpeed.AutoSize = True - Me.ucrReceiverWindSpeed.frmParent = Me - Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(109, 30) - 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.strNcFilePath = "" - Me.ucrReceiverWindSpeed.TabIndex = 2 - Me.ucrReceiverWindSpeed.ucrSelector = Nothing + Me.lblRadiation.Text = "Solar:" ' 'rdoHargreavesSamani ' @@ -277,31 +177,15 @@ Partial Class dlgEvapotranspiration Me.rdoPenmanMonteith.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoPenmanMonteith.UseVisualStyleBackColor = True ' - '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(180, 309) - 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 = 21 - Me.ucrNudMaxDurationMissingData.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - '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(180, 262) - 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 = 17 - Me.ucrNudMaxMissingDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) + '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 ' @@ -309,31 +193,18 @@ Partial Class dlgEvapotranspiration Me.ucrInputMissingMethod.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputMissingMethod.GetSetSelectedIndex = -1 Me.ucrInputMissingMethod.IsReadOnly = False - Me.ucrInputMissingMethod.Location = New System.Drawing.Point(139, 493) + 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 ' - '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(180, 285) - 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 = 19 - Me.ucrNudMaxMissingData.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'ucrInputSolar ' Me.ucrInputSolar.AddQuotesIfUnrecognised = True Me.ucrInputSolar.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputSolar.GetSetSelectedIndex = -1 Me.ucrInputSolar.IsReadOnly = False - Me.ucrInputSolar.Location = New System.Drawing.Point(139, 466) + Me.ucrInputSolar.Location = New System.Drawing.Point(109, 275) Me.ucrInputSolar.Name = "ucrInputSolar" Me.ucrInputSolar.Size = New System.Drawing.Size(137, 21) Me.ucrInputSolar.TabIndex = 27 @@ -342,11 +213,11 @@ Partial Class dlgEvapotranspiration ' Me.ucrReceiverRadiation.AutoSize = True Me.ucrReceiverRadiation.frmParent = Me - Me.ucrReceiverRadiation.Location = New System.Drawing.Point(324, 304) + Me.ucrReceiverRadiation.Location = New System.Drawing.Point(314, 254) 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(123, 20) Me.ucrReceiverRadiation.strNcFilePath = "" Me.ucrReceiverRadiation.TabIndex = 15 Me.ucrReceiverRadiation.ucrSelector = Nothing @@ -357,7 +228,7 @@ 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(139, 520) + Me.ucrInputCrop.Location = New System.Drawing.Point(109, 343) Me.ucrInputCrop.Name = "ucrInputCrop" Me.ucrInputCrop.Size = New System.Drawing.Size(137, 21) Me.ucrInputCrop.TabIndex = 31 @@ -365,7 +236,7 @@ Partial Class dlgEvapotranspiration 'ucrNewColName ' Me.ucrNewColName.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrNewColName.Location = New System.Drawing.Point(5, 555) + Me.ucrNewColName.Location = New System.Drawing.Point(5, 386) 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) @@ -375,11 +246,11 @@ Partial Class dlgEvapotranspiration ' Me.ucrReceiverDate.AutoSize = True Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(324, 79) + Me.ucrReceiverDate.Location = New System.Drawing.Point(314, 63) 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.Size = New System.Drawing.Size(123, 20) Me.ucrReceiverDate.strNcFilePath = "" Me.ucrReceiverDate.TabIndex = 5 Me.ucrReceiverDate.ucrSelector = Nothing @@ -398,20 +269,20 @@ 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(180, 335) + Me.ucrInputTimeStep.Location = New System.Drawing.Point(109, 241) Me.ucrInputTimeStep.Name = "ucrInputTimeStep" - Me.ucrInputTimeStep.Size = New System.Drawing.Size(106, 21) + Me.ucrInputTimeStep.Size = New System.Drawing.Size(113, 21) Me.ucrInputTimeStep.TabIndex = 23 ' 'ucrReceiverHumidityMin ' Me.ucrReceiverHumidityMin.AutoSize = True Me.ucrReceiverHumidityMin.frmParent = Me - Me.ucrReceiverHumidityMin.Location = New System.Drawing.Point(324, 259) + Me.ucrReceiverHumidityMin.Location = New System.Drawing.Point(314, 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(120, 20) + Me.ucrReceiverHumidityMin.Size = New System.Drawing.Size(123, 20) Me.ucrReceiverHumidityMin.strNcFilePath = "" Me.ucrReceiverHumidityMin.TabIndex = 13 Me.ucrReceiverHumidityMin.ucrSelector = Nothing @@ -420,11 +291,11 @@ Partial Class dlgEvapotranspiration ' Me.ucrReceiverHumidityMax.AutoSize = True Me.ucrReceiverHumidityMax.frmParent = Me - Me.ucrReceiverHumidityMax.Location = New System.Drawing.Point(324, 214) + Me.ucrReceiverHumidityMax.Location = New System.Drawing.Point(314, 175) Me.ucrReceiverHumidityMax.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverHumidityMax.Name = "ucrReceiverHumidityMax" Me.ucrReceiverHumidityMax.Selector = Nothing - Me.ucrReceiverHumidityMax.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverHumidityMax.Size = New System.Drawing.Size(123, 20) Me.ucrReceiverHumidityMax.strNcFilePath = "" Me.ucrReceiverHumidityMax.TabIndex = 11 Me.ucrReceiverHumidityMax.ucrSelector = Nothing @@ -433,11 +304,11 @@ Partial Class dlgEvapotranspiration ' Me.ucrReceiverTmin.AutoSize = True Me.ucrReceiverTmin.frmParent = Me - Me.ucrReceiverTmin.Location = New System.Drawing.Point(324, 124) + Me.ucrReceiverTmin.Location = New System.Drawing.Point(314, 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(120, 20) + Me.ucrReceiverTmin.Size = New System.Drawing.Size(123, 20) Me.ucrReceiverTmin.strNcFilePath = "" Me.ucrReceiverTmin.TabIndex = 7 Me.ucrReceiverTmin.ucrSelector = Nothing @@ -446,11 +317,11 @@ Partial Class dlgEvapotranspiration ' Me.ucrReceiverTmax.AutoSize = True Me.ucrReceiverTmax.frmParent = Me - Me.ucrReceiverTmax.Location = New System.Drawing.Point(324, 169) + Me.ucrReceiverTmax.Location = New System.Drawing.Point(314, 133) Me.ucrReceiverTmax.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverTmax.Name = "ucrReceiverTmax" Me.ucrReceiverTmax.Selector = Nothing - Me.ucrReceiverTmax.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverTmax.Size = New System.Drawing.Size(123, 20) Me.ucrReceiverTmax.strNcFilePath = "" Me.ucrReceiverTmax.TabIndex = 9 Me.ucrReceiverTmax.ucrSelector = Nothing @@ -461,7 +332,7 @@ Partial Class dlgEvapotranspiration Me.ucrSelectorEvapotranspiration.bDropUnusedFilterLevels = False Me.ucrSelectorEvapotranspiration.bShowHiddenColumns = False Me.ucrSelectorEvapotranspiration.bUseCurrentFilter = True - Me.ucrSelectorEvapotranspiration.Location = New System.Drawing.Point(5, 65) + Me.ucrSelectorEvapotranspiration.Location = New System.Drawing.Point(5, 50) Me.ucrSelectorEvapotranspiration.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorEvapotranspiration.Name = "ucrSelectorEvapotranspiration" Me.ucrSelectorEvapotranspiration.Size = New System.Drawing.Size(213, 183) @@ -471,35 +342,52 @@ Partial Class dlgEvapotranspiration ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(5, 583) + Me.ucrBase.Location = New System.Drawing.Point(5, 421) 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 + ' '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(452, 640) + Me.ClientSize = New System.Drawing.Size(453, 478) + 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.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.ucrInputMissingMethod) - Me.Controls.Add(Me.ucrNudMaxMissingData) Me.Controls.Add(Me.lblMissingMethod) - Me.Controls.Add(Me.grpWindSpeed) Me.Controls.Add(Me.lblSolar) Me.Controls.Add(Me.ucrInputSolar) Me.Controls.Add(Me.lblRadiation) Me.Controls.Add(Me.ucrReceiverRadiation) Me.Controls.Add(Me.ucrInputCrop) Me.Controls.Add(Me.ucrNewColName) - Me.Controls.Add(Me.grpMissingDataOpts) Me.Controls.Add(Me.lblDate) Me.Controls.Add(Me.ucrReceiverDate) Me.Controls.Add(Me.ucrPnlMethod) @@ -522,10 +410,6 @@ Partial Class dlgEvapotranspiration Me.Name = "dlgEvapotranspiration" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Evapotranspiration" - Me.grpMissingDataOpts.ResumeLayout(False) - Me.grpMissingDataOpts.PerformLayout() - Me.grpWindSpeed.ResumeLayout(False) - Me.grpWindSpeed.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -547,26 +431,17 @@ Partial Class dlgEvapotranspiration Friend WithEvents ucrPnlMethod As UcrPanel Friend WithEvents ucrReceiverDate As ucrReceiverSingle Friend WithEvents lblDate As Label - Friend WithEvents grpMissingDataOpts As GroupBox - Friend WithEvents lblMaxMissingDays As Label - Friend WithEvents lblMaxDurationMissingData As Label - Friend WithEvents lblMaxPerctMissindData As Label - Friend WithEvents ucrChkInterpMissingEntries As ucrCheck - Friend WithEvents ucrChkInterpMissingDays As ucrCheck - Friend WithEvents ucrNudMaxMissingDays As ucrNud - Friend WithEvents ucrNudMaxDurationMissingData As ucrNud - Friend WithEvents ucrNudMaxMissingData As ucrNud Friend WithEvents ucrInputMissingMethod As ucrInputComboBox Friend WithEvents lblMissingMethod As Label Friend WithEvents ucrNewColName As ucrSave Friend WithEvents ucrReceiverTmax As ucrReceiverSingle - Friend WithEvents grpWindSpeed As GroupBox - Friend WithEvents ucrChkWind As ucrCheck - Friend WithEvents ucrReceiverWindSpeed 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 End Class \ No newline at end of file diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index c764a0f401f..f6aacfe15fd 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -13,7 +13,6 @@ ' ' You should have received a copy of the GNU General Public License ' along with this program. If not, see . - Imports instat.Translations Public Class dlgEvapotranspiration @@ -23,15 +22,18 @@ Public Class dlgEvapotranspiration 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 clsDayFunc, clsMonthFunc, clsYearFunc As New RFunction Private clsBaseOperator, clsDailyOperatorHS As New ROperator + Private bRcodeSet As Boolean = True Private Sub dlgdlgEvapotranspiration_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 InitialiseDialog() bFirstload = False End If @@ -79,16 +81,18 @@ Public Class dlgEvapotranspiration ucrReceiverHumidityMax.SetParameter(New RParameter("RHmax", 4)) ucrReceiverHumidityMax.SetParameterIsRFunction() - 'ucrReceiverHumidityMax.bAutoFill = True + ucrReceiverHumidityMax.SetClimaticType("hum_max") + ucrReceiverHumidityMax.bAutoFill = True ucrReceiverHumidityMin.SetParameter(New RParameter("RHmin", 5)) ucrReceiverHumidityMin.SetParameterIsRFunction() - 'ucrReceiverHumidityMin.bAutoFill = True + ucrReceiverHumidityMin.SetClimaticType("hum_min") + ucrReceiverHumidityMin.bAutoFill = True ucrReceiverWindSpeed.SetParameter(New RParameter("u2", 7)) ucrReceiverWindSpeed.SetParameterIsRFunction() - 'ucrReceiverWindSpeed.SetClimaticType("wind_speed") - 'ucrReceiverWindSpeed.bAutoFill = True + ucrReceiverWindSpeed.SetClimaticType("wind_speed") + ucrReceiverWindSpeed.bAutoFill = True ucrInputTimeStep.SetParameter(New RParameter("ts", 2)) dctInputTimeStep.Add("daily", Chr(34) & "daily" & Chr(34)) @@ -101,7 +105,7 @@ Public Class dlgEvapotranspiration 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("data", Chr(34) & "data" & Chr(34)) + dctInputSolar.Add("radiation", Chr(34) & "radiation" & Chr(34)) ucrInputSolar.SetItems(dctInputSolar) ucrInputSolar.SetDropDownStyleAsNonEditable() @@ -118,16 +122,6 @@ Public Class dlgEvapotranspiration ucrChkWind.SetRDefault(Chr(34) & "yes" & Chr(34)) ' Missing Options - 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") - 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)) @@ -136,15 +130,6 @@ Public Class dlgEvapotranspiration ucrInputMissingMethod.SetItems(dctInputMissingMethod) ucrInputMissingMethod.SetDropDownStyleAsNonEditable() - 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) - 'panel setting ucrPnlMethod.AddRadioButton(rdoPenmanMonteith) ucrPnlMethod.AddRadioButton(rdoHargreavesSamani) @@ -161,7 +146,6 @@ Public Class dlgEvapotranspiration ucrPnlMethod.AddToLinkedControls(ucrInputSolar, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlMethod.AddToLinkedControls(ucrInputMissingMethod, {rdoPenmanMonteith}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="monthly average") - ucrChkWind.SetLinkedDisplayControl(grpWindSpeed) ucrReceiverRadiation.SetLinkedDisplayControl(lblRadiation) ucrReceiverHumidityMax.SetLinkedDisplayControl(lblHumidityMax) ucrReceiverHumidityMin.SetLinkedDisplayControl(lblHumidityMin) @@ -240,7 +224,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("n", Chr(34) & "n" & Chr(34), bIncludeArgumentName:=False) clsVarnamesVectorHS.SetRCommand("c") @@ -300,30 +283,25 @@ Public Class dlgEvapotranspiration ucrInputCrop.SetRCode(clsETPenmanMonteith, bReset) ucrChkWind.SetRCode(clsETPenmanMonteith, bReset) ucrNewColName.SetRCode(clsBaseOperator, bReset) - ucrNudMaxMissingData.SetRCode(clsMissingDataVector, bReset) - ucrNudMaxMissingDays.SetRCode(clsMissingDataVector, bReset) - ucrNudMaxDurationMissingData.SetRCode(clsMissingDataVector, bReset) - ucrChkInterpMissingDays.SetRCode(clsReadInputs, bReset) - ucrChkInterpMissingEntries.SetRCode(clsReadInputs, bReset) ucrInputMissingMethod.SetRCode(clsReadInputs, bReset) 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 AndAlso ucrNudMaxMissingData.GetText <> "" AndAlso ucrNudMaxMissingDays.GetText <> "" AndAlso ucrNudMaxDurationMissingData.GetText <> "" 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) End If If ucrChkWind.Checked And ucrReceiverWindSpeed.IsEmpty Then ucrBase.OKEnabled(False) End If ElseIf rdoHargreavesSamani.Checked Then - If ucrNewColName.IsComplete AndAlso Not ucrReceiverDate.IsEmpty() AndAlso Not ucrReceiverTmax.IsEmpty() AndAlso Not ucrReceiverTmin.IsEmpty() AndAlso Not ucrInputTimeStep.IsEmpty() AndAlso ucrNudMaxMissingData.GetText <> "" AndAlso ucrNudMaxMissingDays.GetText <> "" AndAlso ucrNudMaxDurationMissingData.GetText <> "" Then + If ucrNewColName.IsComplete AndAlso Not ucrReceiverDate.IsEmpty() AndAlso Not ucrReceiverTmax.IsEmpty() AndAlso Not ucrReceiverTmin.IsEmpty() AndAlso Not ucrInputTimeStep.IsEmpty() Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) End If - Else - ucrBase.OKEnabled(False) End If End Sub @@ -333,16 +311,24 @@ Public Class dlgEvapotranspiration TestOKEnabled() End Sub + Private Sub cmdEvapOptions_Click(sender As Object, e As EventArgs) Handles cmdEvapOptions.Click + sdgMissingOptionsEvapotranspiration.SetRFunction(clsReadInputs, clsMissingDataVector, bResetSubdialog) + bResetSubdialog = False + sdgMissingOptionsEvapotranspiration.ShowDialog() + 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) 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) End If End Sub @@ -369,7 +355,6 @@ Public Class dlgEvapotranspiration Else clsBaseOperator.RemoveParameterByName("ET.HargreavesSamani") End If - End Sub Private Sub ucrReceiverWindSpeed_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverWindSpeed.ControlValueChanged, ucrChkWind.ControlValueChanged @@ -392,7 +377,7 @@ Public Class dlgEvapotranspiration clsVarnamesVectorPM.RemoveParameterByName("Cd") clsDataFunctionPM.RemoveParameterByName("Rs") clsDataFunctionPM.RemoveParameterByName("cd") - Case "data" + Case "radiation" ucrReceiverRadiation.SetClimaticType("radiation") ucrReceiverRadiation.bAutoFill = True clsVarnamesVectorPM.AddParameter("Rs", Chr(34) & "Rs" & Chr(34), bIncludeArgumentName:=False) @@ -412,8 +397,7 @@ Public Class dlgEvapotranspiration clsDataFunctionPM.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, ucrNudMaxMissingData.ControlContentsChanged, ucrNudMaxDurationMissingData.ControlContentsChanged, ucrNudMaxMissingDays.ControlContentsChanged, ucrChkWind.ControlContentsChanged + 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/instat.vbproj b/instat/instat.vbproj index 72ba823f8a8..14261159918 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -1541,6 +1541,12 @@ Form + + sdgMissingOptionsEvapotranspiration.vb + + + Form + ucrAxes.vb @@ -4859,6 +4865,9 @@ dlgUseModel.vb + + sdgMissingOptionsEvapotranspiration.vb + ucrAdditionalLayers.vb diff --git a/instat/sdgMissingOptionsEvapotranspiration.Designer.vb b/instat/sdgMissingOptionsEvapotranspiration.Designer.vb new file mode 100644 index 00000000000..89002ae7927 --- /dev/null +++ b/instat/sdgMissingOptionsEvapotranspiration.Designer.vb @@ -0,0 +1,177 @@ + _ +Partial Class sdgMissingOptionsEvapotranspiration + 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.lblMaxPerctMissindData = New System.Windows.Forms.Label() + Me.lblMaxDurationMissingData = New System.Windows.Forms.Label() + Me.lblMaxMissingDays = New System.Windows.Forms.Label() + Me.grpMissingDataOpts = New System.Windows.Forms.GroupBox() + Me.ucrChkInterpMissingEntries = New instat.ucrCheck() + Me.ucrChkInterpMissingDays = New instat.ucrCheck() + Me.ucrNudMaxDurationMissingData = New instat.ucrNud() + Me.ucrNudMaxMissingDays = New instat.ucrNud() + Me.ucrNudMaxMissingData = New instat.ucrNud() + Me.ucrSdgButtons = New instat.ucrButtonsSubdialogue() + Me.grpMissingDataOpts.SuspendLayout() + Me.SuspendLayout() + ' + 'lblMaxPerctMissindData + ' + Me.lblMaxPerctMissindData.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMaxPerctMissindData.Location = New System.Drawing.Point(9, 69) + Me.lblMaxPerctMissindData.Name = "lblMaxPerctMissindData" + Me.lblMaxPerctMissindData.Size = New System.Drawing.Size(169, 19) + Me.lblMaxPerctMissindData.TabIndex = 29 + 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.Name = "lblMaxDurationMissingData" + Me.lblMaxDurationMissingData.Size = New System.Drawing.Size(160, 20) + Me.lblMaxDurationMissingData.TabIndex = 27 + 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.Name = "lblMaxMissingDays" + Me.lblMaxMissingDays.Size = New System.Drawing.Size(169, 20) + Me.lblMaxMissingDays.TabIndex = 25 + 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.Name = "grpMissingDataOpts" + Me.grpMissingDataOpts.Size = New System.Drawing.Size(198, 66) + Me.grpMissingDataOpts.TabIndex = 31 + Me.grpMissingDataOpts.TabStop = False + Me.grpMissingDataOpts.Text = "Missing Data Options" + ' + 'ucrChkInterpMissingEntries + ' + Me.ucrChkInterpMissingEntries.AutoSize = True + Me.ucrChkInterpMissingEntries.Checked = False + Me.ucrChkInterpMissingEntries.Location = New System.Drawing.Point(2, 38) + Me.ucrChkInterpMissingEntries.Name = "ucrChkInterpMissingEntries" + Me.ucrChkInterpMissingEntries.Size = New System.Drawing.Size(188, 23) + Me.ucrChkInterpMissingEntries.TabIndex = 5 + ' + 'ucrChkInterpMissingDays + ' + Me.ucrChkInterpMissingDays.AutoSize = True + Me.ucrChkInterpMissingDays.Checked = False + Me.ucrChkInterpMissingDays.Location = New System.Drawing.Point(2, 16) + Me.ucrChkInterpMissingDays.Name = "ucrChkInterpMissingDays" + Me.ucrChkInterpMissingDays.Size = New System.Drawing.Size(168, 23) + Me.ucrChkInterpMissingDays.TabIndex = 6 + ' + '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.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.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + '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(184, 22) + 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.Value = New Decimal(New Integer() {0, 0, 0, 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(184, 45) + 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.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.Name = "ucrSdgButtons" + Me.ucrSdgButtons.Size = New System.Drawing.Size(259, 29) + Me.ucrSdgButtons.TabIndex = 3 + ' + '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.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.ucrSdgButtons) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "sdgMissingOptionsEvapotranspiration" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.Text = "Missing Options Evapotranspiration" + Me.grpMissingDataOpts.ResumeLayout(False) + Me.grpMissingDataOpts.PerformLayout() + Me.ResumeLayout(False) + Me.PerformLayout() + + 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 +End Class diff --git a/instat/sdgMissingOptionsEvapotranspiration.resx b/instat/sdgMissingOptionsEvapotranspiration.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgMissingOptionsEvapotranspiration.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/sdgMissingOptionsEvapotranspiration.vb b/instat/sdgMissingOptionsEvapotranspiration.vb new file mode 100644 index 00000000000..19373554b6f --- /dev/null +++ b/instat/sdgMissingOptionsEvapotranspiration.vb @@ -0,0 +1,61 @@ +' 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 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 + autoTranslate(Me) + End Sub + + Public Sub InitialiseControls() + 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 \ No newline at end of file