From b02ccd707d0d0dec17ac706f57206e461a2ce8f8 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 19 Dec 2023 17:24:42 +0100 Subject: [PATCH 01/37] Added reduce Water --- instat/dlgEndOfRainsSeason.Designer.vb | 286 +-- instat/dlgEndOfRainsSeason.vb | 180 +- instat/dlgTransformClimatic.Designer.vb | 576 ++--- instat/dlgTransformClimatic.resx | 2074 ++++++++--------- instat/dlgTransformClimatic.vb | 96 +- .../InstatObject/R/stand_alone_functions.R | 22 + 6 files changed, 1609 insertions(+), 1625 deletions(-) diff --git a/instat/dlgEndOfRainsSeason.Designer.vb b/instat/dlgEndOfRainsSeason.Designer.vb index 538b4708bfc..cdaaea08385 100644 --- a/instat/dlgEndOfRainsSeason.Designer.vb +++ b/instat/dlgEndOfRainsSeason.Designer.vb @@ -51,7 +51,6 @@ Partial Class dlgEndOfRainsSeason Me.cmdDoyRange = New System.Windows.Forms.Button() Me.rdoVariableEvaporation = New System.Windows.Forms.RadioButton() Me.rdoValueEvaporation = New System.Windows.Forms.RadioButton() - Me.lblReplaceNA = New System.Windows.Forms.Label() Me.grpEndofSeason = New System.Windows.Forms.GroupBox() Me.ucrInputEndofSeasonOccurence = New instat.ucrInputTextBox() Me.ucrInputSeasonDoy = New instat.ucrInputTextBox() @@ -69,7 +68,6 @@ Partial Class dlgEndOfRainsSeason Me.rdoEndOfSeasons = New System.Windows.Forms.RadioButton() Me.rdoEndOfRains = New System.Windows.Forms.RadioButton() Me.ucrPnlEndOfRainsAndSeasons = New instat.UcrPanel() - Me.ucrInputReplaceNA = New instat.ucrInputTextBox() Me.ucrReceiverEvaporation = New instat.ucrReceiverSingle() Me.ucrInputEvaporation = New instat.ucrInputTextBox() Me.ucrPnlEvaporation = New instat.UcrPanel() @@ -94,40 +92,36 @@ Partial Class dlgEndOfRainsSeason 'lblYear ' Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(459, 206) - Me.lblYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblYear.Location = New System.Drawing.Point(306, 137) Me.lblYear.Name = "lblYear" - Me.lblYear.Size = New System.Drawing.Size(47, 20) + Me.lblYear.Size = New System.Drawing.Size(32, 13) Me.lblYear.TabIndex = 5 Me.lblYear.Text = "Year:" ' 'lblDate ' Me.lblDate.AutoSize = True - Me.lblDate.Location = New System.Drawing.Point(459, 136) - Me.lblDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblDate.Location = New System.Drawing.Point(306, 91) Me.lblDate.Name = "lblDate" - Me.lblDate.Size = New System.Drawing.Size(48, 20) + Me.lblDate.Size = New System.Drawing.Size(33, 13) Me.lblDate.TabIndex = 3 Me.lblDate.Text = "Date:" ' 'lblDOY ' Me.lblDOY.AutoSize = True - Me.lblDOY.Location = New System.Drawing.Point(459, 272) - Me.lblDOY.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblDOY.Location = New System.Drawing.Point(306, 181) Me.lblDOY.Name = "lblDOY" - Me.lblDOY.Size = New System.Drawing.Size(97, 20) + Me.lblDOY.Size = New System.Drawing.Size(66, 13) Me.lblDOY.TabIndex = 7 Me.lblDOY.Text = "Day of Year:" ' 'lblCapacity ' Me.lblCapacity.AutoSize = True - Me.lblCapacity.Location = New System.Drawing.Point(24, 465) - Me.lblCapacity.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblCapacity.Location = New System.Drawing.Point(16, 310) Me.lblCapacity.Name = "lblCapacity" - Me.lblCapacity.Size = New System.Drawing.Size(74, 20) + Me.lblCapacity.Size = New System.Drawing.Size(51, 13) Me.lblCapacity.TabIndex = 20 Me.lblCapacity.Tag = "Capacity:" Me.lblCapacity.Text = "Capacity:" @@ -135,60 +129,54 @@ Partial Class dlgEndOfRainsSeason 'lblRainfall ' Me.lblRainfall.AutoSize = True - Me.lblRainfall.Location = New System.Drawing.Point(459, 338) - Me.lblRainfall.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblRainfall.Location = New System.Drawing.Point(306, 225) Me.lblRainfall.Name = "lblRainfall" - Me.lblRainfall.Size = New System.Drawing.Size(104, 20) + Me.lblRainfall.Size = New System.Drawing.Size(70, 13) Me.lblRainfall.TabIndex = 9 Me.lblRainfall.Text = "Rain Column:" ' 'lblEvaporation ' Me.lblEvaporation.AutoSize = True - Me.lblEvaporation.Location = New System.Drawing.Point(22, 517) - Me.lblEvaporation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEvaporation.Location = New System.Drawing.Point(15, 345) Me.lblEvaporation.Name = "lblEvaporation" - Me.lblEvaporation.Size = New System.Drawing.Size(98, 20) + Me.lblEvaporation.Size = New System.Drawing.Size(67, 13) Me.lblEvaporation.TabIndex = 24 Me.lblEvaporation.Text = "Evaporation:" ' 'lblStation ' Me.lblStation.AutoSize = True - Me.lblStation.Location = New System.Drawing.Point(459, 69) - Me.lblStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStation.Location = New System.Drawing.Point(306, 46) Me.lblStation.Name = "lblStation" - Me.lblStation.Size = New System.Drawing.Size(64, 20) + Me.lblStation.Size = New System.Drawing.Size(43, 13) Me.lblStation.TabIndex = 1 Me.lblStation.Text = "Station:" ' 'lblAmount ' Me.lblAmount.AutoSize = True - Me.lblAmount.Location = New System.Drawing.Point(22, 465) - Me.lblAmount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblAmount.Location = New System.Drawing.Point(15, 310) Me.lblAmount.Name = "lblAmount" - Me.lblAmount.Size = New System.Drawing.Size(69, 20) + Me.lblAmount.Size = New System.Drawing.Size(46, 13) Me.lblAmount.TabIndex = 14 Me.lblAmount.Text = "Amount:" ' 'lblTotalOverDays ' Me.lblTotalOverDays.AutoSize = True - Me.lblTotalOverDays.Location = New System.Drawing.Point(242, 465) - Me.lblTotalOverDays.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblTotalOverDays.Location = New System.Drawing.Point(161, 310) Me.lblTotalOverDays.Name = "lblTotalOverDays" - Me.lblTotalOverDays.Size = New System.Drawing.Size(96, 20) + Me.lblTotalOverDays.Size = New System.Drawing.Size(66, 13) Me.lblTotalOverDays.TabIndex = 16 Me.lblTotalOverDays.Text = "Over Day(s):" ' 'lblWaterBalanceLessThan ' Me.lblWaterBalanceLessThan.AutoSize = True - Me.lblWaterBalanceLessThan.Location = New System.Drawing.Point(202, 465) - Me.lblWaterBalanceLessThan.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblWaterBalanceLessThan.Location = New System.Drawing.Point(135, 310) Me.lblWaterBalanceLessThan.Name = "lblWaterBalanceLessThan" - Me.lblWaterBalanceLessThan.Size = New System.Drawing.Size(136, 20) + Me.lblWaterBalanceLessThan.Size = New System.Drawing.Size(93, 13) Me.lblWaterBalanceLessThan.TabIndex = 22 Me.lblWaterBalanceLessThan.Tag = "Water Balance <=" Me.lblWaterBalanceLessThan.Text = "Water Balance <=" @@ -196,10 +184,9 @@ Partial Class dlgEndOfRainsSeason 'cmdDoyRange ' Me.cmdDoyRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDoyRange.Location = New System.Drawing.Point(33, 405) - Me.cmdDoyRange.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDoyRange.Location = New System.Drawing.Point(22, 270) Me.cmdDoyRange.Name = "cmdDoyRange" - Me.cmdDoyRange.Size = New System.Drawing.Size(158, 39) + Me.cmdDoyRange.Size = New System.Drawing.Size(105, 26) Me.cmdDoyRange.TabIndex = 11 Me.cmdDoyRange.Tag = "" Me.cmdDoyRange.Text = "Day Range" @@ -208,10 +195,9 @@ Partial Class dlgEndOfRainsSeason 'rdoVariableEvaporation ' Me.rdoVariableEvaporation.AutoSize = True - Me.rdoVariableEvaporation.Location = New System.Drawing.Point(335, 513) - Me.rdoVariableEvaporation.Margin = New System.Windows.Forms.Padding(4) + Me.rdoVariableEvaporation.Location = New System.Drawing.Point(223, 342) Me.rdoVariableEvaporation.Name = "rdoVariableEvaporation" - Me.rdoVariableEvaporation.Size = New System.Drawing.Size(92, 24) + Me.rdoVariableEvaporation.Size = New System.Drawing.Size(63, 17) Me.rdoVariableEvaporation.TabIndex = 28 Me.rdoVariableEvaporation.Text = "Variable" Me.rdoVariableEvaporation.UseVisualStyleBackColor = True @@ -219,24 +205,13 @@ Partial Class dlgEndOfRainsSeason 'rdoValueEvaporation ' Me.rdoValueEvaporation.AutoSize = True - Me.rdoValueEvaporation.Location = New System.Drawing.Point(144, 513) - Me.rdoValueEvaporation.Margin = New System.Windows.Forms.Padding(4) + Me.rdoValueEvaporation.Location = New System.Drawing.Point(96, 342) Me.rdoValueEvaporation.Name = "rdoValueEvaporation" - Me.rdoValueEvaporation.Size = New System.Drawing.Size(75, 24) + Me.rdoValueEvaporation.Size = New System.Drawing.Size(52, 17) Me.rdoValueEvaporation.TabIndex = 26 Me.rdoValueEvaporation.Text = "Value" Me.rdoValueEvaporation.UseVisualStyleBackColor = True ' - 'lblReplaceNA - ' - Me.lblReplaceNA.AutoSize = True - Me.lblReplaceNA.Location = New System.Drawing.Point(122, 603) - Me.lblReplaceNA.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblReplaceNA.Name = "lblReplaceNA" - Me.lblReplaceNA.Size = New System.Drawing.Size(130, 20) - Me.lblReplaceNA.TabIndex = 30 - Me.lblReplaceNA.Text = "Replace NA with:" - ' 'grpEndofSeason ' Me.grpEndofSeason.Controls.Add(Me.ucrInputEndofSeasonOccurence) @@ -245,11 +220,9 @@ Partial Class dlgEndOfRainsSeason Me.grpEndofSeason.Controls.Add(Me.ucrChkEndofSeasonOccurence) Me.grpEndofSeason.Controls.Add(Me.ucrChkEndofSeasonDate) Me.grpEndofSeason.Controls.Add(Me.ucrChkEndofSeasonDoy) - Me.grpEndofSeason.Location = New System.Drawing.Point(4, 639) - Me.grpEndofSeason.Margin = New System.Windows.Forms.Padding(4) + Me.grpEndofSeason.Location = New System.Drawing.Point(3, 426) Me.grpEndofSeason.Name = "grpEndofSeason" - Me.grpEndofSeason.Padding = New System.Windows.Forms.Padding(4) - Me.grpEndofSeason.Size = New System.Drawing.Size(708, 62) + Me.grpEndofSeason.Size = New System.Drawing.Size(472, 41) Me.grpEndofSeason.TabIndex = 32 Me.grpEndofSeason.TabStop = False Me.grpEndofSeason.Text = "End of Season" @@ -260,10 +233,10 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofSeasonOccurence.AutoSize = True Me.ucrInputEndofSeasonOccurence.IsMultiline = False Me.ucrInputEndofSeasonOccurence.IsReadOnly = False - Me.ucrInputEndofSeasonOccurence.Location = New System.Drawing.Point(542, 22) - Me.ucrInputEndofSeasonOccurence.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputEndofSeasonOccurence.Location = New System.Drawing.Point(361, 15) + Me.ucrInputEndofSeasonOccurence.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputEndofSeasonOccurence.Name = "ucrInputEndofSeasonOccurence" - Me.ucrInputEndofSeasonOccurence.Size = New System.Drawing.Size(156, 32) + Me.ucrInputEndofSeasonOccurence.Size = New System.Drawing.Size(104, 21) Me.ucrInputEndofSeasonOccurence.TabIndex = 38 ' 'ucrInputSeasonDoy @@ -272,10 +245,10 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputSeasonDoy.AutoSize = True Me.ucrInputSeasonDoy.IsMultiline = False Me.ucrInputSeasonDoy.IsReadOnly = False - Me.ucrInputSeasonDoy.Location = New System.Drawing.Point(74, 22) - Me.ucrInputSeasonDoy.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputSeasonDoy.Location = New System.Drawing.Point(49, 15) + Me.ucrInputSeasonDoy.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputSeasonDoy.Name = "ucrInputSeasonDoy" - Me.ucrInputSeasonDoy.Size = New System.Drawing.Size(100, 32) + Me.ucrInputSeasonDoy.Size = New System.Drawing.Size(67, 21) Me.ucrInputSeasonDoy.TabIndex = 32 ' 'ucrInputEndofSeasonDate @@ -284,40 +257,40 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofSeasonDate.AutoSize = True Me.ucrInputEndofSeasonDate.IsMultiline = False Me.ucrInputEndofSeasonDate.IsReadOnly = False - Me.ucrInputEndofSeasonDate.Location = New System.Drawing.Point(248, 22) - Me.ucrInputEndofSeasonDate.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputEndofSeasonDate.Location = New System.Drawing.Point(165, 15) + Me.ucrInputEndofSeasonDate.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputEndofSeasonDate.Name = "ucrInputEndofSeasonDate" - Me.ucrInputEndofSeasonDate.Size = New System.Drawing.Size(165, 32) + Me.ucrInputEndofSeasonDate.Size = New System.Drawing.Size(110, 21) Me.ucrInputEndofSeasonDate.TabIndex = 37 ' 'ucrChkEndofSeasonOccurence ' Me.ucrChkEndofSeasonOccurence.AutoSize = True Me.ucrChkEndofSeasonOccurence.Checked = False - Me.ucrChkEndofSeasonOccurence.Location = New System.Drawing.Point(422, 26) - Me.ucrChkEndofSeasonOccurence.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkEndofSeasonOccurence.Location = New System.Drawing.Point(281, 17) + Me.ucrChkEndofSeasonOccurence.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkEndofSeasonOccurence.Name = "ucrChkEndofSeasonOccurence" - Me.ucrChkEndofSeasonOccurence.Size = New System.Drawing.Size(126, 51) + Me.ucrChkEndofSeasonOccurence.Size = New System.Drawing.Size(84, 34) Me.ucrChkEndofSeasonOccurence.TabIndex = 48 ' 'ucrChkEndofSeasonDate ' Me.ucrChkEndofSeasonDate.AutoSize = True Me.ucrChkEndofSeasonDate.Checked = False - Me.ucrChkEndofSeasonDate.Location = New System.Drawing.Point(182, 24) - Me.ucrChkEndofSeasonDate.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkEndofSeasonDate.Location = New System.Drawing.Point(121, 16) + Me.ucrChkEndofSeasonDate.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkEndofSeasonDate.Name = "ucrChkEndofSeasonDate" - Me.ucrChkEndofSeasonDate.Size = New System.Drawing.Size(80, 51) + Me.ucrChkEndofSeasonDate.Size = New System.Drawing.Size(53, 34) Me.ucrChkEndofSeasonDate.TabIndex = 47 ' 'ucrChkEndofSeasonDoy ' Me.ucrChkEndofSeasonDoy.AutoSize = True Me.ucrChkEndofSeasonDoy.Checked = False - Me.ucrChkEndofSeasonDoy.Location = New System.Drawing.Point(6, 24) - Me.ucrChkEndofSeasonDoy.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkEndofSeasonDoy.Location = New System.Drawing.Point(4, 16) + Me.ucrChkEndofSeasonDoy.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkEndofSeasonDoy.Name = "ucrChkEndofSeasonDoy" - Me.ucrChkEndofSeasonDoy.Size = New System.Drawing.Size(87, 51) + Me.ucrChkEndofSeasonDoy.Size = New System.Drawing.Size(58, 34) Me.ucrChkEndofSeasonDoy.TabIndex = 46 ' 'grpEndofRains @@ -328,11 +301,9 @@ Partial Class dlgEndOfRainsSeason Me.grpEndofRains.Controls.Add(Me.ucrChkEndofRainsDoy) Me.grpEndofRains.Controls.Add(Me.ucrChkEndofRainsDate) Me.grpEndofRains.Controls.Add(Me.ucrChkEndofRainsOccurence) - Me.grpEndofRains.Location = New System.Drawing.Point(4, 639) - Me.grpEndofRains.Margin = New System.Windows.Forms.Padding(4) + Me.grpEndofRains.Location = New System.Drawing.Point(3, 426) Me.grpEndofRains.Name = "grpEndofRains" - Me.grpEndofRains.Padding = New System.Windows.Forms.Padding(4) - Me.grpEndofRains.Size = New System.Drawing.Size(644, 60) + Me.grpEndofRains.Size = New System.Drawing.Size(429, 40) Me.grpEndofRains.TabIndex = 18 Me.grpEndofRains.TabStop = False Me.grpEndofRains.Text = "End of Rains" @@ -343,10 +314,10 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofRainsDate.AutoSize = True Me.ucrInputEndofRainsDate.IsMultiline = False Me.ucrInputEndofRainsDate.IsReadOnly = False - Me.ucrInputEndofRainsDate.Location = New System.Drawing.Point(248, 26) - Me.ucrInputEndofRainsDate.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputEndofRainsDate.Location = New System.Drawing.Point(165, 17) + Me.ucrInputEndofRainsDate.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputEndofRainsDate.Name = "ucrInputEndofRainsDate" - Me.ucrInputEndofRainsDate.Size = New System.Drawing.Size(140, 26) + Me.ucrInputEndofRainsDate.Size = New System.Drawing.Size(93, 17) Me.ucrInputEndofRainsDate.TabIndex = 36 ' 'ucrInputEndofRainsOccurence @@ -355,10 +326,10 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofRainsOccurence.AutoSize = True Me.ucrInputEndofRainsOccurence.IsMultiline = False Me.ucrInputEndofRainsOccurence.IsReadOnly = False - Me.ucrInputEndofRainsOccurence.Location = New System.Drawing.Point(512, 24) - Me.ucrInputEndofRainsOccurence.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputEndofRainsOccurence.Location = New System.Drawing.Point(341, 16) + Me.ucrInputEndofRainsOccurence.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputEndofRainsOccurence.Name = "ucrInputEndofRainsOccurence" - Me.ucrInputEndofRainsOccurence.Size = New System.Drawing.Size(141, 30) + Me.ucrInputEndofRainsOccurence.Size = New System.Drawing.Size(94, 20) Me.ucrInputEndofRainsOccurence.TabIndex = 39 ' 'ucrInputEndRainDoy @@ -367,40 +338,40 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndRainDoy.AutoSize = True Me.ucrInputEndRainDoy.IsMultiline = False Me.ucrInputEndRainDoy.IsReadOnly = False - Me.ucrInputEndRainDoy.Location = New System.Drawing.Point(75, 26) - Me.ucrInputEndRainDoy.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputEndRainDoy.Location = New System.Drawing.Point(50, 17) + Me.ucrInputEndRainDoy.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputEndRainDoy.Name = "ucrInputEndRainDoy" - Me.ucrInputEndRainDoy.Size = New System.Drawing.Size(98, 32) + Me.ucrInputEndRainDoy.Size = New System.Drawing.Size(65, 21) Me.ucrInputEndRainDoy.TabIndex = 50 ' 'ucrChkEndofRainsDoy ' Me.ucrChkEndofRainsDoy.AutoSize = True Me.ucrChkEndofRainsDoy.Checked = False - Me.ucrChkEndofRainsDoy.Location = New System.Drawing.Point(8, 27) - Me.ucrChkEndofRainsDoy.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkEndofRainsDoy.Location = New System.Drawing.Point(5, 18) + Me.ucrChkEndofRainsDoy.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkEndofRainsDoy.Name = "ucrChkEndofRainsDoy" - Me.ucrChkEndofRainsDoy.Size = New System.Drawing.Size(90, 51) + Me.ucrChkEndofRainsDoy.Size = New System.Drawing.Size(60, 34) Me.ucrChkEndofRainsDoy.TabIndex = 49 ' 'ucrChkEndofRainsDate ' Me.ucrChkEndofRainsDate.AutoSize = True Me.ucrChkEndofRainsDate.Checked = False - Me.ucrChkEndofRainsDate.Location = New System.Drawing.Point(177, 26) - Me.ucrChkEndofRainsDate.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkEndofRainsDate.Location = New System.Drawing.Point(118, 17) + Me.ucrChkEndofRainsDate.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkEndofRainsDate.Name = "ucrChkEndofRainsDate" - Me.ucrChkEndofRainsDate.Size = New System.Drawing.Size(78, 51) + Me.ucrChkEndofRainsDate.Size = New System.Drawing.Size(52, 34) Me.ucrChkEndofRainsDate.TabIndex = 48 ' 'ucrChkEndofRainsOccurence ' Me.ucrChkEndofRainsOccurence.AutoSize = True Me.ucrChkEndofRainsOccurence.Checked = False - Me.ucrChkEndofRainsOccurence.Location = New System.Drawing.Point(396, 24) - Me.ucrChkEndofRainsOccurence.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkEndofRainsOccurence.Location = New System.Drawing.Point(264, 16) + Me.ucrChkEndofRainsOccurence.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkEndofRainsOccurence.Name = "ucrChkEndofRainsOccurence" - Me.ucrChkEndofRainsOccurence.Size = New System.Drawing.Size(136, 51) + Me.ucrChkEndofRainsOccurence.Size = New System.Drawing.Size(91, 34) Me.ucrChkEndofRainsOccurence.TabIndex = 47 ' 'rdoEndOfSeasons @@ -411,10 +382,9 @@ Partial Class dlgEndOfRainsSeason Me.rdoEndOfSeasons.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoEndOfSeasons.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoEndOfSeasons.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoEndOfSeasons.Location = New System.Drawing.Point(326, 15) - Me.rdoEndOfSeasons.Margin = New System.Windows.Forms.Padding(4) + Me.rdoEndOfSeasons.Location = New System.Drawing.Point(217, 10) Me.rdoEndOfSeasons.Name = "rdoEndOfSeasons" - Me.rdoEndOfSeasons.Size = New System.Drawing.Size(195, 40) + Me.rdoEndOfSeasons.Size = New System.Drawing.Size(130, 27) Me.rdoEndOfSeasons.TabIndex = 36 Me.rdoEndOfSeasons.Text = "End of Season" Me.rdoEndOfSeasons.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -428,10 +398,9 @@ Partial Class dlgEndOfRainsSeason Me.rdoEndOfRains.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoEndOfRains.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoEndOfRains.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoEndOfRains.Location = New System.Drawing.Point(134, 15) - Me.rdoEndOfRains.Margin = New System.Windows.Forms.Padding(4) + Me.rdoEndOfRains.Location = New System.Drawing.Point(89, 10) Me.rdoEndOfRains.Name = "rdoEndOfRains" - Me.rdoEndOfRains.Size = New System.Drawing.Size(195, 40) + Me.rdoEndOfRains.Size = New System.Drawing.Size(130, 27) Me.rdoEndOfRains.TabIndex = 35 Me.rdoEndOfRains.Text = "End of Rains" Me.rdoEndOfRains.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -440,33 +409,21 @@ Partial Class dlgEndOfRainsSeason 'ucrPnlEndOfRainsAndSeasons ' Me.ucrPnlEndOfRainsAndSeasons.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlEndOfRainsAndSeasons.Location = New System.Drawing.Point(118, 14) - Me.ucrPnlEndOfRainsAndSeasons.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlEndOfRainsAndSeasons.Location = New System.Drawing.Point(79, 9) + Me.ucrPnlEndOfRainsAndSeasons.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrPnlEndOfRainsAndSeasons.Name = "ucrPnlEndOfRainsAndSeasons" - Me.ucrPnlEndOfRainsAndSeasons.Size = New System.Drawing.Size(410, 52) + Me.ucrPnlEndOfRainsAndSeasons.Size = New System.Drawing.Size(273, 35) Me.ucrPnlEndOfRainsAndSeasons.TabIndex = 34 ' - 'ucrInputReplaceNA - ' - Me.ucrInputReplaceNA.AddQuotesIfUnrecognised = True - Me.ucrInputReplaceNA.AutoSize = True - Me.ucrInputReplaceNA.IsMultiline = False - Me.ucrInputReplaceNA.IsReadOnly = False - Me.ucrInputReplaceNA.Location = New System.Drawing.Point(264, 596) - Me.ucrInputReplaceNA.Margin = New System.Windows.Forms.Padding(14) - Me.ucrInputReplaceNA.Name = "ucrInputReplaceNA" - Me.ucrInputReplaceNA.Size = New System.Drawing.Size(78, 32) - Me.ucrInputReplaceNA.TabIndex = 31 - ' 'ucrReceiverEvaporation ' Me.ucrReceiverEvaporation.AutoSize = True Me.ucrReceiverEvaporation.frmParent = Me - Me.ucrReceiverEvaporation.Location = New System.Drawing.Point(431, 513) + Me.ucrReceiverEvaporation.Location = New System.Drawing.Point(287, 342) Me.ucrReceiverEvaporation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverEvaporation.Name = "ucrReceiverEvaporation" Me.ucrReceiverEvaporation.Selector = Nothing - Me.ucrReceiverEvaporation.Size = New System.Drawing.Size(210, 30) + Me.ucrReceiverEvaporation.Size = New System.Drawing.Size(140, 20) Me.ucrReceiverEvaporation.strNcFilePath = "" Me.ucrReceiverEvaporation.TabIndex = 29 Me.ucrReceiverEvaporation.ucrSelector = Nothing @@ -477,19 +434,19 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEvaporation.AutoSize = True Me.ucrInputEvaporation.IsMultiline = False Me.ucrInputEvaporation.IsReadOnly = False - Me.ucrInputEvaporation.Location = New System.Drawing.Point(230, 513) - Me.ucrInputEvaporation.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputEvaporation.Location = New System.Drawing.Point(153, 342) + Me.ucrInputEvaporation.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputEvaporation.Name = "ucrInputEvaporation" - Me.ucrInputEvaporation.Size = New System.Drawing.Size(96, 32) + Me.ucrInputEvaporation.Size = New System.Drawing.Size(64, 21) Me.ucrInputEvaporation.TabIndex = 27 ' 'ucrPnlEvaporation ' Me.ucrPnlEvaporation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlEvaporation.Location = New System.Drawing.Point(144, 505) - Me.ucrPnlEvaporation.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlEvaporation.Location = New System.Drawing.Point(96, 337) + Me.ucrPnlEvaporation.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrPnlEvaporation.Name = "ucrPnlEvaporation" - Me.ucrPnlEvaporation.Size = New System.Drawing.Size(518, 40) + Me.ucrPnlEvaporation.Size = New System.Drawing.Size(345, 27) Me.ucrPnlEvaporation.TabIndex = 25 ' 'ucrInputFilterPreview @@ -498,10 +455,10 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputFilterPreview.AutoSize = True Me.ucrInputFilterPreview.IsMultiline = False Me.ucrInputFilterPreview.IsReadOnly = True - Me.ucrInputFilterPreview.Location = New System.Drawing.Point(196, 410) - Me.ucrInputFilterPreview.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputFilterPreview.Location = New System.Drawing.Point(131, 273) + Me.ucrInputFilterPreview.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" - Me.ucrInputFilterPreview.Size = New System.Drawing.Size(363, 33) + Me.ucrInputFilterPreview.Size = New System.Drawing.Size(242, 22) Me.ucrInputFilterPreview.TabIndex = 12 ' 'ucrNudTotalOverDays @@ -509,12 +466,12 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudTotalOverDays.AutoSize = True Me.ucrNudTotalOverDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTotalOverDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTotalOverDays.Location = New System.Drawing.Point(350, 462) - Me.ucrNudTotalOverDays.Margin = New System.Windows.Forms.Padding(9) + Me.ucrNudTotalOverDays.Location = New System.Drawing.Point(233, 308) + Me.ucrNudTotalOverDays.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudTotalOverDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudTotalOverDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTotalOverDays.Name = "ucrNudTotalOverDays" - Me.ucrNudTotalOverDays.Size = New System.Drawing.Size(75, 30) + Me.ucrNudTotalOverDays.Size = New System.Drawing.Size(50, 20) Me.ucrNudTotalOverDays.TabIndex = 17 Me.ucrNudTotalOverDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -523,12 +480,12 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudAmount.AutoSize = True Me.ucrNudAmount.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAmount.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAmount.Location = New System.Drawing.Point(102, 462) - Me.ucrNudAmount.Margin = New System.Windows.Forms.Padding(9) + Me.ucrNudAmount.Location = New System.Drawing.Point(68, 308) + Me.ucrNudAmount.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudAmount.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAmount.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAmount.Name = "ucrNudAmount" - Me.ucrNudAmount.Size = New System.Drawing.Size(75, 30) + Me.ucrNudAmount.Size = New System.Drawing.Size(50, 20) Me.ucrNudAmount.TabIndex = 15 Me.ucrNudAmount.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -537,12 +494,12 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudWBLessThan.AutoSize = True Me.ucrNudWBLessThan.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWBLessThan.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWBLessThan.Location = New System.Drawing.Point(351, 462) - Me.ucrNudWBLessThan.Margin = New System.Windows.Forms.Padding(9) + Me.ucrNudWBLessThan.Location = New System.Drawing.Point(234, 308) + Me.ucrNudWBLessThan.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudWBLessThan.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudWBLessThan.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWBLessThan.Name = "ucrNudWBLessThan" - Me.ucrNudWBLessThan.Size = New System.Drawing.Size(75, 30) + Me.ucrNudWBLessThan.Size = New System.Drawing.Size(50, 20) Me.ucrNudWBLessThan.TabIndex = 23 Me.ucrNudWBLessThan.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -551,12 +508,12 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudCapacity.AutoSize = True Me.ucrNudCapacity.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudCapacity.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudCapacity.Location = New System.Drawing.Point(104, 462) - Me.ucrNudCapacity.Margin = New System.Windows.Forms.Padding(9) + Me.ucrNudCapacity.Location = New System.Drawing.Point(69, 308) + Me.ucrNudCapacity.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudCapacity.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudCapacity.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudCapacity.Name = "ucrNudCapacity" - Me.ucrNudCapacity.Size = New System.Drawing.Size(75, 30) + Me.ucrNudCapacity.Size = New System.Drawing.Size(50, 20) Me.ucrNudCapacity.TabIndex = 21 Me.ucrNudCapacity.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -564,11 +521,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverStation.AutoSize = True Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Location = New System.Drawing.Point(464, 88) + Me.ucrReceiverStation.Location = New System.Drawing.Point(309, 59) Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStation.Name = "ucrReceiverStation" Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(214, 30) + Me.ucrReceiverStation.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverStation.strNcFilePath = "" Me.ucrReceiverStation.TabIndex = 2 Me.ucrReceiverStation.ucrSelector = Nothing @@ -577,11 +534,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverYear.AutoSize = True Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(464, 225) + Me.ucrReceiverYear.Location = New System.Drawing.Point(309, 150) Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYear.Name = "ucrReceiverYear" Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.Size = New System.Drawing.Size(214, 30) + Me.ucrReceiverYear.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverYear.strNcFilePath = "" Me.ucrReceiverYear.TabIndex = 6 Me.ucrReceiverYear.ucrSelector = Nothing @@ -590,11 +547,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverDate.AutoSize = True Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(464, 156) + Me.ucrReceiverDate.Location = New System.Drawing.Point(309, 104) Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDate.Name = "ucrReceiverDate" Me.ucrReceiverDate.Selector = Nothing - Me.ucrReceiverDate.Size = New System.Drawing.Size(214, 30) + Me.ucrReceiverDate.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverDate.strNcFilePath = "" Me.ucrReceiverDate.TabIndex = 4 Me.ucrReceiverDate.ucrSelector = Nothing @@ -603,11 +560,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverDOY.AutoSize = True Me.ucrReceiverDOY.frmParent = Me - Me.ucrReceiverDOY.Location = New System.Drawing.Point(464, 291) + Me.ucrReceiverDOY.Location = New System.Drawing.Point(309, 194) Me.ucrReceiverDOY.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDOY.Name = "ucrReceiverDOY" Me.ucrReceiverDOY.Selector = Nothing - Me.ucrReceiverDOY.Size = New System.Drawing.Size(214, 30) + Me.ucrReceiverDOY.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverDOY.strNcFilePath = "" Me.ucrReceiverDOY.TabIndex = 8 Me.ucrReceiverDOY.ucrSelector = Nothing @@ -616,11 +573,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverRainfall.AutoSize = True Me.ucrReceiverRainfall.frmParent = Me - Me.ucrReceiverRainfall.Location = New System.Drawing.Point(464, 357) + Me.ucrReceiverRainfall.Location = New System.Drawing.Point(309, 238) Me.ucrReceiverRainfall.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRainfall.Name = "ucrReceiverRainfall" Me.ucrReceiverRainfall.Selector = Nothing - Me.ucrReceiverRainfall.Size = New System.Drawing.Size(214, 30) + Me.ucrReceiverRainfall.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverRainfall.strNcFilePath = "" Me.ucrReceiverRainfall.TabIndex = 10 Me.ucrReceiverRainfall.ucrSelector = Nothing @@ -631,20 +588,20 @@ Partial Class dlgEndOfRainsSeason Me.ucrSelectorForWaterBalance.bDropUnusedFilterLevels = False Me.ucrSelectorForWaterBalance.bShowHiddenColumns = False Me.ucrSelectorForWaterBalance.bUseCurrentFilter = True - Me.ucrSelectorForWaterBalance.Location = New System.Drawing.Point(4, 104) + Me.ucrSelectorForWaterBalance.Location = New System.Drawing.Point(3, 69) Me.ucrSelectorForWaterBalance.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForWaterBalance.Name = "ucrSelectorForWaterBalance" - Me.ucrSelectorForWaterBalance.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorForWaterBalance.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorForWaterBalance.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(4, 708) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Location = New System.Drawing.Point(3, 472) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 33 ' 'ucrNudWB @@ -652,12 +609,12 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudWB.AutoSize = True Me.ucrNudWB.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWB.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWB.Location = New System.Drawing.Point(189, 561) - Me.ucrNudWB.Margin = New System.Windows.Forms.Padding(9) + Me.ucrNudWB.Location = New System.Drawing.Point(126, 374) + Me.ucrNudWB.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudWB.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudWB.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWB.Name = "ucrNudWB" - Me.ucrNudWB.Size = New System.Drawing.Size(75, 30) + Me.ucrNudWB.Size = New System.Drawing.Size(50, 20) Me.ucrNudWB.TabIndex = 47 Me.ucrNudWB.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -665,25 +622,23 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrChkWB.AutoSize = True Me.ucrChkWB.Checked = False - Me.ucrChkWB.Location = New System.Drawing.Point(26, 561) - Me.ucrChkWB.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkWB.Location = New System.Drawing.Point(17, 374) + Me.ucrChkWB.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrChkWB.Name = "ucrChkWB" - Me.ucrChkWB.Size = New System.Drawing.Size(150, 34) + Me.ucrChkWB.Size = New System.Drawing.Size(100, 23) Me.ucrChkWB.TabIndex = 46 ' 'dlgEndOfRainsSeason ' - 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.AutoSize = True - Me.ClientSize = New System.Drawing.Size(716, 824) + Me.ClientSize = New System.Drawing.Size(477, 549) Me.Controls.Add(Me.ucrNudWB) Me.Controls.Add(Me.ucrChkWB) Me.Controls.Add(Me.rdoEndOfSeasons) Me.Controls.Add(Me.rdoEndOfRains) Me.Controls.Add(Me.ucrPnlEndOfRainsAndSeasons) - Me.Controls.Add(Me.ucrInputReplaceNA) - Me.Controls.Add(Me.lblReplaceNA) Me.Controls.Add(Me.rdoVariableEvaporation) Me.Controls.Add(Me.grpEndofSeason) Me.Controls.Add(Me.rdoValueEvaporation) @@ -715,7 +670,6 @@ Partial Class dlgEndOfRainsSeason Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.grpEndofRains) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgEndOfRainsSeason" @@ -759,8 +713,6 @@ Partial Class dlgEndOfRainsSeason Friend WithEvents rdoVariableEvaporation As RadioButton Friend WithEvents rdoValueEvaporation As RadioButton Friend WithEvents ucrPnlEvaporation As UcrPanel - Friend WithEvents ucrInputReplaceNA As ucrInputTextBox - Friend WithEvents lblReplaceNA As Label Friend WithEvents ucrInputEndofRainsOccurence As ucrInputTextBox Friend WithEvents ucrInputEndofSeasonOccurence As ucrInputTextBox Friend WithEvents ucrInputEndofSeasonDate As ucrInputTextBox diff --git a/instat/dlgEndOfRainsSeason.vb b/instat/dlgEndOfRainsSeason.vb index 52cd221bf40..9011080d997 100644 --- a/instat/dlgEndOfRainsSeason.vb +++ b/instat/dlgEndOfRainsSeason.vb @@ -47,9 +47,9 @@ Public Class dlgEndOfRainsSeason #Region "end_of_rains_code_structures" ' Rolling sum rain - Private clsEndRainsRollingSumCalc As New RFunction + Private clsEndRainsRollingSumCalc, clsWBEvaporationMinFunction, clsWBEvaporationMaxFunction As New RFunction Private clsRollSumRainFunction As New RFunction - + Private clsWBOperator1, clsWBOperator2 As New ROperator ' Conditions filter Private clsEndRainsConditionsFilterCalc As New RFunction Private clsEndRainsConditionsFilterSubCalcsList As New RFunction @@ -97,16 +97,20 @@ Public Class dlgEndOfRainsSeason Private clsEndSeasonWBMinCalc As New RFunction Private clsEndSeasonWBMinCalcSubCalcsList As New RFunction Private clsReduceWBMinFunction As New RFunction + Private clsReduceWBMinFunction1 As New RFunction Private clsPMinWBMinFunction As New RFunction Private clsWBMinTailFunction As New RFunction + Private clsWBMinTailFunction1 As New RFunction Private clsWBMinEvapOperator As New ROperator ' Water Balance max Private clsEndSeasonWBMaxCalc As New RFunction Private clsEndSeasonWBMaxCalcSubCalcsList As New RFunction Private clsReduceWBMaxFunction As New RFunction + Private clsReduceWBMaxFunction1 As New RFunction Private clsPMinWBMaxFunction As New RFunction Private clsWBMaxTailFunction As New RFunction + Private clsWBMaxTailFunction1 As New RFunction Private clsWBMaxEvapOperator As New ROperator ' Water Balance @@ -264,11 +268,6 @@ Public Class dlgEndOfRainsSeason ucrInputEvaporation.SetValidationTypeAsNumeric() ucrInputEvaporation.AddQuotesIfUnrecognised = False - ucrInputReplaceNA.SetParameter(New RParameter("yes", 1)) - ucrInputReplaceNA.SetValidationTypeAsNumeric() - ucrInputReplaceNA.AddQuotesIfUnrecognised = False - - ucrNudWBLessThan.SetParameter(New RParameter("1", 1, False)) ucrNudWBLessThan.SetMinMax(0, Integer.MaxValue) ucrNudWBLessThan.Increment = 0.5 @@ -301,32 +300,34 @@ Public Class dlgEndOfRainsSeason ucrChkWB.SetParameter(New RParameter("WB_evap")) ucrChkWB.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkWB.SetText("Reducing") - ucrChkWB.SetLinkedDisplayControl(ucrNudWB) + 'ucrChkWB.SetLinkedDisplayControl(ucrNudWB) ucrNudWB.SetParameter(New RParameter("WB_evap_value")) ucrNudWB.SetMinMax(0, 1) - ucrNudWB.DecimalPlaces = 0.01 + 'ucrNudWB.DecimalPlaces = 0.01 ucrNudWB.Increment = 0.01 + ucrNudWB.DecimalPlaces = 2 + 'linking controls ucrChkEndofRainsDoy.AddToLinkedControls(ucrInputEndRainDoy, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofSeasonOccurence.AddToLinkedControls(ucrInputEndofSeasonOccurence, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofSeasonDate.AddToLinkedControls(ucrInputEndofSeasonDate, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofSeasonDoy.AddToLinkedControls(ucrInputSeasonDoy, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkWB.AddToLinkedControls(ucrNudWB, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkWB.AddToLinkedControls(ucrNudWB, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.5) ucrPnlEvaporation.AddToLinkedControls(ucrInputEvaporation, {rdoValueEvaporation}, bNewLinkedHideIfParameterMissing:=True) ucrPnlEvaporation.AddToLinkedControls(ucrReceiverEvaporation, {rdoVariableEvaporation}, bNewLinkedHideIfParameterMissing:=True) - ucrPnlEvaporation.AddToLinkedControls(ucrInputReplaceNA, {rdoVariableEvaporation}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofRainsOccurence.AddToLinkedControls(ucrInputEndofRainsOccurence, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofRainsDate.AddToLinkedControls(ucrInputEndofRainsDate, {True}, bNewLinkedHideIfParameterMissing:=True) ucrPnlEndOfRainsAndSeasons.AddToLinkedControls({ucrNudAmount, ucrNudTotalOverDays}, {rdoEndOfRains}, bNewLinkedHideIfParameterMissing:=True) ucrPnlEndOfRainsAndSeasons.AddToLinkedControls({ucrNudCapacity, ucrNudWBLessThan, ucrChkEndofSeasonDoy}, {rdoEndOfSeasons}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlEndOfRainsAndSeasons.AddToLinkedControls({ucrPnlEvaporation}, {rdoEndOfSeasons}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlEndOfRainsAndSeasons.AddToLinkedControls({ucrChkWB}, {rdoEndOfSeasons}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlEndOfRainsAndSeasons.AddToLinkedControls({ucrChkEndofSeasonDate, ucrChkEndofSeasonDoy, ucrChkEndofSeasonOccurence}, {rdoEndOfSeasons}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlEndOfRainsAndSeasons.AddToLinkedControls({ucrChkEndofRainsDate, ucrChkEndofRainsDoy, ucrChkEndofRainsOccurence}, {rdoEndOfRains}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofRainsDoy.SetLinkedDisplayControl(grpEndofRains) ucrPnlEvaporation.SetLinkedDisplayControl(lblEvaporation) - ucrInputReplaceNA.SetLinkedDisplayControl(lblReplaceNA) ucrNudAmount.SetLinkedDisplayControl(lblAmount) ucrNudWBLessThan.SetLinkedDisplayControl(lblWaterBalanceLessThan) ucrNudCapacity.SetLinkedDisplayControl(lblCapacity) @@ -421,16 +422,20 @@ Public Class dlgEndOfRainsSeason clsEndSeasonWBMinCalc.Clear() clsEndSeasonWBMinCalcSubCalcsList.Clear() clsReduceWBMinFunction.Clear() + clsReduceWBMinFunction1.Clear() clsPMinWBMinFunction.Clear() clsWBMinTailFunction.Clear() + clsWBMinTailFunction1.Clear() clsWBMinEvapOperator.Clear() ' Water Balance max clsEndSeasonWBMaxCalc.Clear() clsEndSeasonWBMaxCalcSubCalcsList.Clear() clsReduceWBMaxFunction.Clear() + clsReduceWBMaxFunction1.Clear() clsPMinWBMaxFunction.Clear() clsWBMaxTailFunction.Clear() + clsWBMaxTailFunction1.Clear() clsWBMaxEvapOperator.Clear() ' Water Balance @@ -438,6 +443,10 @@ Public Class dlgEndOfRainsSeason clsEndSeasonWBCalcSubCalcsList.Clear() clsIfElseWBFunction.Clear() clsWBOperator.Clear() + clsWBOperator1.Clear() + clsWBOperator2.Clear() + clsWBEvaporationMinFunction.Clear() + clsPMinWBMaxFunction.Clear() clsWBMinMaxOperator.Clear() ' Evaporation @@ -610,6 +619,16 @@ Public Class dlgEndOfRainsSeason clsEndRainsCombinationManipulationList.AddParameter("manip2", clsRFunctionParameter:=clsGroupByStationYearCalc, bIncludeArgumentName:=False, iPosition:=1) clsEndRainsCombinationManipulationList.AddParameter("manip3", clsRFunctionParameter:=clsDoyFilterCalc, bIncludeArgumentName:=False, iPosition:=2) + clsWBOperator1.SetOperation("-") + clsWBOperator1.AddParameter("left", "..1 + ..2", iPosition:=0) + clsWBOperator1.AddParameter("right", clsRFunctionParameter:=clsWBEvaporationMinFunction, iPosition:=1) + clsWBOperator1.bSpaceAroundOperation = True + clsWBOperator1.bBrackets = False + + clsWBEvaporationMinFunction.SetRCommand("WB_evaporation") + clsWBEvaporationMinFunction.AddParameter("water_balance", "..1", iPosition:=0, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("y", "..2", iPosition:=4, bIncludeArgumentName:=False) + clsEndRainsCombinationSubCalcList.SetRCommand("list") clsEndRainsCombinationSubCalcList.AddParameter("sub1", clsRFunctionParameter:=clsEndRainsLastDoySummaryCalc, bIncludeArgumentName:=False, iPosition:=0) @@ -649,13 +668,12 @@ Public Class dlgEndOfRainsSeason 'Pmax clsPMaxFunction.SetRCommand("pmax") - clsPMaxFunction.AddParameter("0", "x + y", iPosition:=0, bIncludeArgumentName:=False) + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) clsPMaxFunction.AddParameter("1", "0", bIncludeArgumentName:=False) ' Water Balance min clsEndSeasonWBMinCalc.SetRCommand("instat_calculation$new") clsEndSeasonWBMinCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) - clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction, iPosition:=1) clsEndSeasonWBMinCalc.AddParameter("result_name", Chr(34) & strWBMin & Chr(34), iPosition:=2) clsEndSeasonWBMinCalc.AddParameter("sub_calculations", clsRFunctionParameter:=clsEndSeasonWBMinCalcSubCalcsList, iPosition:=3) clsEndSeasonWBMinCalc.SetAssignTo(strWBMin) @@ -664,13 +682,20 @@ Public Class dlgEndOfRainsSeason clsEndSeasonWBMinCalcSubCalcsList.AddParameter("0", clsRFunctionParameter:=clsEndSeasonRainMinCalc, iPosition:=0, bIncludeArgumentName:=False) clsReduceWBMinFunction.bToScriptAsRString = True - clsReduceWBMinFunction.SetRCommand("Reduce") - clsReduceWBMinFunction.AddParameter("f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) - clsReduceWBMinFunction.AddParameter("x", clsRFunctionParameter:=clsWBMinTailFunction, iPosition:=1) - clsReduceWBMinFunction.AddParameter("init", "0", iPosition:=2) - clsReduceWBMinFunction.AddParameter("accumulate", "TRUE", iPosition:=3) - - clsPMinWBMinFunction.SetRCommand("function(x, y) pmin") + clsReduceWBMinFunction.SetPackageName("purrr") + clsReduceWBMinFunction.SetRCommand("accumulate") + clsReduceWBMinFunction.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) + clsReduceWBMinFunction.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction, iPosition:=1) + clsReduceWBMinFunction.AddParameter(".init", "0", iPosition:=2) + + clsReduceWBMinFunction1.bToScriptAsRString = True + clsReduceWBMinFunction1.SetPackageName("purrr") + clsReduceWBMinFunction1.SetRCommand("accumulate2") + clsReduceWBMinFunction1.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) + clsReduceWBMinFunction1.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction, iPosition:=1) + clsReduceWBMinFunction1.AddParameter(".init", "0", iPosition:=2) + + clsPMinWBMinFunction.SetRCommand(" ~ pmin") clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) clsPMinWBMinFunction.AddParameter("1", iCapacityDefault, iPosition:=1, bIncludeArgumentName:=False) @@ -678,6 +703,10 @@ Public Class dlgEndOfRainsSeason clsWBMinTailFunction.AddParameter("x", clsROperatorParameter:=clsWBMinEvapOperator, iPosition:=0) clsWBMinTailFunction.AddParameter("n", "-1", iPosition:=1) + clsWBMinTailFunction1.SetRCommand("tail") + clsWBMinTailFunction1.AddParameter("x", ucrReceiverEvaporation.GetVariableNames(False), iPosition:=0) + clsWBMinTailFunction1.AddParameter("n", "-1", iPosition:=1) + clsWBMinEvapOperator.SetOperation("-") clsWBMinEvapOperator.AddParameter("0", strRainMin, iPosition:=0) clsWBMinEvapOperator.AddParameter("value", "5", iPosition:=1) @@ -685,7 +714,6 @@ Public Class dlgEndOfRainsSeason ' Water Balance max clsEndSeasonWBMaxCalc.SetRCommand("instat_calculation$new") clsEndSeasonWBMaxCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) - clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction, iPosition:=1) clsEndSeasonWBMaxCalc.AddParameter("result_name", Chr(34) & strWBMax & Chr(34), iPosition:=2) clsEndSeasonWBMaxCalc.AddParameter("sub_calculations", clsRFunctionParameter:=clsEndSeasonWBMaxCalcSubCalcsList, iPosition:=3) clsEndSeasonWBMaxCalc.SetAssignTo(strWBMax) @@ -694,13 +722,20 @@ Public Class dlgEndOfRainsSeason clsEndSeasonWBMaxCalcSubCalcsList.AddParameter("0", clsRFunctionParameter:=clsEndSeasonRainMaxCalc, iPosition:=0, bIncludeArgumentName:=False) clsReduceWBMaxFunction.bToScriptAsRString = True - clsReduceWBMaxFunction.SetRCommand("Reduce") - clsReduceWBMaxFunction.AddParameter("f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) - clsReduceWBMaxFunction.AddParameter("x", clsRFunctionParameter:=clsWBMaxTailFunction, iPosition:=1) - clsReduceWBMaxFunction.AddParameter("init", "0", iPosition:=2) - clsReduceWBMaxFunction.AddParameter("accumulate", "TRUE", iPosition:=3) - - clsPMinWBMaxFunction.SetRCommand("function(x, y) pmin") + clsReduceWBMaxFunction.SetPackageName("purrr") + clsReduceWBMaxFunction.SetRCommand("accumulate") + clsReduceWBMaxFunction.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) + clsReduceWBMaxFunction.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction, iPosition:=1) + clsReduceWBMaxFunction.AddParameter(".init", "0", iPosition:=2) + + clsReduceWBMaxFunction1.bToScriptAsRString = True + clsReduceWBMaxFunction1.SetPackageName("purrr") + clsReduceWBMaxFunction1.SetRCommand("accumulate2") + clsReduceWBMaxFunction1.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) + clsReduceWBMaxFunction1.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction, iPosition:=1) + clsReduceWBMaxFunction1.AddParameter(".init", "0", iPosition:=2) + + clsPMinWBMaxFunction.SetRCommand(" ~ pmin") clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) clsPMinWBMaxFunction.AddParameter("1", iCapacityDefault, iPosition:=1, bIncludeArgumentName:=False) @@ -708,6 +743,10 @@ Public Class dlgEndOfRainsSeason clsWBMaxTailFunction.AddParameter("x", clsROperatorParameter:=clsWBMaxEvapOperator, iPosition:=0) clsWBMaxTailFunction.AddParameter("n", "-1", iPosition:=1) + clsWBMaxTailFunction1.SetRCommand("tail") + clsWBMaxTailFunction1.AddParameter("x", ucrReceiverEvaporation.GetVariableNames(False), iPosition:=0) + clsWBMaxTailFunction1.AddParameter("n", "-1", iPosition:=1) + clsWBMaxEvapOperator.SetOperation("-") clsWBMaxEvapOperator.AddParameter("0", strRainMax, iPosition:=0) clsWBMaxEvapOperator.AddParameter("value", "5", iPosition:=1) @@ -840,7 +879,7 @@ Public Class dlgEndOfRainsSeason ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsEndSeasonIsNaRain, New RParameter("x", 0), iAdditionalPairNo:=1) ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsIfElseRainMinFunction, New RParameter("no", 2), iAdditionalPairNo:=2) ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsIfElseRainMaxFunction, New RParameter("no", 2), iAdditionalPairNo:=3) - ucrReceiverEvaporation.AddAdditionalCodeParameterPair(clsIfElseVariableEvaporation, New RParameter("no", 2), iAdditionalPairNo:=1) + ucrReceiverEvaporation.AddAdditionalCodeParameterPair(clsWBMaxTailFunction1, New RParameter("x", 0), iAdditionalPairNo:=1) ucrReceiverDate.AddAdditionalCodeParameterPair(clsFirstDateFunction, New RParameter("x", 0), iAdditionalPairNo:=1) ucrNudCapacity.AddAdditionalCodeParameterPair(clsPMinWBMinFunction, New RParameter("1", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) @@ -850,8 +889,6 @@ Public Class dlgEndOfRainsSeason ucrReceiverDOY.SetRCode(clsDayToOperator, bReset) - ucrReceiverEvaporation.SetRCode(clsIsNaEvaporation, bReset) - ucrInputEndRainDoy.SetRCode(clsEndRainsLastDoySummaryCalc, bReset) ucrInputEndofRainsDate.SetRCode(clsEndRainsLastDateSummaryCalc, bReset) ucrInputEndofRainsOccurence.SetRCode(clsEndRainsStatusSummaryCalc, bReset) @@ -866,10 +903,12 @@ Public Class dlgEndOfRainsSeason ucrNudWBLessThan.SetRCode(clsEndSeasonWBConditionOperator, bReset) - ucrPnlEvaporation.SetRCode(clsWBMinEvapOperator, bReset) - ucrInputEvaporation.SetRCode(clsWBMinEvapOperator, bReset) + If bReset Then + ucrPnlEvaporation.SetRCode(clsWBMinEvapOperator, bReset) + ucrInputEvaporation.SetRCode(clsWBMinEvapOperator, bReset) + ucrReceiverEvaporation.SetRCode(clsWBMinTailFunction1, bReset) + End If ucrNudCapacity.SetRCode(clsIfElseRainMaxFunction, bReset) - ucrInputReplaceNA.SetRCode(clsIfElseVariableEvaporation, bReset) ucrChkEndofSeasonDoy.SetRCode(clsEndSeasonCombinationSubCalcList, bReset) ucrChkEndofSeasonDate.SetRCode(clsEndSeasonCombinationSubCalcList, bReset) @@ -912,7 +951,7 @@ Public Class dlgEndOfRainsSeason bOkEnabled = False ElseIf rdoValueEvaporation.Checked AndAlso ucrInputEvaporation.IsEmpty Then bOkEnabled = False - ElseIf rdoVariableEvaporation.Checked AndAlso (ucrReceiverEvaporation.IsEmpty OrElse ucrInputReplaceNA.IsEmpty) Then + ElseIf rdoVariableEvaporation.Checked AndAlso ucrReceiverEvaporation.IsEmpty Then bOkEnabled = False End If Else @@ -989,21 +1028,58 @@ Public Class dlgEndOfRainsSeason clsDoyFilterCalcFromList.ClearParameters() End Sub - Private Sub ucrPnlEvaporation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlEvaporation.ControlValueChanged, ucrReceiverEvaporation.ControlValueChanged, ucrInputReplaceNA.ControlValueChanged, ucrInputEvaporation.ControlValueChanged + Private Sub ucrPnlEvaporation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlEvaporation.ControlValueChanged, ucrReceiverEvaporation.ControlValueChanged, ucrInputEvaporation.ControlValueChanged Evaporation() End Sub Private Sub Evaporation() - If rdoValueEvaporation.Checked Then - ucrReceiverRainfall.SetMeAsReceiver() - clsWBMinEvapOperator.RemoveParameterByName("variable") - clsWBMaxEvapOperator.RemoveParameterByName("variable") - ElseIf rdoVariableEvaporation.Checked Then - ucrReceiverEvaporation.SetMeAsReceiver() - clsWBMinEvapOperator.AddParameter("variable", clsRFunctionParameter:=clsIfElseVariableEvaporation, iPosition:=1, bIncludeArgumentName:=False) - clsWBMinEvapOperator.RemoveParameterByName("value") - clsWBMaxEvapOperator.AddParameter("variable", clsRFunctionParameter:=clsIfElseVariableEvaporation, iPosition:=1, bIncludeArgumentName:=False) - clsWBMaxEvapOperator.RemoveParameterByName("value") + If rdoEndOfSeasons.Checked Then + If rdoValueEvaporation.Checked Then + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction, iPosition:=1) + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction, iPosition:=1) + clsWBMinEvapOperator.RemoveParameterByName("variable") + clsWBMaxEvapOperator.RemoveParameterByName("variable") + If ucrChkWB.Checked Then + clsWBEvaporationMinFunction.AddParameter("WB_evap_value", ucrNudWB.GetText(), iPosition:=1, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("yes", ucrNudCapacity.GetText(), iPosition:=2, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=3, bIncludeArgumentName:=False) + clsPMaxFunction.AddParameter("wb", clsROperatorParameter:=clsWBOperator1, iPosition:=0, bIncludeArgumentName:=False) + clsPMaxFunction.RemoveParameterByName("0") + clsPMaxFunction.RemoveParameterByName("0") + clsWBMaxEvapOperator.RemoveParameterByName("value") + clsWBMinEvapOperator.RemoveParameterByName("value") + Else + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) + clsPMaxFunction.RemoveParameterByName("wb") + clsPMaxFunction.RemoveParameterByName("wb") + clsWBMaxEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) + clsWBMinEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) + End If + Else + ucrReceiverEvaporation.SetMeAsReceiver() + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction1, iPosition:=1) + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction1, iPosition:=1) + clsWBMinEvapOperator.RemoveParameterByName("variable") + clsWBMaxEvapOperator.RemoveParameterByName("variable") + If ucrChkWB.Checked Then + clsWBEvaporationMinFunction.AddParameter("WB_evap_value", ucrNudWB.GetText(), iPosition:=1, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("yes", ucrNudCapacity.GetText(), iPosition:=2, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("value", "..3", bIncludeArgumentName:=False, iPosition:=3) + clsReduceWBMinFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMinTailFunction1, iPosition:=1) + clsReduceWBMaxFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMaxTailFunction1, iPosition:=1) + clsPMaxFunction.AddParameter("wb", clsROperatorParameter:=clsWBOperator1, iPosition:=0, bIncludeArgumentName:=False) + clsPMaxFunction.RemoveParameterByName("0") + clsPMaxFunction.RemoveParameterByName("0") + clsWBMaxEvapOperator.RemoveParameterByName("value") + clsWBMinEvapOperator.RemoveParameterByName("value") + Else + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) + clsPMaxFunction.RemoveParameterByName("wb") + clsPMaxFunction.RemoveParameterByName("wb") + clsReduceWBMinFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMinTailFunction1, iPosition:=1) + clsReduceWBMaxFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMaxTailFunction1, iPosition:=1) + End If + End If End If End Sub @@ -1065,7 +1141,15 @@ Public Class dlgEndOfRainsSeason End If End Sub - Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlEndOfRainsAndSeasons.ControlContentsChanged, ucrReceiverRainfall.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrReceiverDOY.ControlContentsChanged, ucrNudCapacity.ControlContentsChanged, ucrNudWBLessThan.ControlContentsChanged, ucrInputSeasonDoy.ControlContentsChanged, ucrNudTotalOverDays.ControlContentsChanged, ucrNudAmount.ControlContentsChanged, ucrChkEndofRainsDoy.ControlContentsChanged, ucrInputEndRainDoy.ControlContentsChanged, ucrChkEndofRainsDate.ControlContentsChanged, ucrInputEndofRainsDate.ControlContentsChanged, ucrChkEndofRainsOccurence.ControlContentsChanged, ucrInputEndofRainsOccurence.ControlContentsChanged, ucrChkEndofSeasonDoy.ControlContentsChanged, ucrPnlEvaporation.ControlContentsChanged, ucrReceiverEvaporation.ControlContentsChanged, ucrInputReplaceNA.ControlContentsChanged, ucrChkEndofSeasonOccurence.ControlContentsChanged, ucrInputEndofSeasonOccurence.ControlContentsChanged, ucrChkEndofSeasonDate.ControlContentsChanged, ucrInputEndofSeasonDate.ControlContentsChanged, ucrInputEvaporation.ControlContentsChanged + Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlEndOfRainsAndSeasons.ControlContentsChanged, ucrReceiverRainfall.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrReceiverDOY.ControlContentsChanged, ucrNudCapacity.ControlContentsChanged, ucrNudWBLessThan.ControlContentsChanged, ucrInputSeasonDoy.ControlContentsChanged, ucrNudTotalOverDays.ControlContentsChanged, ucrNudAmount.ControlContentsChanged, ucrChkEndofRainsDoy.ControlContentsChanged, ucrInputEndRainDoy.ControlContentsChanged, ucrChkEndofRainsDate.ControlContentsChanged, ucrInputEndofRainsDate.ControlContentsChanged, ucrChkEndofRainsOccurence.ControlContentsChanged, ucrInputEndofRainsOccurence.ControlContentsChanged, ucrChkEndofSeasonDoy.ControlContentsChanged, ucrPnlEvaporation.ControlContentsChanged, ucrReceiverEvaporation.ControlContentsChanged, ucrChkEndofSeasonOccurence.ControlContentsChanged, ucrInputEndofSeasonOccurence.ControlContentsChanged, ucrChkEndofSeasonDate.ControlContentsChanged, ucrInputEndofSeasonDate.ControlContentsChanged, ucrInputEvaporation.ControlContentsChanged TestOKEnabled() End Sub + + Private Sub ucrChkWB_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkWB.ControlValueChanged, ucrNudWB.ControlValueChanged, ucrNudCapacity.ControlValueChanged + Evaporation() + End Sub + + Private Sub rdoValueEvaporation_CheckedChanged(sender As Object, e As EventArgs) Handles rdoValueEvaporation.CheckedChanged, rdoVariableEvaporation.CheckedChanged + Evaporation() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgTransformClimatic.Designer.vb b/instat/dlgTransformClimatic.Designer.vb index 90233cefd17..6878c7a9c9e 100644 --- a/instat/dlgTransformClimatic.Designer.vb +++ b/instat/dlgTransformClimatic.Designer.vb @@ -40,18 +40,26 @@ Partial Class dlgTransformClimatic Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgTransformClimatic)) - Me.lblYear = New System.Windows.Forms.Label() - Me.lblDate = New System.Windows.Forms.Label() - Me.lblStation = New System.Windows.Forms.Label() - Me.lblData = New System.Windows.Forms.Label() + Me.rdoWaterBalance = New System.Windows.Forms.RadioButton() + Me.ucrNudLimit = New instat.ucrNud() + Me.ucrNudMgdd = New instat.ucrNud() + Me.lblBaselineMgdd = New System.Windows.Forms.Label() + Me.lblLimit = New System.Windows.Forms.Label() + Me.ucrInputPosition = New instat.ucrInputComboBox() + Me.ucrChkCircular = New instat.ucrCheck() Me.rdoSpell = New System.Windows.Forms.RadioButton() + Me.lblRowsMultSpells = New System.Windows.Forms.Label() + Me.lblDate = New System.Windows.Forms.Label() + Me.ucrInputSpellUpper = New instat.ucrInputTextBox() Me.rdoMoving = New System.Windows.Forms.RadioButton() Me.rdoCount = New System.Windows.Forms.RadioButton() - Me.rdoWaterBalance = New System.Windows.Forms.RadioButton() - Me.lblSumRows = New System.Windows.Forms.Label() - Me.lblSumOver = New System.Windows.Forms.Label() - Me.lblCountOver = New System.Windows.Forms.Label() + Me.lblStation = New System.Windows.Forms.Label() + Me.lblYear = New System.Windows.Forms.Label() + Me.ucrChkUseMaxMin = New instat.ucrCheck() + Me.lblData = New System.Windows.Forms.Label() Me.grpTransform = New System.Windows.Forms.GroupBox() + Me.ucrNudWB = New instat.ucrNud() + Me.ucrChkWB = New instat.ucrCheck() Me.ucrInputSpellLower = New instat.ucrInputComboBox() Me.ucrChkOptions = New instat.ucrCheck() Me.ucrReceiverEvap = New instat.ucrReceiverSingle() @@ -62,26 +70,20 @@ Partial Class dlgTransformClimatic Me.ucrPnlEvap = New instat.UcrPanel() Me.ucrInputCircularPosition = New instat.ucrInputComboBox() Me.lblPosition = New System.Windows.Forms.Label() - Me.ucrInputPosition = New instat.ucrInputComboBox() - Me.ucrChkCircular = New instat.ucrCheck() Me.ucrNudMultSpells = New instat.ucrNud() - Me.lblRowsMultSpells = New System.Windows.Forms.Label() - Me.ucrInputSpellUpper = New instat.ucrInputTextBox() + Me.lblSumRows = New System.Windows.Forms.Label() Me.ucrInputCondition = New instat.ucrInputComboBox() Me.lblCondition = New System.Windows.Forms.Label() Me.lblWBEvaporation = New System.Windows.Forms.Label() + Me.lblCountOver = New System.Windows.Forms.Label() Me.ucrNudSumOver = New instat.ucrNud() Me.lblWBCapacity = New System.Windows.Forms.Label() Me.ucrNudWBCapacity = New instat.ucrNud() Me.ucrInputSum = New instat.ucrInputComboBox() + Me.lblSumOver = New System.Windows.Forms.Label() Me.ucrNudCountOver = New instat.ucrNud() Me.ucrInputCumulative = New instat.ucrInputComboBox() - Me.lblTMin = New System.Windows.Forms.Label() Me.grpDegree = New System.Windows.Forms.GroupBox() - Me.ucrNudLimit = New instat.ucrNud() - Me.ucrNudMgdd = New instat.ucrNud() - Me.lblBaselineMgdd = New System.Windows.Forms.Label() - Me.lblLimit = New System.Windows.Forms.Label() Me.rdoModifiedGDD = New System.Windows.Forms.RadioButton() Me.lblBaselineGDD = New System.Windows.Forms.Label() Me.rdoGrowingDegreeDays = New System.Windows.Forms.RadioButton() @@ -92,53 +94,87 @@ Partial Class dlgTransformClimatic Me.ucrNudHDD = New instat.ucrNud() Me.rdoDiurnalRange = New System.Windows.Forms.RadioButton() Me.ucrPnlDegree = New instat.UcrPanel() + Me.ucrReceiverData = New instat.ucrReceiverSingle() + Me.ttRdoGdd = New System.Windows.Forms.ToolTip(Me.components) + Me.lblTMin = New System.Windows.Forms.Label() + Me.ucrReceiverStation = New instat.ucrReceiverSingle() Me.rdoMultSpells = New System.Windows.Forms.RadioButton() - Me.rdoCumulative = New System.Windows.Forms.RadioButton() - Me.rdoDegree = New System.Windows.Forms.RadioButton() Me.lblTMax = New System.Windows.Forms.Label() Me.lblTMean = New System.Windows.Forms.Label() - Me.ucrSaveColumn = New instat.ucrSave() Me.ucrPnlTransform = New instat.UcrPanel() + Me.rdoDegree = New System.Windows.Forms.RadioButton() + Me.rdoCumulative = New System.Windows.Forms.RadioButton() Me.ucrReceiverDate = New instat.ucrReceiverSingle() - Me.ucrReceiverStation = New instat.ucrReceiverSingle() - Me.ucrSelectorTransform = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrReceiverTMin = New instat.ucrReceiverSingle() + Me.ucrReceiverYear = New instat.ucrReceiverSingle() Me.ucrReceiverTMean = New instat.ucrReceiverSingle() Me.ucrReceiverTMax = New instat.ucrReceiverSingle() - Me.ucrReceiverData = New instat.ucrReceiverSingle() - Me.ucrReceiverYear = New instat.ucrReceiverSingle() - Me.ucrChkUseMaxMin = New instat.ucrCheck() - Me.ttRdoRange = New System.Windows.Forms.ToolTip(Me.components) + Me.ucrSaveColumn = New instat.ucrSave() + Me.ucrSelectorTransform = New instat.ucrSelectorByDataFrameAddRemove() Me.ttRdoTMean = New System.Windows.Forms.ToolTip(Me.components) Me.ttRdoHdd = New System.Windows.Forms.ToolTip(Me.components) - Me.ttRdoGdd = New System.Windows.Forms.ToolTip(Me.components) Me.ttRdoMgdd = New System.Windows.Forms.ToolTip(Me.components) - Me.ucrChkWB = New instat.ucrCheck() - Me.ucrNudWB = New instat.ucrNud() + Me.ttRdoRange = New System.Windows.Forms.ToolTip(Me.components) Me.grpTransform.SuspendLayout() Me.grpDegree.SuspendLayout() Me.SuspendLayout() ' - 'lblYear + 'rdoWaterBalance ' - resources.ApplyResources(Me.lblYear, "lblYear") - Me.lblYear.Name = "lblYear" + resources.ApplyResources(Me.rdoWaterBalance, "rdoWaterBalance") + Me.rdoWaterBalance.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoWaterBalance.FlatAppearance.BorderSize = 2 + Me.rdoWaterBalance.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoWaterBalance.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoWaterBalance.Name = "rdoWaterBalance" + Me.rdoWaterBalance.UseVisualStyleBackColor = True ' - 'lblDate + 'ucrNudLimit ' - resources.ApplyResources(Me.lblDate, "lblDate") - Me.lblDate.Name = "lblDate" + resources.ApplyResources(Me.ucrNudLimit, "ucrNudLimit") + Me.ucrNudLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLimit.Name = "ucrNudLimit" + Me.ucrNudLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblStation + 'ucrNudMgdd ' - resources.ApplyResources(Me.lblStation, "lblStation") - Me.lblStation.Name = "lblStation" + resources.ApplyResources(Me.ucrNudMgdd, "ucrNudMgdd") + Me.ucrNudMgdd.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMgdd.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudMgdd.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudMgdd.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMgdd.Name = "ucrNudMgdd" + Me.ucrNudMgdd.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblData + 'lblBaselineMgdd ' - resources.ApplyResources(Me.lblData, "lblData") - Me.lblData.Name = "lblData" + resources.ApplyResources(Me.lblBaselineMgdd, "lblBaselineMgdd") + Me.lblBaselineMgdd.Name = "lblBaselineMgdd" + Me.lblBaselineMgdd.Tag = "Over" + ' + 'lblLimit + ' + resources.ApplyResources(Me.lblLimit, "lblLimit") + Me.lblLimit.Name = "lblLimit" + Me.lblLimit.Tag = "Over" + ' + 'ucrInputPosition + ' + Me.ucrInputPosition.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputPosition, "ucrInputPosition") + Me.ucrInputPosition.GetSetSelectedIndex = -1 + Me.ucrInputPosition.IsReadOnly = False + Me.ucrInputPosition.Name = "ucrInputPosition" + ' + 'ucrChkCircular + ' + resources.ApplyResources(Me.ucrChkCircular, "ucrChkCircular") + Me.ucrChkCircular.Checked = False + Me.ucrChkCircular.Name = "ucrChkCircular" ' 'rdoSpell ' @@ -150,6 +186,25 @@ Partial Class dlgTransformClimatic Me.rdoSpell.Name = "rdoSpell" Me.rdoSpell.UseVisualStyleBackColor = True ' + 'lblRowsMultSpells + ' + resources.ApplyResources(Me.lblRowsMultSpells, "lblRowsMultSpells") + Me.lblRowsMultSpells.Name = "lblRowsMultSpells" + Me.lblRowsMultSpells.Tag = "Rows_to_Take_Over:" + ' + 'lblDate + ' + resources.ApplyResources(Me.lblDate, "lblDate") + Me.lblDate.Name = "lblDate" + ' + 'ucrInputSpellUpper + ' + Me.ucrInputSpellUpper.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputSpellUpper, "ucrInputSpellUpper") + Me.ucrInputSpellUpper.IsMultiline = False + Me.ucrInputSpellUpper.IsReadOnly = False + Me.ucrInputSpellUpper.Name = "ucrInputSpellUpper" + ' 'rdoMoving ' resources.ApplyResources(Me.rdoMoving, "rdoMoving") @@ -171,33 +226,26 @@ Partial Class dlgTransformClimatic Me.rdoCount.Name = "rdoCount" Me.rdoCount.UseVisualStyleBackColor = True ' - 'rdoWaterBalance + 'lblStation ' - resources.ApplyResources(Me.rdoWaterBalance, "rdoWaterBalance") - Me.rdoWaterBalance.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoWaterBalance.FlatAppearance.BorderSize = 2 - Me.rdoWaterBalance.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoWaterBalance.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoWaterBalance.Name = "rdoWaterBalance" - Me.rdoWaterBalance.UseVisualStyleBackColor = True + resources.ApplyResources(Me.lblStation, "lblStation") + Me.lblStation.Name = "lblStation" ' - 'lblSumRows + 'lblYear ' - resources.ApplyResources(Me.lblSumRows, "lblSumRows") - Me.lblSumRows.Name = "lblSumRows" - Me.lblSumRows.Tag = "Rows" + resources.ApplyResources(Me.lblYear, "lblYear") + Me.lblYear.Name = "lblYear" ' - 'lblSumOver + 'ucrChkUseMaxMin ' - resources.ApplyResources(Me.lblSumOver, "lblSumOver") - Me.lblSumOver.Name = "lblSumOver" - Me.lblSumOver.Tag = "Over" + resources.ApplyResources(Me.ucrChkUseMaxMin, "ucrChkUseMaxMin") + Me.ucrChkUseMaxMin.Checked = True + Me.ucrChkUseMaxMin.Name = "ucrChkUseMaxMin" ' - 'lblCountOver + 'lblData ' - resources.ApplyResources(Me.lblCountOver, "lblCountOver") - Me.lblCountOver.Name = "lblCountOver" - Me.lblCountOver.Tag = "Rows_to_Count_Over:" + resources.ApplyResources(Me.lblData, "lblData") + Me.lblData.Name = "lblData" ' 'grpTransform ' @@ -234,6 +282,22 @@ Partial Class dlgTransformClimatic Me.grpTransform.Name = "grpTransform" Me.grpTransform.TabStop = False ' + 'ucrNudWB + ' + resources.ApplyResources(Me.ucrNudWB, "ucrNudWB") + Me.ucrNudWB.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWB.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudWB.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudWB.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWB.Name = "ucrNudWB" + Me.ucrNudWB.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkWB + ' + resources.ApplyResources(Me.ucrChkWB, "ucrChkWB") + Me.ucrChkWB.Checked = False + Me.ucrChkWB.Name = "ucrChkWB" + ' 'ucrInputSpellLower ' Me.ucrInputSpellLower.AddQuotesIfUnrecognised = True @@ -303,20 +367,6 @@ Partial Class dlgTransformClimatic resources.ApplyResources(Me.lblPosition, "lblPosition") Me.lblPosition.Name = "lblPosition" ' - 'ucrInputPosition - ' - Me.ucrInputPosition.AddQuotesIfUnrecognised = True - resources.ApplyResources(Me.ucrInputPosition, "ucrInputPosition") - Me.ucrInputPosition.GetSetSelectedIndex = -1 - Me.ucrInputPosition.IsReadOnly = False - Me.ucrInputPosition.Name = "ucrInputPosition" - ' - 'ucrChkCircular - ' - resources.ApplyResources(Me.ucrChkCircular, "ucrChkCircular") - Me.ucrChkCircular.Checked = False - Me.ucrChkCircular.Name = "ucrChkCircular" - ' 'ucrNudMultSpells ' resources.ApplyResources(Me.ucrNudMultSpells, "ucrNudMultSpells") @@ -327,19 +377,11 @@ Partial Class dlgTransformClimatic Me.ucrNudMultSpells.Name = "ucrNudMultSpells" Me.ucrNudMultSpells.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblRowsMultSpells - ' - resources.ApplyResources(Me.lblRowsMultSpells, "lblRowsMultSpells") - Me.lblRowsMultSpells.Name = "lblRowsMultSpells" - Me.lblRowsMultSpells.Tag = "Rows_to_Take_Over:" - ' - 'ucrInputSpellUpper + 'lblSumRows ' - Me.ucrInputSpellUpper.AddQuotesIfUnrecognised = True - resources.ApplyResources(Me.ucrInputSpellUpper, "ucrInputSpellUpper") - Me.ucrInputSpellUpper.IsMultiline = False - Me.ucrInputSpellUpper.IsReadOnly = False - Me.ucrInputSpellUpper.Name = "ucrInputSpellUpper" + resources.ApplyResources(Me.lblSumRows, "lblSumRows") + Me.lblSumRows.Name = "lblSumRows" + Me.lblSumRows.Tag = "Rows" ' 'ucrInputCondition ' @@ -361,6 +403,12 @@ Partial Class dlgTransformClimatic Me.lblWBEvaporation.Name = "lblWBEvaporation" Me.lblWBEvaporation.Tag = "Evaporation" ' + 'lblCountOver + ' + resources.ApplyResources(Me.lblCountOver, "lblCountOver") + Me.lblCountOver.Name = "lblCountOver" + Me.lblCountOver.Tag = "Rows_to_Count_Over:" + ' 'ucrNudSumOver ' resources.ApplyResources(Me.ucrNudSumOver, "ucrNudSumOver") @@ -395,6 +443,12 @@ Partial Class dlgTransformClimatic Me.ucrInputSum.IsReadOnly = False Me.ucrInputSum.Name = "ucrInputSum" ' + 'lblSumOver + ' + resources.ApplyResources(Me.lblSumOver, "lblSumOver") + Me.lblSumOver.Name = "lblSumOver" + Me.lblSumOver.Tag = "Over" + ' 'ucrNudCountOver ' resources.ApplyResources(Me.ucrNudCountOver, "ucrNudCountOver") @@ -413,11 +467,6 @@ Partial Class dlgTransformClimatic Me.ucrInputCumulative.IsReadOnly = False Me.ucrInputCumulative.Name = "ucrInputCumulative" ' - 'lblTMin - ' - resources.ApplyResources(Me.lblTMin, "lblTMin") - Me.lblTMin.Name = "lblTMin" - ' 'grpDegree ' Me.grpDegree.Controls.Add(Me.ucrNudLimit) @@ -438,46 +487,14 @@ Partial Class dlgTransformClimatic Me.grpDegree.Name = "grpDegree" Me.grpDegree.TabStop = False ' - 'ucrNudLimit - ' - resources.ApplyResources(Me.ucrNudLimit, "ucrNudLimit") - Me.ucrNudLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLimit.Name = "ucrNudLimit" - Me.ucrNudLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) + 'rdoModifiedGDD ' - 'ucrNudMgdd + resources.ApplyResources(Me.rdoModifiedGDD, "rdoModifiedGDD") + Me.rdoModifiedGDD.Name = "rdoModifiedGDD" + Me.rdoModifiedGDD.TabStop = True + Me.rdoModifiedGDD.UseVisualStyleBackColor = True ' - resources.ApplyResources(Me.ucrNudMgdd, "ucrNudMgdd") - Me.ucrNudMgdd.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMgdd.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMgdd.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudMgdd.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMgdd.Name = "ucrNudMgdd" - Me.ucrNudMgdd.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'lblBaselineMgdd - ' - resources.ApplyResources(Me.lblBaselineMgdd, "lblBaselineMgdd") - Me.lblBaselineMgdd.Name = "lblBaselineMgdd" - Me.lblBaselineMgdd.Tag = "Over" - ' - 'lblLimit - ' - resources.ApplyResources(Me.lblLimit, "lblLimit") - Me.lblLimit.Name = "lblLimit" - Me.lblLimit.Tag = "Over" - ' - 'rdoModifiedGDD - ' - resources.ApplyResources(Me.rdoModifiedGDD, "rdoModifiedGDD") - Me.rdoModifiedGDD.Name = "rdoModifiedGDD" - Me.rdoModifiedGDD.TabStop = True - Me.rdoModifiedGDD.UseVisualStyleBackColor = True - ' - 'lblBaselineGDD + 'lblBaselineGDD ' resources.ApplyResources(Me.lblBaselineGDD, "lblBaselineGDD") Me.lblBaselineGDD.Name = "lblBaselineGDD" @@ -542,6 +559,29 @@ Partial Class dlgTransformClimatic resources.ApplyResources(Me.ucrPnlDegree, "ucrPnlDegree") Me.ucrPnlDegree.Name = "ucrPnlDegree" ' + 'ucrReceiverData + ' + resources.ApplyResources(Me.ucrReceiverData, "ucrReceiverData") + Me.ucrReceiverData.frmParent = Me + Me.ucrReceiverData.Name = "ucrReceiverData" + Me.ucrReceiverData.Selector = Nothing + Me.ucrReceiverData.strNcFilePath = "" + Me.ucrReceiverData.ucrSelector = Nothing + ' + 'lblTMin + ' + resources.ApplyResources(Me.lblTMin, "lblTMin") + Me.lblTMin.Name = "lblTMin" + ' + 'ucrReceiverStation + ' + resources.ApplyResources(Me.ucrReceiverStation, "ucrReceiverStation") + Me.ucrReceiverStation.frmParent = Me + Me.ucrReceiverStation.Name = "ucrReceiverStation" + Me.ucrReceiverStation.Selector = Nothing + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.ucrSelector = Nothing + ' 'rdoMultSpells ' resources.ApplyResources(Me.rdoMultSpells, "rdoMultSpells") @@ -552,26 +592,6 @@ Partial Class dlgTransformClimatic Me.rdoMultSpells.Name = "rdoMultSpells" Me.rdoMultSpells.UseVisualStyleBackColor = True ' - 'rdoCumulative - ' - resources.ApplyResources(Me.rdoCumulative, "rdoCumulative") - Me.rdoCumulative.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCumulative.FlatAppearance.BorderSize = 2 - Me.rdoCumulative.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCumulative.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoCumulative.Name = "rdoCumulative" - Me.rdoCumulative.UseVisualStyleBackColor = True - ' - 'rdoDegree - ' - resources.ApplyResources(Me.rdoDegree, "rdoDegree") - Me.rdoDegree.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoDegree.FlatAppearance.BorderSize = 2 - Me.rdoDegree.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoDegree.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoDegree.Name = "rdoDegree" - Me.rdoDegree.UseVisualStyleBackColor = True - ' 'lblTMax ' resources.ApplyResources(Me.lblTMax, "lblTMax") @@ -582,16 +602,31 @@ Partial Class dlgTransformClimatic resources.ApplyResources(Me.lblTMean, "lblTMean") Me.lblTMean.Name = "lblTMean" ' - 'ucrSaveColumn - ' - resources.ApplyResources(Me.ucrSaveColumn, "ucrSaveColumn") - Me.ucrSaveColumn.Name = "ucrSaveColumn" - ' 'ucrPnlTransform ' resources.ApplyResources(Me.ucrPnlTransform, "ucrPnlTransform") Me.ucrPnlTransform.Name = "ucrPnlTransform" ' + 'rdoDegree + ' + resources.ApplyResources(Me.rdoDegree, "rdoDegree") + Me.rdoDegree.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDegree.FlatAppearance.BorderSize = 2 + Me.rdoDegree.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDegree.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoDegree.Name = "rdoDegree" + Me.rdoDegree.UseVisualStyleBackColor = True + ' + 'rdoCumulative + ' + resources.ApplyResources(Me.rdoCumulative, "rdoCumulative") + Me.rdoCumulative.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCumulative.FlatAppearance.BorderSize = 2 + Me.rdoCumulative.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCumulative.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoCumulative.Name = "rdoCumulative" + Me.rdoCumulative.UseVisualStyleBackColor = True + ' 'ucrReceiverDate ' resources.ApplyResources(Me.ucrReceiverDate, "ucrReceiverDate") @@ -601,23 +636,6 @@ Partial Class dlgTransformClimatic Me.ucrReceiverDate.strNcFilePath = "" Me.ucrReceiverDate.ucrSelector = Nothing ' - 'ucrReceiverStation - ' - resources.ApplyResources(Me.ucrReceiverStation, "ucrReceiverStation") - Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Name = "ucrReceiverStation" - Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.strNcFilePath = "" - Me.ucrReceiverStation.ucrSelector = Nothing - ' - 'ucrSelectorTransform - ' - resources.ApplyResources(Me.ucrSelectorTransform, "ucrSelectorTransform") - Me.ucrSelectorTransform.bDropUnusedFilterLevels = False - Me.ucrSelectorTransform.bShowHiddenColumns = False - Me.ucrSelectorTransform.bUseCurrentFilter = True - Me.ucrSelectorTransform.Name = "ucrSelectorTransform" - ' 'ucrBase ' resources.ApplyResources(Me.ucrBase, "ucrBase") @@ -632,6 +650,15 @@ Partial Class dlgTransformClimatic Me.ucrReceiverTMin.strNcFilePath = "" Me.ucrReceiverTMin.ucrSelector = Nothing ' + 'ucrReceiverYear + ' + resources.ApplyResources(Me.ucrReceiverYear, "ucrReceiverYear") + Me.ucrReceiverYear.frmParent = Me + Me.ucrReceiverYear.Name = "ucrReceiverYear" + Me.ucrReceiverYear.Selector = Nothing + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.ucrSelector = Nothing + ' 'ucrReceiverTMean ' resources.ApplyResources(Me.ucrReceiverTMean, "ucrReceiverTMean") @@ -650,78 +677,51 @@ Partial Class dlgTransformClimatic Me.ucrReceiverTMax.strNcFilePath = "" Me.ucrReceiverTMax.ucrSelector = Nothing ' - 'ucrReceiverData - ' - resources.ApplyResources(Me.ucrReceiverData, "ucrReceiverData") - Me.ucrReceiverData.frmParent = Me - Me.ucrReceiverData.Name = "ucrReceiverData" - Me.ucrReceiverData.Selector = Nothing - Me.ucrReceiverData.strNcFilePath = "" - Me.ucrReceiverData.ucrSelector = Nothing - ' - 'ucrReceiverYear - ' - resources.ApplyResources(Me.ucrReceiverYear, "ucrReceiverYear") - Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Name = "ucrReceiverYear" - Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.ucrSelector = Nothing - ' - 'ucrChkUseMaxMin - ' - resources.ApplyResources(Me.ucrChkUseMaxMin, "ucrChkUseMaxMin") - Me.ucrChkUseMaxMin.Checked = True - Me.ucrChkUseMaxMin.Name = "ucrChkUseMaxMin" - ' - 'ucrChkWB + 'ucrSaveColumn ' - resources.ApplyResources(Me.ucrChkWB, "ucrChkWB") - Me.ucrChkWB.Checked = False - Me.ucrChkWB.Name = "ucrChkWB" + resources.ApplyResources(Me.ucrSaveColumn, "ucrSaveColumn") + Me.ucrSaveColumn.Name = "ucrSaveColumn" ' - 'ucrNudWB + 'ucrSelectorTransform ' - resources.ApplyResources(Me.ucrNudWB, "ucrNudWB") - Me.ucrNudWB.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudWB.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWB.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudWB.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudWB.Name = "ucrNudWB" - Me.ucrNudWB.Value = New Decimal(New Integer() {0, 0, 0, 0}) + resources.ApplyResources(Me.ucrSelectorTransform, "ucrSelectorTransform") + Me.ucrSelectorTransform.bDropUnusedFilterLevels = False + Me.ucrSelectorTransform.bShowHiddenColumns = False + Me.ucrSelectorTransform.bUseCurrentFilter = True + Me.ucrSelectorTransform.Name = "ucrSelectorTransform" ' 'dlgTransformClimatic ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.Controls.Add(Me.rdoDegree) - Me.Controls.Add(Me.ucrSaveColumn) - Me.Controls.Add(Me.rdoCumulative) - Me.Controls.Add(Me.rdoMultSpells) Me.Controls.Add(Me.rdoWaterBalance) Me.Controls.Add(Me.rdoSpell) + Me.Controls.Add(Me.lblDate) Me.Controls.Add(Me.rdoMoving) Me.Controls.Add(Me.rdoCount) - Me.Controls.Add(Me.ucrPnlTransform) Me.Controls.Add(Me.lblStation) - Me.Controls.Add(Me.ucrReceiverDate) - Me.Controls.Add(Me.ucrReceiverStation) - Me.Controls.Add(Me.ucrSelectorTransform) - Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.lblYear) - Me.Controls.Add(Me.lblDate) - Me.Controls.Add(Me.ucrReceiverTMin) + Me.Controls.Add(Me.ucrChkUseMaxMin) + Me.Controls.Add(Me.lblData) + Me.Controls.Add(Me.grpTransform) Me.Controls.Add(Me.grpDegree) - Me.Controls.Add(Me.ucrReceiverTMean) + Me.Controls.Add(Me.ucrReceiverData) Me.Controls.Add(Me.lblTMin) + Me.Controls.Add(Me.ucrReceiverStation) + Me.Controls.Add(Me.rdoMultSpells) Me.Controls.Add(Me.lblTMax) - Me.Controls.Add(Me.ucrReceiverTMax) - Me.Controls.Add(Me.ucrReceiverData) - Me.Controls.Add(Me.ucrReceiverYear) - Me.Controls.Add(Me.ucrChkUseMaxMin) Me.Controls.Add(Me.lblTMean) - Me.Controls.Add(Me.lblData) - Me.Controls.Add(Me.grpTransform) + Me.Controls.Add(Me.ucrPnlTransform) + Me.Controls.Add(Me.rdoDegree) + Me.Controls.Add(Me.rdoCumulative) + Me.Controls.Add(Me.ucrReceiverDate) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.ucrReceiverTMin) + Me.Controls.Add(Me.ucrReceiverYear) + Me.Controls.Add(Me.ucrReceiverTMean) + Me.Controls.Add(Me.ucrReceiverTMax) + Me.Controls.Add(Me.ucrSaveColumn) + Me.Controls.Add(Me.ucrSelectorTransform) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -735,80 +735,80 @@ Partial Class dlgTransformClimatic End Sub - Friend WithEvents ucrBase As ucrButtons - Friend WithEvents ucrReceiverYear As ucrReceiverSingle - Friend WithEvents lblYear As Label - Friend WithEvents lblDate As Label - Friend WithEvents ucrReceiverDate As ucrReceiverSingle - Friend WithEvents lblStation As Label - Friend WithEvents ucrReceiverStation As ucrReceiverSingle - Friend WithEvents ucrSelectorTransform As ucrSelectorByDataFrameAddRemove - Friend WithEvents lblData As Label - Friend WithEvents ucrReceiverData As ucrReceiverSingle Friend WithEvents rdoWaterBalance As RadioButton + Friend WithEvents ucrNudLimit As ucrNud + Friend WithEvents ucrNudMgdd As ucrNud + Friend WithEvents lblBaselineMgdd As Label + Friend WithEvents lblLimit As Label + Friend WithEvents ucrInputPosition As ucrInputComboBox + Friend WithEvents ucrChkCircular As ucrCheck Friend WithEvents rdoSpell As RadioButton + Friend WithEvents lblRowsMultSpells As Label + Friend WithEvents lblDate As Label + Friend WithEvents ucrInputSpellUpper As ucrInputTextBox Friend WithEvents rdoMoving As RadioButton Friend WithEvents rdoCount As RadioButton - Friend WithEvents ucrPnlTransform As UcrPanel - Friend WithEvents lblSumRows As Label - Friend WithEvents ucrNudSumOver As ucrNud - Friend WithEvents lblSumOver As Label - Friend WithEvents ucrInputSum As ucrInputComboBox - Friend WithEvents ucrNudCountOver As ucrNud - Friend WithEvents lblCountOver As Label - Friend WithEvents lblWBEvaporation As Label - Friend WithEvents ucrNudWBCapacity As ucrNud - Friend WithEvents lblWBCapacity As Label + Friend WithEvents lblStation As Label + Friend WithEvents lblYear As Label + Friend WithEvents ucrChkUseMaxMin As ucrCheck + Friend WithEvents lblData As Label Friend WithEvents grpTransform As GroupBox - Friend WithEvents ucrInputSpellUpper As ucrInputTextBox - Friend WithEvents ucrInputCondition As ucrInputComboBox - Friend WithEvents lblCondition As Label - Friend WithEvents rdoMultSpells As RadioButton - Friend WithEvents ucrChkGroupByYear As ucrCheck - Friend WithEvents ucrNudMultSpells As ucrNud - Friend WithEvents lblRowsMultSpells As Label - Friend WithEvents ucrInputEvaporation As ucrInputTextBox - Friend WithEvents ucrPnlEvap As UcrPanel + Friend WithEvents ucrNudWB As ucrNud + Friend WithEvents ucrChkWB As ucrCheck + Friend WithEvents ucrInputSpellLower As ucrInputComboBox + Friend WithEvents ucrChkOptions As ucrCheck Friend WithEvents ucrReceiverEvap As ucrReceiverSingle - Friend WithEvents rdoEvapVariable As RadioButton - Friend WithEvents rdoEvapValue As RadioButton - Friend WithEvents lblPosition As Label - Friend WithEvents ucrInputPosition As ucrInputComboBox - Friend WithEvents ucrChkCircular As ucrCheck - Friend WithEvents ucrInputCircularPosition As ucrInputComboBox - Friend WithEvents rdoCumulative As RadioButton - Friend WithEvents ucrInputCumulative As ucrInputComboBox - Friend WithEvents ucrSaveColumn As ucrSave - Friend WithEvents ucrReceiverTMean As ucrReceiverSingle - Friend WithEvents lblTMean As Label - Friend WithEvents ucrReceiverTMin As ucrReceiverSingle - Friend WithEvents lblTMax As Label - Friend WithEvents ucrReceiverTMax As ucrReceiverSingle - Friend WithEvents lblTMin As Label - Friend WithEvents ucrChkUseMaxMin As ucrCheck - Friend WithEvents rdoDegree As RadioButton - Friend WithEvents rdoDiurnalRange As RadioButton - Friend WithEvents ucrPnlDegree As UcrPanel - Friend WithEvents rdoModifiedGDD As RadioButton - Friend WithEvents rdoGrowingDegreeDays As RadioButton - Friend WithEvents rdoHeatingDegreeDays As RadioButton - Friend WithEvents rdoTMean As RadioButton Friend WithEvents grpDegree As GroupBox + Friend WithEvents rdoModifiedGDD As RadioButton Friend WithEvents lblBaselineGDD As Label + Friend WithEvents rdoGrowingDegreeDays As RadioButton Friend WithEvents lblBaselineHDD As Label + Friend WithEvents rdoHeatingDegreeDays As RadioButton Friend WithEvents ucrNudGDD As ucrNud + Friend WithEvents rdoTMean As RadioButton Friend WithEvents ucrNudHDD As ucrNud - Friend WithEvents lblLimit As Label - Friend WithEvents ucrChkOptions As ucrCheck - Friend WithEvents ucrInputSpellLower As ucrInputComboBox - Friend WithEvents ucrNudMgdd As ucrNud - Friend WithEvents lblBaselineMgdd As Label - Friend WithEvents ucrNudLimit As ucrNud - Friend WithEvents ttRdoRange As ToolTip + Friend WithEvents rdoDiurnalRange As RadioButton + Friend WithEvents ucrPnlDegree As UcrPanel + Friend WithEvents ucrReceiverData As ucrReceiverSingle + Friend WithEvents lblTMin As Label + Friend WithEvents ucrReceiverStation As ucrReceiverSingle + Friend WithEvents rdoMultSpells As RadioButton + Friend WithEvents lblTMax As Label + Friend WithEvents lblTMean As Label + Friend WithEvents ucrPnlTransform As UcrPanel + Friend WithEvents rdoDegree As RadioButton + Friend WithEvents rdoCumulative As RadioButton + Friend WithEvents ucrReceiverDate As ucrReceiverSingle + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrReceiverTMin As ucrReceiverSingle + Friend WithEvents ucrReceiverYear As ucrReceiverSingle + Friend WithEvents ucrReceiverTMean As ucrReceiverSingle + Friend WithEvents ucrReceiverTMax As ucrReceiverSingle + Friend WithEvents ucrSaveColumn As ucrSave + Friend WithEvents ucrSelectorTransform As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrInputEvaporation As ucrInputTextBox + Friend WithEvents ucrChkGroupByYear As ucrCheck + Friend WithEvents rdoEvapVariable As RadioButton + Friend WithEvents rdoEvapValue As RadioButton + Friend WithEvents ucrPnlEvap As UcrPanel + Friend WithEvents ucrInputCircularPosition As ucrInputComboBox + Friend WithEvents lblPosition As Label + Friend WithEvents ucrNudMultSpells As ucrNud + Friend WithEvents lblSumRows As Label + Friend WithEvents ucrInputCondition As ucrInputComboBox + Friend WithEvents lblCondition As Label + Friend WithEvents lblWBEvaporation As Label + Friend WithEvents lblCountOver As Label + Friend WithEvents ucrNudSumOver As ucrNud + Friend WithEvents lblWBCapacity As Label + Friend WithEvents ucrNudWBCapacity As ucrNud + Friend WithEvents ucrInputSum As ucrInputComboBox + Friend WithEvents lblSumOver As Label + Friend WithEvents ucrNudCountOver As ucrNud + Friend WithEvents ucrInputCumulative As ucrInputComboBox + Friend WithEvents ttRdoGdd As ToolTip Friend WithEvents ttRdoTMean As ToolTip Friend WithEvents ttRdoHdd As ToolTip - Friend WithEvents ttRdoGdd As ToolTip Friend WithEvents ttRdoMgdd As ToolTip - Friend WithEvents ucrNudWB As ucrNud - Friend WithEvents ucrChkWB As ucrCheck + Friend WithEvents ttRdoRange As ToolTip End Class diff --git a/instat/dlgTransformClimatic.resx b/instat/dlgTransformClimatic.resx index b41733cce82..7df82c09ec8 100644 --- a/instat/dlgTransformClimatic.resx +++ b/instat/dlgTransformClimatic.resx @@ -117,141 +117,219 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - NoControl + + Button + + + None - - 408, 250 + + MiddleCenter - - 4, 0, 4, 0 + + Flat - - 47, 20 + + NoControl - - 12 + + 358, 8 - - Year: + + 71, 40 - - lblYear + + + 75 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Water Balance - + + MiddleCenter + + + rdoWaterBalance + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 14 + + 0 - + True - - NoControl + + 136, 122 - - 408, 176 + + 6, 6, 6, 6 - - 4, 0, 4, 0 + + 50, 20 - - 48, 20 + + 45 - - 8 + + ucrNudLimit - - Date: + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - lblDate + + grpDegree - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - $this + + True - - 15 + + 136, 97 - + + 6, 6, 6, 6 + + + 50, 20 + + + 44 + + + ucrNudMgdd + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpDegree + + + 1 + + True - + NoControl - - 408, 100 - - - 4, 0, 4, 0 + + 85, 101 - - 64, 20 + + 50, 13 - - 6 + + 45 - - Station: + + Baseline: - - lblStation + + lblBaselineMgdd - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + grpDegree - - 9 + + 2 - + True - + NoControl - - 408, 326 - - - 4, 0, 4, 0 + + 101, 124 - - 72, 20 + + 31, 13 - - 16 + + 44 - - Element: + + Limit: - - lblData + + lblLimit - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + grpDegree - + + 3 + + + GrowAndShrink + + + 199, 55 + + + 9, 9, 9, 9 + + + 137, 21 + + + 24 + + + ucrInputPosition + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 12 + + + True + + + 24, 58 + + + 6, 6, 6, 6 + + + 100, 34 + + 26 + + ucrChkCircular + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 13 + Button @@ -268,16 +346,13 @@ NoControl - 332, 22 - - - 4, 4, 4, 4 + 220, 8 - 106, 60 + 71, 40 - 3 + 74 Spell @@ -295,43 +370,127 @@ $this - 5 - - - Button - - - None - - - MiddleCenter + 1 - - Flat + + True - + NoControl - - 228, 22 + + 12, 25 - - 4, 4, 4, 4 + + 126, 13 - - 106, 60 + + 14 - - 2 + + Rows to Take Max Over: - - Moving + + lblRowsMultSpells - - MiddleCenter + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - rdoMoving + + grpTransform + + + 15 + + + True + + + NoControl + + + 257, 110 + + + 33, 13 + + + 79 + + + Date: + + + lblDate + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + 285, 50 + + + 9, 9, 9, 9 + + + 49, 21 + + + 13 + + + ucrInputSpellUpper + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 16 + + + Button + + + None + + + MiddleCenter + + + Flat + + + NoControl + + + 151, 8 + + + 71, 40 + + + 73 + + + Moving + + + MiddleCenter + + + rdoMoving System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -340,7 +499,7 @@ $this - 6 + 3 Button @@ -355,16 +514,13 @@ NoControl - 21, 22 - - - 4, 4, 4, 4 + 13, 8 - 106, 60 + 71, 40 - 1 + 72 Count @@ -382,163 +538,136 @@ $this - 7 - - - Button - - - None - - - MiddleCenter + 4 - - Flat + + True - + NoControl - - 538, 22 - - - 4, 4, 4, 4 - - - 106, 60 + + 257, 60 - - 4 + + 43, 13 - - Water Balance + + 77 - - MiddleCenter + + Station: - - rdoWaterBalance + + lblStation - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 4 + + 5 - + True - + NoControl - - 368, 36 - - - 4, 0, 4, 0 + + 257, 160 - - 49, 20 + + 32, 13 - - 5 + + 81 - - Rows + + Year: - - lblSumRows + + lblYear - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpTransform + + $this - - 17 + + 6 - + True - - NoControl - - - 236, 36 - - - 4, 0, 4, 0 + + 260, 173 - - 42, 20 + + 6, 6, 6, 6 - - 3 + + 144, 24 - - Over + + 91 - - lblSumOver + + ucrChkUseMaxMin - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpTransform + + $this - - 26 + + 7 - + True - + NoControl - - 18, 36 - - - 4, 0, 4, 0 + + 258, 210 - - 155, 20 + + 48, 13 - - 8 + + 83 - - Rows to Count Over: + + Element: - - lblCountOver + + lblData - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpTransform + + $this - - 21 + + 8 True - 186, 122 + 124, 81 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 45 @@ -559,13 +688,13 @@ True - 23, 122 + 15, 81 - 6, 6, 6, 6 + 4, 4, 4, 4 - 150, 34 + 100, 23 44 @@ -586,13 +715,13 @@ GrowAndShrink - 106, 76 + 71, 51 - 14, 14, 14, 14 + 9, 9, 9, 9 - 74, 32 + 49, 21 43 @@ -613,493 +742,46 @@ True - 399, 168 + 266, 112 - 9, 9, 9, 9 + 6, 6, 6, 6 - 114, 51 - - - 38 - - - False - - - ucrChkOptions - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpTransform - - - 3 - - - True - - - True - - - 144, 144 - - - True - - - 1154, 735 - - - Button - - - None - - - MiddleCenter - - - Flat - - - NoControl - - - 642, 22 - - - 4, 4, 4, 4 - - - 106, 60 - - - 26 - - - Degrees - - - MiddleCenter - - - rdoDegree - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - GrowAndShrink - - - 16, 616 - - - 6, 8, 6, 8 - - - 502, 32 - - - 20 - - - ucrSaveColumn - - - instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 1 - - - Button - - - None - - - MiddleCenter - - - Flat - - - NoControl - - - 124, 22 - - - 4, 4, 4, 4 - - - 106, 60 - - - 25 - - - Cumulative - - - MiddleCenter - - - rdoCumulative - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - Button - - - None - - - MiddleCenter - - - Flat - - - NoControl - - - 435, 22 - - - 4, 4, 4, 4 - - - 106, 60 - - - 23 - - - Multiple Spells - - - MiddleCenter - - - rdoMultSpells - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - GrowAndShrink - - - 16, 14 - - - 9, 9, 9, 9 - - - 746, 74 - - - 0 - - - ucrPnlTransform - - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 8 - - - True - - - 412, 195 - - - 0, 0, 0, 0 - - - 206, 30 - - - 9 - - - ucrReceiverDate - - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 10 - - - True - - - 412, 120 - - - 0, 0, 0, 0 - - - 206, 30 - - - 7 - - - ucrReceiverStation - - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 11 - - - True - - - 15, 92 - - - 0, 0, 0, 0 - - - 320, 274 - - - 5 - - - ucrSelectorTransform - - - instat.ucrSelectorByDataFrameAddRemove, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 12 - - - True - - - GrowAndShrink - - - 15, 656 - - - 6, 6, 6, 6 - - - 611, 77 - - - 21 - - - ucrBase - - - instat.ucrButtons, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 13 - - - True - - - 412, 420 - - - 0, 0, 0, 0 - - - 206, 30 - - - 31 - - - ucrReceiverTMin - - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 16 - - - True - - - 266, 183 - - - 9, 9, 9, 9 - - - 75, 30 - - - 45 - - - ucrNudLimit - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpDegree - - - 0 - - - True - - - 266, 146 - - - 9, 9, 9, 9 - - - 75, 30 - - - 44 - - - ucrNudMgdd - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpDegree - - - 1 - - - True - - - NoControl - - - 184, 150 - - - 4, 0, 4, 0 - - - 74, 20 - - - 45 - - - Baseline: - - - lblBaselineMgdd - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpDegree - - - 2 - - - True + 100, 34 - - NoControl + + 38 - - 204, 186 + + False - - 4, 0, 4, 0 + + ucrChkOptions - - 46, 20 + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 44 + + grpTransform - - Limit: + + 3 - - lblLimit + + True - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + 96, 96 - - grpDegree + + True - - 3 + + 516, 490 True @@ -1108,13 +790,10 @@ NoControl - 22, 183 - - - 4, 4, 4, 4 + 10, 122 - 139, 24 + 95, 17 41 @@ -1141,13 +820,10 @@ NoControl - 184, 150 - - - 4, 0, 4, 0 + 85, 100 - 74, 20 + 50, 13 43 @@ -1174,13 +850,10 @@ NoControl - 22, 148 - - - 4, 4, 4, 4 + 10, 99 - 75, 24 + 52, 17 40 @@ -1207,13 +880,10 @@ NoControl - 184, 116 - - - 4, 0, 4, 0 + 85, 77 - 74, 20 + 50, 13 43 @@ -1240,13 +910,10 @@ NoControl - 22, 114 - - - 4, 4, 4, 4 + 10, 76 - 74, 24 + 52, 17 39 @@ -1270,13 +937,13 @@ True - 266, 146 + 137, 97 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 43 @@ -1300,13 +967,10 @@ NoControl - 22, 80 - - - 4, 4, 4, 4 + 10, 53 - 87, 24 + 61, 17 38 @@ -1330,13 +994,13 @@ True - 266, 110 + 136, 73 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 43 @@ -1360,13 +1024,10 @@ NoControl - 22, 45 - - - 4, 4, 4, 4 + 10, 30 - 140, 24 + 96, 17 37 @@ -1390,220 +1051,448 @@ GrowAndShrink - 9, 28 + 6, 19 - 9, 9, 9, 9 + 6, 6, 6, 6 - 178, 190 + 99, 127 34 - - ucrPnlDegree + + ucrPnlDegree + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpDegree + + + 13 + + + 9, 246 + + + 195, 151 + + + 98 + + + Options: + + + grpDegree + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + True + + + 260, 223 + + + 0, 0, 0, 0 + + + 123, 20 + + + 84 + + + ucrReceiverData + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 11 + + + True + + + NoControl + + + 257, 260 + + + 33, 13 + + + 92 + + + Tmin: + + + lblTMin + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 12 + + + True + + + 260, 73 + + + 0, 0, 0, 0 + + + 123, 20 + + + 78 + + + ucrReceiverStation + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 13 + + + Button + + + None + + + MiddleCenter + + + Flat + + + NoControl + + + 289, 8 + + + 71, 40 + + + 88 + + + Multiple Spells + + + MiddleCenter + + + rdoMultSpells + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + True + + + NoControl + + + 257, 210 + + + 36, 13 + + + 94 + + + Tmax: + + + lblTMax + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + True + + + NoControl + + + 255, 210 + + + 43, 13 + + + 96 + + + Tmean: + + + lblTMean + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + + + GrowAndShrink - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 10, 2 - - grpDegree + + 6, 6, 6, 6 - - 13 + + 497, 49 - - 785, 176 + + 71 - - 4, 4, 4, 4 + + ucrPnlTransform - - 4, 4, 4, 4 + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 356, 226 + + $this - - 42 + + 17 - - Options: + + Button - - grpDegree + + None - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + MiddleCenter - - $this + + Flat - - 17 + + NoControl - - True + + 427, 8 - - 412, 345 + + 71, 40 - - 0, 0, 0, 0 + + 90 - - 206, 30 + + Degrees - - 33 + + MiddleCenter - - ucrReceiverTMean + + rdoDegree - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 18 - - True + + Button - + + None + + + MiddleCenter + + + Flat + + NoControl - - 408, 400 + + 82, 8 - - 4, 0, 4, 0 + + 71, 40 - - 47, 20 + + 89 - - 28 + + Cumulative - - Tmin: + + MiddleCenter - - lblTMin + + rdoCumulative - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 19 - + True - - NoControl - - - 408, 326 - - - 4, 0, 4, 0 + + 260, 123 - - 51, 20 + + 0, 0, 0, 0 - - 30 + + 123, 20 - - Tmax: + + 80 - - lblTMax + + ucrReceiverDate - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - + 20 - + True - - 412, 345 + + GrowAndShrink - - 0, 0, 0, 0 + + 9, 430 - - 206, 30 + + 4, 4, 4, 4 - - 29 + + 408, 52 - - ucrReceiverTMax + + 87 - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + ucrBase - + + instat.ucrButtons, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + $this - + 21 - + True - - 412, 345 + + 260, 273 - + 0, 0, 0, 0 - - 206, 30 + + 123, 20 - - 17 + + 95 - - ucrReceiverData + + ucrReceiverTMin - + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - + 22 True - 412, 270 + 260, 173 0, 0, 0, 0 - 206, 30 + 123, 20 - 13 + 82 ucrReceiverYear @@ -1617,68 +1506,113 @@ 23 - + True - - 412, 270 + + 260, 223 - - 9, 9, 9, 9 + + 0, 0, 0, 0 - - 206, 36 + + 123, 20 - - 27 + + 97 - - ucrChkUseMaxMin + + ucrReceiverTMean + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 24 + + + True + + + 260, 223 + + + 0, 0, 0, 0 + + + 123, 20 + + + 93 + + + ucrReceiverTMax + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 25 + + + GrowAndShrink + + + 10, 404 + + + 4, 5, 4, 5 + + + 335, 21 + + + 86 + + + ucrSaveColumn - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - - 24 + + 26 - + True - - NoControl - - - 408, 326 - - - 4, 0, 4, 0 + + 9, 54 - - 62, 20 + + 0, 0, 0, 0 - - 32 + + 213, 183 - - Tmean: + + 76 - - lblTMean + + ucrSelectorTransform - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrSelectorByDataFrameAddRemove, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - - 25 - - - 4, 4, 4, 4 + + 27 CenterScreen @@ -1686,10 +1620,10 @@ Transform - - ttRdoRange + + ttRdoGdd - + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1704,18 +1638,18 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ttRdoGdd - - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ttRdoMgdd System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ttRdoRange + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + dlgTransformClimatic @@ -1723,13 +1657,13 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 530, 80 + 310, 53 0, 0, 0, 0 - 154, 30 + 103, 20 37 @@ -1750,13 +1684,13 @@ True - 232, 80 + 151, 53 - 14, 14, 14, 14 + 9, 9, 9, 9 - 154, 32 + 88, 21 31 @@ -1777,13 +1711,13 @@ True - 36, 168 + 24, 112 - 9, 9, 9, 9 + 6, 6, 6, 6 - 261, 51 + 174, 34 22 @@ -1807,13 +1741,10 @@ NoControl - 430, 83 - - - 4, 4, 4, 4 + 247, 55 - 92, 24 + 63, 17 36 @@ -1840,13 +1771,10 @@ NoControl - 129, 82 - - - 4, 4, 4, 4 + 86, 55 - 75, 24 + 52, 17 35 @@ -1870,13 +1798,13 @@ GrowAndShrink - 123, 70 + 82, 47 - 9, 9, 9, 9 + 6, 6, 6, 6 - 578, 44 + 343, 29 29 @@ -1897,13 +1825,13 @@ GrowAndShrink - 298, 82 + 199, 55 - 14, 14, 14, 14 + 9, 9, 9, 9 - 206, 32 + 137, 21 27 @@ -1927,13 +1855,10 @@ NoControl - 226, 88 - - - 4, 0, 4, 0 + 151, 59 - 69, 20 + 47, 13 25 @@ -1953,71 +1878,17 @@ 11 - - GrowAndShrink - - - 298, 82 - - - 14, 14, 14, 14 - - - 206, 32 - - - 24 - - - ucrInputPosition - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpTransform - - - 12 - - - True - - - 36, 87 - - - 9, 9, 9, 9 - - - 150, 51 - - - 26 - - - ucrChkCircular - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpTransform - - - 13 - True - 291, 32 + 194, 21 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 15 @@ -2034,77 +1905,47 @@ 14 - + True - + NoControl - - 18, 38 - - - 4, 0, 4, 0 + + 245, 24 - - 180, 20 + + 34, 13 - - 14 + + 5 - - Rows to Take Max Over: + + Rows - - lblRowsMultSpells + + lblSumRows - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpTransform - - - 15 - - - True - - - 428, 75 - - - 14, 14, 14, 14 - - - 74, 32 - - - 13 - - - ucrInputSpellUpper - - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - + grpTransform - - 16 + + 17 GrowAndShrink - 186, 75 + 124, 50 - 14, 14, 14, 14 + 9, 9, 9, 9 - 232, 32 + 155, 21 12 @@ -2128,13 +1969,10 @@ NoControl - 18, 80 - - - 4, 0, 4, 0 + 12, 53 - 80, 20 + 54, 13 10 @@ -2161,13 +1999,10 @@ NoControl - 20, 82 - - - 4, 0, 4, 0 + 13, 55 - 98, 20 + 67, 13 6 @@ -2187,17 +2022,47 @@ 20 + + True + + + NoControl + + + 12, 24 + + + 106, 13 + + + 8 + + + Rows to Count Over: + + + lblCountOver + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 21 + True - 290, 32 + 193, 21 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 4 @@ -2221,13 +2086,10 @@ NoControl - 20, 38 - - - 4, 0, 4, 0 + 13, 25 - 74, 20 + 51, 13 1 @@ -2251,13 +2113,13 @@ True - 129, 32 + 86, 21 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 2 @@ -2278,13 +2140,13 @@ GrowAndShrink - 36, 32 + 24, 21 - 14, 14, 14, 14 + 9, 9, 9, 9 - 168, 32 + 112, 21 0 @@ -2301,17 +2163,47 @@ 25 + + True + + + NoControl + + + 157, 24 + + + 30, 13 + + + 3 + + + Over + + + lblSumOver + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 26 + True - 201, 32 + 134, 21 - 9, 9, 9, 9 + 6, 6, 6, 6 - 75, 30 + 50, 20 9 @@ -2332,13 +2224,13 @@ GrowAndShrink - 36, 32 + 24, 21 - 14, 14, 14, 14 + 9, 9, 9, 9 - 168, 32 + 112, 21 26 @@ -2356,19 +2248,13 @@ 28 - 15, 392 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 + 9, 254 - 733, 213 + 428, 151 - 18 + 85 Options @@ -2383,21 +2269,21 @@ $this - 27 + 9 - - 17, 17 + + 38, 8 - 133, 17 + 170, 8 - 252, 17 - - - 357, 17 + 289, 8 - 462, 17 + 405, 12 + + + 520, 12 \ No newline at end of file diff --git a/instat/dlgTransformClimatic.vb b/instat/dlgTransformClimatic.vb index 1aefa1e19c8..54f8333ae37 100644 --- a/instat/dlgTransformClimatic.vb +++ b/instat/dlgTransformClimatic.vb @@ -35,8 +35,8 @@ Public Class dlgTransformClimatic Private clsGreaterThanOperator, clsLessThanOperator As New ROperator ' Water Balance - Private clsPMinFunctionMax, clsPMaxFunctionMax, clsRWaterBalanceFunction As New RFunction - Private clsPMaxOperatorMax, clsReduceOpEvapValue As New ROperator + Private clsPMinFunctionMax, clsPMaxFunctionMax, clsRWaterBalanceFunction, clsTailFunction, clsWBEvaporation As New RFunction + Private clsPMaxOperatorMax, clsReduceOpEvapValue, clsWBOperator As New ROperator 'Degree Private clsDiurnalRangeOperator, clsTMeanAddOperator, clsTMeanDivideOperator As New ROperator @@ -230,9 +230,10 @@ Public Class dlgTransformClimatic ucrChkWB.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkWB.SetText("Reducing") - ucrNudWB.SetParameter(New RParameter("WB_evap_value")) + ucrNudWB.SetParameter(New RParameter("WB_evap_value", 2)) ucrNudWB.SetMinMax(0, 1) ucrNudWB.Increment = 0.01 + ucrNudWB.DecimalPlaces = 2 ' Count ucrNudCountOver.SetParameter(New RParameter("width", 1)) @@ -322,7 +323,7 @@ Public Class dlgTransformClimatic ucrPnlDegree.AddToLinkedControls(ucrNudHDD, {rdoHeatingDegreeDays}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=15.0) ucrPnlDegree.AddToLinkedControls(ucrNudLimit, {rdoModifiedGDD}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=30.0) - ucrChkWB.AddToLinkedControls(ucrNudWB, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkWB.AddToLinkedControls(ucrNudWB, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.5) ucrPnlTransform.AddToLinkedControls({ucrInputCumulative}, {rdoCumulative}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Sum") ucrPnlTransform.AddToLinkedControls({ucrNudCountOver}, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=1) @@ -337,7 +338,6 @@ Public Class dlgTransformClimatic ucrPnlTransform.AddToLinkedControls({ucrReceiverYear, ucrReceiverData, ucrChkOptions}, {rdoCumulative, rdoCount, rdoMoving, rdoMultSpells, rdoSpell, rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlTransform.AddToLinkedControls({ucrChkUseMaxMin, ucrPnlDegree}, {rdoDegree}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlTransform.AddToLinkedControls({ucrChkWB}, {rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkCircular.AddToLinkedControls(ucrInputCircularPosition, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkCircular.AddToLinkedControls(ucrInputPosition, {False}, bNewLinkedHideIfParameterMissing:=True) @@ -366,7 +366,8 @@ Public Class dlgTransformClimatic clsReplaceNAasElement = New RFunction clsRCountFunction = New RFunction clsRWaterBalanceFunction = New RFunction - + clsWBEvaporation = New RFunction + clsTailFunction = New RFunction clsRRaindayMatch = New RFunction clsRRaindayAndOperator = New ROperator clsRRaindayOrOperator = New ROperator @@ -395,6 +396,7 @@ Public Class dlgTransformClimatic clsPMinFunctionMax = New RFunction clsPMaxFunctionMax = New RFunction clsPMaxOperatorMax = New ROperator + clsWBOperator = New ROperator clsGroupByYear.Clear() clsReduceOpEvapValue.Clear() clsGreaterThanOperator.Clear() @@ -496,8 +498,24 @@ Public Class dlgTransformClimatic clsPMinFunctionMax.AddParameter("capacity", 60, iPosition:=1, bIncludeArgumentName:=False) clsRWaterBalanceFunction.AddParameter("replace_na", iPosition:=1, bIncludeArgumentName:=False) clsRWaterBalanceFunction.AddParameter("accumulate", "TRUE", iPosition:=2) - '"Reduce(function(x, y) pmin(pmax(x + y - " & ucrInputEvaporation.GetText & ", 0), " & ucrNudCapacity.Value & "), Rain, accumulate=TRUE)" & Chr(34)) + clsWBOperator.SetOperation("-") + clsWBOperator.AddParameter("left", "x + y", iPosition:=0) + clsWBOperator.AddParameter("right", clsRFunctionParameter:=clsWBEvaporation, iPosition:=1) + clsWBOperator.bSpaceAroundOperation = True + clsWBOperator.bBrackets = False + + clsWBEvaporation.SetRCommand("WB_evaporation") + clsWBEvaporation.AddParameter("water_balance", "x", iPosition:=0, bIncludeArgumentName:=False) + clsWBEvaporation.AddParameter("WB_evap_value", 0.5, iPosition:=1, bIncludeArgumentName:=False) + clsWBEvaporation.AddParameter("capacity", 60, iPosition:=2, bIncludeArgumentName:=False) + clsWBEvaporation.AddParameter("evaporation_value", 5, iPosition:=3, bIncludeArgumentName:=False) + clsWBEvaporation.AddParameter("rain", "rain", iPosition:=4, bIncludeArgumentName:=False) + + clsTailFunction.SetPackageName("utils") + clsTailFunction.SetRCommand("tail") + clsTailFunction.AddParameter("x", "rain", iPosition:=0) + clsTailFunction.AddParameter("n", "-1", iPosition:=1) ' Degree clsDiurnalRangeOperator.SetOperation("-") clsDiurnalRangeOperator.bToScriptAsRString = True @@ -660,9 +678,9 @@ Public Class dlgTransformClimatic ' Water Balance ucrPnlEvap.SetRCode(clsPMaxOperatorMax, bReset) - ucrInputEvaporation.SetRCode(clsPMaxOperatorMax, bReset) ucrReceiverEvap.SetRCode(clsReduceOpEvapValue, bReset) ucrNudWBCapacity.SetRCode(clsPMinFunctionMax, bReset) + ucrNudWB.SetRCode(clsWBOperator, bReset) 'Degree ucrReceiverTMin.SetRCode(clsDiurnalRangeOperator, bReset) @@ -675,6 +693,9 @@ Public Class dlgTransformClimatic ucrPnlDegree.SetRCode(clsDummyFunction, bReset) ucrSaveColumn.SetRCode(clsRTransform, bReset) + If bReset Then + ucrInputEvaporation.SetRCode(clsPMaxOperatorMax, bReset) + End If End Sub Private Sub TestOkEnabled() @@ -779,7 +800,8 @@ Public Class dlgTransformClimatic clsRTransform.RemoveParameterByName("sub_calculations") clsTransformCheck = clsRTransform End If - Evaporation() + ReduceWaterBalance() + 'Evaporation() AddCalculate() SetAssignName() GroupByStation() @@ -901,28 +923,12 @@ Public Class dlgTransformClimatic clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")", iPosition:=3) End Sub - Private Sub Evaporation() - If rdoWaterBalance.Checked Then - If rdoEvapValue.Checked Then - ucrReceiverData.SetMeAsReceiver() - clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")") - clsPMaxOperatorMax.AddParameter("evaporation.value", 5, iPosition:=1, bIncludeArgumentName:=False) - ElseIf rdoEvapVariable.Checked Then - ucrReceiverEvap.SetMeAsReceiver() - clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ", " & strCurrDataName & "=" & ucrReceiverEvap.GetVariableNames & ")") - clsReduceOpEvapValue.SetOperation("-") - clsRWaterBalanceFunction.AddParameter("replace_na", clsROperatorParameter:=clsReduceOpEvapValue, iPosition:=1, bIncludeArgumentName:=False) - clsPMaxOperatorMax.RemoveParameterByName("evaporation.value") - End If - End If - End Sub - Private Sub ucrSelectorTransform_ControlValueChanged(ucrchangedControl As ucrCore) Handles ucrSelectorTransform.ControlValueChanged strCurrDataName = Chr(34) & ucrSelectorTransform.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34) RainDays() GroupByYear() GroupByStation() - Evaporation() + ReduceWaterBalance() ChangeFunctions() AddCalculate() End Sub @@ -933,7 +939,7 @@ Public Class dlgTransformClimatic Private Sub ucrReceiverData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlValueChanged, ucrReceiverEvap.ControlValueChanged RainDays() - Evaporation() + ReduceWaterBalance() End Sub Private Sub ucrReceiverStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged @@ -955,7 +961,7 @@ Public Class dlgTransformClimatic End Sub Private Sub ucrInputEvaporation_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputEvaporation.ControlContentsChanged, ucrPnlEvap.ControlContentsChanged - Evaporation() + ReduceWaterBalance() End Sub Private Sub RasterFunction() @@ -1086,4 +1092,38 @@ Public Class dlgTransformClimatic AddRemoveMeanOperator() AddCalculate() End Sub + Private Sub ReduceWaterBalance() + If rdoWaterBalance.Checked Then + If rdoEvapValue.Checked Then + ucrReceiverData.SetMeAsReceiver() + clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")") + If ucrChkWB.Checked Then + clsPMaxFunctionMax.AddParameter("0", 0, iPosition:=1, bIncludeArgumentName:=False) + clsPMaxOperatorMax.AddParameter("wb", clsROperatorParameter:=clsWBOperator, iPosition:=0, bIncludeArgumentName:=False) + clsPMaxOperatorMax.RemoveParameterByName("first") + clsPMaxOperatorMax.RemoveParameterByName("evaporation.value") + clsRWaterBalanceFunction.AddParameter("replace_na", clsRFunctionParameter:=clsTailFunction, iPosition:=2, bIncludeArgumentName:=False) + clsRWaterBalanceFunction.AddParameter("init", "0", iPosition:=3, bIncludeArgumentName:=False) + Else + clsPMaxOperatorMax.AddParameter("evaporation.value", 5, iPosition:=1, bIncludeArgumentName:=False) + clsPMaxFunctionMax.RemoveParameterByName("wb") + End If + + ElseIf rdoEvapVariable.Checked Then + ucrReceiverEvap.SetMeAsReceiver() + clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ", " & strCurrDataName & "=" & ucrReceiverEvap.GetVariableNames & ")") + clsReduceOpEvapValue.SetOperation("-") + clsRWaterBalanceFunction.AddParameter("replace_na", clsROperatorParameter:=clsReduceOpEvapValue, iPosition:=1, bIncludeArgumentName:=False) + clsPMaxOperatorMax.RemoveParameterByName("evaporation.value") + End If + End If + End Sub + + Private Sub ucrChkWB_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkWB.ControlValueChanged + ReduceWaterBalance() + End Sub + + Private Sub rdoEvapValue_CheckedChanged(sender As Object, e As EventArgs) Handles rdoEvapValue.CheckedChanged, rdoEvapVariable.CheckedChanged + ReduceWaterBalance() + End Sub End Class \ No newline at end of file diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 09f224a2981..c5c51361406 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -3006,3 +3006,25 @@ getExample <- function (topic, package = NULL, lib.loc = NULL, character.only = } return(example_text) } + +WB_evaporation <- function(water_balance, frac, capacity, evaporation_value, rain){ + if (water_balance >= frac*capacity){ + evaporation <- evaporation_value + } else { + if (rain == 0){ + evaporation <- evaporation_value * ((water_balance)/(frac*capacity)) + } else { + if (water_balance < frac*capacity){ + if (rain > evaporation_value){ + evaporation <- evaporation_value + } else { + evaporation <- evaporation_value * ((water_balance)/(frac*capacity)) + evaporation <- evaporation + ((evaporation_value - evaporation)*(rain/evaporation_value)) + } + } else { + evaporation <- evaporation_value + } + } + } + return(evaporation) +} \ No newline at end of file From bf4b8a50591d0930827f19d9859096cb45c4249b Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 28 Dec 2023 17:13:11 +0100 Subject: [PATCH 02/37] Created Climpact dialogue that exports station data in Climpact2 format --- instat/dlgExportForCimpact.Designer.vb | 340 +++++++++++++++++++++++++ instat/dlgExportForCimpact.resx | 120 +++++++++ instat/dlgExportForCimpact.vb | 261 +++++++++++++++++++ instat/frmMain.Designer.vb | 14 +- instat/frmMain.vb | 4 + instat/instat.vbproj | 9 + 6 files changed, 744 insertions(+), 4 deletions(-) create mode 100644 instat/dlgExportForCimpact.Designer.vb create mode 100644 instat/dlgExportForCimpact.resx create mode 100644 instat/dlgExportForCimpact.vb diff --git a/instat/dlgExportForCimpact.Designer.vb b/instat/dlgExportForCimpact.Designer.vb new file mode 100644 index 00000000000..f3accf48437 --- /dev/null +++ b/instat/dlgExportForCimpact.Designer.vb @@ -0,0 +1,340 @@ + _ +Partial Class dlgExportForClimpact + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.lblTN = New System.Windows.Forms.Label() + Me.ucrReceiverTN = New instat.ucrReceiverSingle() + Me.lblTX = New System.Windows.Forms.Label() + Me.ucrReceiverTX = New instat.ucrReceiverSingle() + Me.lblRR = New System.Windows.Forms.Label() + Me.ucrReceiverRR = New instat.ucrReceiverSingle() + Me.lblDay = New System.Windows.Forms.Label() + Me.ucrReceiverDay = New instat.ucrReceiverSingle() + Me.lblMonth = New System.Windows.Forms.Label() + Me.ucrReceiverMonth = New instat.ucrReceiverSingle() + Me.ucrChkExportDataFrame = New instat.ucrCheck() + Me.lblExport = New System.Windows.Forms.Label() + Me.cmdBrowse = New System.Windows.Forms.Button() + Me.ucrInputExportFile = New instat.ucrInputTextBox() + Me.ucrSaveNewDataFrame = New instat.ucrSave() + Me.ucrChkNewDataFrame = New instat.ucrCheck() + Me.ucrBase = New instat.ucrButtons() + Me.lblYear = New System.Windows.Forms.Label() + Me.ucrReceiverYear = New instat.ucrReceiverSingle() + Me.ucrSelectorImportToClimpact = New instat.ucrSelectorByDataFrameAddRemove() + Me.lblMissingValues = New System.Windows.Forms.Label() + Me.ucrInputCodeMissingValues = New instat.ucrInputTextBox() + Me.SuspendLayout() + ' + 'lblTN + ' + Me.lblTN.AutoSize = True + Me.lblTN.Location = New System.Drawing.Point(278, 244) + Me.lblTN.Name = "lblTN" + Me.lblTN.Size = New System.Drawing.Size(93, 13) + Me.lblTN.TabIndex = 11 + Me.lblTN.Text = "Min. Temperature:" + ' + 'ucrReceiverTN + ' + Me.ucrReceiverTN.AutoSize = True + Me.ucrReceiverTN.frmParent = Me + Me.ucrReceiverTN.Location = New System.Drawing.Point(278, 257) + Me.ucrReceiverTN.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverTN.Name = "ucrReceiverTN" + Me.ucrReceiverTN.Selector = Nothing + Me.ucrReceiverTN.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverTN.strNcFilePath = "" + Me.ucrReceiverTN.TabIndex = 12 + Me.ucrReceiverTN.ucrSelector = Nothing + ' + 'lblTX + ' + Me.lblTX.AutoSize = True + Me.lblTX.Location = New System.Drawing.Point(278, 197) + Me.lblTX.Name = "lblTX" + Me.lblTX.Size = New System.Drawing.Size(96, 13) + Me.lblTX.TabIndex = 9 + Me.lblTX.Text = "Max. Temperature:" + ' + 'ucrReceiverTX + ' + Me.ucrReceiverTX.AutoSize = True + Me.ucrReceiverTX.frmParent = Me + Me.ucrReceiverTX.Location = New System.Drawing.Point(278, 215) + Me.ucrReceiverTX.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverTX.Name = "ucrReceiverTX" + Me.ucrReceiverTX.Selector = Nothing + Me.ucrReceiverTX.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverTX.strNcFilePath = "" + Me.ucrReceiverTX.TabIndex = 10 + Me.ucrReceiverTX.ucrSelector = Nothing + ' + 'lblRR + ' + Me.lblRR.AutoSize = True + Me.lblRR.Location = New System.Drawing.Point(278, 150) + Me.lblRR.Name = "lblRR" + Me.lblRR.Size = New System.Drawing.Size(45, 13) + Me.lblRR.TabIndex = 7 + Me.lblRR.Text = "Rainfall:" + ' + 'ucrReceiverRR + ' + Me.ucrReceiverRR.AutoSize = True + Me.ucrReceiverRR.frmParent = Me + Me.ucrReceiverRR.Location = New System.Drawing.Point(278, 168) + Me.ucrReceiverRR.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRR.Name = "ucrReceiverRR" + Me.ucrReceiverRR.Selector = Nothing + Me.ucrReceiverRR.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverRR.strNcFilePath = "" + Me.ucrReceiverRR.TabIndex = 8 + Me.ucrReceiverRR.ucrSelector = Nothing + ' + 'lblDay + ' + Me.lblDay.AutoSize = True + Me.lblDay.Location = New System.Drawing.Point(278, 106) + Me.lblDay.Name = "lblDay" + Me.lblDay.Size = New System.Drawing.Size(29, 13) + Me.lblDay.TabIndex = 5 + Me.lblDay.Text = "Day:" + ' + 'ucrReceiverDay + ' + Me.ucrReceiverDay.AutoSize = True + Me.ucrReceiverDay.frmParent = Me + Me.ucrReceiverDay.Location = New System.Drawing.Point(278, 119) + 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 = 6 + Me.ucrReceiverDay.ucrSelector = Nothing + ' + 'lblMonth + ' + Me.lblMonth.AutoSize = True + Me.lblMonth.Location = New System.Drawing.Point(278, 59) + Me.lblMonth.Name = "lblMonth" + Me.lblMonth.Size = New System.Drawing.Size(40, 13) + Me.lblMonth.TabIndex = 3 + Me.lblMonth.Text = "Month:" + ' + 'ucrReceiverMonth + ' + Me.ucrReceiverMonth.AutoSize = True + Me.ucrReceiverMonth.frmParent = Me + Me.ucrReceiverMonth.Location = New System.Drawing.Point(278, 77) + 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 = 4 + Me.ucrReceiverMonth.ucrSelector = Nothing + ' + 'ucrChkExportDataFrame + ' + Me.ucrChkExportDataFrame.AutoSize = True + Me.ucrChkExportDataFrame.Checked = False + Me.ucrChkExportDataFrame.Location = New System.Drawing.Point(9, 299) + Me.ucrChkExportDataFrame.Name = "ucrChkExportDataFrame" + Me.ucrChkExportDataFrame.Size = New System.Drawing.Size(266, 23) + Me.ucrChkExportDataFrame.TabIndex = 14 + ' + 'lblExport + ' + Me.lblExport.AutoSize = True + Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblExport.Location = New System.Drawing.Point(9, 370) + Me.lblExport.Name = "lblExport" + Me.lblExport.Size = New System.Drawing.Size(59, 13) + Me.lblExport.TabIndex = 16 + Me.lblExport.Text = "Export File:" + ' + 'cmdBrowse + ' + Me.cmdBrowse.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdBrowse.Location = New System.Drawing.Point(326, 365) + Me.cmdBrowse.Name = "cmdBrowse" + Me.cmdBrowse.Size = New System.Drawing.Size(80, 23) + Me.cmdBrowse.TabIndex = 18 + Me.cmdBrowse.Text = "Browse" + Me.cmdBrowse.UseVisualStyleBackColor = True + ' + 'ucrInputExportFile + ' + Me.ucrInputExportFile.AddQuotesIfUnrecognised = True + Me.ucrInputExportFile.AutoSize = True + Me.ucrInputExportFile.IsMultiline = False + Me.ucrInputExportFile.IsReadOnly = False + Me.ucrInputExportFile.Location = New System.Drawing.Point(142, 366) + Me.ucrInputExportFile.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputExportFile.Name = "ucrInputExportFile" + Me.ucrInputExportFile.Size = New System.Drawing.Size(182, 21) + Me.ucrInputExportFile.TabIndex = 17 + ' + 'ucrSaveNewDataFrame + ' + Me.ucrSaveNewDataFrame.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveNewDataFrame.Location = New System.Drawing.Point(9, 331) + Me.ucrSaveNewDataFrame.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveNewDataFrame.Name = "ucrSaveNewDataFrame" + Me.ucrSaveNewDataFrame.Size = New System.Drawing.Size(348, 24) + Me.ucrSaveNewDataFrame.TabIndex = 15 + ' + 'ucrChkNewDataFrame + ' + Me.ucrChkNewDataFrame.AutoSize = True + Me.ucrChkNewDataFrame.Checked = False + Me.ucrChkNewDataFrame.Location = New System.Drawing.Point(9, 270) + Me.ucrChkNewDataFrame.Name = "ucrChkNewDataFrame" + Me.ucrChkNewDataFrame.Size = New System.Drawing.Size(266, 23) + Me.ucrChkNewDataFrame.TabIndex = 13 + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(7, 396) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 19 + ' + 'lblYear + ' + Me.lblYear.AutoSize = True + Me.lblYear.Location = New System.Drawing.Point(278, 12) + Me.lblYear.Name = "lblYear" + Me.lblYear.Size = New System.Drawing.Size(32, 13) + Me.lblYear.TabIndex = 1 + Me.lblYear.Text = "Year:" + ' + 'ucrReceiverYear + ' + Me.ucrReceiverYear.AutoSize = True + Me.ucrReceiverYear.frmParent = Me + Me.ucrReceiverYear.Location = New System.Drawing.Point(278, 30) + 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 = 2 + Me.ucrReceiverYear.ucrSelector = Nothing + ' + 'ucrSelectorImportToClimpact + ' + Me.ucrSelectorImportToClimpact.AutoSize = True + Me.ucrSelectorImportToClimpact.bDropUnusedFilterLevels = False + Me.ucrSelectorImportToClimpact.bShowHiddenColumns = False + Me.ucrSelectorImportToClimpact.bUseCurrentFilter = True + Me.ucrSelectorImportToClimpact.Location = New System.Drawing.Point(9, 3) + Me.ucrSelectorImportToClimpact.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorImportToClimpact.Name = "ucrSelectorImportToClimpact" + Me.ucrSelectorImportToClimpact.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorImportToClimpact.TabIndex = 0 + ' + 'lblMissingValues + ' + Me.lblMissingValues.AutoSize = True + Me.lblMissingValues.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMissingValues.Location = New System.Drawing.Point(4, 244) + Me.lblMissingValues.Name = "lblMissingValues" + Me.lblMissingValues.Size = New System.Drawing.Size(122, 13) + Me.lblMissingValues.TabIndex = 33 + Me.lblMissingValues.Text = "Code Missing Values as:" + ' + 'ucrInputCodeMissingValues + ' + Me.ucrInputCodeMissingValues.AddQuotesIfUnrecognised = True + Me.ucrInputCodeMissingValues.AutoSize = True + Me.ucrInputCodeMissingValues.IsMultiline = False + Me.ucrInputCodeMissingValues.IsReadOnly = False + Me.ucrInputCodeMissingValues.Location = New System.Drawing.Point(132, 242) + Me.ucrInputCodeMissingValues.Name = "ucrInputCodeMissingValues" + Me.ucrInputCodeMissingValues.Size = New System.Drawing.Size(99, 21) + Me.ucrInputCodeMissingValues.TabIndex = 32 + ' + 'dlgExportForClimpact + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi + Me.ClientSize = New System.Drawing.Size(422, 450) + Me.Controls.Add(Me.lblMissingValues) + Me.Controls.Add(Me.ucrInputCodeMissingValues) + Me.Controls.Add(Me.lblTN) + Me.Controls.Add(Me.ucrReceiverTN) + Me.Controls.Add(Me.lblTX) + Me.Controls.Add(Me.ucrReceiverTX) + Me.Controls.Add(Me.lblRR) + Me.Controls.Add(Me.ucrReceiverRR) + Me.Controls.Add(Me.lblDay) + Me.Controls.Add(Me.ucrReceiverDay) + Me.Controls.Add(Me.lblMonth) + Me.Controls.Add(Me.ucrReceiverMonth) + Me.Controls.Add(Me.ucrChkExportDataFrame) + Me.Controls.Add(Me.lblExport) + Me.Controls.Add(Me.cmdBrowse) + Me.Controls.Add(Me.ucrInputExportFile) + Me.Controls.Add(Me.ucrSaveNewDataFrame) + Me.Controls.Add(Me.ucrChkNewDataFrame) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.lblYear) + Me.Controls.Add(Me.ucrReceiverYear) + Me.Controls.Add(Me.ucrSelectorImportToClimpact) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgExportForClimpact" + Me.Text = "Export For Climpact" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents lblTN As Label + Friend WithEvents ucrReceiverTN As ucrReceiverSingle + Friend WithEvents lblTX As Label + Friend WithEvents ucrReceiverTX As ucrReceiverSingle + Friend WithEvents lblRR As Label + Friend WithEvents ucrReceiverRR As ucrReceiverSingle + Friend WithEvents lblDay As Label + Friend WithEvents ucrReceiverDay As ucrReceiverSingle + Friend WithEvents lblMonth As Label + Friend WithEvents ucrReceiverMonth As ucrReceiverSingle + Friend WithEvents ucrChkExportDataFrame As ucrCheck + Friend WithEvents lblExport As Label + Friend WithEvents cmdBrowse As Button + Friend WithEvents ucrInputExportFile As ucrInputTextBox + Friend WithEvents ucrSaveNewDataFrame As ucrSave + Friend WithEvents ucrChkNewDataFrame As ucrCheck + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents lblYear As Label + Friend WithEvents ucrReceiverYear As ucrReceiverSingle + Friend WithEvents ucrSelectorImportToClimpact As ucrSelectorByDataFrameAddRemove + Friend WithEvents lblMissingValues As Label + Friend WithEvents ucrInputCodeMissingValues As ucrInputTextBox +End Class diff --git a/instat/dlgExportForCimpact.resx b/instat/dlgExportForCimpact.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgExportForCimpact.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/dlgExportForCimpact.vb b/instat/dlgExportForCimpact.vb new file mode 100644 index 00000000000..80a6108ad49 --- /dev/null +++ b/instat/dlgExportForCimpact.vb @@ -0,0 +1,261 @@ +' 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 System.IO +Imports instat.Translations + +Public Class dlgExportForClimpact + Private bFirstLoad As Boolean = True + Private bReset As Boolean = True + Private clsDataFrameFunction, clsCurrentNewColumnFunction, clsOutputClimpact, clsDummyFunction, clsMutateFunction, clsExportClimpactFunction As New RFunction + Private clsPipeOperator As New ROperator + + Private Sub dlgExportForClimpact_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstLoad Then + InitialiseDialog() + bFirstLoad = False + End If + If bReset Then + SetDefaults() + End If + SetRCodeForControls(bReset) + bReset = False + autoTranslate(Me) + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + + ucrInputCodeMissingValues.SetParameter(New RParameter("na_code")) + ucrInputCodeMissingValues.SetRDefault("-99.9") + ucrInputCodeMissingValues.AddQuotesIfUnrecognised = False + + 'Year Receiver + ucrReceiverYear.Selector = ucrSelectorImportToClimpact + ucrReceiverYear.SetClimaticType("year") + ucrReceiverYear.bAutoFill = True + ucrReceiverYear.strSelectorHeading = "Year Variables" + + 'Month Receiver + ucrReceiverMonth.Selector = ucrSelectorImportToClimpact + ucrReceiverMonth.SetClimaticType("month") + ucrReceiverMonth.bAutoFill = True + ucrReceiverMonth.strSelectorHeading = "Month Variables" + + 'Day Receiver + ucrReceiverDay.Selector = ucrSelectorImportToClimpact + ucrReceiverDay.SetParameter(New RParameter("day", 0)) + ucrReceiverDay.SetParameterIsString() + ucrReceiverDay.bWithQuotes = False + ucrReceiverDay.bAutoFill = True + ucrReceiverDay.SetClimaticType("doy") + ucrReceiverDay.strSelectorHeading = "Day Variables" + + 'Element Receiver + ucrReceiverTX.Selector = ucrSelectorImportToClimpact + ucrReceiverTX.SetParameter(New RParameter("x", 0, bNewIncludeArgumentName:=False)) + ucrReceiverTX.SetParameterIsString() + ucrReceiverTX.bWithQuotes = False + ucrReceiverTX.SetClimaticType("temp_max") + ucrReceiverTX.bAutoFill = True + + + ucrReceiverTN.Selector = ucrSelectorImportToClimpact + ucrReceiverTN.SetParameter(New RParameter("x", 1, bNewIncludeArgumentName:=False)) + ucrReceiverTN.SetParameterIsString() + ucrReceiverTN.SetClimaticType("temp_min") + ucrReceiverTN.bAutoFill = True + ucrReceiverTN.bWithQuotes = False + + ucrReceiverRR.SetParameter(New RParameter("left", 2, bNewIncludeArgumentName:=False)) + ucrReceiverRR.Selector = ucrSelectorImportToClimpact + ucrReceiverRR.SetClimaticType("rain") + ucrReceiverRR.bAutoFill = True + ucrReceiverRR.SetParameterIsString() + ucrReceiverRR.bWithQuotes = False + + ucrChkNewDataFrame.SetText("New Data Frame Name") + ucrChkNewDataFrame.AddToLinkedControls(ucrSaveNewDataFrame, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkNewDataFrame.AddParameterValuesCondition(True, "dataframe", "True") + ucrChkNewDataFrame.AddParameterValuesCondition(False, "dataframe", "False") + + ucrChkExportDataFrame.SetText(" Export Data Frame(s)") + ucrChkExportDataFrame.AddToLinkedControls(ucrInputExportFile, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkExportDataFrame.AddParameterValuesCondition(True, "export", "True") + ucrChkExportDataFrame.AddParameterValuesCondition(False, "export", "False") + + ucrSaveNewDataFrame.SetSaveTypeAsDataFrame() + ucrSaveNewDataFrame.SetIsTextBox() + ucrSaveNewDataFrame.SetLabelText("Data Frame Name:") + + ucrInputExportFile.SetParameter(New RParameter("file", 1)) + ucrInputExportFile.IsReadOnly = True + ucrInputExportFile.SetLinkedDisplayControl(lblExport) + + DataFrameAssignTo() + End Sub + + Private Sub SetDefaults() + clsDataFrameFunction = New RFunction + clsDummyFunction = New RFunction + clsCurrentNewColumnFunction = New RFunction + clsMutateFunction = New RFunction + clsExportClimpactFunction = New RFunction + clsPipeOperator = New ROperator + clsOutputClimpact = New RFunction + + ucrSelectorImportToClimpact.Reset() + ucrSaveNewDataFrame.Reset() + + + clsDummyFunction.AddParameter("dataframe", "True", iPosition:=0) + clsDummyFunction.AddParameter("export", "False", iPosition:=1) + + clsDataFrameFunction.SetRCommand("data.frame") + clsDataFrameFunction.AddParameter("x", "columns", iPosition:=5, bIncludeArgumentName:=False) + + clsPipeOperator.SetOperation("%>%") + clsPipeOperator.AddParameter("left", clsRFunctionParameter:=clsOutputClimpact, iPosition:=0) + clsPipeOperator.AddParameter("right", clsRFunctionParameter:=clsMutateFunction, iPosition:=1) + + clsOutputClimpact.SetRCommand("output_Climpact") + clsOutputClimpact.AddParameter("long.data", "TRUE") + + clsMutateFunction.SetPackageName("dplyr") + clsMutateFunction.SetRCommand("mutate") + + clsExportClimpactFunction.SetPackageName("rio") + clsExportClimpactFunction.SetRCommand("export") + clsExportClimpactFunction.AddParameter("x", clsROperatorParameter:=clsPipeOperator, iPosition:=0) + + + 'ucrBase.clsRsyntax.SetBaseRFunction(clsExportClimpactFunction) + ucrBase.clsRsyntax.SetBaseROperator(clsPipeOperator) + 'ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction) + + End Sub + + Private Sub SetRCodeForControls(bReset As Boolean) + ucrReceiverDay.SetRCode(clsOutputClimpact, bReset) + ucrReceiverYear.SetRCode(clsOutputClimpact, bReset) + ucrSelectorImportToClimpact.SetRCode(clsOutputClimpact, bReset) + ucrReceiverRR.SetRCode(clsOutputClimpact, bReset) + ucrReceiverTN.SetRCode(clsOutputClimpact, bReset) + ucrReceiverTX.SetRCode(clsOutputClimpact, bReset) + ucrReceiverMonth.SetRCode(clsOutputClimpact, bReset) + ucrInputCodeMissingValues.SetRCode(clsOutputClimpact, bReset) + ucrInputExportFile.SetRCode(clsExportClimpactFunction) + End Sub + + Private Sub TestOkEnabled() + ucrBase.OKEnabled(Not ucrReceiverDay.IsEmpty _ + AndAlso Not ucrReceiverMonth.IsEmpty _ + AndAlso Not ucrReceiverYear.IsEmpty _ + AndAlso Not ucrReceiverRR.IsEmpty _ + AndAlso Not ucrReceiverTX.IsEmpty _ + AndAlso Not ucrReceiverTN.IsEmpty + ) + If ucrChkNewDataFrame.Checked And Not ucrSaveNewDataFrame.IsComplete Then + ucrBase.OKEnabled(False) + End If + If ucrChkExportDataFrame.Checked And ucrInputExportFile.IsEmpty Then + ucrBase.OKEnabled(False) + End If + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOkEnabled() + End Sub + + Private Sub DataFrameAssignTo() + Dim strDataframeName As String = ucrSelectorImportToClimpact.ucrAvailableDataFrames.cboAvailableDataFrames.Text + If strDataframeName = "" OrElse ucrSaveNewDataFrame.bUserTyped Then + Exit Sub + End If + ucrSaveNewDataFrame.SetPrefix(strDataframeName & "__climpact") + End Sub + + Private Sub cmdBrowse_Click(sender As Object, e As EventArgs) Handles cmdBrowse.Click + SelectFileToSave() + End Sub + + Private Sub SelectFileToSave() + Using dlgSave As New SaveFileDialog + dlgSave.Title = "Save Climpact File" + dlgSave.Filter = "Comma separated file (*.csv)|*.csv|Text File (*.txt)|*.txt" + If ucrInputExportFile.GetText() <> "" Then + dlgSave.InitialDirectory = ucrInputExportFile.GetText().Replace("/", "\") + Else + dlgSave.InitialDirectory = frmMain.clsInstatOptions.strWorkingDirectory + End If + If dlgSave.ShowDialog() = DialogResult.OK Then + ucrInputExportFile.SetName(dlgSave.FileName.Replace("\", "/")) + End If + TestOkEnabled() + End Using + End Sub + + Private Sub ucrSelectorImportToClimpact_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorImportToClimpact.ControlValueChanged + DataFrameAssignTo() + End Sub + + 'Private Sub ucrChkNewDataFrame_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNewDataFrame.ControlValueChanged, ucrChkExportDataFrame.ControlValueChanged + ' SettingBaseFunction() + 'End Sub + + 'Private Sub ucrReceiverElements_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRR.ControlValueChanged, ucrReceiverTN.ControlValueChanged, ucrReceiverTX.ControlValueChanged + ' ucrBase.clsRsyntax.lstBeforeCodes.Clear() + ' clsCurrentNewColumnFunction = ucrReceiver.Get(True).Clone + ' clsCurrentNewColumnFunction.SetAssignTo("columns") + ' ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction) + ' SettingBaseFunction() + 'End Sub + + Private Sub ucrReceiverElements_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRR.ControlContentsChanged, ucrReceiverTN.ControlValueChanged, + ucrSaveNewDataFrame.ControlContentsChanged, ucrInputExportFile.ControlContentsChanged, ucrChkExportDataFrame.ControlContentsChanged, ucrReceiverTX.ControlValueChanged + TestOkEnabled() + End Sub + + Private Sub ucrInputExportFile_Click(sender As Object, e As EventArgs) Handles ucrInputExportFile.Click + If ucrInputExportFile.IsEmpty() Then + SelectFileToSave() + End If + 'SettingBaseFunction() + End Sub + + Private Sub SettingBaseFunction() + cmdBrowse.Visible = False + If ucrChkNewDataFrame.Checked And ucrChkExportDataFrame.Checked Then + ucrBase.clsRsyntax.SetBaseROperator(clsPipeOperator) + ucrBase.clsRsyntax.ClearCodes() + ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction) + ucrBase.clsRsyntax.AddToAfterCodes(clsExportClimpactFunction) + cmdBrowse.Visible = True + ElseIf ucrChkNewDataFrame.Checked AndAlso Not ucrChkExportDataFrame.Checked Then + ucrBase.clsRsyntax.SetBaseROperator(clsPipeOperator) + ucrBase.clsRsyntax.lstAfterCodes.Clear() + cmdBrowse.Visible = False + ElseIf ucrChkExportDataFrame.Checked AndAlso Not ucrChkNewDataFrame.Checked Then + ucrBase.clsRsyntax.lstBeforeCodes.Clear() + ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction) + ucrBase.clsRsyntax.SetBaseRFunction(clsExportClimpactFunction) + ucrBase.clsRsyntax.lstAfterCodes.Clear() + cmdBrowse.Visible = True + End If + End Sub +End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 8b97727f1a8..1e5af34703e 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -188,6 +188,7 @@ Partial Class frmMain Me.mnuClimaticFileExportToClimsoft = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFileExportToCPT = New System.Windows.Forms.ToolStripMenuItem() Me.mnuExportToWWRToolStrip = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticFileExportToClimpact = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator18 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticTidyandExamine = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticTidyandExamineVisualiseData = New System.Windows.Forms.ToolStripMenuItem() @@ -1623,7 +1624,7 @@ Partial Class frmMain ' 'mnuClimaticFile ' - 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.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.ToolStripSeparator20, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimateFileImportfromClimSoftWizard, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip, Me.mnuClimaticFileExportToClimpact}) Me.mnuClimaticFile.Name = "mnuClimaticFile" Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticFile.Text = "File" @@ -1707,6 +1708,12 @@ Partial Class frmMain Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' + 'mnuClimaticFileExportToClimpact + ' + Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact" + Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..." + ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" @@ -5092,9 +5099,7 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + - My.Application.Info.Version.Minor.ToString + "." + - My.Application.Info.Version.Build.ToString + Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() @@ -5774,4 +5779,5 @@ Partial Class frmMain Friend WithEvents mnuClimaticDescribeOtherRosePlots As ToolStripMenuItem Friend WithEvents mnuClimaticDescribeTrendGraph As ToolStripMenuItem Friend WithEvents mnuClimaticDescribeSeasonalGraph As ToolStripMenuItem + Friend WithEvents mnuClimaticFileExportToClimpact As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 3d47b2e8971..f05c52c3480 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2450,6 +2450,10 @@ Public Class frmMain dlgExportToClimsoft.ShowDialog() End Sub + Private Sub mnuClimaticFileExportToClimpact_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileExportToClimpact.Click + dlgExportForClimpact.ShowDialog() + End Sub + Private Sub mnuPrepareDataReshapeScaleOrDistance_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataReshapeScaleOrDistance.Click dlgCluster.ShowDialog() End Sub diff --git a/instat/instat.vbproj b/instat/instat.vbproj index eb03c008b07..ffff0848a70 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -239,6 +239,12 @@ Form + + dlgExportForCimpact.vb + + + Form + dlgFindInVariableOrFilter.vb @@ -3038,6 +3044,9 @@ dlgEdit.vb + + dlgExportForCimpact.vb + dlgExportToClimsoft.vb From 15c498dd715a65c237dd937acc10c54d8b7a2fe7 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 8 Jan 2024 10:36:05 +0100 Subject: [PATCH 03/37] Code Changes --- ...ct.Designer.vb => dlgExportForClimpact.Designer.vb} | 0 ...ExportForCimpact.resx => dlgExportForClimpact.resx} | 0 ...{dlgExportForCimpact.vb => dlgExportForClimpact.vb} | 0 instat/instat.vbproj | 10 +++++----- 4 files changed, 5 insertions(+), 5 deletions(-) rename instat/{dlgExportForCimpact.Designer.vb => dlgExportForClimpact.Designer.vb} (100%) rename instat/{dlgExportForCimpact.resx => dlgExportForClimpact.resx} (100%) rename instat/{dlgExportForCimpact.vb => dlgExportForClimpact.vb} (100%) diff --git a/instat/dlgExportForCimpact.Designer.vb b/instat/dlgExportForClimpact.Designer.vb similarity index 100% rename from instat/dlgExportForCimpact.Designer.vb rename to instat/dlgExportForClimpact.Designer.vb diff --git a/instat/dlgExportForCimpact.resx b/instat/dlgExportForClimpact.resx similarity index 100% rename from instat/dlgExportForCimpact.resx rename to instat/dlgExportForClimpact.resx diff --git a/instat/dlgExportForCimpact.vb b/instat/dlgExportForClimpact.vb similarity index 100% rename from instat/dlgExportForCimpact.vb rename to instat/dlgExportForClimpact.vb diff --git a/instat/instat.vbproj b/instat/instat.vbproj index ffff0848a70..bbd77d95dd3 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -239,10 +239,10 @@ Form - - dlgExportForCimpact.vb + + dlgExportForClimpact.vb - + Form @@ -3044,8 +3044,8 @@ dlgEdit.vb - - dlgExportForCimpact.vb + + dlgExportForClimpact.vb dlgExportToClimsoft.vb From 9ddf799896538d0b12fbced60a70e44ef910604b Mon Sep 17 00:00:00 2001 From: n-thony Date: Mon, 8 Jan 2024 14:36:44 +0300 Subject: [PATCH 04/37] Fixed bug in Column Selection > Partially labelled option --- instat/static/InstatObject/R/stand_alone_functions.R | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 09f224a2981..0b9e0bee90d 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2555,10 +2555,8 @@ is.containValueLabel <- function(x){ } is.containPartialValueLabel <- function(x) { - if(is.containValueLabel(x)) { - return(!all(x[!is.na(x)] %in% attr(x, labels_label))) - } - else{return(FALSE)} + level_counts <- table(x) + return(length(names(level_counts[level_counts == 0])) > 0) } read_corpora <- function(data){ From 3641eef2235b530e66e51073b89189f4db42c283 Mon Sep 17 00:00:00 2001 From: n-thony Date: Tue, 9 Jan 2024 16:11:18 +0300 Subject: [PATCH 05/37] Added option to select column with un --- instat/dlgSelectColumns.vb | 4 +++- instat/static/InstatObject/R/stand_alone_functions.R | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/instat/dlgSelectColumns.vb b/instat/dlgSelectColumns.vb index 20e1bb3abc9..3ecbe0daa37 100644 --- a/instat/dlgSelectColumns.vb +++ b/instat/dlgSelectColumns.vb @@ -53,7 +53,7 @@ Public Class dlgSelectColumns ucrInputSelectOperation.SetItems({"Columns", "Starts with", "Ends with", "Contains", "Matches", "Numeric range", "Last column", "Where"}) ucrInputSelectOperation.SetDropDownStyleAsNonEditable() - ucrInputColumnType.SetItems({"Numeric", "Factor", "Character", "Logical", "Variable label", "Value label", "Empty columns", "NA columns", "Partially labelled"}) + ucrInputColumnType.SetItems({"Numeric", "Factor", "Character", "Logical", "Variable label", "Value label", "Empty columns", "NA columns", "Partially labelled", "Unused label"}) ucrInputColumnType.SetDropDownStyleAsNonEditable() ucrInputSelectOperation.AddToLinkedControls(ucrChkIgnoreCase, {"Starts with", "Ends with", "Contains", "Matches"}, bNewLinkedHideIfParameterMissing:=True) @@ -222,6 +222,8 @@ Public Class dlgSelectColumns clsParametersList.AddParameter("fn", "is.NAvariable", iPosition:=0) ElseIf strValue = "Partially labelled" Then clsParametersList.AddParameter("fn", "is.containPartialValueLabel", iPosition:=0) + ElseIf strValue = "Unused label" Then + clsParametersList.AddParameter("fn", "is.containUnusedValueLabel", iPosition:=0) End If Case "Last column" strValue = "Last column" diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 0b9e0bee90d..6fc572a5b41 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2555,6 +2555,14 @@ is.containValueLabel <- function(x){ } is.containPartialValueLabel <- function(x) { + if(is.containValueLabel(x)) { + return(!all(x[!is.na(x)] %in% attr(x, labels_label))) + } + else{return(FALSE)} +} + +is.containUnusedValueLabel <- function(x) { + if(!is.containValueLabel(x)) return(FALSE) level_counts <- table(x) return(length(names(level_counts[level_counts == 0])) > 0) } From a5b85df1591f110f811e14da0a7d45cde6569451 Mon Sep 17 00:00:00 2001 From: n-thony Date: Wed, 10 Jan 2024 12:57:30 +0300 Subject: [PATCH 06/37] minor code change --- instat/dlgSelectColumns.vb | 4 +--- instat/static/InstatObject/R/stand_alone_functions.R | 9 ++------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/instat/dlgSelectColumns.vb b/instat/dlgSelectColumns.vb index 3ecbe0daa37..20e1bb3abc9 100644 --- a/instat/dlgSelectColumns.vb +++ b/instat/dlgSelectColumns.vb @@ -53,7 +53,7 @@ Public Class dlgSelectColumns ucrInputSelectOperation.SetItems({"Columns", "Starts with", "Ends with", "Contains", "Matches", "Numeric range", "Last column", "Where"}) ucrInputSelectOperation.SetDropDownStyleAsNonEditable() - ucrInputColumnType.SetItems({"Numeric", "Factor", "Character", "Logical", "Variable label", "Value label", "Empty columns", "NA columns", "Partially labelled", "Unused label"}) + ucrInputColumnType.SetItems({"Numeric", "Factor", "Character", "Logical", "Variable label", "Value label", "Empty columns", "NA columns", "Partially labelled"}) ucrInputColumnType.SetDropDownStyleAsNonEditable() ucrInputSelectOperation.AddToLinkedControls(ucrChkIgnoreCase, {"Starts with", "Ends with", "Contains", "Matches"}, bNewLinkedHideIfParameterMissing:=True) @@ -222,8 +222,6 @@ Public Class dlgSelectColumns clsParametersList.AddParameter("fn", "is.NAvariable", iPosition:=0) ElseIf strValue = "Partially labelled" Then clsParametersList.AddParameter("fn", "is.containPartialValueLabel", iPosition:=0) - ElseIf strValue = "Unused label" Then - clsParametersList.AddParameter("fn", "is.containUnusedValueLabel", iPosition:=0) End If Case "Last column" strValue = "Last column" diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 6fc572a5b41..641dbe99c56 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2556,17 +2556,12 @@ is.containValueLabel <- function(x){ is.containPartialValueLabel <- function(x) { if(is.containValueLabel(x)) { - return(!all(x[!is.na(x)] %in% attr(x, labels_label))) + level_counts <- table(x) + return(!all(x[!is.na(x)] %in% attr(x, labels_label)) && sum(levelCounts == 0) == 0) } else{return(FALSE)} } -is.containUnusedValueLabel <- function(x) { - if(!is.containValueLabel(x)) return(FALSE) - level_counts <- table(x) - return(length(names(level_counts[level_counts == 0])) > 0) -} - read_corpora <- function(data){ data_all <- NULL description <- NULL From 1d8c872a7147b0789750e777d13b195fa92cc5c6 Mon Sep 17 00:00:00 2001 From: n-thony Date: Wed, 10 Jan 2024 13:13:04 +0300 Subject: [PATCH 07/37] minor addition --- instat/static/InstatObject/R/stand_alone_functions.R | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 641dbe99c56..fe3bc9e6fcf 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2556,8 +2556,9 @@ is.containValueLabel <- function(x){ is.containPartialValueLabel <- function(x) { if(is.containValueLabel(x)) { - level_counts <- table(x) - return(!all(x[!is.na(x)] %in% attr(x, labels_label)) && sum(levelCounts == 0) == 0) + levelCounts <- table(x) + return(!all(x[!is.na(x)] %in% attr(x, labels_label)) && + sum(levelCounts == 0) == 0) } else{return(FALSE)} } From b2da5ac25485ca958a16d617566216dcf020df1e Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 17 Jan 2024 17:59:42 +0100 Subject: [PATCH 08/37] Change made --- instat/dlgEndOfRainsSeason.vb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/instat/dlgEndOfRainsSeason.vb b/instat/dlgEndOfRainsSeason.vb index 9011080d997..46103d31e9f 100644 --- a/instat/dlgEndOfRainsSeason.vb +++ b/instat/dlgEndOfRainsSeason.vb @@ -314,8 +314,8 @@ Public Class dlgEndOfRainsSeason ucrChkEndofSeasonOccurence.AddToLinkedControls(ucrInputEndofSeasonOccurence, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofSeasonDate.AddToLinkedControls(ucrInputEndofSeasonDate, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofSeasonDoy.AddToLinkedControls(ucrInputSeasonDoy, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkWB.AddToLinkedControls(ucrNudWB, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.5) - ucrPnlEvaporation.AddToLinkedControls(ucrInputEvaporation, {rdoValueEvaporation}, bNewLinkedHideIfParameterMissing:=True) + ucrChkWB.AddToLinkedControls(ucrNudWB, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.5) + ucrPnlEvaporation.AddToLinkedControls(ucrInputEvaporation, {rdoValueEvaporation},bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlEvaporation.AddToLinkedControls(ucrReceiverEvaporation, {rdoVariableEvaporation}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofRainsOccurence.AddToLinkedControls(ucrInputEndofRainsOccurence, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofRainsDate.AddToLinkedControls(ucrInputEndofRainsDate, {True}, bNewLinkedHideIfParameterMissing:=True) @@ -674,6 +674,7 @@ Public Class dlgEndOfRainsSeason ' Water Balance min clsEndSeasonWBMinCalc.SetRCommand("instat_calculation$new") clsEndSeasonWBMinCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction, iPosition:=1) clsEndSeasonWBMinCalc.AddParameter("result_name", Chr(34) & strWBMin & Chr(34), iPosition:=2) clsEndSeasonWBMinCalc.AddParameter("sub_calculations", clsRFunctionParameter:=clsEndSeasonWBMinCalcSubCalcsList, iPosition:=3) clsEndSeasonWBMinCalc.SetAssignTo(strWBMin) @@ -714,6 +715,7 @@ Public Class dlgEndOfRainsSeason ' Water Balance max clsEndSeasonWBMaxCalc.SetRCommand("instat_calculation$new") clsEndSeasonWBMaxCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction, iPosition:=1) clsEndSeasonWBMaxCalc.AddParameter("result_name", Chr(34) & strWBMax & Chr(34), iPosition:=2) clsEndSeasonWBMaxCalc.AddParameter("sub_calculations", clsRFunctionParameter:=clsEndSeasonWBMaxCalcSubCalcsList, iPosition:=3) clsEndSeasonWBMaxCalc.SetAssignTo(strWBMax) From 2ec1cdb9c8ecfb1603c1a1f7f7d0621b97e9ad6a Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 18 Jan 2024 07:53:55 +0100 Subject: [PATCH 09/37] Minor Design change --- instat/dlgEndOfRainsSeason.Designer.vb | 50 +++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/instat/dlgEndOfRainsSeason.Designer.vb b/instat/dlgEndOfRainsSeason.Designer.vb index cdaaea08385..8b4b8203617 100644 --- a/instat/dlgEndOfRainsSeason.Designer.vb +++ b/instat/dlgEndOfRainsSeason.Designer.vb @@ -234,7 +234,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofSeasonOccurence.IsMultiline = False Me.ucrInputEndofSeasonOccurence.IsReadOnly = False Me.ucrInputEndofSeasonOccurence.Location = New System.Drawing.Point(361, 15) - Me.ucrInputEndofSeasonOccurence.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputEndofSeasonOccurence.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputEndofSeasonOccurence.Name = "ucrInputEndofSeasonOccurence" Me.ucrInputEndofSeasonOccurence.Size = New System.Drawing.Size(104, 21) Me.ucrInputEndofSeasonOccurence.TabIndex = 38 @@ -246,7 +246,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputSeasonDoy.IsMultiline = False Me.ucrInputSeasonDoy.IsReadOnly = False Me.ucrInputSeasonDoy.Location = New System.Drawing.Point(49, 15) - Me.ucrInputSeasonDoy.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputSeasonDoy.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputSeasonDoy.Name = "ucrInputSeasonDoy" Me.ucrInputSeasonDoy.Size = New System.Drawing.Size(67, 21) Me.ucrInputSeasonDoy.TabIndex = 32 @@ -258,7 +258,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofSeasonDate.IsMultiline = False Me.ucrInputEndofSeasonDate.IsReadOnly = False Me.ucrInputEndofSeasonDate.Location = New System.Drawing.Point(165, 15) - Me.ucrInputEndofSeasonDate.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputEndofSeasonDate.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputEndofSeasonDate.Name = "ucrInputEndofSeasonDate" Me.ucrInputEndofSeasonDate.Size = New System.Drawing.Size(110, 21) Me.ucrInputEndofSeasonDate.TabIndex = 37 @@ -268,7 +268,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrChkEndofSeasonOccurence.AutoSize = True Me.ucrChkEndofSeasonOccurence.Checked = False Me.ucrChkEndofSeasonOccurence.Location = New System.Drawing.Point(281, 17) - Me.ucrChkEndofSeasonOccurence.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkEndofSeasonOccurence.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkEndofSeasonOccurence.Name = "ucrChkEndofSeasonOccurence" Me.ucrChkEndofSeasonOccurence.Size = New System.Drawing.Size(84, 34) Me.ucrChkEndofSeasonOccurence.TabIndex = 48 @@ -278,7 +278,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrChkEndofSeasonDate.AutoSize = True Me.ucrChkEndofSeasonDate.Checked = False Me.ucrChkEndofSeasonDate.Location = New System.Drawing.Point(121, 16) - Me.ucrChkEndofSeasonDate.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkEndofSeasonDate.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkEndofSeasonDate.Name = "ucrChkEndofSeasonDate" Me.ucrChkEndofSeasonDate.Size = New System.Drawing.Size(53, 34) Me.ucrChkEndofSeasonDate.TabIndex = 47 @@ -288,7 +288,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrChkEndofSeasonDoy.AutoSize = True Me.ucrChkEndofSeasonDoy.Checked = False Me.ucrChkEndofSeasonDoy.Location = New System.Drawing.Point(4, 16) - Me.ucrChkEndofSeasonDoy.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkEndofSeasonDoy.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkEndofSeasonDoy.Name = "ucrChkEndofSeasonDoy" Me.ucrChkEndofSeasonDoy.Size = New System.Drawing.Size(58, 34) Me.ucrChkEndofSeasonDoy.TabIndex = 46 @@ -315,7 +315,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofRainsDate.IsMultiline = False Me.ucrInputEndofRainsDate.IsReadOnly = False Me.ucrInputEndofRainsDate.Location = New System.Drawing.Point(165, 17) - Me.ucrInputEndofRainsDate.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputEndofRainsDate.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputEndofRainsDate.Name = "ucrInputEndofRainsDate" Me.ucrInputEndofRainsDate.Size = New System.Drawing.Size(93, 17) Me.ucrInputEndofRainsDate.TabIndex = 36 @@ -327,7 +327,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofRainsOccurence.IsMultiline = False Me.ucrInputEndofRainsOccurence.IsReadOnly = False Me.ucrInputEndofRainsOccurence.Location = New System.Drawing.Point(341, 16) - Me.ucrInputEndofRainsOccurence.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputEndofRainsOccurence.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputEndofRainsOccurence.Name = "ucrInputEndofRainsOccurence" Me.ucrInputEndofRainsOccurence.Size = New System.Drawing.Size(94, 20) Me.ucrInputEndofRainsOccurence.TabIndex = 39 @@ -339,7 +339,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndRainDoy.IsMultiline = False Me.ucrInputEndRainDoy.IsReadOnly = False Me.ucrInputEndRainDoy.Location = New System.Drawing.Point(50, 17) - Me.ucrInputEndRainDoy.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputEndRainDoy.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputEndRainDoy.Name = "ucrInputEndRainDoy" Me.ucrInputEndRainDoy.Size = New System.Drawing.Size(65, 21) Me.ucrInputEndRainDoy.TabIndex = 50 @@ -349,7 +349,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrChkEndofRainsDoy.AutoSize = True Me.ucrChkEndofRainsDoy.Checked = False Me.ucrChkEndofRainsDoy.Location = New System.Drawing.Point(5, 18) - Me.ucrChkEndofRainsDoy.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkEndofRainsDoy.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkEndofRainsDoy.Name = "ucrChkEndofRainsDoy" Me.ucrChkEndofRainsDoy.Size = New System.Drawing.Size(60, 34) Me.ucrChkEndofRainsDoy.TabIndex = 49 @@ -359,7 +359,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrChkEndofRainsDate.AutoSize = True Me.ucrChkEndofRainsDate.Checked = False Me.ucrChkEndofRainsDate.Location = New System.Drawing.Point(118, 17) - Me.ucrChkEndofRainsDate.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkEndofRainsDate.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkEndofRainsDate.Name = "ucrChkEndofRainsDate" Me.ucrChkEndofRainsDate.Size = New System.Drawing.Size(52, 34) Me.ucrChkEndofRainsDate.TabIndex = 48 @@ -369,7 +369,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrChkEndofRainsOccurence.AutoSize = True Me.ucrChkEndofRainsOccurence.Checked = False Me.ucrChkEndofRainsOccurence.Location = New System.Drawing.Point(264, 16) - Me.ucrChkEndofRainsOccurence.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkEndofRainsOccurence.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkEndofRainsOccurence.Name = "ucrChkEndofRainsOccurence" Me.ucrChkEndofRainsOccurence.Size = New System.Drawing.Size(91, 34) Me.ucrChkEndofRainsOccurence.TabIndex = 47 @@ -410,7 +410,7 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrPnlEndOfRainsAndSeasons.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlEndOfRainsAndSeasons.Location = New System.Drawing.Point(79, 9) - Me.ucrPnlEndOfRainsAndSeasons.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlEndOfRainsAndSeasons.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlEndOfRainsAndSeasons.Name = "ucrPnlEndOfRainsAndSeasons" Me.ucrPnlEndOfRainsAndSeasons.Size = New System.Drawing.Size(273, 35) Me.ucrPnlEndOfRainsAndSeasons.TabIndex = 34 @@ -435,7 +435,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEvaporation.IsMultiline = False Me.ucrInputEvaporation.IsReadOnly = False Me.ucrInputEvaporation.Location = New System.Drawing.Point(153, 342) - Me.ucrInputEvaporation.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputEvaporation.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputEvaporation.Name = "ucrInputEvaporation" Me.ucrInputEvaporation.Size = New System.Drawing.Size(64, 21) Me.ucrInputEvaporation.TabIndex = 27 @@ -444,7 +444,7 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrPnlEvaporation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlEvaporation.Location = New System.Drawing.Point(96, 337) - Me.ucrPnlEvaporation.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlEvaporation.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlEvaporation.Name = "ucrPnlEvaporation" Me.ucrPnlEvaporation.Size = New System.Drawing.Size(345, 27) Me.ucrPnlEvaporation.TabIndex = 25 @@ -456,7 +456,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputFilterPreview.IsMultiline = False Me.ucrInputFilterPreview.IsReadOnly = True Me.ucrInputFilterPreview.Location = New System.Drawing.Point(131, 273) - Me.ucrInputFilterPreview.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputFilterPreview.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" Me.ucrInputFilterPreview.Size = New System.Drawing.Size(242, 22) Me.ucrInputFilterPreview.TabIndex = 12 @@ -467,7 +467,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudTotalOverDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTotalOverDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudTotalOverDays.Location = New System.Drawing.Point(233, 308) - Me.ucrNudTotalOverDays.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudTotalOverDays.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudTotalOverDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudTotalOverDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTotalOverDays.Name = "ucrNudTotalOverDays" @@ -481,7 +481,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudAmount.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAmount.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudAmount.Location = New System.Drawing.Point(68, 308) - Me.ucrNudAmount.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudAmount.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudAmount.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAmount.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAmount.Name = "ucrNudAmount" @@ -495,7 +495,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudWBLessThan.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWBLessThan.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudWBLessThan.Location = New System.Drawing.Point(234, 308) - Me.ucrNudWBLessThan.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudWBLessThan.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudWBLessThan.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudWBLessThan.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWBLessThan.Name = "ucrNudWBLessThan" @@ -509,7 +509,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudCapacity.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudCapacity.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudCapacity.Location = New System.Drawing.Point(69, 308) - Me.ucrNudCapacity.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudCapacity.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudCapacity.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudCapacity.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudCapacity.Name = "ucrNudCapacity" @@ -599,7 +599,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(3, 472) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 33 @@ -610,7 +610,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrNudWB.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWB.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudWB.Location = New System.Drawing.Point(126, 374) - Me.ucrNudWB.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudWB.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudWB.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudWB.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWB.Name = "ucrNudWB" @@ -623,7 +623,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrChkWB.AutoSize = True Me.ucrChkWB.Checked = False Me.ucrChkWB.Location = New System.Drawing.Point(17, 374) - Me.ucrChkWB.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ucrChkWB.Margin = New System.Windows.Forms.Padding(4) Me.ucrChkWB.Name = "ucrChkWB" Me.ucrChkWB.Size = New System.Drawing.Size(100, 23) Me.ucrChkWB.TabIndex = 46 @@ -634,6 +634,8 @@ Partial Class dlgEndOfRainsSeason Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(477, 549) + Me.Controls.Add(Me.ucrReceiverEvaporation) + Me.Controls.Add(Me.ucrInputEvaporation) Me.Controls.Add(Me.ucrNudWB) Me.Controls.Add(Me.ucrChkWB) Me.Controls.Add(Me.rdoEndOfSeasons) @@ -642,8 +644,6 @@ Partial Class dlgEndOfRainsSeason Me.Controls.Add(Me.rdoVariableEvaporation) Me.Controls.Add(Me.grpEndofSeason) Me.Controls.Add(Me.rdoValueEvaporation) - Me.Controls.Add(Me.ucrReceiverEvaporation) - Me.Controls.Add(Me.ucrInputEvaporation) Me.Controls.Add(Me.ucrPnlEvaporation) Me.Controls.Add(Me.ucrInputFilterPreview) Me.Controls.Add(Me.cmdDoyRange) From bd82e5e455090a4530028677dad85fd373206428 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Fri, 19 Jan 2024 08:09:18 +0100 Subject: [PATCH 10/37] Ajusted Appearance of the Define Climatic Data dialog --- instat/DlgDefineClimaticData.Designer.vb | 770 +++++++++++------------ 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/instat/DlgDefineClimaticData.Designer.vb b/instat/DlgDefineClimaticData.Designer.vb index cfd7f27a21e..bfa0558f912 100644 --- a/instat/DlgDefineClimaticData.Designer.vb +++ b/instat/DlgDefineClimaticData.Designer.vb @@ -38,102 +38,68 @@ 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() - Me.ucrReceiverMinRH = New instat.ucrReceiverSingle() Me.lblMinimumRH = New System.Windows.Forms.Label() + Me.lblMaxTemp = New System.Windows.Forms.Label() + Me.lblCloudCover = New System.Windows.Forms.Label() + Me.lblMinTemp = New System.Windows.Forms.Label() + Me.lblRadiation = New System.Windows.Forms.Label() + Me.lblSunshine = New System.Windows.Forms.Label() + Me.lblWindSpeed = New System.Windows.Forms.Label() + Me.lblWindDirection = New System.Windows.Forms.Label() + Me.ucrChkLinkedMetaData = New instat.ucrCheck() + Me.ucrSelectorLinkedDataFrame = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrInputCheckInput = New instat.ucrInputTextBox() + Me.ucrSelectorDefineClimaticData = New instat.ucrSelectorByDataFrameAddRemove() + 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.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.ucrReceiverMaxRH = New instat.ucrReceiverSingle() + Me.ucrReceiverMinRH = New instat.ucrReceiverSingle() Me.ucrReceiverWindDirection = New instat.ucrReceiverSingle() Me.ucrReceiverRain = New instat.ucrReceiverSingle() Me.ucrReceiverSunshine = New instat.ucrReceiverSingle() Me.ucrReceiverRadiation = New instat.ucrReceiverSingle() Me.ucrReceiverMaxTemp = New instat.ucrReceiverSingle() Me.ucrReceiverCloudCover = New instat.ucrReceiverSingle() - Me.lblMaxTemp = New System.Windows.Forms.Label() - Me.lblCloudCover = New System.Windows.Forms.Label() - Me.lblMinTemp = New System.Windows.Forms.Label() - Me.lblRadiation = New System.Windows.Forms.Label() Me.ucrReceiverWindSpeed = New instat.ucrReceiverSingle() - Me.lblSunshine = New System.Windows.Forms.Label() Me.ucrReceiverMinTemp = New instat.ucrReceiverSingle() - Me.lblWindSpeed = New System.Windows.Forms.Label() - Me.lblWindDirection = 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.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(16, 204) - 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(16, 224) - 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 @@ -144,18 +110,6 @@ Partial Class DlgDefineClimaticData 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(16, 9) - 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 @@ -218,74 +172,12 @@ Partial Class DlgDefineClimaticData 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.Size = New System.Drawing.Size(126, 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(10, 29) - 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(10, 106) - 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(10, 68) - 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(10, 145) - 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) @@ -298,7 +190,7 @@ Partial Class DlgDefineClimaticData Me.grpDateTime.Controls.Add(Me.ucrReceiverMonth) Me.grpDateTime.Controls.Add(Me.ucrReceiverDay) Me.grpDateTime.Controls.Add(Me.lblDay) - Me.grpDateTime.Location = New System.Drawing.Point(372, 234) + Me.grpDateTime.Location = New System.Drawing.Point(242, 12) Me.grpDateTime.Name = "grpDateTime" Me.grpDateTime.Size = New System.Drawing.Size(126, 196) Me.grpDateTime.TabIndex = 15 @@ -306,19 +198,6 @@ Partial Class DlgDefineClimaticData 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(12, 62) - 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 @@ -339,19 +218,6 @@ Partial Class DlgDefineClimaticData Me.lblMonth.TabIndex = 4 Me.lblMonth.Text = "Month:" ' - 'ucrReceiverDOY - ' - Me.ucrReceiverDOY.AutoSize = True - Me.ucrReceiverDOY.frmParent = Me - 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 - 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 @@ -362,45 +228,6 @@ Partial Class DlgDefineClimaticData Me.lblYear.TabIndex = 2 Me.lblYear.Text = "Year:" ' - 'ucrReceiverDate - ' - Me.ucrReceiverDate.AutoSize = True - Me.ucrReceiverDate.frmParent = Me - 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 - 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(12, 98) - 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(12, 133) - 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 @@ -451,77 +278,25 @@ Partial Class DlgDefineClimaticData Me.Label4.TabIndex = 0 Me.Label4.Text = "Name:" ' - 'ucrReceiverStationMeta - ' - Me.ucrReceiverStationMeta.AutoSize = True - Me.ucrReceiverStationMeta.frmParent = Me - 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 - Me.ucrReceiverStationMeta.Size = New System.Drawing.Size(93, 20) - Me.ucrReceiverStationMeta.strNcFilePath = "" - Me.ucrReceiverStationMeta.TabIndex = 8 - Me.ucrReceiverStationMeta.ucrSelector = Nothing - ' - 'ucrReceiverLonMeta + 'grpMeta ' - Me.ucrReceiverLonMeta.AutoSize = True - Me.ucrReceiverLonMeta.frmParent = Me - 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 - Me.ucrReceiverLonMeta.Size = New System.Drawing.Size(93, 20) - Me.ucrReceiverLonMeta.strNcFilePath = "" - Me.ucrReceiverLonMeta.TabIndex = 10 - Me.ucrReceiverLonMeta.ucrSelector = Nothing + 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" ' - 'ucrReceiverLatMeta - ' - Me.ucrReceiverLatMeta.AutoSize = True - Me.ucrReceiverLatMeta.frmParent = Me - 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 - 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(9, 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 + 'lblRain ' Me.lblRain.AutoSize = True Me.lblRain.ImeMode = System.Windows.Forms.ImeMode.NoControl @@ -553,64 +328,307 @@ 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(374, 12) Me.grpElements.Name = "grpElements" - Me.grpElements.Size = New System.Drawing.Size(260, 225) + Me.grpElements.Size = New System.Drawing.Size(151, 395) Me.grpElements.TabIndex = 16 Me.grpElements.TabStop = False Me.grpElements.Text = "Elements" ' + 'lblMaxRH + ' + Me.lblMaxRH.AutoSize = True + Me.lblMaxRH.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMaxRH.Location = New System.Drawing.Point(15, 351) + Me.lblMaxRH.Name = "lblMaxRH" + Me.lblMaxRH.Size = New System.Drawing.Size(90, 13) + Me.lblMaxRH.TabIndex = 18 + Me.lblMaxRH.Text = "Maximum RH (%):" + ' + 'lblMinimumRH + ' + Me.lblMinimumRH.AutoSize = True + Me.lblMinimumRH.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMinimumRH.Location = New System.Drawing.Point(15, 315) + Me.lblMinimumRH.Name = "lblMinimumRH" + Me.lblMinimumRH.Size = New System.Drawing.Size(87, 13) + Me.lblMinimumRH.TabIndex = 16 + Me.lblMinimumRH.Text = "Minimum RH (%):" + ' + 'lblMaxTemp + ' + Me.lblMaxTemp.AutoSize = True + Me.lblMaxTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMaxTemp.Location = New System.Drawing.Point(15, 88) + Me.lblMaxTemp.Name = "lblMaxTemp" + Me.lblMaxTemp.Size = New System.Drawing.Size(117, 13) + Me.lblMaxTemp.TabIndex = 4 + Me.lblMaxTemp.Text = "Maximum Temperature:" + ' + 'lblCloudCover + ' + Me.lblCloudCover.AutoSize = True + Me.lblCloudCover.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblCloudCover.Location = New System.Drawing.Point(15, 277) + Me.lblCloudCover.Name = "lblCloudCover" + Me.lblCloudCover.Size = New System.Drawing.Size(68, 13) + Me.lblCloudCover.TabIndex = 14 + Me.lblCloudCover.Text = "Cloud Cover:" + ' + 'lblMinTemp + ' + Me.lblMinTemp.AutoSize = True + Me.lblMinTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMinTemp.Location = New System.Drawing.Point(15, 51) + Me.lblMinTemp.Name = "lblMinTemp" + Me.lblMinTemp.Size = New System.Drawing.Size(114, 13) + Me.lblMinTemp.TabIndex = 2 + Me.lblMinTemp.Text = "Minimum Temperature:" + ' + 'lblRadiation + ' + Me.lblRadiation.AutoSize = True + Me.lblRadiation.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRadiation.Location = New System.Drawing.Point(15, 239) + Me.lblRadiation.Name = "lblRadiation" + Me.lblRadiation.Size = New System.Drawing.Size(55, 13) + Me.lblRadiation.TabIndex = 12 + Me.lblRadiation.Text = "Radiation:" + ' + 'lblSunshine + ' + Me.lblSunshine.AutoSize = True + Me.lblSunshine.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblSunshine.Location = New System.Drawing.Point(15, 199) + Me.lblSunshine.Name = "lblSunshine" + Me.lblSunshine.Size = New System.Drawing.Size(85, 13) + Me.lblSunshine.TabIndex = 10 + Me.lblSunshine.Text = "Sunshine Hours:" + ' + 'lblWindSpeed + ' + Me.lblWindSpeed.AutoSize = True + Me.lblWindSpeed.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblWindSpeed.Location = New System.Drawing.Point(15, 125) + Me.lblWindSpeed.Name = "lblWindSpeed" + Me.lblWindSpeed.Size = New System.Drawing.Size(69, 13) + Me.lblWindSpeed.TabIndex = 6 + Me.lblWindSpeed.Text = "Wind Speed:" + ' + 'lblWindDirection + ' + Me.lblWindDirection.AutoSize = True + Me.lblWindDirection.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblWindDirection.Location = New System.Drawing.Point(15, 162) + Me.lblWindDirection.Name = "lblWindDirection" + Me.lblWindDirection.Size = New System.Drawing.Size(80, 13) + Me.lblWindDirection.TabIndex = 8 + Me.lblWindDirection.Text = "Wind Direction:" + ' + 'ucrChkLinkedMetaData + ' + Me.ucrChkLinkedMetaData.AutoSize = True + Me.ucrChkLinkedMetaData.Checked = False + Me.ucrChkLinkedMetaData.Location = New System.Drawing.Point(16, 204) + Me.ucrChkLinkedMetaData.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkLinkedMetaData.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(16, 224) + 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 + ' + 'ucrSelectorDefineClimaticData + ' + Me.ucrSelectorDefineClimaticData.AutoSize = True + Me.ucrSelectorDefineClimaticData.bDropUnusedFilterLevels = False + Me.ucrSelectorDefineClimaticData.bShowHiddenColumns = False + Me.ucrSelectorDefineClimaticData.bUseCurrentFilter = True + 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) + Me.ucrSelectorDefineClimaticData.TabIndex = 13 + ' + 'ucrReceiverStation + ' + Me.ucrReceiverStation.AutoSize = True + Me.ucrReceiverStation.frmParent = Nothing + 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 + Me.ucrReceiverStation.Size = New System.Drawing.Size(100, 20) + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.TabIndex = 8 + Me.ucrReceiverStation.ucrSelector = Nothing + ' + 'ucrReceiverLongitude + ' + Me.ucrReceiverLongitude.AutoSize = True + Me.ucrReceiverLongitude.frmParent = Nothing + 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 + Me.ucrReceiverLongitude.Size = New System.Drawing.Size(100, 20) + Me.ucrReceiverLongitude.strNcFilePath = "" + Me.ucrReceiverLongitude.TabIndex = 10 + Me.ucrReceiverLongitude.ucrSelector = Nothing + ' + 'ucrReceiverLatitude + ' + Me.ucrReceiverLatitude.AutoSize = True + Me.ucrReceiverLatitude.frmParent = Nothing + 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 + Me.ucrReceiverLatitude.Size = New System.Drawing.Size(100, 20) + Me.ucrReceiverLatitude.strNcFilePath = "" + Me.ucrReceiverLatitude.TabIndex = 9 + Me.ucrReceiverLatitude.ucrSelector = Nothing + ' + 'ucrReceiverAltitude + ' + Me.ucrReceiverAltitude.AutoSize = True + Me.ucrReceiverAltitude.frmParent = Nothing + 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 + Me.ucrReceiverAltitude.Size = New System.Drawing.Size(100, 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 + ' + 'ucrReceiverYear + ' + Me.ucrReceiverYear.AutoSize = True + Me.ucrReceiverYear.frmParent = Nothing + 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 + Me.ucrReceiverYear.Size = New System.Drawing.Size(98, 20) + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.TabIndex = 3 + Me.ucrReceiverYear.ucrSelector = Nothing + ' + 'ucrReceiverDOY + ' + Me.ucrReceiverDOY.AutoSize = True + Me.ucrReceiverDOY.frmParent = Nothing + 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 + Me.ucrReceiverDOY.Size = New System.Drawing.Size(98, 20) + Me.ucrReceiverDOY.strNcFilePath = "" + Me.ucrReceiverDOY.TabIndex = 9 + Me.ucrReceiverDOY.ucrSelector = Nothing + ' + 'ucrReceiverDate + ' + Me.ucrReceiverDate.AutoSize = True + Me.ucrReceiverDate.frmParent = Nothing + 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 + 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 = Nothing + 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 + 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 = Nothing + 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 + Me.ucrReceiverDay.Size = New System.Drawing.Size(98, 20) + Me.ucrReceiverDay.strNcFilePath = "" + Me.ucrReceiverDay.TabIndex = 7 + Me.ucrReceiverDay.ucrSelector = Nothing + ' 'ucrReceiverMaxRH ' Me.ucrReceiverMaxRH.AutoSize = True - Me.ucrReceiverMaxRH.frmParent = Me - Me.ucrReceiverMaxRH.Location = New System.Drawing.Point(144, 193) + Me.ucrReceiverMaxRH.frmParent = Nothing + Me.ucrReceiverMaxRH.Location = New System.Drawing.Point(18, 366) Me.ucrReceiverMaxRH.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxRH.Name = "ucrReceiverMaxRH" Me.ucrReceiverMaxRH.Selector = Nothing - Me.ucrReceiverMaxRH.Size = New System.Drawing.Size(99, 20) + Me.ucrReceiverMaxRH.Size = New System.Drawing.Size(116, 20) Me.ucrReceiverMaxRH.strNcFilePath = "" Me.ucrReceiverMaxRH.TabIndex = 19 Me.ucrReceiverMaxRH.ucrSelector = Nothing ' - 'lblMaxRH - ' - Me.lblMaxRH.AutoSize = True - Me.lblMaxRH.ImeMode = System.Windows.Forms.ImeMode.NoControl - 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 - Me.lblMaxRH.Text = "Maximum RH (%):" - ' 'ucrReceiverMinRH ' Me.ucrReceiverMinRH.AutoSize = True - Me.ucrReceiverMinRH.frmParent = Me - Me.ucrReceiverMinRH.Location = New System.Drawing.Point(144, 152) + Me.ucrReceiverMinRH.frmParent = Nothing + Me.ucrReceiverMinRH.Location = New System.Drawing.Point(18, 330) Me.ucrReceiverMinRH.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinRH.Name = "ucrReceiverMinRH" Me.ucrReceiverMinRH.Selector = Nothing - Me.ucrReceiverMinRH.Size = New System.Drawing.Size(99, 20) + Me.ucrReceiverMinRH.Size = New System.Drawing.Size(116, 20) Me.ucrReceiverMinRH.strNcFilePath = "" Me.ucrReceiverMinRH.TabIndex = 17 Me.ucrReceiverMinRH.ucrSelector = Nothing ' - 'lblMinimumRH - ' - Me.lblMinimumRH.AutoSize = True - Me.lblMinimumRH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMinimumRH.Location = New System.Drawing.Point(141, 137) - Me.lblMinimumRH.Name = "lblMinimumRH" - Me.lblMinimumRH.Size = New System.Drawing.Size(87, 13) - Me.lblMinimumRH.TabIndex = 16 - Me.lblMinimumRH.Text = "Minimum RH (%):" - ' 'ucrReceiverWindDirection ' Me.ucrReceiverWindDirection.AutoSize = True - Me.ucrReceiverWindDirection.frmParent = Me - Me.ucrReceiverWindDirection.Location = New System.Drawing.Point(18, 193) + Me.ucrReceiverWindDirection.frmParent = Nothing + Me.ucrReceiverWindDirection.Location = New System.Drawing.Point(18, 177) Me.ucrReceiverWindDirection.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverWindDirection.Name = "ucrReceiverWindDirection" Me.ucrReceiverWindDirection.Selector = Nothing @@ -622,8 +640,8 @@ Partial Class DlgDefineClimaticData 'ucrReceiverRain ' Me.ucrReceiverRain.AutoSize = True - Me.ucrReceiverRain.frmParent = Me - Me.ucrReceiverRain.Location = New System.Drawing.Point(18, 31) + Me.ucrReceiverRain.frmParent = Nothing + Me.ucrReceiverRain.Location = New System.Drawing.Point(18, 30) Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRain.Name = "ucrReceiverRain" Me.ucrReceiverRain.Selector = Nothing @@ -635,12 +653,12 @@ Partial Class DlgDefineClimaticData 'ucrReceiverSunshine ' Me.ucrReceiverSunshine.AutoSize = True - Me.ucrReceiverSunshine.frmParent = Me - Me.ucrReceiverSunshine.Location = New System.Drawing.Point(144, 31) + Me.ucrReceiverSunshine.frmParent = Nothing + Me.ucrReceiverSunshine.Location = New System.Drawing.Point(18, 215) Me.ucrReceiverSunshine.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSunshine.Name = "ucrReceiverSunshine" Me.ucrReceiverSunshine.Selector = Nothing - Me.ucrReceiverSunshine.Size = New System.Drawing.Size(99, 20) + Me.ucrReceiverSunshine.Size = New System.Drawing.Size(116, 20) Me.ucrReceiverSunshine.strNcFilePath = "" Me.ucrReceiverSunshine.TabIndex = 11 Me.ucrReceiverSunshine.ucrSelector = Nothing @@ -648,12 +666,12 @@ Partial Class DlgDefineClimaticData 'ucrReceiverRadiation ' Me.ucrReceiverRadiation.AutoSize = True - Me.ucrReceiverRadiation.frmParent = Me - Me.ucrReceiverRadiation.Location = New System.Drawing.Point(144, 70) + Me.ucrReceiverRadiation.frmParent = Nothing + Me.ucrReceiverRadiation.Location = New System.Drawing.Point(18, 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(99, 20) + Me.ucrReceiverRadiation.Size = New System.Drawing.Size(116, 20) Me.ucrReceiverRadiation.strNcFilePath = "" Me.ucrReceiverRadiation.TabIndex = 13 Me.ucrReceiverRadiation.ucrSelector = Nothing @@ -661,8 +679,8 @@ Partial Class DlgDefineClimaticData 'ucrReceiverMaxTemp ' Me.ucrReceiverMaxTemp.AutoSize = True - Me.ucrReceiverMaxTemp.frmParent = Me - Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(18, 111) + Me.ucrReceiverMaxTemp.frmParent = Nothing + Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(18, 103) Me.ucrReceiverMaxTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxTemp.Name = "ucrReceiverMaxTemp" Me.ucrReceiverMaxTemp.Selector = Nothing @@ -674,61 +692,21 @@ Partial Class DlgDefineClimaticData 'ucrReceiverCloudCover ' Me.ucrReceiverCloudCover.AutoSize = True - Me.ucrReceiverCloudCover.frmParent = Me - Me.ucrReceiverCloudCover.Location = New System.Drawing.Point(144, 111) + Me.ucrReceiverCloudCover.frmParent = Nothing + Me.ucrReceiverCloudCover.Location = New System.Drawing.Point(18, 292) Me.ucrReceiverCloudCover.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverCloudCover.Name = "ucrReceiverCloudCover" Me.ucrReceiverCloudCover.Selector = Nothing - Me.ucrReceiverCloudCover.Size = New System.Drawing.Size(99, 20) + Me.ucrReceiverCloudCover.Size = New System.Drawing.Size(116, 20) Me.ucrReceiverCloudCover.strNcFilePath = "" Me.ucrReceiverCloudCover.TabIndex = 15 Me.ucrReceiverCloudCover.ucrSelector = Nothing ' - 'lblMaxTemp - ' - Me.lblMaxTemp.AutoSize = True - Me.lblMaxTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxTemp.Location = New System.Drawing.Point(15, 96) - Me.lblMaxTemp.Name = "lblMaxTemp" - Me.lblMaxTemp.Size = New System.Drawing.Size(117, 13) - Me.lblMaxTemp.TabIndex = 4 - Me.lblMaxTemp.Text = "Maximum Temperature:" - ' - 'lblCloudCover - ' - Me.lblCloudCover.AutoSize = True - Me.lblCloudCover.ImeMode = System.Windows.Forms.ImeMode.NoControl - 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 - Me.lblCloudCover.Text = "Cloud Cover:" - ' - 'lblMinTemp - ' - Me.lblMinTemp.AutoSize = True - Me.lblMinTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl - 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 - Me.lblMinTemp.Text = "Minimum Temperature" - ' - 'lblRadiation - ' - Me.lblRadiation.AutoSize = True - Me.lblRadiation.ImeMode = System.Windows.Forms.ImeMode.NoControl - 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 - Me.lblRadiation.Text = "Radiation:" - ' 'ucrReceiverWindSpeed ' Me.ucrReceiverWindSpeed.AutoSize = True - Me.ucrReceiverWindSpeed.frmParent = Me - Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(18, 152) + Me.ucrReceiverWindSpeed.frmParent = Nothing + Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(18, 140) Me.ucrReceiverWindSpeed.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverWindSpeed.Name = "ucrReceiverWindSpeed" Me.ucrReceiverWindSpeed.Selector = Nothing @@ -737,21 +715,11 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverWindSpeed.TabIndex = 7 Me.ucrReceiverWindSpeed.ucrSelector = Nothing ' - 'lblSunshine - ' - Me.lblSunshine.AutoSize = True - Me.lblSunshine.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSunshine.Location = New System.Drawing.Point(141, 15) - Me.lblSunshine.Name = "lblSunshine" - Me.lblSunshine.Size = New System.Drawing.Size(85, 13) - Me.lblSunshine.TabIndex = 10 - Me.lblSunshine.Text = "Sunshine Hours:" - ' 'ucrReceiverMinTemp ' Me.ucrReceiverMinTemp.AutoSize = True - Me.ucrReceiverMinTemp.frmParent = Me - Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(18, 70) + Me.ucrReceiverMinTemp.frmParent = Nothing + Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(18, 66) Me.ucrReceiverMinTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinTemp.Name = "ucrReceiverMinTemp" Me.ucrReceiverMinTemp.Selector = Nothing @@ -760,32 +728,64 @@ Partial Class DlgDefineClimaticData Me.ucrReceiverMinTemp.TabIndex = 3 Me.ucrReceiverMinTemp.ucrSelector = Nothing ' - 'lblWindSpeed + 'ucrReceiverStationMeta ' - Me.lblWindSpeed.AutoSize = True - Me.lblWindSpeed.ImeMode = System.Windows.Forms.ImeMode.NoControl - 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 - Me.lblWindSpeed.Text = "Wind Speed:" + Me.ucrReceiverStationMeta.AutoSize = True + Me.ucrReceiverStationMeta.frmParent = Nothing + 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 + Me.ucrReceiverStationMeta.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverStationMeta.strNcFilePath = "" + Me.ucrReceiverStationMeta.TabIndex = 8 + Me.ucrReceiverStationMeta.ucrSelector = Nothing ' - 'lblWindDirection + 'ucrReceiverLonMeta ' - Me.lblWindDirection.AutoSize = True - Me.lblWindDirection.ImeMode = System.Windows.Forms.ImeMode.NoControl - 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 - Me.lblWindDirection.Text = "Wind Direction:" + Me.ucrReceiverLonMeta.AutoSize = True + Me.ucrReceiverLonMeta.frmParent = Nothing + 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 + 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 = Nothing + 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 + 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 = Nothing + 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 + Me.ucrReceiverAltMeta.Size = New System.Drawing.Size(93, 20) + Me.ucrReceiverAltMeta.strNcFilePath = "" + Me.ucrReceiverAltMeta.TabIndex = 11 + Me.ucrReceiverAltMeta.ucrSelector = Nothing ' '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(502, 460) + Me.ClientSize = New System.Drawing.Size(533, 531) Me.Controls.Add(Me.ucrChkLinkedMetaData) Me.Controls.Add(Me.ucrSelectorLinkedDataFrame) Me.Controls.Add(Me.ucrInputCheckInput) From 1680e60835d175b0daa15a23486da1e60597d759 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 19 Jan 2024 08:58:22 +0100 Subject: [PATCH 11/37] Code Changes --- instat/dlgExportForClimpact.Designer.vb | 34 +---- instat/dlgExportForClimpact.vb | 120 +++--------------- .../InstatObject/R/stand_alone_functions.R | 19 +++ 3 files changed, 44 insertions(+), 129 deletions(-) diff --git a/instat/dlgExportForClimpact.Designer.vb b/instat/dlgExportForClimpact.Designer.vb index f3accf48437..89b93233df1 100644 --- a/instat/dlgExportForClimpact.Designer.vb +++ b/instat/dlgExportForClimpact.Designer.vb @@ -36,8 +36,6 @@ Partial Class dlgExportForClimpact Me.lblExport = New System.Windows.Forms.Label() Me.cmdBrowse = New System.Windows.Forms.Button() Me.ucrInputExportFile = New instat.ucrInputTextBox() - Me.ucrSaveNewDataFrame = New instat.ucrSave() - Me.ucrChkNewDataFrame = New instat.ucrCheck() Me.ucrBase = New instat.ucrButtons() Me.lblYear = New System.Windows.Forms.Label() Me.ucrReceiverYear = New instat.ucrReceiverSingle() @@ -169,7 +167,7 @@ Partial Class dlgExportForClimpact ' Me.lblExport.AutoSize = True Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExport.Location = New System.Drawing.Point(9, 370) + Me.lblExport.Location = New System.Drawing.Point(9, 330) Me.lblExport.Name = "lblExport" Me.lblExport.Size = New System.Drawing.Size(59, 13) Me.lblExport.TabIndex = 16 @@ -178,7 +176,7 @@ Partial Class dlgExportForClimpact 'cmdBrowse ' Me.cmdBrowse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrowse.Location = New System.Drawing.Point(326, 365) + Me.cmdBrowse.Location = New System.Drawing.Point(326, 325) Me.cmdBrowse.Name = "cmdBrowse" Me.cmdBrowse.Size = New System.Drawing.Size(80, 23) Me.cmdBrowse.TabIndex = 18 @@ -191,35 +189,17 @@ Partial Class dlgExportForClimpact Me.ucrInputExportFile.AutoSize = True Me.ucrInputExportFile.IsMultiline = False Me.ucrInputExportFile.IsReadOnly = False - Me.ucrInputExportFile.Location = New System.Drawing.Point(142, 366) + Me.ucrInputExportFile.Location = New System.Drawing.Point(142, 326) Me.ucrInputExportFile.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrInputExportFile.Name = "ucrInputExportFile" Me.ucrInputExportFile.Size = New System.Drawing.Size(182, 21) Me.ucrInputExportFile.TabIndex = 17 ' - 'ucrSaveNewDataFrame - ' - Me.ucrSaveNewDataFrame.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveNewDataFrame.Location = New System.Drawing.Point(9, 331) - Me.ucrSaveNewDataFrame.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveNewDataFrame.Name = "ucrSaveNewDataFrame" - Me.ucrSaveNewDataFrame.Size = New System.Drawing.Size(348, 24) - Me.ucrSaveNewDataFrame.TabIndex = 15 - ' - 'ucrChkNewDataFrame - ' - Me.ucrChkNewDataFrame.AutoSize = True - Me.ucrChkNewDataFrame.Checked = False - Me.ucrChkNewDataFrame.Location = New System.Drawing.Point(9, 270) - Me.ucrChkNewDataFrame.Name = "ucrChkNewDataFrame" - Me.ucrChkNewDataFrame.Size = New System.Drawing.Size(266, 23) - Me.ucrChkNewDataFrame.TabIndex = 13 - ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(7, 396) + Me.ucrBase.Location = New System.Drawing.Point(7, 356) Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) @@ -284,7 +264,7 @@ Partial Class dlgExportForClimpact ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(422, 450) + Me.ClientSize = New System.Drawing.Size(422, 412) Me.Controls.Add(Me.lblMissingValues) Me.Controls.Add(Me.ucrInputCodeMissingValues) Me.Controls.Add(Me.lblTN) @@ -301,8 +281,6 @@ Partial Class dlgExportForClimpact Me.Controls.Add(Me.lblExport) Me.Controls.Add(Me.cmdBrowse) Me.Controls.Add(Me.ucrInputExportFile) - Me.Controls.Add(Me.ucrSaveNewDataFrame) - Me.Controls.Add(Me.ucrChkNewDataFrame) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.lblYear) Me.Controls.Add(Me.ucrReceiverYear) @@ -329,8 +307,6 @@ Partial Class dlgExportForClimpact Friend WithEvents lblExport As Label Friend WithEvents cmdBrowse As Button Friend WithEvents ucrInputExportFile As ucrInputTextBox - Friend WithEvents ucrSaveNewDataFrame As ucrSave - Friend WithEvents ucrChkNewDataFrame As ucrCheck Friend WithEvents ucrBase As ucrButtons Friend WithEvents lblYear As Label Friend WithEvents ucrReceiverYear As ucrReceiverSingle diff --git a/instat/dlgExportForClimpact.vb b/instat/dlgExportForClimpact.vb index 80a6108ad49..e3063d08cd7 100644 --- a/instat/dlgExportForClimpact.vb +++ b/instat/dlgExportForClimpact.vb @@ -20,8 +20,8 @@ Imports instat.Translations Public Class dlgExportForClimpact Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsDataFrameFunction, clsCurrentNewColumnFunction, clsOutputClimpact, clsDummyFunction, clsMutateFunction, clsExportClimpactFunction As New RFunction - Private clsPipeOperator As New ROperator + Private clsOutputClimpact As New RFunction + Private Sub dlgExportForClimpact_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -57,22 +57,20 @@ Public Class dlgExportForClimpact 'Day Receiver ucrReceiverDay.Selector = ucrSelectorImportToClimpact - ucrReceiverDay.SetParameter(New RParameter("day", 0)) + ucrReceiverDay.SetParameter(New RParameter("day", 5, bNewIncludeArgumentName:=False)) ucrReceiverDay.SetParameterIsString() ucrReceiverDay.bWithQuotes = False + ucrReceiverDay.SetClimaticType("day") ucrReceiverDay.bAutoFill = True - ucrReceiverDay.SetClimaticType("doy") - ucrReceiverDay.strSelectorHeading = "Day Variables" 'Element Receiver ucrReceiverTX.Selector = ucrSelectorImportToClimpact - ucrReceiverTX.SetParameter(New RParameter("x", 0, bNewIncludeArgumentName:=False)) + ucrReceiverTX.SetParameter(New RParameter("x", 4, bNewIncludeArgumentName:=False)) ucrReceiverTX.SetParameterIsString() ucrReceiverTX.bWithQuotes = False ucrReceiverTX.SetClimaticType("temp_max") ucrReceiverTX.bAutoFill = True - ucrReceiverTN.Selector = ucrSelectorImportToClimpact ucrReceiverTN.SetParameter(New RParameter("x", 1, bNewIncludeArgumentName:=False)) ucrReceiverTN.SetParameterIsString() @@ -87,64 +85,36 @@ Public Class dlgExportForClimpact ucrReceiverRR.SetParameterIsString() ucrReceiverRR.bWithQuotes = False - ucrChkNewDataFrame.SetText("New Data Frame Name") - ucrChkNewDataFrame.AddToLinkedControls(ucrSaveNewDataFrame, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkNewDataFrame.AddParameterValuesCondition(True, "dataframe", "True") - ucrChkNewDataFrame.AddParameterValuesCondition(False, "dataframe", "False") - ucrChkExportDataFrame.SetText(" Export Data Frame(s)") ucrChkExportDataFrame.AddToLinkedControls(ucrInputExportFile, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkExportDataFrame.AddParameterValuesCondition(True, "export", "True") ucrChkExportDataFrame.AddParameterValuesCondition(False, "export", "False") - ucrSaveNewDataFrame.SetSaveTypeAsDataFrame() - ucrSaveNewDataFrame.SetIsTextBox() - ucrSaveNewDataFrame.SetLabelText("Data Frame Name:") - - ucrInputExportFile.SetParameter(New RParameter("file", 1)) + ucrInputExportFile.SetParameter(New RParameter("output_file ", 9)) ucrInputExportFile.IsReadOnly = True ucrInputExportFile.SetLinkedDisplayControl(lblExport) - DataFrameAssignTo() End Sub Private Sub SetDefaults() - clsDataFrameFunction = New RFunction - clsDummyFunction = New RFunction - clsCurrentNewColumnFunction = New RFunction - clsMutateFunction = New RFunction - clsExportClimpactFunction = New RFunction - clsPipeOperator = New ROperator + clsOutputClimpact = New RFunction ucrSelectorImportToClimpact.Reset() - ucrSaveNewDataFrame.Reset() - clsDummyFunction.AddParameter("dataframe", "True", iPosition:=0) - clsDummyFunction.AddParameter("export", "False", iPosition:=1) + clsOutputClimpact.SetRCommand("write_weather_data") + clsOutputClimpact.AddParameter("year", clsRFunctionParameter:=ucrReceiverYear.GetVariables, iPosition:=1) + clsOutputClimpact.AddParameter("month", clsRFunctionParameter:=ucrReceiverMonth.GetVariables, iPosition:=2) + clsOutputClimpact.AddParameter("day", clsRFunctionParameter:=ucrReceiverDay.GetVariables, iPosition:=3) + clsOutputClimpact.AddParameter("rain", clsRFunctionParameter:=ucrReceiverRR.GetVariables, iPosition:=4) + clsOutputClimpact.AddParameter("mn_tmp", clsRFunctionParameter:=ucrReceiverTN.GetVariables, iPosition:=5) + clsOutputClimpact.AddParameter("mx_tmp", clsRFunctionParameter:=ucrReceiverTX.GetVariables, iPosition:=6) + clsOutputClimpact.AddParameter("missing_code", "-99.9", iPosition:=7) - clsDataFrameFunction.SetRCommand("data.frame") - clsDataFrameFunction.AddParameter("x", "columns", iPosition:=5, bIncludeArgumentName:=False) - clsPipeOperator.SetOperation("%>%") - clsPipeOperator.AddParameter("left", clsRFunctionParameter:=clsOutputClimpact, iPosition:=0) - clsPipeOperator.AddParameter("right", clsRFunctionParameter:=clsMutateFunction, iPosition:=1) + ucrBase.clsRsyntax.SetBaseRFunction(clsOutputClimpact) - clsOutputClimpact.SetRCommand("output_Climpact") - clsOutputClimpact.AddParameter("long.data", "TRUE") - - clsMutateFunction.SetPackageName("dplyr") - clsMutateFunction.SetRCommand("mutate") - - clsExportClimpactFunction.SetPackageName("rio") - clsExportClimpactFunction.SetRCommand("export") - clsExportClimpactFunction.AddParameter("x", clsROperatorParameter:=clsPipeOperator, iPosition:=0) - - - 'ucrBase.clsRsyntax.SetBaseRFunction(clsExportClimpactFunction) - ucrBase.clsRsyntax.SetBaseROperator(clsPipeOperator) - 'ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction) End Sub @@ -152,12 +122,10 @@ Public Class dlgExportForClimpact ucrReceiverDay.SetRCode(clsOutputClimpact, bReset) ucrReceiverYear.SetRCode(clsOutputClimpact, bReset) ucrSelectorImportToClimpact.SetRCode(clsOutputClimpact, bReset) - ucrReceiverRR.SetRCode(clsOutputClimpact, bReset) - ucrReceiverTN.SetRCode(clsOutputClimpact, bReset) - ucrReceiverTX.SetRCode(clsOutputClimpact, bReset) + ucrReceiverMonth.SetRCode(clsOutputClimpact, bReset) ucrInputCodeMissingValues.SetRCode(clsOutputClimpact, bReset) - ucrInputExportFile.SetRCode(clsExportClimpactFunction) + ucrInputExportFile.SetRCode(clsOutputClimpact) End Sub Private Sub TestOkEnabled() @@ -168,9 +136,6 @@ Public Class dlgExportForClimpact AndAlso Not ucrReceiverTX.IsEmpty _ AndAlso Not ucrReceiverTN.IsEmpty ) - If ucrChkNewDataFrame.Checked And Not ucrSaveNewDataFrame.IsComplete Then - ucrBase.OKEnabled(False) - End If If ucrChkExportDataFrame.Checked And ucrInputExportFile.IsEmpty Then ucrBase.OKEnabled(False) End If @@ -182,14 +147,6 @@ Public Class dlgExportForClimpact TestOkEnabled() End Sub - Private Sub DataFrameAssignTo() - Dim strDataframeName As String = ucrSelectorImportToClimpact.ucrAvailableDataFrames.cboAvailableDataFrames.Text - If strDataframeName = "" OrElse ucrSaveNewDataFrame.bUserTyped Then - Exit Sub - End If - ucrSaveNewDataFrame.SetPrefix(strDataframeName & "__climpact") - End Sub - Private Sub cmdBrowse_Click(sender As Object, e As EventArgs) Handles cmdBrowse.Click SelectFileToSave() End Sub @@ -197,7 +154,7 @@ Public Class dlgExportForClimpact Private Sub SelectFileToSave() Using dlgSave As New SaveFileDialog dlgSave.Title = "Save Climpact File" - dlgSave.Filter = "Comma separated file (*.csv)|*.csv|Text File (*.txt)|*.txt" + dlgSave.Filter = "Text File (*.txt)|*.txt" If ucrInputExportFile.GetText() <> "" Then dlgSave.InitialDirectory = ucrInputExportFile.GetText().Replace("/", "\") Else @@ -210,24 +167,8 @@ Public Class dlgExportForClimpact End Using End Sub - Private Sub ucrSelectorImportToClimpact_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorImportToClimpact.ControlValueChanged - DataFrameAssignTo() - End Sub - - 'Private Sub ucrChkNewDataFrame_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNewDataFrame.ControlValueChanged, ucrChkExportDataFrame.ControlValueChanged - ' SettingBaseFunction() - 'End Sub - - 'Private Sub ucrReceiverElements_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRR.ControlValueChanged, ucrReceiverTN.ControlValueChanged, ucrReceiverTX.ControlValueChanged - ' ucrBase.clsRsyntax.lstBeforeCodes.Clear() - ' clsCurrentNewColumnFunction = ucrReceiver.Get(True).Clone - ' clsCurrentNewColumnFunction.SetAssignTo("columns") - ' ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction) - ' SettingBaseFunction() - 'End Sub - Private Sub ucrReceiverElements_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRR.ControlContentsChanged, ucrReceiverTN.ControlValueChanged, - ucrSaveNewDataFrame.ControlContentsChanged, ucrInputExportFile.ControlContentsChanged, ucrChkExportDataFrame.ControlContentsChanged, ucrReceiverTX.ControlValueChanged + Private Sub ucrReceiverElements_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRR.ControlContentsChanged, ucrReceiverTN.ControlValueChanged, ucrReceiverDay.ControlValueChanged, ucrReceiverYear.ControlValueChanged, ucrInputExportFile.ControlContentsChanged, ucrChkExportDataFrame.ControlContentsChanged, ucrReceiverTX.ControlValueChanged, ucrReceiverMonth.ControlValueChanged TestOkEnabled() End Sub @@ -235,27 +176,6 @@ Public Class dlgExportForClimpact If ucrInputExportFile.IsEmpty() Then SelectFileToSave() End If - 'SettingBaseFunction() End Sub - Private Sub SettingBaseFunction() - cmdBrowse.Visible = False - If ucrChkNewDataFrame.Checked And ucrChkExportDataFrame.Checked Then - ucrBase.clsRsyntax.SetBaseROperator(clsPipeOperator) - ucrBase.clsRsyntax.ClearCodes() - ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction) - ucrBase.clsRsyntax.AddToAfterCodes(clsExportClimpactFunction) - cmdBrowse.Visible = True - ElseIf ucrChkNewDataFrame.Checked AndAlso Not ucrChkExportDataFrame.Checked Then - ucrBase.clsRsyntax.SetBaseROperator(clsPipeOperator) - ucrBase.clsRsyntax.lstAfterCodes.Clear() - cmdBrowse.Visible = False - ElseIf ucrChkExportDataFrame.Checked AndAlso Not ucrChkNewDataFrame.Checked Then - ucrBase.clsRsyntax.lstBeforeCodes.Clear() - ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction) - ucrBase.clsRsyntax.SetBaseRFunction(clsExportClimpactFunction) - ucrBase.clsRsyntax.lstAfterCodes.Clear() - cmdBrowse.Visible = True - End If - End Sub End Class \ No newline at end of file diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 09f224a2981..9c5ea7de187 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -3006,3 +3006,22 @@ getExample <- function (topic, package = NULL, lib.loc = NULL, character.only = } return(example_text) } + + +write_weather_data <- function(year, month, day, rain, mn_tmp, mx_tmp, missing_code, output_file) { + # Create a data frame with the provided inputs + weather_data <- data.frame(year = year, + month = month, + day = day, + rain = rain, + mn_tmp = mn_tmp, + mx_tmp = mx_tmp) + + # Replace missing values with the specified code + weather_data[is.na(weather_data)] <- missing_code + + # Write the data frame to a text file + write.table(weather_data, file = output_file, sep = "\t", row.names = FALSE, col.names = TRUE) + + cat("Weather data has been written to", output_file, "\n") +} \ No newline at end of file From 9303e77f30fb8aee30a34ef4105e620ab74570f1 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 19 Jan 2024 09:01:43 +0100 Subject: [PATCH 12/37] Design Changes --- instat/dlgExportForClimpact.Designer.vb | 22 +++++----------------- instat/dlgExportForClimpact.vb | 17 ++--------------- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/instat/dlgExportForClimpact.Designer.vb b/instat/dlgExportForClimpact.Designer.vb index 89b93233df1..fcd6f1c67ff 100644 --- a/instat/dlgExportForClimpact.Designer.vb +++ b/instat/dlgExportForClimpact.Designer.vb @@ -32,7 +32,6 @@ Partial Class dlgExportForClimpact Me.ucrReceiverDay = New instat.ucrReceiverSingle() Me.lblMonth = New System.Windows.Forms.Label() Me.ucrReceiverMonth = New instat.ucrReceiverSingle() - Me.ucrChkExportDataFrame = New instat.ucrCheck() Me.lblExport = New System.Windows.Forms.Label() Me.cmdBrowse = New System.Windows.Forms.Button() Me.ucrInputExportFile = New instat.ucrInputTextBox() @@ -154,20 +153,11 @@ Partial Class dlgExportForClimpact Me.ucrReceiverMonth.TabIndex = 4 Me.ucrReceiverMonth.ucrSelector = Nothing ' - 'ucrChkExportDataFrame - ' - Me.ucrChkExportDataFrame.AutoSize = True - Me.ucrChkExportDataFrame.Checked = False - Me.ucrChkExportDataFrame.Location = New System.Drawing.Point(9, 299) - Me.ucrChkExportDataFrame.Name = "ucrChkExportDataFrame" - Me.ucrChkExportDataFrame.Size = New System.Drawing.Size(266, 23) - Me.ucrChkExportDataFrame.TabIndex = 14 - ' 'lblExport ' Me.lblExport.AutoSize = True Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExport.Location = New System.Drawing.Point(9, 330) + Me.lblExport.Location = New System.Drawing.Point(9, 307) Me.lblExport.Name = "lblExport" Me.lblExport.Size = New System.Drawing.Size(59, 13) Me.lblExport.TabIndex = 16 @@ -176,7 +166,7 @@ Partial Class dlgExportForClimpact 'cmdBrowse ' Me.cmdBrowse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrowse.Location = New System.Drawing.Point(326, 325) + Me.cmdBrowse.Location = New System.Drawing.Point(293, 302) Me.cmdBrowse.Name = "cmdBrowse" Me.cmdBrowse.Size = New System.Drawing.Size(80, 23) Me.cmdBrowse.TabIndex = 18 @@ -189,7 +179,7 @@ Partial Class dlgExportForClimpact Me.ucrInputExportFile.AutoSize = True Me.ucrInputExportFile.IsMultiline = False Me.ucrInputExportFile.IsReadOnly = False - Me.ucrInputExportFile.Location = New System.Drawing.Point(142, 326) + Me.ucrInputExportFile.Location = New System.Drawing.Point(108, 303) Me.ucrInputExportFile.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrInputExportFile.Name = "ucrInputExportFile" Me.ucrInputExportFile.Size = New System.Drawing.Size(182, 21) @@ -199,7 +189,7 @@ Partial Class dlgExportForClimpact ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(7, 356) + Me.ucrBase.Location = New System.Drawing.Point(7, 332) Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) @@ -264,7 +254,7 @@ Partial Class dlgExportForClimpact ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(422, 412) + Me.ClientSize = New System.Drawing.Size(422, 388) Me.Controls.Add(Me.lblMissingValues) Me.Controls.Add(Me.ucrInputCodeMissingValues) Me.Controls.Add(Me.lblTN) @@ -277,7 +267,6 @@ Partial Class dlgExportForClimpact Me.Controls.Add(Me.ucrReceiverDay) Me.Controls.Add(Me.lblMonth) Me.Controls.Add(Me.ucrReceiverMonth) - Me.Controls.Add(Me.ucrChkExportDataFrame) Me.Controls.Add(Me.lblExport) Me.Controls.Add(Me.cmdBrowse) Me.Controls.Add(Me.ucrInputExportFile) @@ -303,7 +292,6 @@ Partial Class dlgExportForClimpact Friend WithEvents ucrReceiverDay As ucrReceiverSingle Friend WithEvents lblMonth As Label Friend WithEvents ucrReceiverMonth As ucrReceiverSingle - Friend WithEvents ucrChkExportDataFrame As ucrCheck Friend WithEvents lblExport As Label Friend WithEvents cmdBrowse As Button Friend WithEvents ucrInputExportFile As ucrInputTextBox diff --git a/instat/dlgExportForClimpact.vb b/instat/dlgExportForClimpact.vb index e3063d08cd7..48628621480 100644 --- a/instat/dlgExportForClimpact.vb +++ b/instat/dlgExportForClimpact.vb @@ -22,7 +22,6 @@ Public Class dlgExportForClimpact Private bReset As Boolean = True Private clsOutputClimpact As New RFunction - Private Sub dlgExportForClimpact_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -85,11 +84,6 @@ Public Class dlgExportForClimpact ucrReceiverRR.SetParameterIsString() ucrReceiverRR.bWithQuotes = False - ucrChkExportDataFrame.SetText(" Export Data Frame(s)") - ucrChkExportDataFrame.AddToLinkedControls(ucrInputExportFile, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkExportDataFrame.AddParameterValuesCondition(True, "export", "True") - ucrChkExportDataFrame.AddParameterValuesCondition(False, "export", "False") - ucrInputExportFile.SetParameter(New RParameter("output_file ", 9)) ucrInputExportFile.IsReadOnly = True ucrInputExportFile.SetLinkedDisplayControl(lblExport) @@ -97,12 +91,10 @@ Public Class dlgExportForClimpact End Sub Private Sub SetDefaults() - clsOutputClimpact = New RFunction ucrSelectorImportToClimpact.Reset() - clsOutputClimpact.SetRCommand("write_weather_data") clsOutputClimpact.AddParameter("year", clsRFunctionParameter:=ucrReceiverYear.GetVariables, iPosition:=1) clsOutputClimpact.AddParameter("month", clsRFunctionParameter:=ucrReceiverMonth.GetVariables, iPosition:=2) @@ -112,14 +104,10 @@ Public Class dlgExportForClimpact clsOutputClimpact.AddParameter("mx_tmp", clsRFunctionParameter:=ucrReceiverTX.GetVariables, iPosition:=6) clsOutputClimpact.AddParameter("missing_code", "-99.9", iPosition:=7) - ucrBase.clsRsyntax.SetBaseRFunction(clsOutputClimpact) - - End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrReceiverDay.SetRCode(clsOutputClimpact, bReset) ucrReceiverYear.SetRCode(clsOutputClimpact, bReset) ucrSelectorImportToClimpact.SetRCode(clsOutputClimpact, bReset) @@ -136,7 +124,7 @@ Public Class dlgExportForClimpact AndAlso Not ucrReceiverTX.IsEmpty _ AndAlso Not ucrReceiverTN.IsEmpty ) - If ucrChkExportDataFrame.Checked And ucrInputExportFile.IsEmpty Then + If ucrInputExportFile.IsEmpty Then ucrBase.OKEnabled(False) End If End Sub @@ -167,8 +155,7 @@ Public Class dlgExportForClimpact End Using End Sub - - Private Sub ucrReceiverElements_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRR.ControlContentsChanged, ucrReceiverTN.ControlValueChanged, ucrReceiverDay.ControlValueChanged, ucrReceiverYear.ControlValueChanged, ucrInputExportFile.ControlContentsChanged, ucrChkExportDataFrame.ControlContentsChanged, ucrReceiverTX.ControlValueChanged, ucrReceiverMonth.ControlValueChanged + Private Sub ucrReceiverElements_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRR.ControlContentsChanged, ucrReceiverTN.ControlValueChanged, ucrReceiverDay.ControlValueChanged, ucrReceiverYear.ControlValueChanged, ucrInputExportFile.ControlContentsChanged, ucrReceiverTX.ControlValueChanged, ucrReceiverMonth.ControlValueChanged TestOkEnabled() End Sub From 12312451d9702adaa4f02a9a9ebb18e8d30125f0 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 19 Jan 2024 09:13:14 +0100 Subject: [PATCH 13/37] Design Changes --- instat/dlgExportForClimpact.Designer.vb | 194 ++++++++++++------------ 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/instat/dlgExportForClimpact.Designer.vb b/instat/dlgExportForClimpact.Designer.vb index fcd6f1c67ff..8f633d2e8a2 100644 --- a/instat/dlgExportForClimpact.Designer.vb +++ b/instat/dlgExportForClimpact.Designer.vb @@ -23,24 +23,24 @@ Partial Class dlgExportForClimpact _ Private Sub InitializeComponent() Me.lblTN = New System.Windows.Forms.Label() - Me.ucrReceiverTN = New instat.ucrReceiverSingle() Me.lblTX = New System.Windows.Forms.Label() - Me.ucrReceiverTX = New instat.ucrReceiverSingle() Me.lblRR = New System.Windows.Forms.Label() - Me.ucrReceiverRR = New instat.ucrReceiverSingle() Me.lblDay = New System.Windows.Forms.Label() - Me.ucrReceiverDay = New instat.ucrReceiverSingle() Me.lblMonth = New System.Windows.Forms.Label() - Me.ucrReceiverMonth = New instat.ucrReceiverSingle() Me.lblExport = New System.Windows.Forms.Label() Me.cmdBrowse = New System.Windows.Forms.Button() + Me.lblYear = New System.Windows.Forms.Label() + Me.lblMissingValues = New System.Windows.Forms.Label() + Me.ucrInputCodeMissingValues = New instat.ucrInputTextBox() + Me.ucrReceiverTN = New instat.ucrReceiverSingle() + Me.ucrReceiverTX = New instat.ucrReceiverSingle() + Me.ucrReceiverRR = New instat.ucrReceiverSingle() + Me.ucrReceiverDay = New instat.ucrReceiverSingle() + Me.ucrReceiverMonth = New instat.ucrReceiverSingle() Me.ucrInputExportFile = New instat.ucrInputTextBox() Me.ucrBase = New instat.ucrButtons() - Me.lblYear = New System.Windows.Forms.Label() Me.ucrReceiverYear = New instat.ucrReceiverSingle() Me.ucrSelectorImportToClimpact = New instat.ucrSelectorByDataFrameAddRemove() - Me.lblMissingValues = New System.Windows.Forms.Label() - Me.ucrInputCodeMissingValues = New instat.ucrInputTextBox() Me.SuspendLayout() ' 'lblTN @@ -52,6 +52,92 @@ Partial Class dlgExportForClimpact Me.lblTN.TabIndex = 11 Me.lblTN.Text = "Min. Temperature:" ' + 'lblTX + ' + Me.lblTX.AutoSize = True + Me.lblTX.Location = New System.Drawing.Point(278, 197) + Me.lblTX.Name = "lblTX" + Me.lblTX.Size = New System.Drawing.Size(96, 13) + Me.lblTX.TabIndex = 9 + Me.lblTX.Text = "Max. Temperature:" + ' + 'lblRR + ' + Me.lblRR.AutoSize = True + Me.lblRR.Location = New System.Drawing.Point(278, 150) + Me.lblRR.Name = "lblRR" + Me.lblRR.Size = New System.Drawing.Size(45, 13) + Me.lblRR.TabIndex = 7 + Me.lblRR.Text = "Rainfall:" + ' + 'lblDay + ' + Me.lblDay.AutoSize = True + Me.lblDay.Location = New System.Drawing.Point(278, 106) + Me.lblDay.Name = "lblDay" + Me.lblDay.Size = New System.Drawing.Size(29, 13) + Me.lblDay.TabIndex = 5 + Me.lblDay.Text = "Day:" + ' + 'lblMonth + ' + Me.lblMonth.AutoSize = True + Me.lblMonth.Location = New System.Drawing.Point(278, 59) + Me.lblMonth.Name = "lblMonth" + Me.lblMonth.Size = New System.Drawing.Size(40, 13) + Me.lblMonth.TabIndex = 3 + Me.lblMonth.Text = "Month:" + ' + 'lblExport + ' + Me.lblExport.AutoSize = True + Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblExport.Location = New System.Drawing.Point(9, 297) + Me.lblExport.Name = "lblExport" + Me.lblExport.Size = New System.Drawing.Size(59, 13) + Me.lblExport.TabIndex = 16 + Me.lblExport.Text = "Export File:" + ' + 'cmdBrowse + ' + Me.cmdBrowse.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdBrowse.Location = New System.Drawing.Point(293, 291) + Me.cmdBrowse.Name = "cmdBrowse" + Me.cmdBrowse.Size = New System.Drawing.Size(80, 23) + Me.cmdBrowse.TabIndex = 18 + Me.cmdBrowse.Text = "Browse" + Me.cmdBrowse.UseVisualStyleBackColor = True + ' + 'lblYear + ' + Me.lblYear.AutoSize = True + Me.lblYear.Location = New System.Drawing.Point(278, 12) + Me.lblYear.Name = "lblYear" + Me.lblYear.Size = New System.Drawing.Size(32, 13) + Me.lblYear.TabIndex = 1 + Me.lblYear.Text = "Year:" + ' + 'lblMissingValues + ' + Me.lblMissingValues.AutoSize = True + Me.lblMissingValues.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMissingValues.Location = New System.Drawing.Point(4, 244) + Me.lblMissingValues.Name = "lblMissingValues" + Me.lblMissingValues.Size = New System.Drawing.Size(122, 13) + Me.lblMissingValues.TabIndex = 33 + Me.lblMissingValues.Text = "Code Missing Values as:" + ' + 'ucrInputCodeMissingValues + ' + Me.ucrInputCodeMissingValues.AddQuotesIfUnrecognised = True + Me.ucrInputCodeMissingValues.AutoSize = True + Me.ucrInputCodeMissingValues.IsMultiline = False + Me.ucrInputCodeMissingValues.IsReadOnly = False + Me.ucrInputCodeMissingValues.Location = New System.Drawing.Point(132, 242) + Me.ucrInputCodeMissingValues.Name = "ucrInputCodeMissingValues" + Me.ucrInputCodeMissingValues.Size = New System.Drawing.Size(99, 21) + Me.ucrInputCodeMissingValues.TabIndex = 32 + ' 'ucrReceiverTN ' Me.ucrReceiverTN.AutoSize = True @@ -65,15 +151,6 @@ Partial Class dlgExportForClimpact Me.ucrReceiverTN.TabIndex = 12 Me.ucrReceiverTN.ucrSelector = Nothing ' - 'lblTX - ' - Me.lblTX.AutoSize = True - Me.lblTX.Location = New System.Drawing.Point(278, 197) - Me.lblTX.Name = "lblTX" - Me.lblTX.Size = New System.Drawing.Size(96, 13) - Me.lblTX.TabIndex = 9 - Me.lblTX.Text = "Max. Temperature:" - ' 'ucrReceiverTX ' Me.ucrReceiverTX.AutoSize = True @@ -87,15 +164,6 @@ Partial Class dlgExportForClimpact Me.ucrReceiverTX.TabIndex = 10 Me.ucrReceiverTX.ucrSelector = Nothing ' - 'lblRR - ' - Me.lblRR.AutoSize = True - Me.lblRR.Location = New System.Drawing.Point(278, 150) - Me.lblRR.Name = "lblRR" - Me.lblRR.Size = New System.Drawing.Size(45, 13) - Me.lblRR.TabIndex = 7 - Me.lblRR.Text = "Rainfall:" - ' 'ucrReceiverRR ' Me.ucrReceiverRR.AutoSize = True @@ -109,15 +177,6 @@ Partial Class dlgExportForClimpact Me.ucrReceiverRR.TabIndex = 8 Me.ucrReceiverRR.ucrSelector = Nothing ' - 'lblDay - ' - Me.lblDay.AutoSize = True - Me.lblDay.Location = New System.Drawing.Point(278, 106) - Me.lblDay.Name = "lblDay" - Me.lblDay.Size = New System.Drawing.Size(29, 13) - Me.lblDay.TabIndex = 5 - Me.lblDay.Text = "Day:" - ' 'ucrReceiverDay ' Me.ucrReceiverDay.AutoSize = True @@ -131,15 +190,6 @@ Partial Class dlgExportForClimpact Me.ucrReceiverDay.TabIndex = 6 Me.ucrReceiverDay.ucrSelector = Nothing ' - 'lblMonth - ' - Me.lblMonth.AutoSize = True - Me.lblMonth.Location = New System.Drawing.Point(278, 59) - Me.lblMonth.Name = "lblMonth" - Me.lblMonth.Size = New System.Drawing.Size(40, 13) - Me.lblMonth.TabIndex = 3 - Me.lblMonth.Text = "Month:" - ' 'ucrReceiverMonth ' Me.ucrReceiverMonth.AutoSize = True @@ -153,33 +203,13 @@ Partial Class dlgExportForClimpact Me.ucrReceiverMonth.TabIndex = 4 Me.ucrReceiverMonth.ucrSelector = Nothing ' - 'lblExport - ' - Me.lblExport.AutoSize = True - Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExport.Location = New System.Drawing.Point(9, 307) - Me.lblExport.Name = "lblExport" - Me.lblExport.Size = New System.Drawing.Size(59, 13) - Me.lblExport.TabIndex = 16 - Me.lblExport.Text = "Export File:" - ' - 'cmdBrowse - ' - Me.cmdBrowse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrowse.Location = New System.Drawing.Point(293, 302) - Me.cmdBrowse.Name = "cmdBrowse" - Me.cmdBrowse.Size = New System.Drawing.Size(80, 23) - Me.cmdBrowse.TabIndex = 18 - Me.cmdBrowse.Text = "Browse" - Me.cmdBrowse.UseVisualStyleBackColor = True - ' 'ucrInputExportFile ' Me.ucrInputExportFile.AddQuotesIfUnrecognised = True Me.ucrInputExportFile.AutoSize = True Me.ucrInputExportFile.IsMultiline = False Me.ucrInputExportFile.IsReadOnly = False - Me.ucrInputExportFile.Location = New System.Drawing.Point(108, 303) + Me.ucrInputExportFile.Location = New System.Drawing.Point(108, 293) Me.ucrInputExportFile.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrInputExportFile.Name = "ucrInputExportFile" Me.ucrInputExportFile.Size = New System.Drawing.Size(182, 21) @@ -189,21 +219,12 @@ Partial Class dlgExportForClimpact ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(7, 332) + Me.ucrBase.Location = New System.Drawing.Point(7, 318) Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 19 ' - 'lblYear - ' - Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(278, 12) - Me.lblYear.Name = "lblYear" - Me.lblYear.Size = New System.Drawing.Size(32, 13) - Me.lblYear.TabIndex = 1 - Me.lblYear.Text = "Year:" - ' 'ucrReceiverYear ' Me.ucrReceiverYear.AutoSize = True @@ -229,32 +250,11 @@ Partial Class dlgExportForClimpact Me.ucrSelectorImportToClimpact.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorImportToClimpact.TabIndex = 0 ' - 'lblMissingValues - ' - Me.lblMissingValues.AutoSize = True - Me.lblMissingValues.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMissingValues.Location = New System.Drawing.Point(4, 244) - Me.lblMissingValues.Name = "lblMissingValues" - Me.lblMissingValues.Size = New System.Drawing.Size(122, 13) - Me.lblMissingValues.TabIndex = 33 - Me.lblMissingValues.Text = "Code Missing Values as:" - ' - 'ucrInputCodeMissingValues - ' - Me.ucrInputCodeMissingValues.AddQuotesIfUnrecognised = True - Me.ucrInputCodeMissingValues.AutoSize = True - Me.ucrInputCodeMissingValues.IsMultiline = False - Me.ucrInputCodeMissingValues.IsReadOnly = False - Me.ucrInputCodeMissingValues.Location = New System.Drawing.Point(132, 242) - Me.ucrInputCodeMissingValues.Name = "ucrInputCodeMissingValues" - Me.ucrInputCodeMissingValues.Size = New System.Drawing.Size(99, 21) - Me.ucrInputCodeMissingValues.TabIndex = 32 - ' 'dlgExportForClimpact ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(422, 388) + Me.ClientSize = New System.Drawing.Size(422, 370) Me.Controls.Add(Me.lblMissingValues) Me.Controls.Add(Me.ucrInputCodeMissingValues) Me.Controls.Add(Me.lblTN) From 00102aad6d26c39564c3c895ca6ce291de01483a Mon Sep 17 00:00:00 2001 From: n-thony Date: Mon, 22 Jan 2024 12:24:50 +0300 Subject: [PATCH 14/37] minor change --- instat/ucrSplitButton.vb | 55 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/instat/ucrSplitButton.vb b/instat/ucrSplitButton.vb index de6826314e7..fac51d5c750 100644 --- a/instat/ucrSplitButton.vb +++ b/instat/ucrSplitButton.vb @@ -585,9 +585,60 @@ Public Class ucrSplitButton State = PushButtonState.Pressed - If _contextSplitMenuStrip IsNot Nothing Then - _contextSplitMenuStrip.Show(Me, New Point(0, Height), ToolStripDropDownDirection.BelowRight) + Dim tmpForm As New Form With { + .AutoScaleMode = AutoScaleMode.None, + .FormBorderStyle = FormBorderStyle.None, + .StartPosition = FormStartPosition.Manual, + .ShowInTaskbar = False + } + + '' Event handler for item click + 'Dim itemClickHandler As EventHandler = Sub(sender As Object, e As ToolStripItemClickedEventArgs) + ' ' Handle the item click here + ' ' You can perform actions based on the selected item + ' ' ... + + ' ' Detach the event handler + ' RemoveHandler _contextSplitMenuStrip.ItemClicked, itemClickHandler + + ' ' Close the form + ' tmpForm.Close() + ' End Sub + + '' Attach the event handler + 'AddHandler _contextSplitMenuStrip.ItemClicked, itemClickHandler + + Dim panel As New Panel With { + .Dock = DockStyle.Fill, + .AutoScroll = True + } + + _contextSplitMenuStrip.TopLevel = False + _contextSplitMenuStrip.Dock = DockStyle.Top + panel.Controls.Add(_contextSplitMenuStrip) + + ' Set the panel size based on the preferred size of the context menu + panel.Size = _contextSplitMenuStrip.PreferredSize + + ' Set a maximum height for the form + Dim maxHeight As Integer = 100 + If panel.Height > maxHeight Then + panel.Height = maxHeight End If + + tmpForm.Size = New Size(panel.Width, panel.Height) + tmpForm.Location = PointToScreen(New Point(0, Height)) + + tmpForm.Controls.Add(panel) + tmpForm.Show() + _contextSplitMenuStrip.Show(panel, New Point(0, 0)) + + ' Set the initial vertical scroll position to show the last items in the menu + panel.VerticalScroll.Value = panel.VerticalScroll.Maximum + + 'If _contextSplitMenuStrip IsNot Nothing Then + ' _contextSplitMenuStrip.Show(Me, New Point(0, Height), ToolStripDropDownDirection.BelowRight) + 'End If End Sub Private Sub SplitMenuStrip_Opening(sender As Object, e As CancelEventArgs) From 31cf29a486245cf8e40925faf3482330228461fc Mon Sep 17 00:00:00 2001 From: n-thony Date: Mon, 22 Jan 2024 12:53:22 +0300 Subject: [PATCH 15/37] minor code addition --- instat/ucrSplitButton.vb | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/instat/ucrSplitButton.vb b/instat/ucrSplitButton.vb index fac51d5c750..40435240c41 100644 --- a/instat/ucrSplitButton.vb +++ b/instat/ucrSplitButton.vb @@ -592,21 +592,12 @@ Public Class ucrSplitButton .ShowInTaskbar = False } - '' Event handler for item click - 'Dim itemClickHandler As EventHandler = Sub(sender As Object, e As ToolStripItemClickedEventArgs) - ' ' Handle the item click here - ' ' You can perform actions based on the selected item - ' ' ... - - ' ' Detach the event handler - ' RemoveHandler _contextSplitMenuStrip.ItemClicked, itemClickHandler - - ' ' Close the form - ' tmpForm.Close() - ' End Sub - - '' Attach the event handler - 'AddHandler _contextSplitMenuStrip.ItemClicked, itemClickHandler + ' Event handler for item click + AddHandler _contextSplitMenuStrip.ItemClicked, Sub(sender As Object, e As ToolStripItemClickedEventArgs) + RemoveHandler _contextSplitMenuStrip.ItemClicked + ' Close the form + tmpForm.Close() + End Sub Dim panel As New Panel With { .Dock = DockStyle.Fill, From 211755b6bc5d98555bd7e5126d8d6a6107458b32 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 22 Jan 2024 12:02:04 +0100 Subject: [PATCH 16/37] Code changes --- instat/dlgExportForClimpact.Designer.vb | 1 + instat/dlgExportForClimpact.vb | 37 ++++++++++--------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/instat/dlgExportForClimpact.Designer.vb b/instat/dlgExportForClimpact.Designer.vb index 8f633d2e8a2..fa0a0034e58 100644 --- a/instat/dlgExportForClimpact.Designer.vb +++ b/instat/dlgExportForClimpact.Designer.vb @@ -276,6 +276,7 @@ Partial Class dlgExportForClimpact Me.Controls.Add(Me.ucrSelectorImportToClimpact) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "dlgExportForClimpact" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Export For Climpact" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/dlgExportForClimpact.vb b/instat/dlgExportForClimpact.vb index 48628621480..a7d078dcec0 100644 --- a/instat/dlgExportForClimpact.vb +++ b/instat/dlgExportForClimpact.vb @@ -38,50 +38,54 @@ Public Class dlgExportForClimpact Private Sub InitialiseDialog() - ucrInputCodeMissingValues.SetParameter(New RParameter("na_code")) + ucrInputCodeMissingValues.SetParameter(New RParameter("missing_code", 6)) ucrInputCodeMissingValues.SetRDefault("-99.9") - ucrInputCodeMissingValues.AddQuotesIfUnrecognised = False 'Year Receiver ucrReceiverYear.Selector = ucrSelectorImportToClimpact + ucrReceiverYear.SetParameter(New RParameter("year", 0)) ucrReceiverYear.SetClimaticType("year") + ucrReceiverYear.SetParameterIsRFunction() ucrReceiverYear.bAutoFill = True ucrReceiverYear.strSelectorHeading = "Year Variables" 'Month Receiver ucrReceiverMonth.Selector = ucrSelectorImportToClimpact + ucrReceiverMonth.SetParameter(New RParameter("month", 1)) ucrReceiverMonth.SetClimaticType("month") + ucrReceiverMonth.SetParameterIsRFunction() ucrReceiverMonth.bAutoFill = True ucrReceiverMonth.strSelectorHeading = "Month Variables" + ucrReceiverMonth.bWithQuotes = False 'Day Receiver ucrReceiverDay.Selector = ucrSelectorImportToClimpact - ucrReceiverDay.SetParameter(New RParameter("day", 5, bNewIncludeArgumentName:=False)) - ucrReceiverDay.SetParameterIsString() + ucrReceiverDay.SetParameter(New RParameter("day", 2)) + ucrReceiverDay.SetParameterIsRFunction() ucrReceiverDay.bWithQuotes = False ucrReceiverDay.SetClimaticType("day") ucrReceiverDay.bAutoFill = True 'Element Receiver ucrReceiverTX.Selector = ucrSelectorImportToClimpact - ucrReceiverTX.SetParameter(New RParameter("x", 4, bNewIncludeArgumentName:=False)) - ucrReceiverTX.SetParameterIsString() + ucrReceiverTX.SetParameter(New RParameter("mx_tmp", 3)) + ucrReceiverTX.SetParameterIsRFunction() ucrReceiverTX.bWithQuotes = False ucrReceiverTX.SetClimaticType("temp_max") ucrReceiverTX.bAutoFill = True ucrReceiverTN.Selector = ucrSelectorImportToClimpact - ucrReceiverTN.SetParameter(New RParameter("x", 1, bNewIncludeArgumentName:=False)) - ucrReceiverTN.SetParameterIsString() + ucrReceiverTN.SetParameter(New RParameter("mn_tmp", 4)) + ucrReceiverTN.SetParameterIsRFunction() ucrReceiverTN.SetClimaticType("temp_min") ucrReceiverTN.bAutoFill = True ucrReceiverTN.bWithQuotes = False - ucrReceiverRR.SetParameter(New RParameter("left", 2, bNewIncludeArgumentName:=False)) + ucrReceiverRR.SetParameter(New RParameter("rain", 5,)) ucrReceiverRR.Selector = ucrSelectorImportToClimpact ucrReceiverRR.SetClimaticType("rain") ucrReceiverRR.bAutoFill = True - ucrReceiverRR.SetParameterIsString() + ucrReceiverRR.SetParameterIsRFunction() ucrReceiverRR.bWithQuotes = False ucrInputExportFile.SetParameter(New RParameter("output_file ", 9)) @@ -96,24 +100,13 @@ Public Class dlgExportForClimpact ucrSelectorImportToClimpact.Reset() clsOutputClimpact.SetRCommand("write_weather_data") - clsOutputClimpact.AddParameter("year", clsRFunctionParameter:=ucrReceiverYear.GetVariables, iPosition:=1) - clsOutputClimpact.AddParameter("month", clsRFunctionParameter:=ucrReceiverMonth.GetVariables, iPosition:=2) - clsOutputClimpact.AddParameter("day", clsRFunctionParameter:=ucrReceiverDay.GetVariables, iPosition:=3) - clsOutputClimpact.AddParameter("rain", clsRFunctionParameter:=ucrReceiverRR.GetVariables, iPosition:=4) - clsOutputClimpact.AddParameter("mn_tmp", clsRFunctionParameter:=ucrReceiverTN.GetVariables, iPosition:=5) - clsOutputClimpact.AddParameter("mx_tmp", clsRFunctionParameter:=ucrReceiverTX.GetVariables, iPosition:=6) - clsOutputClimpact.AddParameter("missing_code", "-99.9", iPosition:=7) ucrBase.clsRsyntax.SetBaseRFunction(clsOutputClimpact) End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrReceiverYear.SetRCode(clsOutputClimpact, bReset) - ucrSelectorImportToClimpact.SetRCode(clsOutputClimpact, bReset) - ucrReceiverMonth.SetRCode(clsOutputClimpact, bReset) - ucrInputCodeMissingValues.SetRCode(clsOutputClimpact, bReset) - ucrInputExportFile.SetRCode(clsOutputClimpact) + SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset) End Sub Private Sub TestOkEnabled() From 0e8611772917b9ef268fa9bd3ed6a9da3258b0be Mon Sep 17 00:00:00 2001 From: n-thony Date: Mon, 22 Jan 2024 16:19:17 +0300 Subject: [PATCH 17/37] bug fixes --- instat/ucrSplitButton.vb | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/instat/ucrSplitButton.vb b/instat/ucrSplitButton.vb index 40435240c41..4a2ef4b0c38 100644 --- a/instat/ucrSplitButton.vb +++ b/instat/ucrSplitButton.vb @@ -591,45 +591,43 @@ Public Class ucrSplitButton .StartPosition = FormStartPosition.Manual, .ShowInTaskbar = False } - - ' Event handler for item click - AddHandler _contextSplitMenuStrip.ItemClicked, Sub(sender As Object, e As ToolStripItemClickedEventArgs) - RemoveHandler _contextSplitMenuStrip.ItemClicked - ' Close the form - tmpForm.Close() - End Sub - Dim panel As New Panel With { .Dock = DockStyle.Fill, .AutoScroll = True } - _contextSplitMenuStrip.TopLevel = False _contextSplitMenuStrip.Dock = DockStyle.Top - panel.Controls.Add(_contextSplitMenuStrip) ' Set the panel size based on the preferred size of the context menu panel.Size = _contextSplitMenuStrip.PreferredSize + ' Event handler for item click + AddHandler _contextSplitMenuStrip.ItemClicked, Sub(sender As Object, e As ToolStripItemClickedEventArgs) + tmpForm.Close() + End Sub + + AddHandler tmpForm.FormClosed, Sub(sender As Object, e As FormClosedEventArgs) + If panel.Controls.Contains(_contextSplitMenuStrip) Then + panel.Controls.Remove(_contextSplitMenuStrip) + End If + End Sub + + + panel.Controls.Add(_contextSplitMenuStrip) ' Set a maximum height for the form Dim maxHeight As Integer = 100 If panel.Height > maxHeight Then panel.Height = maxHeight End If + If _contextSplitMenuStrip IsNot Nothing Then + _contextSplitMenuStrip.Show() + End If + tmpForm.Size = New Size(panel.Width, panel.Height) tmpForm.Location = PointToScreen(New Point(0, Height)) - tmpForm.Controls.Add(panel) tmpForm.Show() - _contextSplitMenuStrip.Show(panel, New Point(0, 0)) - - ' Set the initial vertical scroll position to show the last items in the menu - panel.VerticalScroll.Value = panel.VerticalScroll.Maximum - - 'If _contextSplitMenuStrip IsNot Nothing Then - ' _contextSplitMenuStrip.Show(Me, New Point(0, Height), ToolStripDropDownDirection.BelowRight) - 'End If End Sub Private Sub SplitMenuStrip_Opening(sender As Object, e As CancelEventArgs) From ce18b6e0866a95ea62c0f8555f7abdd6d7e642ce Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:43:01 +0100 Subject: [PATCH 18/37] Removing the quotes from the dataframe --- instat/static/InstatObject/R/stand_alone_functions.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 9c5ea7de187..3b0fa0f4436 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -3021,7 +3021,7 @@ write_weather_data <- function(year, month, day, rain, mn_tmp, mx_tmp, missing_c weather_data[is.na(weather_data)] <- missing_code # Write the data frame to a text file - write.table(weather_data, file = output_file, sep = "\t", row.names = FALSE, col.names = TRUE) + write.table(weather_data, file = output_file, sep = "\t", row.names = FALSE, col.names = TRUE, quote = FALSE) cat("Weather data has been written to", output_file, "\n") } \ No newline at end of file From 432f371294937be2cc991f4f332e219f1ef691e3 Mon Sep 17 00:00:00 2001 From: n-thony Date: Tue, 23 Jan 2024 11:04:43 +0300 Subject: [PATCH 19/37] minor design changes --- instat/ucrSplitButton.vb | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/instat/ucrSplitButton.vb b/instat/ucrSplitButton.vb index 4a2ef4b0c38..29cb60fafec 100644 --- a/instat/ucrSplitButton.vb +++ b/instat/ucrSplitButton.vb @@ -232,14 +232,19 @@ Public Class ucrSplitButton If mevent.Button = MouseButtons.Right AndAlso ClientRectangle.Contains(mevent.Location) AndAlso Not _bSplitMenuVisible Then ShowContextMenuStrip() ElseIf _contextSplitMenuStrip Is Nothing OrElse Not _bSplitMenuVisible Then - SetButtonDrawState() - If ClientRectangle.Contains(mevent.Location) AndAlso Not _dropDownRectangle.Contains(mevent.Location) Then - OnClick(New EventArgs()) + ' Trigger the Click event + OnClick(EventArgs.Empty) End If End If + + ' Set the button state to Normal regardless of other conditions + State = PushButtonState.Normal + + MyBase.OnMouseUp(mevent) End Sub + Protected Overrides Sub OnPaint(pevent As PaintEventArgs) MyBase.OnPaint(pevent) If Not _bShowSplit Then Exit Sub @@ -593,15 +598,13 @@ Public Class ucrSplitButton } Dim panel As New Panel With { .Dock = DockStyle.Fill, - .AutoScroll = True + .AutoScroll = True, + .Size = _contextSplitMenuStrip.PreferredSize, + .BorderStyle = BorderStyle.FixedSingle } _contextSplitMenuStrip.TopLevel = False _contextSplitMenuStrip.Dock = DockStyle.Top - ' Set the panel size based on the preferred size of the context menu - panel.Size = _contextSplitMenuStrip.PreferredSize - - ' Event handler for item click AddHandler _contextSplitMenuStrip.ItemClicked, Sub(sender As Object, e As ToolStripItemClickedEventArgs) tmpForm.Close() End Sub @@ -612,6 +615,10 @@ Public Class ucrSplitButton End If End Sub + AddHandler tmpForm.LostFocus, Sub(sender As Object, e As EventArgs) + _bSplitMenuVisible = False + tmpForm.Close() + End Sub panel.Controls.Add(_contextSplitMenuStrip) ' Set a maximum height for the form From 4dce91150680a1cf17fed177392a009a5477c0a4 Mon Sep 17 00:00:00 2001 From: n-thony Date: Tue, 23 Jan 2024 13:14:58 +0300 Subject: [PATCH 20/37] minor design change --- instat/ucrSplitButton.vb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/instat/ucrSplitButton.vb b/instat/ucrSplitButton.vb index 29cb60fafec..cdb21f10c3b 100644 --- a/instat/ucrSplitButton.vb +++ b/instat/ucrSplitButton.vb @@ -598,12 +598,14 @@ Public Class ucrSplitButton } Dim panel As New Panel With { .Dock = DockStyle.Fill, - .AutoScroll = True, .Size = _contextSplitMenuStrip.PreferredSize, + .AutoScroll = True, .BorderStyle = BorderStyle.FixedSingle } _contextSplitMenuStrip.TopLevel = False _contextSplitMenuStrip.Dock = DockStyle.Top + _contextSplitMenuStrip.Padding = New Padding(0, -2, 0, -2) + _contextSplitMenuStrip.ShowImageMargin = False AddHandler _contextSplitMenuStrip.ItemClicked, Sub(sender As Object, e As ToolStripItemClickedEventArgs) tmpForm.Close() @@ -622,7 +624,7 @@ Public Class ucrSplitButton panel.Controls.Add(_contextSplitMenuStrip) ' Set a maximum height for the form - Dim maxHeight As Integer = 100 + Dim maxHeight As Integer = 250 If panel.Height > maxHeight Then panel.Height = maxHeight End If From 70af7216d89c68958e9a8eac5a47cf920f06d912 Mon Sep 17 00:00:00 2001 From: n-thony Date: Wed, 24 Jan 2024 10:30:16 +0300 Subject: [PATCH 21/37] adjusted the scrollbar --- instat/ucrSplitButton.vb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/instat/ucrSplitButton.vb b/instat/ucrSplitButton.vb index cdb21f10c3b..2b30b7ac5b5 100644 --- a/instat/ucrSplitButton.vb +++ b/instat/ucrSplitButton.vb @@ -598,13 +598,11 @@ Public Class ucrSplitButton } Dim panel As New Panel With { .Dock = DockStyle.Fill, - .Size = _contextSplitMenuStrip.PreferredSize, - .AutoScroll = True, - .BorderStyle = BorderStyle.FixedSingle + .BorderStyle = BorderStyle.None, + .Size = _contextSplitMenuStrip.PreferredSize } _contextSplitMenuStrip.TopLevel = False _contextSplitMenuStrip.Dock = DockStyle.Top - _contextSplitMenuStrip.Padding = New Padding(0, -2, 0, -2) _contextSplitMenuStrip.ShowImageMargin = False AddHandler _contextSplitMenuStrip.ItemClicked, Sub(sender As Object, e As ToolStripItemClickedEventArgs) @@ -627,14 +625,23 @@ Public Class ucrSplitButton Dim maxHeight As Integer = 250 If panel.Height > maxHeight Then panel.Height = maxHeight + panel.AutoScroll = True End If If _contextSplitMenuStrip IsNot Nothing Then _contextSplitMenuStrip.Show() End If + ' Calculate whether to show the form above or below + Dim screenRect As Rectangle = Screen.FromControl(Me).WorkingArea + Dim bShowUp As Boolean = PointToScreen(New Point(0, Height + panel.Height)).Y > screenRect.Bottom + + If bShowUp Then + tmpForm.Location = PointToScreen(New Point(0, Height - tmpForm.Height)) + Else + tmpForm.Location = PointToScreen(New Point(0, Height)) + End If tmpForm.Size = New Size(panel.Width, panel.Height) - tmpForm.Location = PointToScreen(New Point(0, Height)) tmpForm.Controls.Add(panel) tmpForm.Show() End Sub From 10d07b974d02105b7b74ba6fd415a9cd78d2a0c2 Mon Sep 17 00:00:00 2001 From: n-thony Date: Wed, 24 Jan 2024 11:49:37 +0300 Subject: [PATCH 22/37] bug fixes --- instat/ucrSplitButton.vb | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/instat/ucrSplitButton.vb b/instat/ucrSplitButton.vb index 2b30b7ac5b5..95776041dba 100644 --- a/instat/ucrSplitButton.vb +++ b/instat/ucrSplitButton.vb @@ -598,8 +598,7 @@ Public Class ucrSplitButton } Dim panel As New Panel With { .Dock = DockStyle.Fill, - .BorderStyle = BorderStyle.None, - .Size = _contextSplitMenuStrip.PreferredSize + .BorderStyle = BorderStyle.None } _contextSplitMenuStrip.TopLevel = False _contextSplitMenuStrip.Dock = DockStyle.Top @@ -623,9 +622,14 @@ Public Class ucrSplitButton panel.Controls.Add(_contextSplitMenuStrip) ' Set a maximum height for the form Dim maxHeight As Integer = 250 - If panel.Height > maxHeight Then - panel.Height = maxHeight + + ' Ensure that the panel fits the preferred size of the context menu without extra space + Dim preferredSize As Size = _contextSplitMenuStrip.PreferredSize + If preferredSize.Height > maxHeight Then panel.AutoScroll = True + preferredSize.Height = maxHeight + Else + panel.AutoScroll = False End If If _contextSplitMenuStrip IsNot Nothing Then @@ -634,14 +638,16 @@ Public Class ucrSplitButton ' Calculate whether to show the form above or below Dim screenRect As Rectangle = Screen.FromControl(Me).WorkingArea - Dim bShowUp As Boolean = PointToScreen(New Point(0, Height + panel.Height)).Y > screenRect.Bottom + Dim showUp As Boolean = PointToScreen(New Point(0, Height + PreferredSize.Height)).Y > screenRect.Bottom - If bShowUp Then + ' Set the form size and location accordingly + tmpForm.Size = New Size(PreferredSize.Width, PreferredSize.Height) + If showUp Then tmpForm.Location = PointToScreen(New Point(0, Height - tmpForm.Height)) Else tmpForm.Location = PointToScreen(New Point(0, Height)) End If - tmpForm.Size = New Size(panel.Width, panel.Height) + tmpForm.Controls.Add(panel) tmpForm.Show() End Sub From c26173249959c167016637f10685380f0abeaa7c Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 24 Jan 2024 12:08:41 +0100 Subject: [PATCH 23/37] Fixes bug where the script tab does not come with a name --- instat/ucrScript.vb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb index 8186584b1a6..b507c785a7a 100644 --- a/instat/ucrScript.vb +++ b/instat/ucrScript.vb @@ -26,7 +26,7 @@ Public Class ucrScript Private iMaxLineNumberCharLength As Integer = 0 Private Const iTabIndexLog As Integer = 0 Private strRInstatLogFilesFolderPath As String = Path.Combine(Path.GetFullPath(FileIO.SpecialDirectories.MyDocuments), "R-Instat_Log_files") - + Private strCurrentScriptFileName As String = "" 'holds the saved script file name to help remember the current selected folder path Friend WithEvents clsScriptActive As Scintilla Friend WithEvents clsScriptLog As Scintilla @@ -214,7 +214,12 @@ Public Class ucrScript Using dlgSave As New SaveFileDialog dlgSave.Title = "Save " & If(bIsLog, "Log", "Script") & " To File" dlgSave.Filter = "R Script File (*.R)|*.R|Text File (*.txt)|*.txt" - + If Not String.IsNullOrEmpty(strCurrentScriptFileName) Then + dlgSave.FileName = Path.GetFileName(strCurrentScriptFileName) + dlgSave.InitialDirectory = Path.GetDirectoryName(strCurrentScriptFileName) + Else + dlgSave.InitialDirectory = frmMain.clsInstatOptions.strWorkingDirectory + End If 'Ensure that dialog opens in correct folder. 'In theory, we should be able to use `dlgLoad.RestoreDirectory = True` but this does 'not work (I think a bug in WinForms).So we need to use static variables instead. @@ -225,6 +230,7 @@ Public Class ucrScript If dlgSave.ShowDialog() = DialogResult.OK Then Try File.WriteAllText(dlgSave.FileName, If(bIsLog, clsScriptLog.Text, clsScriptActive.Text)) + strCurrentScriptFileName = dlgSave.FileName bIsTextChanged = False TabControl.SelectedTab.Text = System.IO.Path.GetFileNameWithoutExtension(dlgSave.FileName) frmMain.clsRecentItems.addToMenu(Replace(Path.Combine(Path.GetFullPath(FileIO.SpecialDirectories.MyDocuments), System.IO.Path.GetFileName(dlgSave.FileName)), "\", "/")) From 227bac85c1c5866467021d13ee6a788ce73df709 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 24 Jan 2024 13:26:36 +0100 Subject: [PATCH 24/37] change made --- instat/dlgEndOfRainsSeason.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instat/dlgEndOfRainsSeason.vb b/instat/dlgEndOfRainsSeason.vb index 46103d31e9f..bb6f21e4d1a 100644 --- a/instat/dlgEndOfRainsSeason.vb +++ b/instat/dlgEndOfRainsSeason.vb @@ -276,6 +276,7 @@ Public Class dlgEndOfRainsSeason ucrNudCapacity.SetParameter(New RParameter("yes", 1)) ucrNudCapacity.SetMinMax(1, Integer.MaxValue) ucrNudCapacity.Increment = 10 + ucrNudCapacity.SetRDefault(100) ucrInputSeasonDoy.SetParameter(New RParameter("result_name", 3)) ucrInputSeasonDoy.SetValidationTypeAsRVariable() @@ -315,7 +316,7 @@ Public Class dlgEndOfRainsSeason ucrChkEndofSeasonDate.AddToLinkedControls(ucrInputEndofSeasonDate, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofSeasonDoy.AddToLinkedControls(ucrInputSeasonDoy, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkWB.AddToLinkedControls(ucrNudWB, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.5) - ucrPnlEvaporation.AddToLinkedControls(ucrInputEvaporation, {rdoValueEvaporation},bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlEvaporation.AddToLinkedControls(ucrInputEvaporation, {rdoValueEvaporation}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=5) ucrPnlEvaporation.AddToLinkedControls(ucrReceiverEvaporation, {rdoVariableEvaporation}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofRainsOccurence.AddToLinkedControls(ucrInputEndofRainsOccurence, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkEndofRainsDate.AddToLinkedControls(ucrInputEndofRainsDate, {True}, bNewLinkedHideIfParameterMissing:=True) From 2c2f751c117cda57468968568ed507ff4fbef09c Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 24 Jan 2024 14:41:00 +0100 Subject: [PATCH 25/37] Change made --- instat/dlgEndOfRainsSeason.vb | 9 ++++++++- instat/dlgStartofRains.Designer.vb | 32 ++++++++++++++---------------- instat/dlgStartofRains.vb | 22 ++++++++++++++------ 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/instat/dlgEndOfRainsSeason.vb b/instat/dlgEndOfRainsSeason.vb index bb6f21e4d1a..6c9a4e03f3f 100644 --- a/instat/dlgEndOfRainsSeason.vb +++ b/instat/dlgEndOfRainsSeason.vb @@ -276,7 +276,6 @@ Public Class dlgEndOfRainsSeason ucrNudCapacity.SetParameter(New RParameter("yes", 1)) ucrNudCapacity.SetMinMax(1, Integer.MaxValue) ucrNudCapacity.Increment = 10 - ucrNudCapacity.SetRDefault(100) ucrInputSeasonDoy.SetParameter(New RParameter("result_name", 3)) ucrInputSeasonDoy.SetValidationTypeAsRVariable() @@ -1051,12 +1050,16 @@ Public Class dlgEndOfRainsSeason clsPMaxFunction.RemoveParameterByName("0") clsWBMaxEvapOperator.RemoveParameterByName("value") clsWBMinEvapOperator.RemoveParameterByName("value") + clsPMinWBMaxFunction.RemoveParameterByName("1") + clsPMinWBMinFunction.RemoveParameterByName("1") Else clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) clsPMaxFunction.RemoveParameterByName("wb") clsPMaxFunction.RemoveParameterByName("wb") clsWBMaxEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) clsWBMinEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) + clsPMinWBMaxFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) + clsPMinWBMinFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) End If Else ucrReceiverEvaporation.SetMeAsReceiver() @@ -1075,12 +1078,16 @@ Public Class dlgEndOfRainsSeason clsPMaxFunction.RemoveParameterByName("0") clsWBMaxEvapOperator.RemoveParameterByName("value") clsWBMinEvapOperator.RemoveParameterByName("value") + clsPMinWBMaxFunction.RemoveParameterByName("1") + clsPMinWBMinFunction.RemoveParameterByName("1") Else clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) clsPMaxFunction.RemoveParameterByName("wb") clsPMaxFunction.RemoveParameterByName("wb") clsReduceWBMinFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMinTailFunction1, iPosition:=1) clsReduceWBMaxFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMaxTailFunction1, iPosition:=1) + clsPMinWBMaxFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) + clsPMinWBMinFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) End If End If End If diff --git a/instat/dlgStartofRains.Designer.vb b/instat/dlgStartofRains.Designer.vb index ea3a0db2d9d..e5f35fb174b 100644 --- a/instat/dlgStartofRains.Designer.vb +++ b/instat/dlgStartofRains.Designer.vb @@ -66,9 +66,9 @@ Partial Class dlgStartofRains Me.rdoTRPercentile = New System.Windows.Forms.RadioButton() Me.ucrPnlTRCalculateBy = New instat.UcrPanel() Me.grpRainParameters = New System.Windows.Forms.GroupBox() + Me.ucrInputThreshold = New instat.ucrInputComboBox() Me.ucrInputFilterPreview = New instat.ucrInputTextBox() Me.cmdDoyRange = New System.Windows.Forms.Button() - Me.ucrNudThreshold = New instat.ucrNud() Me.lblThreshold = New System.Windows.Forms.Label() Me.lblDOY = New System.Windows.Forms.Label() Me.lblDate = New System.Windows.Forms.Label() @@ -409,9 +409,9 @@ Partial Class dlgStartofRains ' 'grpRainParameters ' + Me.grpRainParameters.Controls.Add(Me.ucrInputThreshold) Me.grpRainParameters.Controls.Add(Me.ucrInputFilterPreview) Me.grpRainParameters.Controls.Add(Me.cmdDoyRange) - Me.grpRainParameters.Controls.Add(Me.ucrNudThreshold) Me.grpRainParameters.Controls.Add(Me.lblThreshold) Me.grpRainParameters.Location = New System.Drawing.Point(4, 238) Me.grpRainParameters.Name = "grpRainParameters" @@ -419,6 +419,17 @@ Partial Class dlgStartofRains Me.grpRainParameters.TabIndex = 11 Me.grpRainParameters.TabStop = False ' + 'ucrInputThreshold + ' + Me.ucrInputThreshold.AddQuotesIfUnrecognised = True + Me.ucrInputThreshold.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputThreshold.GetSetSelectedIndex = -1 + Me.ucrInputThreshold.IsReadOnly = False + Me.ucrInputThreshold.Location = New System.Drawing.Point(70, 11) + Me.ucrInputThreshold.Name = "ucrInputThreshold" + Me.ucrInputThreshold.Size = New System.Drawing.Size(62, 21) + Me.ucrInputThreshold.TabIndex = 21 + ' 'ucrInputFilterPreview ' Me.ucrInputFilterPreview.AddQuotesIfUnrecognised = True @@ -441,19 +452,6 @@ Partial Class dlgStartofRains Me.cmdDoyRange.Text = "Day Range" Me.cmdDoyRange.UseVisualStyleBackColor = True ' - 'ucrNudThreshold - ' - Me.ucrNudThreshold.AutoSize = True - Me.ucrNudThreshold.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudThreshold.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudThreshold.Location = New System.Drawing.Point(69, 11) - Me.ucrNudThreshold.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudThreshold.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudThreshold.Name = "ucrNudThreshold" - Me.ucrNudThreshold.Size = New System.Drawing.Size(42, 20) - Me.ucrNudThreshold.TabIndex = 1 - Me.ucrNudThreshold.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'lblThreshold ' Me.lblThreshold.AutoSize = True @@ -665,7 +663,7 @@ Partial Class dlgStartofRains Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(5, 514) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 20 ' 'dlgStartofRains @@ -741,7 +739,6 @@ Partial Class dlgStartofRains Friend WithEvents ucrPnlTRCalculateBy As UcrPanel Friend WithEvents ucrNudRDMinimumDays As ucrNud Friend WithEvents ucrNudRDOutOfDays As ucrNud - Friend WithEvents ucrNudThreshold As ucrNud Friend WithEvents ucrChkNumberOfRainyDays As ucrCheck Friend WithEvents ucrNudDSLengthOfTime As ucrNud Friend WithEvents ucrNudDSMaximumDays As ucrNud @@ -760,4 +757,5 @@ Partial Class dlgStartofRains Friend WithEvents ucrChkStatus As ucrCheck Friend WithEvents ucrInputNewStatusColumnName As ucrInputTextBox Friend WithEvents grpDisplay As GroupBox + Friend WithEvents ucrInputThreshold As ucrInputComboBox End Class \ No newline at end of file diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index 45a55caf552..8717e3e6506 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -87,6 +87,7 @@ Public Class dlgStartofRains Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 199 + Dim dctInputThreshold As New Dictionary(Of String, String) ' setting the selector ucrSelectorForStartofRains.SetParameter(New RParameter("data_name", 0)) @@ -129,8 +130,17 @@ Public Class dlgStartofRains ucrReceiverRainfall.SetClimaticType("rain") ucrReceiverRainfall.bAutoFill = True - ucrNudThreshold.SetParameter(New RParameter("threshold", 1)) - ucrNudThreshold.DecimalPlaces = 2 + ucrInputThreshold.SetParameter(New RParameter("threshold", 1)) + dctInputThreshold.Add("0.85", "0.85") + dctInputThreshold.Add("0.5", "0.5") + dctInputThreshold.Add("0.05", "0.05") + dctInputThreshold.Add("0.99", "0.99") + ucrInputThreshold.SetItems(dctInputThreshold) + ucrInputThreshold.AddQuotesIfUnrecognised = False + ucrInputThreshold.SetLinkedDisplayControl(lblThreshold) + ucrInputThreshold.SetRDefault(0.85) + + 'Total Rainfall ucrPnlTRCalculateBy.AddRadioButton(rdoTRAmount) @@ -715,7 +725,7 @@ Public Class dlgStartofRains ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsRainDayConditionOperator, New RParameter("rain", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=3) ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsFirstRain, New RParameter("x", 0), iAdditionalPairNo:=4) ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsIsNaRain, New RParameter("x", 0), iAdditionalPairNo:=5) - ucrNudThreshold.AddAdditionalCodeParameterPair(clsRainDayConditionOperator, New RParameter("threshold", 1), iAdditionalPairNo:=1) + ucrInputThreshold.AddAdditionalCodeParameterPair(clsRainDayConditionOperator, New RParameter("threshold", 1), iAdditionalPairNo:=1) 'clsSORStartSummary.SetControlParameters(ucrReceiverRainfall, iAdditionalPairNo:=4) 'clsSORStatusSummary.SetControlParameters(ucrReceiverRainfall, iAdditionalPairNo:=5) @@ -727,7 +737,7 @@ Public Class dlgStartofRains ucrChkAsDoy.SetRCode(clsCombinationSubCalcList, bReset) ucrChkStatus.SetRCode(clsCombinationSubCalcList, bReset) ucrChkAsDate.SetRCode(clsCombinationSubCalcList, bReset) - ucrNudThreshold.SetRCode(clsRainDayOperator, bReset) + ucrInputThreshold.SetRCode(clsRainDayOperator, bReset) ucrReceiverDate.SetRCode(clsFirstDate, bReset) ucrInputNewDoyColumnName.SetRCode(clsCalcStartDOY, bReset) @@ -766,7 +776,7 @@ Public Class dlgStartofRains Not ucrReceiverDate.IsEmpty AndAlso Not ucrReceiverDOY.IsEmpty AndAlso Not ucrReceiverYear.IsEmpty AndAlso - ucrNudThreshold.GetText <> "" AndAlso + ucrInputThreshold.GetText <> "" AndAlso ( (ucrChkNumberOfRainyDays.Checked AndAlso ucrNudRDMinimumDays.GetText <> "" AndAlso ucrNudRDOutOfDays.GetText <> "") OrElse Not ucrChkNumberOfRainyDays.Checked) AndAlso @@ -970,7 +980,7 @@ Public Class dlgStartofRains End If End Sub - Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRainfall.ControlContentsChanged, ucrInputNewDoyColumnName.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverDOY.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrNudThreshold.ControlContentsChanged, ucrChkNumberOfRainyDays.ControlContentsChanged, ucrNudRDMinimumDays.ControlContentsChanged, ucrNudRDOutOfDays.ControlContentsChanged, ucrChkTotalRainfall.ControlContentsChanged, ucrNudTROverDays.ControlContentsChanged, ucrPnlTRCalculateBy.ControlContentsChanged, ucrNudTRAmount.ControlContentsChanged, ucrNudTRPercentile.ControlContentsChanged, ucrChkDrySpell.ControlContentsChanged, ucrNudDSMaximumDays.ControlContentsChanged, ucrNudDSLengthOfTime.ControlContentsChanged, ucrNudDPMaxRain.ControlContentsChanged, ucrChkAsDoy.ControlContentsChanged, ucrChkAsDate.ControlContentsChanged, ucrInputNewDateColumnName.ControlContentsChanged, ucrChkStatus.ControlContentsChanged, ucrInputNewStatusColumnName.ControlContentsChanged + Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRainfall.ControlContentsChanged, ucrInputNewDoyColumnName.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverDOY.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrInputThreshold.ControlContentsChanged, ucrChkNumberOfRainyDays.ControlContentsChanged, ucrNudRDMinimumDays.ControlContentsChanged, ucrNudRDOutOfDays.ControlContentsChanged, ucrChkTotalRainfall.ControlContentsChanged, ucrNudTROverDays.ControlContentsChanged, ucrPnlTRCalculateBy.ControlContentsChanged, ucrNudTRAmount.ControlContentsChanged, ucrNudTRPercentile.ControlContentsChanged, ucrChkDrySpell.ControlContentsChanged, ucrNudDSMaximumDays.ControlContentsChanged, ucrNudDSLengthOfTime.ControlContentsChanged, ucrNudDPMaxRain.ControlContentsChanged, ucrChkAsDoy.ControlContentsChanged, ucrChkAsDate.ControlContentsChanged, ucrInputNewDateColumnName.ControlContentsChanged, ucrChkStatus.ControlContentsChanged, ucrInputNewStatusColumnName.ControlContentsChanged TestOKEnabled() End Sub From f8cb648627f83053079892e2ab2403232912f703 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 25 Jan 2024 10:23:00 +0100 Subject: [PATCH 26/37] Code changes --- instat/dlgExportForClimpact.vb | 7 +++---- instat/frmMain.Designer.vb | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/instat/dlgExportForClimpact.vb b/instat/dlgExportForClimpact.vb index a7d078dcec0..9949b76e5b6 100644 --- a/instat/dlgExportForClimpact.vb +++ b/instat/dlgExportForClimpact.vb @@ -148,14 +148,13 @@ Public Class dlgExportForClimpact End Using End Sub - Private Sub ucrReceiverElements_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRR.ControlContentsChanged, ucrReceiverTN.ControlValueChanged, ucrReceiverDay.ControlValueChanged, ucrReceiverYear.ControlValueChanged, ucrInputExportFile.ControlContentsChanged, ucrReceiverTX.ControlValueChanged, ucrReceiverMonth.ControlValueChanged - TestOkEnabled() - End Sub - Private Sub ucrInputExportFile_Click(sender As Object, e As EventArgs) Handles ucrInputExportFile.Click If ucrInputExportFile.IsEmpty() Then SelectFileToSave() End If End Sub + Private Sub ucrReceiverElements_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRR.ControlContentsChanged, ucrReceiverTN.ControlValueChanged, ucrReceiverDay.ControlValueChanged, ucrReceiverYear.ControlValueChanged, ucrInputExportFile.ControlContentsChanged, ucrReceiverTX.ControlValueChanged, ucrReceiverMonth.ControlValueChanged + TestOkEnabled() + End Sub End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index b646fda10dc..5333d6462c3 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -5107,8 +5107,6 @@ Partial Class frmMain 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() From 44bce7710298d71851eb7ee2d3b55e8d33bb3668 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 25 Jan 2024 11:35:59 +0100 Subject: [PATCH 27/37] Code Changes --- instat/ucrScript.vb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb index b507c785a7a..56fcbf581cd 100644 --- a/instat/ucrScript.vb +++ b/instat/ucrScript.vb @@ -26,7 +26,7 @@ Public Class ucrScript Private iMaxLineNumberCharLength As Integer = 0 Private Const iTabIndexLog As Integer = 0 Private strRInstatLogFilesFolderPath As String = Path.Combine(Path.GetFullPath(FileIO.SpecialDirectories.MyDocuments), "R-Instat_Log_files") - Private strCurrentScriptFileName As String = "" 'holds the saved script file name to help remember the current selected folder path + Friend WithEvents clsScriptActive As Scintilla Friend WithEvents clsScriptLog As Scintilla @@ -196,6 +196,10 @@ Public Class ucrScript End If End Sub + Private Function SelectedTab() As String + Return TabControl.SelectedTab.Text + End Function + ''' ''' Displays a file save dialog; allows the user to specify a folder and file name; and saves ''' the log/script to the specified file. @@ -214,12 +218,8 @@ Public Class ucrScript Using dlgSave As New SaveFileDialog dlgSave.Title = "Save " & If(bIsLog, "Log", "Script") & " To File" dlgSave.Filter = "R Script File (*.R)|*.R|Text File (*.txt)|*.txt" - If Not String.IsNullOrEmpty(strCurrentScriptFileName) Then - dlgSave.FileName = Path.GetFileName(strCurrentScriptFileName) - dlgSave.InitialDirectory = Path.GetDirectoryName(strCurrentScriptFileName) - Else - dlgSave.InitialDirectory = frmMain.clsInstatOptions.strWorkingDirectory - End If + dlgSave.FileName = Path.GetFileName(SelectedTab) + 'Ensure that dialog opens in correct folder. 'In theory, we should be able to use `dlgLoad.RestoreDirectory = True` but this does 'not work (I think a bug in WinForms).So we need to use static variables instead. @@ -230,7 +230,6 @@ Public Class ucrScript If dlgSave.ShowDialog() = DialogResult.OK Then Try File.WriteAllText(dlgSave.FileName, If(bIsLog, clsScriptLog.Text, clsScriptActive.Text)) - strCurrentScriptFileName = dlgSave.FileName bIsTextChanged = False TabControl.SelectedTab.Text = System.IO.Path.GetFileNameWithoutExtension(dlgSave.FileName) frmMain.clsRecentItems.addToMenu(Replace(Path.Combine(Path.GetFullPath(FileIO.SpecialDirectories.MyDocuments), System.IO.Path.GetFileName(dlgSave.FileName)), "\", "/")) From cd1b6c7626550e44943223e5c9c3ca55b86aba27 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 26 Jan 2024 09:00:45 +0100 Subject: [PATCH 28/37] Code changes --- instat/ucrScript.vb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb index 56fcbf581cd..94ee428fca8 100644 --- a/instat/ucrScript.vb +++ b/instat/ucrScript.vb @@ -196,10 +196,6 @@ Public Class ucrScript End If End Sub - Private Function SelectedTab() As String - Return TabControl.SelectedTab.Text - End Function - ''' ''' Displays a file save dialog; allows the user to specify a folder and file name; and saves ''' the log/script to the specified file. @@ -218,7 +214,7 @@ Public Class ucrScript Using dlgSave As New SaveFileDialog dlgSave.Title = "Save " & If(bIsLog, "Log", "Script") & " To File" dlgSave.Filter = "R Script File (*.R)|*.R|Text File (*.txt)|*.txt" - dlgSave.FileName = Path.GetFileName(SelectedTab) + dlgSave.FileName = Path.GetFileName(TabControl.SelectedTab.Text) 'Ensure that dialog opens in correct folder. 'In theory, we should be able to use `dlgLoad.RestoreDirectory = True` but this does From ca53d2b580d17fc563031085fd18d3f5bc5e90b1 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 29 Jan 2024 10:33:52 +0100 Subject: [PATCH 29/37] Small change made. --- instat/dlgEndOfRainsSeason.vb | 2 -- instat/dlgTransformClimatic.vb | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/instat/dlgEndOfRainsSeason.vb b/instat/dlgEndOfRainsSeason.vb index 6c9a4e03f3f..f4685299ee9 100644 --- a/instat/dlgEndOfRainsSeason.vb +++ b/instat/dlgEndOfRainsSeason.vb @@ -300,11 +300,9 @@ Public Class dlgEndOfRainsSeason ucrChkWB.SetParameter(New RParameter("WB_evap")) ucrChkWB.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkWB.SetText("Reducing") - 'ucrChkWB.SetLinkedDisplayControl(ucrNudWB) ucrNudWB.SetParameter(New RParameter("WB_evap_value")) ucrNudWB.SetMinMax(0, 1) - 'ucrNudWB.DecimalPlaces = 0.01 ucrNudWB.Increment = 0.01 ucrNudWB.DecimalPlaces = 2 diff --git a/instat/dlgTransformClimatic.vb b/instat/dlgTransformClimatic.vb index 54f8333ae37..d4b2ae83e7f 100644 --- a/instat/dlgTransformClimatic.vb +++ b/instat/dlgTransformClimatic.vb @@ -505,6 +505,8 @@ Public Class dlgTransformClimatic clsWBOperator.bSpaceAroundOperation = True clsWBOperator.bBrackets = False + clsReduceOpEvapValue.SetOperation("-") + clsWBEvaporation.SetRCommand("WB_evaporation") clsWBEvaporation.AddParameter("water_balance", "x", iPosition:=0, bIncludeArgumentName:=False) clsWBEvaporation.AddParameter("WB_evap_value", 0.5, iPosition:=1, bIncludeArgumentName:=False) @@ -1095,6 +1097,7 @@ Public Class dlgTransformClimatic Private Sub ReduceWaterBalance() If rdoWaterBalance.Checked Then If rdoEvapValue.Checked Then + clsRTransform.RemoveParameterByName("calculated_from") ucrReceiverData.SetMeAsReceiver() clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")") If ucrChkWB.Checked Then @@ -1112,7 +1115,6 @@ Public Class dlgTransformClimatic ElseIf rdoEvapVariable.Checked Then ucrReceiverEvap.SetMeAsReceiver() clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ", " & strCurrDataName & "=" & ucrReceiverEvap.GetVariableNames & ")") - clsReduceOpEvapValue.SetOperation("-") clsRWaterBalanceFunction.AddParameter("replace_na", clsROperatorParameter:=clsReduceOpEvapValue, iPosition:=1, bIncludeArgumentName:=False) clsPMaxOperatorMax.RemoveParameterByName("evaporation.value") End If From 610660ae626fe7d39360bd1ec76e1a3805a38a61 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Mon, 29 Jan 2024 17:02:09 +0300 Subject: [PATCH 30/37] changes --- instat/dlgBarAndPieChart.Designer.vb | 104 +++++++-- instat/dlgBarAndPieChart.vb | 243 +++++++++++++++++++ instat/dlgHistogram.designer.vb | 76 +++++- instat/dlgHistogram.vb | 274 +++++++++++++++++++++- instat/dlgLinePlot.designer.vb | 334 ++++++++++++++++----------- instat/dlgLinePlot.vb | 241 +++++++++++++++++++ instat/dlgScatterPlot.Designer.vb | 76 +++++- instat/dlgScatterPlot.vb | 244 +++++++++++++++++++ 8 files changed, 1428 insertions(+), 164 deletions(-) diff --git a/instat/dlgBarAndPieChart.Designer.vb b/instat/dlgBarAndPieChart.Designer.vb index 7e857d855c2..a319b8a4e5d 100644 --- a/instat/dlgBarAndPieChart.Designer.vb +++ b/instat/dlgBarAndPieChart.Designer.vb @@ -67,9 +67,10 @@ Partial Class dlgBarAndPieChart Me.contextMenuStripOptions = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.toolStripMenuItemPlotOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemBarchartOptions = New System.Windows.Forms.ToolStripMenuItem() - Me.toolStripMenuItemLollipopOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemTextOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemLollipopOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemTreemapOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemTreemapTextOptionsOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemWordcloudOptions = New System.Windows.Forms.ToolStripMenuItem() Me.cmdOptions = New instat.ucrSplitButton() Me.ucrChkReorderValue = New instat.ucrCheck() @@ -111,7 +112,11 @@ Partial Class dlgBarAndPieChart Me.ucrChkAddLabelsTreemap = New instat.ucrCheck() Me.ucrChkBacktoback = New instat.ucrCheck() Me.ucrChkIncreaseSize = New instat.ucrCheck() - Me.toolStripMenuItemTreemapTextOptionsOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.ucrInputStation = New instat.ucrInputComboBox() + Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() + Me.lblFacetBy = New System.Windows.Forms.Label() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrChkLegend = New instat.ucrCheck() Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' @@ -390,7 +395,7 @@ Partial Class dlgBarAndPieChart ' Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemBarchartOptions, Me.toolStripMenuItemTextOptions, Me.toolStripMenuItemLollipopOptions, Me.toolStripMenuItemTreemapOptions, Me.toolStripMenuItemTreemapTextOptionsOptions, Me.toolStripMenuItemWordcloudOptions}) Me.contextMenuStripOptions.Name = "contextMenuStripOk" - Me.contextMenuStripOptions.Size = New System.Drawing.Size(189, 180) + Me.contextMenuStripOptions.Size = New System.Drawing.Size(189, 158) ' 'toolStripMenuItemPlotOptions ' @@ -404,24 +409,30 @@ Partial Class dlgBarAndPieChart Me.toolStripMenuItemBarchartOptions.Size = New System.Drawing.Size(188, 22) Me.toolStripMenuItemBarchartOptions.Text = "BarChart Options" ' - 'toolStripMenuItemLollipopOptions - ' - Me.toolStripMenuItemLollipopOptions.Name = "toolStripMenuItemLollipopOptions" - Me.toolStripMenuItemLollipopOptions.Size = New System.Drawing.Size(188, 22) - Me.toolStripMenuItemLollipopOptions.Text = "Lollipop Options" - ' 'toolStripMenuItemTextOptions ' Me.toolStripMenuItemTextOptions.Name = "toolStripMenuItemTextOptions" Me.toolStripMenuItemTextOptions.Size = New System.Drawing.Size(188, 22) Me.toolStripMenuItemTextOptions.Text = "Text Options" ' + 'toolStripMenuItemLollipopOptions + ' + Me.toolStripMenuItemLollipopOptions.Name = "toolStripMenuItemLollipopOptions" + Me.toolStripMenuItemLollipopOptions.Size = New System.Drawing.Size(188, 22) + Me.toolStripMenuItemLollipopOptions.Text = "Lollipop Options" + ' 'toolStripMenuItemTreemapOptions ' Me.toolStripMenuItemTreemapOptions.Name = "toolStripMenuItemTreemapOptions" Me.toolStripMenuItemTreemapOptions.Size = New System.Drawing.Size(188, 22) Me.toolStripMenuItemTreemapOptions.Text = "Treemap Options" ' + 'toolStripMenuItemTreemapTextOptionsOptions + ' + Me.toolStripMenuItemTreemapTextOptionsOptions.Name = "toolStripMenuItemTreemapTextOptionsOptions" + Me.toolStripMenuItemTreemapTextOptionsOptions.Size = New System.Drawing.Size(188, 22) + Me.toolStripMenuItemTreemapTextOptionsOptions.Text = "Treemap Text Options" + ' 'toolStripMenuItemWordcloudOptions ' Me.toolStripMenuItemWordcloudOptions.Name = "toolStripMenuItemWordcloudOptions" @@ -576,7 +587,7 @@ Partial Class dlgBarAndPieChart 'ucrSaveBar ' Me.ucrSaveBar.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveBar.Location = New System.Drawing.Point(10, 461) + Me.ucrSaveBar.Location = New System.Drawing.Point(10, 512) Me.ucrSaveBar.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveBar.Name = "ucrSaveBar" Me.ucrSaveBar.Size = New System.Drawing.Size(372, 24) @@ -611,7 +622,7 @@ Partial Class dlgBarAndPieChart ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(7, 491) + Me.ucrBase.Location = New System.Drawing.Point(7, 542) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 60 @@ -863,18 +874,72 @@ Partial Class dlgBarAndPieChart Me.ucrChkIncreaseSize.Size = New System.Drawing.Size(88, 23) Me.ucrChkIncreaseSize.TabIndex = 63 ' - 'toolStripMenuItemTreemapTextOptionsOptions - ' - Me.toolStripMenuItemTreemapTextOptionsOptions.Name = "toolStripMenuItemTreemapTextOptionsOptions" - Me.toolStripMenuItemTreemapTextOptionsOptions.Size = New System.Drawing.Size(188, 22) - Me.toolStripMenuItemTreemapTextOptionsOptions.Text = "Treemap Text Options" + '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(327, 478) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(86, 21) + Me.ucrInputStation.TabIndex = 71 + ' + 'ucr1stFactorReceiver + ' + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(214, 479) + 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 = 70 + Me.ucr1stFactorReceiver.ucrSelector = Nothing + ' + 'lblFacetBy + ' + Me.lblFacetBy.AutoSize = True + Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBy.Location = New System.Drawing.Point(214, 464) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) + Me.lblFacetBy.TabIndex = 69 + Me.lblFacetBy.Tag = "" + Me.lblFacetBy.Text = "Facet By:" + ' + '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(97, 478) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) + Me.ucrInputLegendPosition.TabIndex = 73 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(10, 479) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) + Me.ucrChkLegend.TabIndex = 72 ' 'dlgBarAndPieChart ' 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(415, 547) + Me.ClientSize = New System.Drawing.Size(415, 596) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucr1stFactorReceiver) + Me.Controls.Add(Me.lblFacetBy) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.ucrChkReorderValue) Me.Controls.Add(Me.ucrChkReorderFrequency) @@ -1024,4 +1089,9 @@ Partial Class dlgBarAndPieChart Friend WithEvents cmdOptions As ucrSplitButton Friend WithEvents toolStripMenuItemLollipopOptions As ToolStripMenuItem Friend WithEvents toolStripMenuItemTreemapTextOptionsOptions As ToolStripMenuItem + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkLegend As ucrCheck End Class \ No newline at end of file diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 75dc081567e..d1ff1e49111 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -76,14 +76,29 @@ Public Class dlgBarAndPieChart Private clsGeomTextWordcloudAesFunction As New RFunction Private clsScaleSizeAreaFunction As New RFunction Private clsDummyFunction As New RFunction + Private clsThemeFunction As New RFunction Private clsPointsFunction As New RFunction Private clsGeomLollipopAesFunction As New RFunction + Private clsFacetFunction As New RFunction + 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 ReadOnly strAscending As String = "Ascending" Private ReadOnly strDescending As String = "Descending" Private ReadOnly strReverse As String = "Reverse" Private ReadOnly strNone As String = "None" + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False + 'Parameter names for geoms Private strFirstParameterName As String = "geomfunc" Private strStatSummaryParameterName As String = "stat_summary" @@ -117,6 +132,7 @@ Public Class dlgBarAndPieChart Dim dctLayout As New Dictionary(Of String, String) Dim dctStart As New Dictionary(Of String, String) Dim dctPlace As New Dictionary(Of String, String) + Dim dctLegendPosition As New Dictionary(Of String, String) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrBase.clsRsyntax.iCallType = 3 @@ -359,6 +375,32 @@ Public Class dlgBarAndPieChart ucrInputPlace.SetRDefault(Chr(34) & "middle" & Chr(34)) ucrInputPlace.SetDropDownStyleAsNonEditable() + ucrChkLegend.SetText("Legend:") + ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") + ucrInputLegendPosition.SetDropDownStyleAsNonEditable() + ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) + dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34)) + dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34)) + dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34)) + dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34)) + dctLegendPosition.Add("Bottom", Chr(34) & "bottom" & Chr(34)) + ucrInputLegendPosition.SetItems(dctLegendPosition) + ucrChkLegend.AddParameterPresentCondition(True, "legend.position") + ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False) + + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) + ucr1stFactorReceiver.Selector = ucrBarChartSelector + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(1) + ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + ucrNudMaxSize.SetParameter(New RParameter("max_size", 0)) ucrChkIncreaseSize.SetText("Increase size") ucrChkIncreaseSize.AddToLinkedControls(ucrNudMaxSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=20) @@ -408,6 +450,15 @@ Public Class dlgBarAndPieChart clsDummyFunction = New RFunction clsPointsFunction = New RFunction clsGeomLollipopAesFunction = New RFunction + clsFacetFunction = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + clsGroupByFunction = New RFunction + + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True ucrBarChartSelector.Reset() ucrBarChartSelector.SetGgplotFunction(clsBaseOperator) @@ -569,6 +620,22 @@ Public Class dlgBarAndPieChart clsScaleSizeAreaFunction.SetPackageName("ggplot2") clsScaleSizeAreaFunction.SetRCommand("scale_size_area") + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") + clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXlabFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone() @@ -581,6 +648,7 @@ Public Class dlgBarAndPieChart clsXScaleDateFunction = GgplotDefaults.clsXScaleDateFunction.Clone() clsYScaleDateFunction = GgplotDefaults.clsYScaleDateFunction.Clone() clsThemeFuction = GgplotDefaults.clsDefaultThemeFunction.Clone + clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() clsScaleFillViridisFunction = GgplotDefaults.clsScaleFillViridisFunction @@ -630,6 +698,8 @@ Public Class dlgBarAndPieChart ucrChkAddLabelsTreemap.SetRCode(clsBaseOperator, bReset) ucrNudMaxSize.SetRCode(clsScaleSizeAreaFunction, bReset) ucrChkReorderFrequency.SetRCode(clsDummyFunction, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrChkStart.SetRCode(clsGeomTreemapFunction, bReset) @@ -672,6 +742,18 @@ Public Class dlgBarAndPieChart TestOkEnabled() End Sub + Private Sub AddRemoveTheme() + If clsThemeFunction.iParameterCount > 0 Then + clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) + Else + clsBaseOperator.RemoveParameterByName("theme") + End If + End Sub + + Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged + AddRemoveTheme() + End Sub + Private Sub openSdgLayerOptions(clsNewGeomFunc As RFunction, clsNewAesFunction As RFunction) sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsNewGeomFunc, clsNewGlobalAesFunc:=clsNewAesFunction, clsNewLocalAes:=clsLocalRaesFunction, @@ -1027,6 +1109,167 @@ Public Class dlgBarAndPieChart UpdateParameter() End Sub + Private Sub AutoFacetStation() + Dim ucrCurrentReceiver As ucrReceiver = Nothing + + If ucrBarChartSelector.CurrentReceiver IsNot Nothing Then + ucrCurrentReceiver = ucrBarChartSelector.CurrentReceiver + End If + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrBarChartSelector.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() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucr1stFactorReceiver.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucr1stFactorReceiver.ChangeParameterName("var1") + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) + Case strFacetCol + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) + Case strFacetRow + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) + End Select + If Not clsRFacetFunction.ContainsParameter("x") Then + clsRFacetFunction.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 ucr1stFactorReceiver.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 + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.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(clsFacetVariablesOperator) + 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 ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() + End If + End Sub + + Private Sub ucrBarChartSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrBarChartSelector.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + End Sub + Private Sub ucrPnlOptions_ControlValueChanged() Handles ucrPnlOptions.ControlValueChanged, ucrVariablesAsFactorForBarChart.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrReceiverByFactor.ControlValueChanged, ucrReceiverLabel.ControlValueChanged, ucrChkAddLabelsText.ControlValueChanged, ucrChkReorderValue.ControlValueChanged, ucrInputReorderX.ControlValueChanged, diff --git a/instat/dlgHistogram.designer.vb b/instat/dlgHistogram.designer.vb index 46b7178c5f8..734dab62ee1 100644 --- a/instat/dlgHistogram.designer.vb +++ b/instat/dlgHistogram.designer.vb @@ -64,6 +64,11 @@ Partial Class dlgHistogram Me.ucrPnlOptions = New instat.UcrPanel() Me.lblReorder = New System.Windows.Forms.Label() Me.ucrInputAddReorder = New instat.ucrInputComboBox() + Me.ucrInputStation = New instat.ucrInputComboBox() + Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() + Me.lblFacetBy = New System.Windows.Forms.Label() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrChkLegend = New instat.ucrCheck() Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' @@ -236,7 +241,7 @@ Partial Class dlgHistogram 'ucrSaveHist ' Me.ucrSaveHist.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveHist.Location = New System.Drawing.Point(10, 342) + Me.ucrSaveHist.Location = New System.Drawing.Point(10, 385) Me.ucrSaveHist.Margin = New System.Windows.Forms.Padding(5) Me.ucrSaveHist.Name = "ucrSaveHist" Me.ucrSaveHist.Size = New System.Drawing.Size(322, 24) @@ -285,7 +290,7 @@ Partial Class dlgHistogram ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 365) + Me.ucrBase.Location = New System.Drawing.Point(10, 408) Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) @@ -321,12 +326,72 @@ Partial Class dlgHistogram Me.ucrInputAddReorder.Size = New System.Drawing.Size(120, 21) Me.ucrInputAddReorder.TabIndex = 39 ' + '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(318, 348) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(101, 21) + Me.ucrInputStation.TabIndex = 86 + ' + 'ucr1stFactorReceiver + ' + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(205, 349) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(110, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 85 + Me.ucr1stFactorReceiver.ucrSelector = Nothing + ' + 'lblFacetBy + ' + Me.lblFacetBy.AutoSize = True + Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBy.Location = New System.Drawing.Point(208, 334) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) + Me.lblFacetBy.TabIndex = 84 + Me.lblFacetBy.Tag = "" + Me.lblFacetBy.Text = "Facet By:" + ' + '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(87, 348) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) + Me.ucrInputLegendPosition.TabIndex = 88 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(11, 349) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) + Me.ucrChkLegend.TabIndex = 87 + ' 'dlgHistogram ' 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(448, 422) + Me.ClientSize = New System.Drawing.Size(448, 461) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucr1stFactorReceiver) + Me.Controls.Add(Me.lblFacetBy) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.lblReorder) Me.Controls.Add(Me.ucrInputAddReorder) Me.Controls.Add(Me.cmdOptions) @@ -382,4 +447,9 @@ Partial Class dlgHistogram Friend WithEvents toolStripMenuItemDotOptions As ToolStripMenuItem Friend WithEvents lblReorder As Label Friend WithEvents ucrInputAddReorder As ucrInputComboBox + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkLegend As ucrCheck End Class \ No newline at end of file diff --git a/instat/dlgHistogram.vb b/instat/dlgHistogram.vb index 850fb1e5099..3fc31cd62f5 100644 --- a/instat/dlgHistogram.vb +++ b/instat/dlgHistogram.vb @@ -47,6 +47,20 @@ Public Class dlgHistogram Private clsForecatsInfreqValue As New RFunction Private clsForecatsReverseValue As New RFunction + Private clsFacetFunction As New RFunction + 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 ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False + Private ReadOnly strAscending As String = "Ascending" Private ReadOnly strDescending As String = "Descending" Private ReadOnly strReverse As String = "Reverse" @@ -75,6 +89,7 @@ Public Class dlgHistogram Private Sub InitialiseDialog() Dim dctStats As New Dictionary(Of String, String) + Dim dctLegendPosition As New Dictionary(Of String, String) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrBase.clsRsyntax.iCallType = 3 ucrBase.iHelpTopicID = 435 @@ -131,6 +146,32 @@ Public Class dlgHistogram ucrInputAddReorder.SetDropDownStyleAsNonEditable() ucrInputAddReorder.SetLinkedDisplayControl(lblReorder) + ucrChkLegend.SetText("Legend:") + ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") + ucrInputLegendPosition.SetDropDownStyleAsNonEditable() + ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) + dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34)) + dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34)) + dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34)) + dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34)) + dctLegendPosition.Add("Bottom", Chr(34) & "bottom" & Chr(34)) + ucrInputLegendPosition.SetItems(dctLegendPosition) + ucrChkLegend.AddParameterPresentCondition(True, "legend.position") + ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False) + + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) + ucr1stFactorReceiver.Selector = ucrHistogramSelector + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(1) + ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + ucrPnlOptions.AddToLinkedControls({ucrChkDisplayAsDotPlot}, {rdoHistogram}, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrChkRidges}, {rdoDensity_ridges}, bNewLinkedHideIfParameterMissing:=True) ucrChkRidges.AddToLinkedControls(ucrInputStats, {"FALSE"}, bNewLinkedHideIfParameterMissing:=True) @@ -154,6 +195,15 @@ Public Class dlgHistogram clsForecatsReverse = New RFunction clsForecatsInfreqValue = New RFunction clsForecatsReverseValue = New RFunction + clsFacetFunction = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + clsGroupByFunction = New RFunction + + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True ucrHistogramSelector.Reset() ucrHistogramSelector.SetGgplotFunction(clsBaseOperator) ucrSaveHist.Reset() @@ -195,6 +245,22 @@ Public Class dlgHistogram clsForecatsInfreqValue.SetPackageName("forcats") clsForecatsInfreqValue.SetRCommand("fct_infreq") + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone() @@ -226,6 +292,8 @@ Public Class dlgHistogram ucrChkDisplayAsDotPlot.SetRCode(clsRgeomPlotFunction, bReset) ucrChkRidges.SetRCode(clsRgeomPlotFunction, bReset) ucrVariablesAsFactorforHist.SetRCode(clsRaesFunction, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrInputStats.SetRCode(clsHistAesFunction, bReset) ucrFactorReceiver.SetRCode(clsRaesFunction, bReset) @@ -247,6 +315,18 @@ Public Class dlgHistogram TestOkEnabled() End Sub + Private Sub AddRemoveTheme() + If clsThemeFunction.iParameterCount > 0 Then + clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) + Else + clsBaseOperator.RemoveParameterByName("theme") + End If + End Sub + + Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged + AddRemoveTheme() + End Sub + Private Sub SetDialogOptions() clsHistAesFunction.RemoveParameterByName("x") clsHistAesFunction.RemoveParameterByName("y") @@ -452,27 +532,203 @@ Public Class dlgHistogram Private Sub DialogueSize() If rdoHistogram.Checked Then - Me.Size = New Size(464, 409) + Me.Size = New Size(464, 468) Me.lblReorder.Location = New Point(283, 275) Me.ucrInputAddReorder.Location = New Point(283, 289) - Me.ucrSaveHist.Location = New Point(10, 314) - Me.ucrBase.Location = New Point(10, 342) + Me.ucrSaveHist.Location = New Point(10, 360) + Me.ucrChkLegend.Location = New Point(11, 329) + Me.ucrInputStation.Location = New Point(318, 328) + Me.ucrInputLegendPosition.Location = New Point(87, 328) + Me.ucr1stFactorReceiver.Location = New Point(205, 329) + Me.lblFacetBy.Location = New Point(208, 315) + Me.ucrBase.Location = New Point(10, 390) ElseIf rdoDensity_ridges.Checked Then - Me.Size = New Size(464, 461) + Me.Size = New Size(464, 500) Me.lblReorder.Location = New Point(286, 298) Me.ucrInputAddReorder.Location = New Point(287, 314) - Me.ucrSaveHist.Location = New Point(10, 342) - Me.ucrBase.Location = New Point(10, 365) + Me.ucrSaveHist.Location = New Point(10, 380) + Me.ucrBase.Location = New Point(10, 408) + Me.ucrChkLegend.Location = New Point(11, 349) + Me.ucrInputStation.Location = New Point(318, 348) + Me.ucrInputLegendPosition.Location = New Point(87, 348) + Me.ucr1stFactorReceiver.Location = New Point(205, 349) + Me.lblFacetBy.Location = New Point(208, 334) Else - Me.Size = New Size(464, 401) + Me.Size = New Size(464, 440) Me.lblReorder.Location = New Point(283, 250) Me.ucrInputAddReorder.Location = New Point(283, 264) - Me.ucrSaveHist.Location = New Point(10, 288) - Me.ucrBase.Location = New Point(10, 314) + Me.ucrSaveHist.Location = New Point(10, 330) + Me.ucrChkLegend.Location = New Point(11, 296) + Me.ucrInputStation.Location = New Point(318, 294) + Me.ucrInputLegendPosition.Location = New Point(87, 294) + Me.ucr1stFactorReceiver.Location = New Point(205, 296) + Me.lblFacetBy.Location = New Point(208, 283) + Me.ucrBase.Location = New Point(10, 357) + End If + End Sub + + Private Sub AutoFacetStation() + Dim ucrCurrentReceiver As ucrReceiver = Nothing + + If ucrHistogramSelector.CurrentReceiver IsNot Nothing Then + ucrCurrentReceiver = ucrHistogramSelector.CurrentReceiver + End If + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrHistogramSelector.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() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucr1stFactorReceiver.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucr1stFactorReceiver.ChangeParameterName("var1") + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) + Case strFacetCol + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) + Case strFacetRow + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) + End Select + If Not clsRaesFunction.ContainsParameter("x") Then + clsRaesFunction.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 ucr1stFactorReceiver.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 + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged, ucrVariablesAsFactorforHist.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(clsFacetVariablesOperator) + 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 ucrHistogramSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrHistogramSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() + End If + End Sub + + Private Sub ucrHistogramSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrHistogramSelector.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + End Sub Private Sub CoreControls_ControlContentsChanged() Handles ucrVariablesAsFactorforHist.ControlContentsChanged, ucrSaveHist.ControlContentsChanged, ucrFactorReceiver.ControlContentsChanged, ucrChkRidges.ControlContentsChanged, ucrInputAddReorder.ControlContentsChanged TestOkEnabled() End Sub + End Class \ No newline at end of file diff --git a/instat/dlgLinePlot.designer.vb b/instat/dlgLinePlot.designer.vb index 7e93036b5fc..e265e1421d0 100644 --- a/instat/dlgLinePlot.designer.vb +++ b/instat/dlgLinePlot.designer.vb @@ -49,6 +49,13 @@ Partial Class dlgLinePlot Me.lblMethod = New System.Windows.Forms.Label() Me.lblFamily = New System.Windows.Forms.Label() Me.grpSmoothOptions = New System.Windows.Forms.GroupBox() + Me.ucrInputFormula = New instat.ucrInputComboBox() + Me.ucrChkSpan = New instat.ucrCheck() + Me.ucrChkFormula = New instat.ucrCheck() + Me.ucrChkAddSE = New instat.ucrCheck() + Me.ucrNudSpan = New instat.ucrNud() + Me.ucrInputMethod = New instat.ucrInputComboBox() + Me.ucrFamilyInput = New instat.ucrInputComboBox() Me.rdoRibbon = New System.Windows.Forms.RadioButton() Me.rdoPointrange = New System.Windows.Forms.RadioButton() Me.rdoErrorbar = New System.Windows.Forms.RadioButton() @@ -74,11 +81,16 @@ Partial Class dlgLinePlot Me.lblSlopeLineTicknes = New System.Windows.Forms.Label() Me.contextMenuStripOptions = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.PlotOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AreaOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.CrossbarOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DumbbellOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ErrorbarOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LineOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.LinerangeOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PathOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.AreaOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PointOptionToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PointrangeOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.RibbonOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SmoothOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StepOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.rdoDumbbell = New System.Windows.Forms.RadioButton() @@ -128,20 +140,13 @@ Partial Class dlgLinePlot Me.ucrReceiverXEnd = New instat.ucrReceiverSingle() Me.ucrReceiverSlopeColour = New instat.ucrReceiverSingle() Me.ucrReceiverSlopeX = New instat.ucrReceiverSingle() - Me.ucrInputFormula = New instat.ucrInputComboBox() - Me.ucrChkSpan = New instat.ucrCheck() - Me.ucrChkFormula = New instat.ucrCheck() - Me.ucrChkAddSE = New instat.ucrCheck() - Me.ucrNudSpan = New instat.ucrNud() - Me.ucrInputMethod = New instat.ucrInputComboBox() - Me.ucrFamilyInput = New instat.ucrInputComboBox() Me.ucrPnlStepOrPath = New instat.UcrPanel() Me.ucrPnlLinerangeOptions = New instat.UcrPanel() - Me.LinerangeOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.CrossbarOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ErrorbarOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.RibbonOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.PointrangeOptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ucrInputStation = New instat.ucrInputComboBox() + Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() + Me.lblFacetBy = New System.Windows.Forms.Label() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrChkLegend = New instat.ucrCheck() Me.grpSmoothOptions.SuspendLayout() Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() @@ -277,6 +282,79 @@ Partial Class dlgLinePlot Me.grpSmoothOptions.TabStop = False Me.grpSmoothOptions.Text = "Smooth Options" ' + 'ucrInputFormula + ' + Me.ucrInputFormula.AddQuotesIfUnrecognised = True + Me.ucrInputFormula.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputFormula.GetSetSelectedIndex = -1 + Me.ucrInputFormula.IsReadOnly = False + Me.ucrInputFormula.Location = New System.Drawing.Point(73, 46) + Me.ucrInputFormula.Name = "ucrInputFormula" + Me.ucrInputFormula.Size = New System.Drawing.Size(110, 23) + Me.ucrInputFormula.TabIndex = 7 + ' + 'ucrChkSpan + ' + Me.ucrChkSpan.AutoSize = True + Me.ucrChkSpan.Checked = False + Me.ucrChkSpan.Location = New System.Drawing.Point(185, 20) + Me.ucrChkSpan.Name = "ucrChkSpan" + Me.ucrChkSpan.Size = New System.Drawing.Size(54, 23) + Me.ucrChkSpan.TabIndex = 4 + ' + 'ucrChkFormula + ' + Me.ucrChkFormula.AutoSize = True + Me.ucrChkFormula.Checked = False + Me.ucrChkFormula.Location = New System.Drawing.Point(5, 49) + Me.ucrChkFormula.Name = "ucrChkFormula" + Me.ucrChkFormula.Size = New System.Drawing.Size(66, 23) + Me.ucrChkFormula.TabIndex = 1 + ' + 'ucrChkAddSE + ' + Me.ucrChkAddSE.AutoSize = True + Me.ucrChkAddSE.Checked = False + Me.ucrChkAddSE.Location = New System.Drawing.Point(185, 51) + Me.ucrChkAddSE.Name = "ucrChkAddSE" + Me.ucrChkAddSE.Size = New System.Drawing.Size(82, 23) + Me.ucrChkAddSE.TabIndex = 8 + ' + 'ucrNudSpan + ' + Me.ucrNudSpan.AutoSize = True + Me.ucrNudSpan.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSpan.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSpan.Location = New System.Drawing.Point(239, 20) + Me.ucrNudSpan.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSpan.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSpan.Name = "ucrNudSpan" + Me.ucrNudSpan.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSpan.TabIndex = 6 + Me.ucrNudSpan.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputMethod + ' + Me.ucrInputMethod.AddQuotesIfUnrecognised = True + Me.ucrInputMethod.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputMethod.GetSetSelectedIndex = -1 + Me.ucrInputMethod.IsReadOnly = False + Me.ucrInputMethod.Location = New System.Drawing.Point(52, 20) + Me.ucrInputMethod.Name = "ucrInputMethod" + Me.ucrInputMethod.Size = New System.Drawing.Size(90, 21) + Me.ucrInputMethod.TabIndex = 2 + ' + 'ucrFamilyInput + ' + Me.ucrFamilyInput.AddQuotesIfUnrecognised = True + Me.ucrFamilyInput.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrFamilyInput.GetSetSelectedIndex = -1 + Me.ucrFamilyInput.IsReadOnly = False + Me.ucrFamilyInput.Location = New System.Drawing.Point(210, 20) + Me.ucrFamilyInput.Name = "ucrFamilyInput" + Me.ucrFamilyInput.Size = New System.Drawing.Size(110, 24) + Me.ucrFamilyInput.TabIndex = 5 + ' 'rdoRibbon ' Me.rdoRibbon.AutoSize = True @@ -532,54 +610,84 @@ Partial Class dlgLinePlot ' Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PlotOptionsToolStripMenuItem, Me.AreaOptionsToolStripMenuItem, Me.CrossbarOptionsToolStripMenuItem, Me.DumbbellOptionsToolStripMenuItem, Me.ErrorbarOptionsToolStripMenuItem, Me.LineOptionsToolStripMenuItem, Me.LinerangeOptionsToolStripMenuItem, Me.PathOptionsToolStripMenuItem, Me.PointOptionToolStripMenuItem, Me.PointrangeOptionsToolStripMenuItem, Me.RibbonOptionsToolStripMenuItem, Me.SmoothOptionsToolStripMenuItem, Me.StepOptionsToolStripMenuItem}) Me.contextMenuStripOptions.Name = "contextMenuStripOk" - Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 312) + Me.contextMenuStripOptions.Size = New System.Drawing.Size(178, 290) ' 'PlotOptionsToolStripMenuItem ' Me.PlotOptionsToolStripMenuItem.Name = "PlotOptionsToolStripMenuItem" - Me.PlotOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PlotOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.PlotOptionsToolStripMenuItem.Text = "Plot Options" ' + 'AreaOptionsToolStripMenuItem + ' + Me.AreaOptionsToolStripMenuItem.Name = "AreaOptionsToolStripMenuItem" + Me.AreaOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.AreaOptionsToolStripMenuItem.Text = "Area Options" + ' + 'CrossbarOptionsToolStripMenuItem + ' + Me.CrossbarOptionsToolStripMenuItem.Name = "CrossbarOptionsToolStripMenuItem" + Me.CrossbarOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.CrossbarOptionsToolStripMenuItem.Text = "Crossbar Options" + ' 'DumbbellOptionsToolStripMenuItem ' Me.DumbbellOptionsToolStripMenuItem.Name = "DumbbellOptionsToolStripMenuItem" - Me.DumbbellOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.DumbbellOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.DumbbellOptionsToolStripMenuItem.Text = "Dumbbell Options" ' + 'ErrorbarOptionsToolStripMenuItem + ' + Me.ErrorbarOptionsToolStripMenuItem.Name = "ErrorbarOptionsToolStripMenuItem" + Me.ErrorbarOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.ErrorbarOptionsToolStripMenuItem.Text = "Errorbar Options" + ' 'LineOptionsToolStripMenuItem ' Me.LineOptionsToolStripMenuItem.Name = "LineOptionsToolStripMenuItem" - Me.LineOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.LineOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.LineOptionsToolStripMenuItem.Text = "Line Options" ' + 'LinerangeOptionsToolStripMenuItem + ' + Me.LinerangeOptionsToolStripMenuItem.Name = "LinerangeOptionsToolStripMenuItem" + Me.LinerangeOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.LinerangeOptionsToolStripMenuItem.Text = "Linerange Options" + ' 'PathOptionsToolStripMenuItem ' Me.PathOptionsToolStripMenuItem.Name = "PathOptionsToolStripMenuItem" - Me.PathOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PathOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.PathOptionsToolStripMenuItem.Text = "Path Options " ' - 'AreaOptionsToolStripMenuItem - ' - Me.AreaOptionsToolStripMenuItem.Name = "AreaOptionsToolStripMenuItem" - Me.AreaOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.AreaOptionsToolStripMenuItem.Text = "Area Options" - ' 'PointOptionToolStripMenuItem ' Me.PointOptionToolStripMenuItem.Name = "PointOptionToolStripMenuItem" - Me.PointOptionToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PointOptionToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.PointOptionToolStripMenuItem.Text = "Point Options " ' + 'PointrangeOptionsToolStripMenuItem + ' + Me.PointrangeOptionsToolStripMenuItem.Name = "PointrangeOptionsToolStripMenuItem" + Me.PointrangeOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.PointrangeOptionsToolStripMenuItem.Text = "Pointrange Options" + ' + 'RibbonOptionsToolStripMenuItem + ' + Me.RibbonOptionsToolStripMenuItem.Name = "RibbonOptionsToolStripMenuItem" + Me.RibbonOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) + Me.RibbonOptionsToolStripMenuItem.Text = "Ribbon Options" + ' 'SmoothOptionsToolStripMenuItem ' Me.SmoothOptionsToolStripMenuItem.Name = "SmoothOptionsToolStripMenuItem" - Me.SmoothOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SmoothOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.SmoothOptionsToolStripMenuItem.Text = "Smooth Options" ' 'StepOptionsToolStripMenuItem ' Me.StepOptionsToolStripMenuItem.Name = "StepOptionsToolStripMenuItem" - Me.StepOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.StepOptionsToolStripMenuItem.Size = New System.Drawing.Size(177, 22) Me.StepOptionsToolStripMenuItem.Text = "Step Options" ' 'rdoDumbbell @@ -876,7 +984,7 @@ Partial Class dlgLinePlot 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(9, 442) + Me.ucrSave.Location = New System.Drawing.Point(9, 482) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(401, 24) @@ -911,7 +1019,7 @@ Partial Class dlgLinePlot ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 467) + Me.ucrBase.Location = New System.Drawing.Point(9, 507) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 68 @@ -1124,79 +1232,6 @@ Partial Class dlgLinePlot Me.ucrReceiverSlopeX.TabIndex = 17 Me.ucrReceiverSlopeX.ucrSelector = Nothing ' - 'ucrInputFormula - ' - Me.ucrInputFormula.AddQuotesIfUnrecognised = True - Me.ucrInputFormula.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputFormula.GetSetSelectedIndex = -1 - Me.ucrInputFormula.IsReadOnly = False - Me.ucrInputFormula.Location = New System.Drawing.Point(73, 46) - Me.ucrInputFormula.Name = "ucrInputFormula" - Me.ucrInputFormula.Size = New System.Drawing.Size(110, 23) - Me.ucrInputFormula.TabIndex = 7 - ' - 'ucrChkSpan - ' - Me.ucrChkSpan.AutoSize = True - Me.ucrChkSpan.Checked = False - Me.ucrChkSpan.Location = New System.Drawing.Point(185, 20) - Me.ucrChkSpan.Name = "ucrChkSpan" - Me.ucrChkSpan.Size = New System.Drawing.Size(54, 23) - Me.ucrChkSpan.TabIndex = 4 - ' - 'ucrChkFormula - ' - Me.ucrChkFormula.AutoSize = True - Me.ucrChkFormula.Checked = False - Me.ucrChkFormula.Location = New System.Drawing.Point(5, 49) - Me.ucrChkFormula.Name = "ucrChkFormula" - Me.ucrChkFormula.Size = New System.Drawing.Size(66, 23) - Me.ucrChkFormula.TabIndex = 1 - ' - 'ucrChkAddSE - ' - Me.ucrChkAddSE.AutoSize = True - Me.ucrChkAddSE.Checked = False - Me.ucrChkAddSE.Location = New System.Drawing.Point(185, 51) - Me.ucrChkAddSE.Name = "ucrChkAddSE" - Me.ucrChkAddSE.Size = New System.Drawing.Size(82, 23) - Me.ucrChkAddSE.TabIndex = 8 - ' - 'ucrNudSpan - ' - Me.ucrNudSpan.AutoSize = True - Me.ucrNudSpan.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSpan.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSpan.Location = New System.Drawing.Point(239, 20) - Me.ucrNudSpan.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSpan.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSpan.Name = "ucrNudSpan" - Me.ucrNudSpan.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSpan.TabIndex = 6 - Me.ucrNudSpan.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputMethod - ' - Me.ucrInputMethod.AddQuotesIfUnrecognised = True - Me.ucrInputMethod.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputMethod.GetSetSelectedIndex = -1 - Me.ucrInputMethod.IsReadOnly = False - Me.ucrInputMethod.Location = New System.Drawing.Point(52, 20) - Me.ucrInputMethod.Name = "ucrInputMethod" - Me.ucrInputMethod.Size = New System.Drawing.Size(90, 21) - Me.ucrInputMethod.TabIndex = 2 - ' - 'ucrFamilyInput - ' - Me.ucrFamilyInput.AddQuotesIfUnrecognised = True - Me.ucrFamilyInput.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrFamilyInput.GetSetSelectedIndex = -1 - Me.ucrFamilyInput.IsReadOnly = False - Me.ucrFamilyInput.Location = New System.Drawing.Point(210, 20) - Me.ucrFamilyInput.Name = "ucrFamilyInput" - Me.ucrFamilyInput.Size = New System.Drawing.Size(110, 24) - Me.ucrFamilyInput.TabIndex = 5 - ' 'ucrPnlStepOrPath ' Me.ucrPnlStepOrPath.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -1213,41 +1248,71 @@ Partial Class dlgLinePlot Me.ucrPnlLinerangeOptions.Size = New System.Drawing.Size(385, 33) Me.ucrPnlLinerangeOptions.TabIndex = 2 ' - 'LinerangeOptionsToolStripMenuItem - ' - Me.LinerangeOptionsToolStripMenuItem.Name = "LinerangeOptionsToolStripMenuItem" - Me.LinerangeOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.LinerangeOptionsToolStripMenuItem.Text = "Linerange Options" - ' - 'CrossbarOptionsToolStripMenuItem - ' - Me.CrossbarOptionsToolStripMenuItem.Name = "CrossbarOptionsToolStripMenuItem" - Me.CrossbarOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.CrossbarOptionsToolStripMenuItem.Text = "Crossbar Options" - ' - 'ErrorbarOptionsToolStripMenuItem - ' - Me.ErrorbarOptionsToolStripMenuItem.Name = "ErrorbarOptionsToolStripMenuItem" - Me.ErrorbarOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.ErrorbarOptionsToolStripMenuItem.Text = "Errorbar Options" - ' - 'RibbonOptionsToolStripMenuItem - ' - Me.RibbonOptionsToolStripMenuItem.Name = "RibbonOptionsToolStripMenuItem" - Me.RibbonOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.RibbonOptionsToolStripMenuItem.Text = "Ribbon Options" - ' - 'PointrangeOptionsToolStripMenuItem - ' - Me.PointrangeOptionsToolStripMenuItem.Name = "PointrangeOptionsToolStripMenuItem" - Me.PointrangeOptionsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.PointrangeOptionsToolStripMenuItem.Text = "Pointrange Options" + '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(318, 452) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(101, 21) + Me.ucrInputStation.TabIndex = 81 + ' + 'ucr1stFactorReceiver + ' + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(205, 453) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(110, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 80 + Me.ucr1stFactorReceiver.ucrSelector = Nothing + ' + 'lblFacetBy + ' + Me.lblFacetBy.AutoSize = True + Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBy.Location = New System.Drawing.Point(208, 438) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) + Me.lblFacetBy.TabIndex = 79 + Me.lblFacetBy.Tag = "" + Me.lblFacetBy.Text = "Facet By:" + ' + '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(87, 452) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) + Me.ucrInputLegendPosition.TabIndex = 83 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(11, 453) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) + Me.ucrChkLegend.TabIndex = 82 ' 'dlgLinePlot ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(423, 523) + Me.ClientSize = New System.Drawing.Size(423, 563) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucr1stFactorReceiver) + Me.Controls.Add(Me.lblFacetBy) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.rdoArea) Me.Controls.Add(Me.lblGroupLine) Me.Controls.Add(Me.ucrReceiverGroup) @@ -1445,4 +1510,9 @@ Partial Class dlgLinePlot Friend WithEvents LinerangeOptionsToolStripMenuItem As ToolStripMenuItem Friend WithEvents PointrangeOptionsToolStripMenuItem As ToolStripMenuItem Friend WithEvents RibbonOptionsToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkLegend As ucrCheck End Class diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index 009c05e0d8a..a23719978a3 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -63,6 +63,21 @@ Public Class dlgLinePlot Private clsGeomErrorbarFunction As New RFunction Private clsGeomPointrangeFunction As New RFunction + Private clsFacetFunction As New RFunction + 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 ReadOnly strNone As String = "None" + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False + 'Parameter names for geoms Private strFirstParameterName As String = "geomfunc" Private strgeomSmoothParameterName As String = "geom_smooth" @@ -91,6 +106,7 @@ Public Class dlgLinePlot Dim dctFamilyOptions As New Dictionary(Of String, String) Dim dctColourOptions As New Dictionary(Of String, String) Dim dctSlopeLineColourOptions As New Dictionary(Of String, String) + Dim dctLegendPosition As New Dictionary(Of String, String) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrBase.clsRsyntax.iCallType = 3 @@ -396,6 +412,32 @@ Public Class dlgLinePlot ucrChkSlopeLegend.AddParameterPresentCondition(True, "slopetheme") ucrChkSlopeLegend.AddParameterPresentCondition(False, "slopetheme", False) + ucrChkLegend.SetText("Legend:") + ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") + ucrInputLegendPosition.SetDropDownStyleAsNonEditable() + ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) + dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34)) + dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34)) + dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34)) + dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34)) + dctLegendPosition.Add("Bottom", Chr(34) & "bottom" & Chr(34)) + ucrInputLegendPosition.SetItems(dctLegendPosition) + ucrChkLegend.AddParameterPresentCondition(True, "legend.position") + ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False) + + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) + ucr1stFactorReceiver.Selector = ucrLinePlotSelector + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(1) + ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + ucrPnlOptions.AddToLinkedControls({ucrChkPathOrStep, ucrChkWithSE, ucrChkLineofBestFit}, {rdoLine}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrChkAddLine, ucrInputMethod, ucrInputFormula}, {rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrChkAddSE, ucrChkFormula, ucrChkSpan}, {rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="FALSE") @@ -475,6 +517,15 @@ Public Class dlgLinePlot clsGeomLinerangeFunction = New RFunction clsGeomPointrangeFunction = New RFunction clsGeomRibbonFunction = New RFunction + clsFacetFunction = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + clsGroupByFunction = New RFunction + + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True ucrLinePlotSelector.Reset() ucrLinePlotSelector.SetGgplotFunction(clsBaseOperator) @@ -513,6 +564,22 @@ Public Class dlgLinePlot clsSlopeThemeFunction.SetRCommand("slopegraph_theme") + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone @@ -615,6 +682,8 @@ Public Class dlgLinePlot ucrChkSlopeLabelOptions.SetRCode(clsGgSlopeFunction, bReset) ucrChkSlopeTextOptions.SetRCode(clsGgSlopeFunction, bReset) ucrChkSlopeLineOptions.SetRCode(clsGgSlopeFunction, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrChkRibbon.SetRCode(clsOptionsFunction, bReset) End If @@ -818,6 +887,18 @@ Public Class dlgLinePlot End If End Sub + Private Sub AddRemoveTheme() + If clsThemeFunction.iParameterCount > 0 Then + clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) + Else + clsBaseOperator.RemoveParameterByName("theme") + End If + End Sub + + Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged + AddRemoveTheme() + End Sub + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, PlotOptionsToolStripMenuItem.Click sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, @@ -877,4 +958,164 @@ Public Class dlgLinePlot openSdgLayerOptions(clsGeomRibbonFunction) End Sub + Private Sub AutoFacetStation() + Dim ucrCurrentReceiver As ucrReceiver = Nothing + + If ucrLinePlotSelector.CurrentReceiver IsNot Nothing Then + ucrCurrentReceiver = ucrLinePlotSelector.CurrentReceiver + End If + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrLinePlotSelector.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() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucr1stFactorReceiver.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucr1stFactorReceiver.ChangeParameterName("var1") + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) + Case strFacetCol + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) + Case strFacetRow + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) + End Select + If Not clsRaesFunction.ContainsParameter("x") Then + clsRaesFunction.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 ucr1stFactorReceiver.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 + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.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(clsFacetVariablesOperator) + 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 ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() + End If + End Sub + + Private Sub ucrLinePlotSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrLinePlotSelector.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgScatterPlot.Designer.vb b/instat/dlgScatterPlot.Designer.vb index a722c9958a4..7da7e411a27 100644 --- a/instat/dlgScatterPlot.Designer.vb +++ b/instat/dlgScatterPlot.Designer.vb @@ -82,6 +82,11 @@ Partial Class dlgScatterPlot Me.ucrFactorOptionalReceiver = New instat.ucrReceiverSingle() Me.ucrReceiverX = New instat.ucrReceiverSingle() Me.ucrBase = New instat.ucrButtons() + Me.ucrInputStation = New instat.ucrInputComboBox() + Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() + Me.lblFacetBy = New System.Windows.Forms.Label() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrChkLegend = New instat.ucrCheck() Me.contextMenuStripOptions.SuspendLayout() Me.grpGeom.SuspendLayout() Me.SuspendLayout() @@ -457,7 +462,7 @@ Partial Class dlgScatterPlot 'ucrSaveScatterPlot ' Me.ucrSaveScatterPlot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveScatterPlot.Location = New System.Drawing.Point(10, 428) + Me.ucrSaveScatterPlot.Location = New System.Drawing.Point(10, 473) Me.ucrSaveScatterPlot.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveScatterPlot.Name = "ucrSaveScatterPlot" Me.ucrSaveScatterPlot.Size = New System.Drawing.Size(312, 24) @@ -518,17 +523,77 @@ Partial Class dlgScatterPlot ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 459) + Me.ucrBase.Location = New System.Drawing.Point(10, 504) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 17 ' + '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(339, 440) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(101, 21) + Me.ucrInputStation.TabIndex = 76 + ' + 'ucr1stFactorReceiver + ' + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(212, 441) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(121, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 75 + Me.ucr1stFactorReceiver.ucrSelector = Nothing + ' + 'lblFacetBy + ' + Me.lblFacetBy.AutoSize = True + Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBy.Location = New System.Drawing.Point(212, 426) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(52, 13) + Me.lblFacetBy.TabIndex = 74 + Me.lblFacetBy.Tag = "" + Me.lblFacetBy.Text = "Facet By:" + ' + '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(96, 440) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) + Me.ucrInputLegendPosition.TabIndex = 78 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(10, 441) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) + Me.ucrChkLegend.TabIndex = 77 + ' 'dlgScatterPlot ' 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(483, 521) + Me.ClientSize = New System.Drawing.Size(469, 558) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucr1stFactorReceiver) + Me.Controls.Add(Me.lblFacetBy) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.grpGeom) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.ucrInputSides) @@ -605,4 +670,9 @@ Partial Class dlgScatterPlot Friend WithEvents lblPosition As Label Friend WithEvents ucrInputLegend As ucrInputComboBox Friend WithEvents lblLegend As Label + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkLegend As ucrCheck End Class diff --git a/instat/dlgScatterPlot.vb b/instat/dlgScatterPlot.vb index 24238bce012..fc4e930fce1 100644 --- a/instat/dlgScatterPlot.vb +++ b/instat/dlgScatterPlot.vb @@ -44,6 +44,21 @@ Public Class dlgScatterPlot Private clsGeomRugFunction As New RFunction Private clsGeomJitterFunction As New RFunction Private clsCountGeomFunction, clsDummyFunction As New RFunction + + Private clsFacetFunction As New RFunction + 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 ReadOnly strNone As String = "None" + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + + Private bUpdateComboOptions As Boolean = True + Private bUpdatingParameters As Boolean = False 'Parameter names for geoms Private strFirstParameterName As String = "geomfunc" Private strGeomSmoothParameterName As String = "geom_smooth" @@ -71,6 +86,7 @@ Public Class dlgScatterPlot Dim dctSidesOptions As New Dictionary(Of String, String) Dim dctShapePoint As New Dictionary(Of String, String) Dim dctPositioncount As New Dictionary(Of String, String) + Dim dctLegendPosition As New Dictionary(Of String, String) ucrBase.iHelpTopicID = 433 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False @@ -224,6 +240,33 @@ Public Class dlgScatterPlot ucrInputSides.SetRDefault(Chr(34) & "bl" & Chr(34)) ucrInputSides.SetDropDownStyleAsNonEditable() + ucrChkLegend.SetText("Legend:") + ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") + ucrInputLegendPosition.SetDropDownStyleAsNonEditable() + ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) + dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34)) + dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34)) + dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34)) + dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34)) + dctLegendPosition.Add("Bottom", Chr(34) & "bottom" & Chr(34)) + ucrInputLegendPosition.SetItems(dctLegendPosition) + ucrChkLegend.AddParameterPresentCondition(True, "legend.position") + ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False) + + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) + ucr1stFactorReceiver.Selector = ucrSelectorForScatter + ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) + ucr1stFactorReceiver.strSelectorHeading = "Factors" + ucr1stFactorReceiver.bWithQuotes = False + ucr1stFactorReceiver.SetParameterIsString() + ucr1stFactorReceiver.SetValuesToIgnore({"."}) + ucr1stFactorReceiver.SetParameterPosition(1) + ucr1stFactorReceiver.SetLinkedDisplayControl(lblFacetBy) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + + ucrNudSize.SetLinkedDisplayControl(lblSize) ucrNudWidth.SetLinkedDisplayControl(lblWidth) ucrNudHeigth.SetLinkedDisplayControl(lblHeith) @@ -245,6 +288,15 @@ Public Class dlgScatterPlot clsGeomJitterFunction = New RFunction clsCountGeomFunction = New RFunction clsDummyFunction = New RFunction + clsFacetFunction = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + clsGroupByFunction = New RFunction + + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True ucrSelectorForScatter.Reset() ucrSelectorForScatter.SetGgplotFunction(clsBaseOperator) @@ -293,6 +345,22 @@ Public Class dlgScatterPlot clsGeomJitterFunction.AddParameter("width", 0.4, iPosition:=0) clsGeomJitterFunction.AddParameter("height", 0.4, iPosition:=1) + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabsFunction = GgplotDefaults.clsYlabTitleFunction.Clone() @@ -343,6 +411,8 @@ Public Class dlgScatterPlot ucrNudPointsize.SetRCode(clsRScatterGeomFunction, bReset) ucrInputLegend.SetRCode(clsCountGeomFunction, bReset) ucrInputPosition.SetRCode(clsCountGeomFunction, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrPnlGeoms.SetRCode(clsDummyFunction, bReset) End If @@ -381,6 +451,18 @@ Public Class dlgScatterPlot toolStripMenuItemRugOptions.Enabled = ucrChkAddRugPlot.Checked End Sub + Private Sub AddRemoveTheme() + If clsThemeFunction.iParameterCount > 0 Then + clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) + Else + clsBaseOperator.RemoveParameterByName("theme") + End If + End Sub + + Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged + AddRemoveTheme() + End Sub + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, toolStripMenuItemPlotOptions.Click sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewGlobalAesFunction:=clsRaesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, @@ -498,4 +580,166 @@ Public Class dlgScatterPlot clsCountGeomFunction.AddParameter("position", Chr(34) & ucrInputPosition.GetText & Chr(34), iPosition:=0) End If End Sub + + Private Sub AutoFacetStation() + Dim ucrCurrentReceiver As ucrReceiver = Nothing + + If ucrSelectorForScatter.CurrentReceiver IsNot Nothing Then + ucrCurrentReceiver = ucrSelectorForScatter.CurrentReceiver + End If + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrSelectorForScatter.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() + clsFacetVariablesOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucr1stFactorReceiver.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucr1stFactorReceiver.ChangeParameterName("var1") + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator) + Case strFacetCol + ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetColOp) + Case strFacetRow + ucr1stFactorReceiver.ChangeParameterName("row" & ucrInputStation.Name) + ucr1stFactorReceiver.SetRCode(clsFacetRowOp) + End Select + If Not clsRaesFunction.ContainsParameter("x") Then + clsRaesFunction.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 ucr1stFactorReceiver.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 + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.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(clsFacetVariablesOperator) + 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 ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() + End If + End Sub + + Private Sub ucrSelectorForScatter_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorForScatter.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + End Sub + End Class From adf7e24d0219f8656bf24c223631772d8f4e1a32 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Tue, 30 Jan 2024 11:06:05 +0300 Subject: [PATCH 31/37] changes to the code --- instat/dlgBarAndPieChart.vb | 13 +++++-------- instat/dlgHistogram.vb | 13 +++++-------- instat/dlgLinePlot.vb | 14 +++++--------- instat/dlgScatterPlot.vb | 13 +++++-------- 4 files changed, 20 insertions(+), 33 deletions(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index d1ff1e49111..cc5d0acfec9 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -1110,16 +1110,13 @@ Public Class dlgBarAndPieChart End Sub Private Sub AutoFacetStation() - Dim ucrCurrentReceiver As ucrReceiver = Nothing + Dim currentReceiver As ucrReceiver = ucrBarChartSelector.CurrentReceiver - If ucrBarChartSelector.CurrentReceiver IsNot Nothing Then - ucrCurrentReceiver = ucrBarChartSelector.CurrentReceiver + If currentReceiver IsNot Nothing Then + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy() End If - ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrBarChartSelector.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 diff --git a/instat/dlgHistogram.vb b/instat/dlgHistogram.vb index 3fc31cd62f5..f18b733bea8 100644 --- a/instat/dlgHistogram.vb +++ b/instat/dlgHistogram.vb @@ -568,16 +568,13 @@ Public Class dlgHistogram End Sub Private Sub AutoFacetStation() - Dim ucrCurrentReceiver As ucrReceiver = Nothing + Dim currentReceiver As ucrReceiver = ucrHistogramSelector.CurrentReceiver - If ucrHistogramSelector.CurrentReceiver IsNot Nothing Then - ucrCurrentReceiver = ucrHistogramSelector.CurrentReceiver + If currentReceiver IsNot Nothing Then + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrHistogramSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy() End If - ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrHistogramSelector.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 diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index a23719978a3..47ab39ee10f 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -959,18 +959,14 @@ Public Class dlgLinePlot End Sub Private Sub AutoFacetStation() - Dim ucrCurrentReceiver As ucrReceiver = Nothing + Dim currentReceiver As ucrReceiver = ucrLinePlotSelector.CurrentReceiver - If ucrLinePlotSelector.CurrentReceiver IsNot Nothing Then - ucrCurrentReceiver = ucrLinePlotSelector.CurrentReceiver + If currentReceiver IsNot Nothing Then + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy() End If - ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrLinePlotSelector.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 diff --git a/instat/dlgScatterPlot.vb b/instat/dlgScatterPlot.vb index fc4e930fce1..2f69199c046 100644 --- a/instat/dlgScatterPlot.vb +++ b/instat/dlgScatterPlot.vb @@ -582,16 +582,13 @@ Public Class dlgScatterPlot End Sub Private Sub AutoFacetStation() - Dim ucrCurrentReceiver As ucrReceiver = Nothing + Dim currentReceiver As ucrReceiver = ucrSelectorForScatter.CurrentReceiver - If ucrSelectorForScatter.CurrentReceiver IsNot Nothing Then - ucrCurrentReceiver = ucrSelectorForScatter.CurrentReceiver + If currentReceiver IsNot Nothing Then + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy() End If - ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrSelectorForScatter.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 From 39b8b150da3c6fcf6ecbb6dcba72fd024ad0df73 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 31 Jan 2024 09:58:51 +0100 Subject: [PATCH 32/37] Change Made On the Design --- instat/DlgDefineClimaticData.Designer.vb | 684 +++++++++++------------ 1 file changed, 342 insertions(+), 342 deletions(-) diff --git a/instat/DlgDefineClimaticData.Designer.vb b/instat/DlgDefineClimaticData.Designer.vb index bfa0558f912..d50f0fef080 100644 --- a/instat/DlgDefineClimaticData.Designer.vb +++ b/instat/DlgDefineClimaticData.Designer.vb @@ -45,55 +45,55 @@ Partial Class DlgDefineClimaticData 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.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.grpMeta = New System.Windows.Forms.GroupBox() + Me.ucrReceiverStationMeta = New instat.ucrReceiverSingle() + Me.ucrReceiverLonMeta = New instat.ucrReceiverSingle() + Me.ucrReceiverLatMeta = New instat.ucrReceiverSingle() + Me.ucrReceiverAltMeta = New instat.ucrReceiverSingle() 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() + Me.ucrReceiverMinRH = New instat.ucrReceiverSingle() Me.lblMinimumRH = New System.Windows.Forms.Label() + Me.ucrReceiverWindDirection = New instat.ucrReceiverSingle() + Me.ucrReceiverRain = New instat.ucrReceiverSingle() + Me.ucrReceiverSunshine = New instat.ucrReceiverSingle() + Me.ucrReceiverRadiation = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxTemp = New instat.ucrReceiverSingle() + Me.ucrReceiverCloudCover = New instat.ucrReceiverSingle() Me.lblMaxTemp = New System.Windows.Forms.Label() Me.lblCloudCover = New System.Windows.Forms.Label() Me.lblMinTemp = New System.Windows.Forms.Label() Me.lblRadiation = New System.Windows.Forms.Label() + Me.ucrReceiverWindSpeed = New instat.ucrReceiverSingle() Me.lblSunshine = New System.Windows.Forms.Label() + Me.ucrReceiverMinTemp = New instat.ucrReceiverSingle() Me.lblWindSpeed = New System.Windows.Forms.Label() Me.lblWindDirection = New System.Windows.Forms.Label() Me.ucrChkLinkedMetaData = New instat.ucrCheck() Me.ucrSelectorLinkedDataFrame = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrInputCheckInput = New instat.ucrInputTextBox() Me.ucrSelectorDefineClimaticData = New instat.ucrSelectorByDataFrameAddRemove() - 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.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.ucrReceiverMaxRH = New instat.ucrReceiverSingle() - Me.ucrReceiverMinRH = New instat.ucrReceiverSingle() - Me.ucrReceiverWindDirection = New instat.ucrReceiverSingle() - Me.ucrReceiverRain = New instat.ucrReceiverSingle() - Me.ucrReceiverSunshine = New instat.ucrReceiverSingle() - Me.ucrReceiverRadiation = New instat.ucrReceiverSingle() - Me.ucrReceiverMaxTemp = New instat.ucrReceiverSingle() - Me.ucrReceiverCloudCover = New instat.ucrReceiverSingle() - Me.ucrReceiverWindSpeed = New instat.ucrReceiverSingle() - Me.ucrReceiverMinTemp = New instat.ucrReceiverSingle() - Me.ucrReceiverStationMeta = New instat.ucrReceiverSingle() - Me.ucrReceiverLonMeta = New instat.ucrReceiverSingle() - Me.ucrReceiverLatMeta = New instat.ucrReceiverSingle() - Me.ucrReceiverAltMeta = New instat.ucrReceiverSingle() Me.grpStation.SuspendLayout() Me.grpDateTime.SuspendLayout() Me.grpMeta.SuspendLayout() @@ -178,6 +178,58 @@ Partial Class DlgDefineClimaticData Me.grpStation.Tag = "" Me.grpStation.Text = "Station" ' + 'ucrReceiverStation + ' + Me.ucrReceiverStation.AutoSize = True + Me.ucrReceiverStation.frmParent = Me + 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 + Me.ucrReceiverStation.Size = New System.Drawing.Size(100, 20) + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.TabIndex = 6 + Me.ucrReceiverStation.ucrSelector = Nothing + ' + 'ucrReceiverLongitude + ' + Me.ucrReceiverLongitude.AutoSize = True + Me.ucrReceiverLongitude.frmParent = Me + 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 + Me.ucrReceiverLongitude.Size = New System.Drawing.Size(100, 20) + Me.ucrReceiverLongitude.strNcFilePath = "" + Me.ucrReceiverLongitude.TabIndex = 8 + Me.ucrReceiverLongitude.ucrSelector = Nothing + ' + 'ucrReceiverLatitude + ' + Me.ucrReceiverLatitude.AutoSize = True + Me.ucrReceiverLatitude.frmParent = Me + 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 + Me.ucrReceiverLatitude.Size = New System.Drawing.Size(100, 20) + Me.ucrReceiverLatitude.strNcFilePath = "" + Me.ucrReceiverLatitude.TabIndex = 7 + Me.ucrReceiverLatitude.ucrSelector = Nothing + ' + 'ucrReceiverAltitude + ' + Me.ucrReceiverAltitude.AutoSize = True + Me.ucrReceiverAltitude.frmParent = Me + 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 + Me.ucrReceiverAltitude.Size = New System.Drawing.Size(100, 20) + Me.ucrReceiverAltitude.strNcFilePath = "" + Me.ucrReceiverAltitude.TabIndex = 9 + Me.ucrReceiverAltitude.ucrSelector = Nothing + ' 'grpDateTime ' Me.grpDateTime.Controls.Add(Me.lblDOY) @@ -198,6 +250,19 @@ Partial Class DlgDefineClimaticData 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(12, 62) + 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 = 2 + Me.ucrReceiverYear.ucrSelector = Nothing + ' 'lblDate ' Me.lblDate.AutoSize = True @@ -218,6 +283,19 @@ Partial Class DlgDefineClimaticData Me.lblMonth.TabIndex = 4 Me.lblMonth.Text = "Month:" ' + 'ucrReceiverDOY + ' + Me.ucrReceiverDOY.AutoSize = True + Me.ucrReceiverDOY.frmParent = Me + 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 + Me.ucrReceiverDOY.Size = New System.Drawing.Size(98, 20) + Me.ucrReceiverDOY.strNcFilePath = "" + Me.ucrReceiverDOY.TabIndex = 5 + Me.ucrReceiverDOY.ucrSelector = Nothing + ' 'lblYear ' Me.lblYear.AutoSize = True @@ -228,6 +306,45 @@ Partial Class DlgDefineClimaticData Me.lblYear.TabIndex = 2 Me.lblYear.Text = "Year:" ' + 'ucrReceiverDate + ' + Me.ucrReceiverDate.AutoSize = True + Me.ucrReceiverDate.frmParent = Me + 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 + 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(12, 98) + 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 = 3 + Me.ucrReceiverMonth.ucrSelector = Nothing + ' + 'ucrReceiverDay + ' + Me.ucrReceiverDay.AutoSize = True + Me.ucrReceiverDay.frmParent = Me + 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 + Me.ucrReceiverDay.Size = New System.Drawing.Size(98, 20) + Me.ucrReceiverDay.strNcFilePath = "" + Me.ucrReceiverDay.TabIndex = 4 + Me.ucrReceiverDay.ucrSelector = Nothing + ' 'lblDay ' Me.lblDay.AutoSize = True @@ -296,6 +413,58 @@ Partial Class DlgDefineClimaticData Me.grpMeta.Tag = "" Me.grpMeta.Text = "Station" ' + 'ucrReceiverStationMeta + ' + Me.ucrReceiverStationMeta.AutoSize = True + Me.ucrReceiverStationMeta.frmParent = Me + 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 + 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(9, 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(9, 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(9, 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 + ' 'lblRain ' Me.lblRain.AutoSize = True @@ -335,6 +504,19 @@ Partial Class DlgDefineClimaticData Me.grpElements.TabStop = False Me.grpElements.Text = "Elements" ' + 'ucrReceiverMaxRH + ' + Me.ucrReceiverMaxRH.AutoSize = True + Me.ucrReceiverMaxRH.frmParent = Me + Me.ucrReceiverMaxRH.Location = New System.Drawing.Point(18, 366) + Me.ucrReceiverMaxRH.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxRH.Name = "ucrReceiverMaxRH" + Me.ucrReceiverMaxRH.Selector = Nothing + Me.ucrReceiverMaxRH.Size = New System.Drawing.Size(116, 20) + Me.ucrReceiverMaxRH.strNcFilePath = "" + Me.ucrReceiverMaxRH.TabIndex = 19 + Me.ucrReceiverMaxRH.ucrSelector = Nothing + ' 'lblMaxRH ' Me.lblMaxRH.AutoSize = True @@ -345,6 +527,19 @@ Partial Class DlgDefineClimaticData Me.lblMaxRH.TabIndex = 18 Me.lblMaxRH.Text = "Maximum RH (%):" ' + 'ucrReceiverMinRH + ' + Me.ucrReceiverMinRH.AutoSize = True + Me.ucrReceiverMinRH.frmParent = Me + Me.ucrReceiverMinRH.Location = New System.Drawing.Point(18, 330) + Me.ucrReceiverMinRH.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinRH.Name = "ucrReceiverMinRH" + Me.ucrReceiverMinRH.Selector = Nothing + Me.ucrReceiverMinRH.Size = New System.Drawing.Size(116, 20) + Me.ucrReceiverMinRH.strNcFilePath = "" + Me.ucrReceiverMinRH.TabIndex = 18 + Me.ucrReceiverMinRH.ucrSelector = Nothing + ' 'lblMinimumRH ' Me.lblMinimumRH.AutoSize = True @@ -355,31 +550,109 @@ Partial Class DlgDefineClimaticData Me.lblMinimumRH.TabIndex = 16 Me.lblMinimumRH.Text = "Minimum RH (%):" ' - 'lblMaxTemp + 'ucrReceiverWindDirection ' - Me.lblMaxTemp.AutoSize = True - Me.lblMaxTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMaxTemp.Location = New System.Drawing.Point(15, 88) - Me.lblMaxTemp.Name = "lblMaxTemp" - Me.lblMaxTemp.Size = New System.Drawing.Size(117, 13) - Me.lblMaxTemp.TabIndex = 4 - Me.lblMaxTemp.Text = "Maximum Temperature:" + Me.ucrReceiverWindDirection.AutoSize = True + Me.ucrReceiverWindDirection.frmParent = Me + Me.ucrReceiverWindDirection.Location = New System.Drawing.Point(18, 177) + Me.ucrReceiverWindDirection.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverWindDirection.Name = "ucrReceiverWindDirection" + Me.ucrReceiverWindDirection.Selector = Nothing + Me.ucrReceiverWindDirection.Size = New System.Drawing.Size(111, 20) + Me.ucrReceiverWindDirection.strNcFilePath = "" + Me.ucrReceiverWindDirection.TabIndex = 14 + Me.ucrReceiverWindDirection.ucrSelector = Nothing ' - 'lblCloudCover + 'ucrReceiverRain ' - Me.lblCloudCover.AutoSize = True - Me.lblCloudCover.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCloudCover.Location = New System.Drawing.Point(15, 277) - Me.lblCloudCover.Name = "lblCloudCover" - Me.lblCloudCover.Size = New System.Drawing.Size(68, 13) - Me.lblCloudCover.TabIndex = 14 - Me.lblCloudCover.Text = "Cloud Cover:" + Me.ucrReceiverRain.AutoSize = True + Me.ucrReceiverRain.frmParent = Me + Me.ucrReceiverRain.Location = New System.Drawing.Point(18, 30) + Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRain.Name = "ucrReceiverRain" + Me.ucrReceiverRain.Selector = Nothing + Me.ucrReceiverRain.Size = New System.Drawing.Size(111, 20) + Me.ucrReceiverRain.strNcFilePath = "" + Me.ucrReceiverRain.TabIndex = 10 + Me.ucrReceiverRain.ucrSelector = Nothing ' - 'lblMinTemp + 'ucrReceiverSunshine ' - Me.lblMinTemp.AutoSize = True - Me.lblMinTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMinTemp.Location = New System.Drawing.Point(15, 51) + Me.ucrReceiverSunshine.AutoSize = True + Me.ucrReceiverSunshine.frmParent = Me + Me.ucrReceiverSunshine.Location = New System.Drawing.Point(18, 215) + Me.ucrReceiverSunshine.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSunshine.Name = "ucrReceiverSunshine" + Me.ucrReceiverSunshine.Selector = Nothing + Me.ucrReceiverSunshine.Size = New System.Drawing.Size(116, 20) + Me.ucrReceiverSunshine.strNcFilePath = "" + Me.ucrReceiverSunshine.TabIndex = 15 + Me.ucrReceiverSunshine.ucrSelector = Nothing + ' + 'ucrReceiverRadiation + ' + Me.ucrReceiverRadiation.AutoSize = True + Me.ucrReceiverRadiation.frmParent = Me + Me.ucrReceiverRadiation.Location = New System.Drawing.Point(18, 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(116, 20) + Me.ucrReceiverRadiation.strNcFilePath = "" + Me.ucrReceiverRadiation.TabIndex = 16 + Me.ucrReceiverRadiation.ucrSelector = Nothing + ' + 'ucrReceiverMaxTemp + ' + Me.ucrReceiverMaxTemp.AutoSize = True + Me.ucrReceiverMaxTemp.frmParent = Me + Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(18, 103) + Me.ucrReceiverMaxTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxTemp.Name = "ucrReceiverMaxTemp" + Me.ucrReceiverMaxTemp.Selector = Nothing + Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(111, 20) + Me.ucrReceiverMaxTemp.strNcFilePath = "" + Me.ucrReceiverMaxTemp.TabIndex = 12 + Me.ucrReceiverMaxTemp.ucrSelector = Nothing + ' + 'ucrReceiverCloudCover + ' + Me.ucrReceiverCloudCover.AutoSize = True + Me.ucrReceiverCloudCover.frmParent = Me + Me.ucrReceiverCloudCover.Location = New System.Drawing.Point(18, 292) + Me.ucrReceiverCloudCover.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverCloudCover.Name = "ucrReceiverCloudCover" + Me.ucrReceiverCloudCover.Selector = Nothing + Me.ucrReceiverCloudCover.Size = New System.Drawing.Size(116, 20) + Me.ucrReceiverCloudCover.strNcFilePath = "" + Me.ucrReceiverCloudCover.TabIndex = 17 + Me.ucrReceiverCloudCover.ucrSelector = Nothing + ' + 'lblMaxTemp + ' + Me.lblMaxTemp.AutoSize = True + Me.lblMaxTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMaxTemp.Location = New System.Drawing.Point(15, 88) + Me.lblMaxTemp.Name = "lblMaxTemp" + Me.lblMaxTemp.Size = New System.Drawing.Size(117, 13) + Me.lblMaxTemp.TabIndex = 4 + Me.lblMaxTemp.Text = "Maximum Temperature:" + ' + 'lblCloudCover + ' + Me.lblCloudCover.AutoSize = True + Me.lblCloudCover.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblCloudCover.Location = New System.Drawing.Point(15, 277) + Me.lblCloudCover.Name = "lblCloudCover" + Me.lblCloudCover.Size = New System.Drawing.Size(68, 13) + Me.lblCloudCover.TabIndex = 14 + Me.lblCloudCover.Text = "Cloud Cover:" + ' + 'lblMinTemp + ' + Me.lblMinTemp.AutoSize = True + Me.lblMinTemp.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMinTemp.Location = New System.Drawing.Point(15, 51) Me.lblMinTemp.Name = "lblMinTemp" Me.lblMinTemp.Size = New System.Drawing.Size(114, 13) Me.lblMinTemp.TabIndex = 2 @@ -395,6 +668,19 @@ Partial Class DlgDefineClimaticData Me.lblRadiation.TabIndex = 12 Me.lblRadiation.Text = "Radiation:" ' + 'ucrReceiverWindSpeed + ' + Me.ucrReceiverWindSpeed.AutoSize = True + Me.ucrReceiverWindSpeed.frmParent = Me + Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(18, 140) + Me.ucrReceiverWindSpeed.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverWindSpeed.Name = "ucrReceiverWindSpeed" + Me.ucrReceiverWindSpeed.Selector = Nothing + Me.ucrReceiverWindSpeed.Size = New System.Drawing.Size(111, 20) + Me.ucrReceiverWindSpeed.strNcFilePath = "" + Me.ucrReceiverWindSpeed.TabIndex = 13 + Me.ucrReceiverWindSpeed.ucrSelector = Nothing + ' 'lblSunshine ' Me.lblSunshine.AutoSize = True @@ -405,6 +691,19 @@ Partial Class DlgDefineClimaticData Me.lblSunshine.TabIndex = 10 Me.lblSunshine.Text = "Sunshine Hours:" ' + 'ucrReceiverMinTemp + ' + Me.ucrReceiverMinTemp.AutoSize = True + Me.ucrReceiverMinTemp.frmParent = Me + Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(18, 66) + Me.ucrReceiverMinTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinTemp.Name = "ucrReceiverMinTemp" + Me.ucrReceiverMinTemp.Selector = Nothing + Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(111, 20) + Me.ucrReceiverMinTemp.strNcFilePath = "" + Me.ucrReceiverMinTemp.TabIndex = 11 + Me.ucrReceiverMinTemp.ucrSelector = Nothing + ' 'lblWindSpeed ' Me.lblWindSpeed.AutoSize = True @@ -471,58 +770,6 @@ Partial Class DlgDefineClimaticData Me.ucrSelectorDefineClimaticData.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorDefineClimaticData.TabIndex = 13 ' - 'ucrReceiverStation - ' - Me.ucrReceiverStation.AutoSize = True - Me.ucrReceiverStation.frmParent = Nothing - 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 - Me.ucrReceiverStation.Size = New System.Drawing.Size(100, 20) - Me.ucrReceiverStation.strNcFilePath = "" - Me.ucrReceiverStation.TabIndex = 8 - Me.ucrReceiverStation.ucrSelector = Nothing - ' - 'ucrReceiverLongitude - ' - Me.ucrReceiverLongitude.AutoSize = True - Me.ucrReceiverLongitude.frmParent = Nothing - 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 - Me.ucrReceiverLongitude.Size = New System.Drawing.Size(100, 20) - Me.ucrReceiverLongitude.strNcFilePath = "" - Me.ucrReceiverLongitude.TabIndex = 10 - Me.ucrReceiverLongitude.ucrSelector = Nothing - ' - 'ucrReceiverLatitude - ' - Me.ucrReceiverLatitude.AutoSize = True - Me.ucrReceiverLatitude.frmParent = Nothing - 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 - Me.ucrReceiverLatitude.Size = New System.Drawing.Size(100, 20) - Me.ucrReceiverLatitude.strNcFilePath = "" - Me.ucrReceiverLatitude.TabIndex = 9 - Me.ucrReceiverLatitude.ucrSelector = Nothing - ' - 'ucrReceiverAltitude - ' - Me.ucrReceiverAltitude.AutoSize = True - Me.ucrReceiverAltitude.frmParent = Nothing - 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 - Me.ucrReceiverAltitude.Size = New System.Drawing.Size(100, 20) - Me.ucrReceiverAltitude.strNcFilePath = "" - Me.ucrReceiverAltitude.TabIndex = 11 - Me.ucrReceiverAltitude.ucrSelector = Nothing - ' 'ucrBase ' Me.ucrBase.AutoSize = True @@ -533,253 +780,6 @@ Partial Class DlgDefineClimaticData Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 19 ' - 'ucrReceiverYear - ' - Me.ucrReceiverYear.AutoSize = True - Me.ucrReceiverYear.frmParent = Nothing - 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 - Me.ucrReceiverYear.Size = New System.Drawing.Size(98, 20) - Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.TabIndex = 3 - Me.ucrReceiverYear.ucrSelector = Nothing - ' - 'ucrReceiverDOY - ' - Me.ucrReceiverDOY.AutoSize = True - Me.ucrReceiverDOY.frmParent = Nothing - 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 - Me.ucrReceiverDOY.Size = New System.Drawing.Size(98, 20) - Me.ucrReceiverDOY.strNcFilePath = "" - Me.ucrReceiverDOY.TabIndex = 9 - Me.ucrReceiverDOY.ucrSelector = Nothing - ' - 'ucrReceiverDate - ' - Me.ucrReceiverDate.AutoSize = True - Me.ucrReceiverDate.frmParent = Nothing - 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 - 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 = Nothing - 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 - 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 = Nothing - 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 - Me.ucrReceiverDay.Size = New System.Drawing.Size(98, 20) - Me.ucrReceiverDay.strNcFilePath = "" - Me.ucrReceiverDay.TabIndex = 7 - Me.ucrReceiverDay.ucrSelector = Nothing - ' - 'ucrReceiverMaxRH - ' - Me.ucrReceiverMaxRH.AutoSize = True - Me.ucrReceiverMaxRH.frmParent = Nothing - Me.ucrReceiverMaxRH.Location = New System.Drawing.Point(18, 366) - Me.ucrReceiverMaxRH.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxRH.Name = "ucrReceiverMaxRH" - Me.ucrReceiverMaxRH.Selector = Nothing - Me.ucrReceiverMaxRH.Size = New System.Drawing.Size(116, 20) - Me.ucrReceiverMaxRH.strNcFilePath = "" - Me.ucrReceiverMaxRH.TabIndex = 19 - Me.ucrReceiverMaxRH.ucrSelector = Nothing - ' - 'ucrReceiverMinRH - ' - Me.ucrReceiverMinRH.AutoSize = True - Me.ucrReceiverMinRH.frmParent = Nothing - Me.ucrReceiverMinRH.Location = New System.Drawing.Point(18, 330) - Me.ucrReceiverMinRH.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMinRH.Name = "ucrReceiverMinRH" - Me.ucrReceiverMinRH.Selector = Nothing - Me.ucrReceiverMinRH.Size = New System.Drawing.Size(116, 20) - Me.ucrReceiverMinRH.strNcFilePath = "" - Me.ucrReceiverMinRH.TabIndex = 17 - Me.ucrReceiverMinRH.ucrSelector = Nothing - ' - 'ucrReceiverWindDirection - ' - Me.ucrReceiverWindDirection.AutoSize = True - Me.ucrReceiverWindDirection.frmParent = Nothing - Me.ucrReceiverWindDirection.Location = New System.Drawing.Point(18, 177) - Me.ucrReceiverWindDirection.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverWindDirection.Name = "ucrReceiverWindDirection" - Me.ucrReceiverWindDirection.Selector = Nothing - Me.ucrReceiverWindDirection.Size = New System.Drawing.Size(111, 20) - Me.ucrReceiverWindDirection.strNcFilePath = "" - Me.ucrReceiverWindDirection.TabIndex = 9 - Me.ucrReceiverWindDirection.ucrSelector = Nothing - ' - 'ucrReceiverRain - ' - Me.ucrReceiverRain.AutoSize = True - Me.ucrReceiverRain.frmParent = Nothing - Me.ucrReceiverRain.Location = New System.Drawing.Point(18, 30) - Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverRain.Name = "ucrReceiverRain" - Me.ucrReceiverRain.Selector = Nothing - Me.ucrReceiverRain.Size = New System.Drawing.Size(111, 20) - Me.ucrReceiverRain.strNcFilePath = "" - Me.ucrReceiverRain.TabIndex = 1 - Me.ucrReceiverRain.ucrSelector = Nothing - ' - 'ucrReceiverSunshine - ' - Me.ucrReceiverSunshine.AutoSize = True - Me.ucrReceiverSunshine.frmParent = Nothing - Me.ucrReceiverSunshine.Location = New System.Drawing.Point(18, 215) - Me.ucrReceiverSunshine.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSunshine.Name = "ucrReceiverSunshine" - Me.ucrReceiverSunshine.Selector = Nothing - Me.ucrReceiverSunshine.Size = New System.Drawing.Size(116, 20) - Me.ucrReceiverSunshine.strNcFilePath = "" - Me.ucrReceiverSunshine.TabIndex = 11 - Me.ucrReceiverSunshine.ucrSelector = Nothing - ' - 'ucrReceiverRadiation - ' - Me.ucrReceiverRadiation.AutoSize = True - Me.ucrReceiverRadiation.frmParent = Nothing - Me.ucrReceiverRadiation.Location = New System.Drawing.Point(18, 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(116, 20) - Me.ucrReceiverRadiation.strNcFilePath = "" - Me.ucrReceiverRadiation.TabIndex = 13 - Me.ucrReceiverRadiation.ucrSelector = Nothing - ' - 'ucrReceiverMaxTemp - ' - Me.ucrReceiverMaxTemp.AutoSize = True - Me.ucrReceiverMaxTemp.frmParent = Nothing - Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(18, 103) - Me.ucrReceiverMaxTemp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxTemp.Name = "ucrReceiverMaxTemp" - Me.ucrReceiverMaxTemp.Selector = Nothing - Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(111, 20) - Me.ucrReceiverMaxTemp.strNcFilePath = "" - Me.ucrReceiverMaxTemp.TabIndex = 5 - Me.ucrReceiverMaxTemp.ucrSelector = Nothing - ' - 'ucrReceiverCloudCover - ' - Me.ucrReceiverCloudCover.AutoSize = True - Me.ucrReceiverCloudCover.frmParent = Nothing - Me.ucrReceiverCloudCover.Location = New System.Drawing.Point(18, 292) - Me.ucrReceiverCloudCover.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverCloudCover.Name = "ucrReceiverCloudCover" - Me.ucrReceiverCloudCover.Selector = Nothing - Me.ucrReceiverCloudCover.Size = New System.Drawing.Size(116, 20) - Me.ucrReceiverCloudCover.strNcFilePath = "" - Me.ucrReceiverCloudCover.TabIndex = 15 - Me.ucrReceiverCloudCover.ucrSelector = Nothing - ' - 'ucrReceiverWindSpeed - ' - Me.ucrReceiverWindSpeed.AutoSize = True - Me.ucrReceiverWindSpeed.frmParent = Nothing - Me.ucrReceiverWindSpeed.Location = New System.Drawing.Point(18, 140) - Me.ucrReceiverWindSpeed.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverWindSpeed.Name = "ucrReceiverWindSpeed" - Me.ucrReceiverWindSpeed.Selector = Nothing - Me.ucrReceiverWindSpeed.Size = New System.Drawing.Size(111, 20) - Me.ucrReceiverWindSpeed.strNcFilePath = "" - Me.ucrReceiverWindSpeed.TabIndex = 7 - Me.ucrReceiverWindSpeed.ucrSelector = Nothing - ' - 'ucrReceiverMinTemp - ' - Me.ucrReceiverMinTemp.AutoSize = True - Me.ucrReceiverMinTemp.frmParent = Nothing - Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(18, 66) - Me.ucrReceiverMinTemp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMinTemp.Name = "ucrReceiverMinTemp" - Me.ucrReceiverMinTemp.Selector = Nothing - Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(111, 20) - Me.ucrReceiverMinTemp.strNcFilePath = "" - Me.ucrReceiverMinTemp.TabIndex = 3 - Me.ucrReceiverMinTemp.ucrSelector = Nothing - ' - 'ucrReceiverStationMeta - ' - Me.ucrReceiverStationMeta.AutoSize = True - Me.ucrReceiverStationMeta.frmParent = Nothing - 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 - 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 = Nothing - 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 - 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 = Nothing - 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 - 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 = Nothing - 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 - Me.ucrReceiverAltMeta.Size = New System.Drawing.Size(93, 20) - Me.ucrReceiverAltMeta.strNcFilePath = "" - Me.ucrReceiverAltMeta.TabIndex = 11 - Me.ucrReceiverAltMeta.ucrSelector = Nothing - ' 'DlgDefineClimaticData ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) From f7e57711c5cb2882738425811d0bd11f704b6722 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Wed, 31 Jan 2024 16:43:20 +0300 Subject: [PATCH 33/37] Change --- instat/dlgHomogenization.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgHomogenization.vb b/instat/dlgHomogenization.vb index a3132b561ac..c376b0bdb9f 100644 --- a/instat/dlgHomogenization.vb +++ b/instat/dlgHomogenization.vb @@ -54,6 +54,7 @@ Public Class dlgHomogenization Dim dctMeanVarDistribution As New Dictionary(Of String, String) ucrBase.clsRsyntax.iCallType = 2 + ucrBase.iHelpTopicID = 621 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrSelectorStationFile.SetParameter(New RParameter("stnfile", 1)) From 1ef02811c6b14d7ad8b72a55a4f8bac417941f97 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 1 Feb 2024 15:04:54 +0100 Subject: [PATCH 34/37] Minor change on Pisca menu --- instat/frmMain.Designer.vb | 15 +++++++++------ instat/frmMain.vb | 5 +++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 896b10f2850..b59bcf68049 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -681,6 +681,7 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticPICSAGeneralGrap = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -2276,7 +2277,7 @@ Partial Class frmMain ' 'mnuClimaticPICSA ' - Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) + Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGrap, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPICSA.Text = "PICSA" @@ -5092,6 +5093,12 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' + 'mnuClimaticPICSAGeneralGrap + ' + Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap" + Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..." + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5105,10 +5112,6 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - - Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + - My.Application.Info.Version.Minor.ToString + "." + - My.Application.Info.Version.Build.ToString Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) @@ -5793,5 +5796,5 @@ Partial Class frmMain Friend WithEvents mnuViewSwapDataAndScript As ToolStripMenuItem Friend WithEvents mnuClimaticExamineEditDataVisualiseData As ToolStripMenuItem Friend WithEvents ToolStripSeparator27 As ToolStripSeparator - + Friend WithEvents mnuClimaticPICSAGeneralGrap As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index ea815bd1e0c..3dbd7477bd1 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2674,4 +2674,9 @@ Public Class frmMain Private Sub mnuClimaticExamineEditDataVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuClimaticExamineEditDataVisualiseData.Click dlgVisualizeData.ShowDialog() End Sub + + Private Sub mnuClimaticPICSAGeneralGrap_Click(sender As Object, e As EventArgs) Handles mnuClimaticPICSAGeneralGrap.Click + dlgPICSARainfall.enumPICSAMode = dlgPICSARainfall.PICSAMode.General + dlgPICSARainfall.ShowDialog() + End Sub End Class From be3b04a04dae50277766e4fabab465e81a5b0144 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 2 Feb 2024 09:15:16 +0300 Subject: [PATCH 35/37] returned the version number --- 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 b59bcf68049..9638a7ff857 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -5112,7 +5112,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() From 2a5df2345a5baf5aa6ec03ca25810a87e5d20303 Mon Sep 17 00:00:00 2001 From: n-thony Date: Fri, 2 Feb 2024 10:52:43 +0300 Subject: [PATCH 36/37] Bug fix in stand alone function file --- instat/static/InstatObject/R/stand_alone_functions.R | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 3b3e8187f31..904794d2d2c 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -3029,6 +3029,7 @@ WB_evaporation <- function(water_balance, frac, capacity, evaporation_value, rai } } return(evaporation) +} write_weather_data <- function(year, month, day, rain, mn_tmp, mx_tmp, missing_code, output_file) { # Create a data frame with the provided inputs From 23cf90fb25b5b019f3e69838d4df48e1a0208db4 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Fri, 2 Feb 2024 15:08:18 +0300 Subject: [PATCH 37/37] Changes to the code --- instat/dlgBarAndPieChart.vb | 2 +- instat/dlgHistogram.vb | 2 +- instat/dlgLinePlot.vb | 2 +- instat/dlgScatterPlot.vb | 2 +- instat/sdgPlots.vb | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index cc5d0acfec9..8b68ddcf059 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -807,7 +807,7 @@ Public Class dlgBarAndPieChart clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewThemeFunction:=clsThemeFuction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsTempGlobalAesFunction, ucrNewBaseSelector:=ucrBarChartSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, + clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False diff --git a/instat/dlgHistogram.vb b/instat/dlgHistogram.vb index f18b733bea8..75e3de42232 100644 --- a/instat/dlgHistogram.vb +++ b/instat/dlgHistogram.vb @@ -478,7 +478,7 @@ Public Class dlgHistogram Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, toolStripMenuItemPlotOptions.Click sdgPlots.SetRCode(clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewThemeFunction:=clsThemeFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, - clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrHistogramSelector, + clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrHistogramSelector, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, clsNewGlobalAesFunction:=clsRaesFunction, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) sdgPlots.ShowDialog() diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index 47ab39ee10f..7f92eac8db7 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -902,7 +902,7 @@ Public Class dlgLinePlot Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, PlotOptionsToolStripMenuItem.Click sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, - clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, ucrNewBaseSelector:=ucrLinePlotSelector, + clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, ucrNewBaseSelector:=ucrLinePlotSelector, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) diff --git a/instat/dlgScatterPlot.vb b/instat/dlgScatterPlot.vb index 2f69199c046..656dfed42bf 100644 --- a/instat/dlgScatterPlot.vb +++ b/instat/dlgScatterPlot.vb @@ -468,7 +468,7 @@ Public Class dlgScatterPlot clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, - clsNewThemeFunction:=clsThemeFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, + clsNewThemeFunction:=clsThemeFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrSelectorForScatter, strMainDialogGeomParameterNames:=strGeomParameterNames, clsNewAnnotateFunction:=clsAnnotateFunction, bReset:=bResetSubdialog) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index de83d3ad2c9..840c21da035 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -2383,6 +2383,7 @@ Public Class sdgPlots urChkSelectTheme.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) ucrPnlHorizonatalVertical.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) + ucr1stFactorReceiver.SetRCode(clsFacetVariablesOperator, bReset, bCloneIfNeeded:=True) ucr2ndFactorReceiver.SetRCode(clsFacetVariablesOperator, bReset, bCloneIfNeeded:=True) @@ -2391,11 +2392,11 @@ Public Class sdgPlots ucrChkFreeScalesX.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrChkFreeScalesY.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) + ucrChkIncludeFacets.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) End If ucrNudNumberofRows.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) ucrChkLabeler.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) ucrChkDrop.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) - ucrChkIncludeFacets.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) 'Annnotation ucrChkAnnotation.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True)