From 2ec269fb3b7ccb90737303f13b3b0088af01f925 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Wed, 21 Jun 2023 17:11:09 +0300 Subject: [PATCH 01/12] dialog layout design --- instat/dlgEndOfRainsSeason.Designer.vb | 367 +++++++++------ instat/dlgEndOfRainsSeason.vb | 10 + instat/dlgTransformClimatic.Designer.vb | 22 + instat/dlgTransformClimatic.resx | 580 +++++++++++++++++------- instat/dlgTransformClimatic.vb | 11 + 5 files changed, 673 insertions(+), 317 deletions(-) diff --git a/instat/dlgEndOfRainsSeason.Designer.vb b/instat/dlgEndOfRainsSeason.Designer.vb index 491fc33273b..538b4708bfc 100644 --- a/instat/dlgEndOfRainsSeason.Designer.vb +++ b/instat/dlgEndOfRainsSeason.Designer.vb @@ -53,19 +53,19 @@ Partial Class dlgEndOfRainsSeason 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() + Me.ucrInputEndofSeasonDate = New instat.ucrInputTextBox() Me.ucrChkEndofSeasonOccurence = New instat.ucrCheck() Me.ucrChkEndofSeasonDate = New instat.ucrCheck() Me.ucrChkEndofSeasonDoy = New instat.ucrCheck() - Me.ucrInputSeasonDoy = New instat.ucrInputTextBox() - Me.ucrInputEndofSeasonDate = New instat.ucrInputTextBox() - Me.ucrInputEndofSeasonOccurence = New instat.ucrInputTextBox() Me.grpEndofRains = New System.Windows.Forms.GroupBox() + Me.ucrInputEndofRainsDate = New instat.ucrInputTextBox() + Me.ucrInputEndofRainsOccurence = New instat.ucrInputTextBox() Me.ucrInputEndRainDoy = New instat.ucrInputTextBox() Me.ucrChkEndofRainsDoy = New instat.ucrCheck() Me.ucrChkEndofRainsDate = New instat.ucrCheck() Me.ucrChkEndofRainsOccurence = New instat.ucrCheck() - Me.ucrInputEndofRainsDate = New instat.ucrInputTextBox() - Me.ucrInputEndofRainsOccurence = New instat.ucrInputTextBox() Me.rdoEndOfSeasons = New System.Windows.Forms.RadioButton() Me.rdoEndOfRains = New System.Windows.Forms.RadioButton() Me.ucrPnlEndOfRainsAndSeasons = New instat.UcrPanel() @@ -85,6 +85,8 @@ Partial Class dlgEndOfRainsSeason Me.ucrReceiverRainfall = New instat.ucrReceiverSingle() Me.ucrSelectorForWaterBalance = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() + Me.ucrNudWB = New instat.ucrNud() + Me.ucrChkWB = New instat.ucrCheck() Me.grpEndofSeason.SuspendLayout() Me.grpEndofRains.SuspendLayout() Me.SuspendLayout() @@ -92,36 +94,40 @@ Partial Class dlgEndOfRainsSeason 'lblYear ' Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(306, 137) + Me.lblYear.Location = New System.Drawing.Point(459, 206) + Me.lblYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblYear.Name = "lblYear" - Me.lblYear.Size = New System.Drawing.Size(32, 13) + Me.lblYear.Size = New System.Drawing.Size(47, 20) Me.lblYear.TabIndex = 5 Me.lblYear.Text = "Year:" ' 'lblDate ' Me.lblDate.AutoSize = True - Me.lblDate.Location = New System.Drawing.Point(306, 91) + Me.lblDate.Location = New System.Drawing.Point(459, 136) + Me.lblDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDate.Name = "lblDate" - Me.lblDate.Size = New System.Drawing.Size(33, 13) + Me.lblDate.Size = New System.Drawing.Size(48, 20) Me.lblDate.TabIndex = 3 Me.lblDate.Text = "Date:" ' 'lblDOY ' Me.lblDOY.AutoSize = True - Me.lblDOY.Location = New System.Drawing.Point(306, 181) + Me.lblDOY.Location = New System.Drawing.Point(459, 272) + Me.lblDOY.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDOY.Name = "lblDOY" - Me.lblDOY.Size = New System.Drawing.Size(66, 13) + Me.lblDOY.Size = New System.Drawing.Size(97, 20) Me.lblDOY.TabIndex = 7 Me.lblDOY.Text = "Day of Year:" ' 'lblCapacity ' Me.lblCapacity.AutoSize = True - Me.lblCapacity.Location = New System.Drawing.Point(16, 310) + Me.lblCapacity.Location = New System.Drawing.Point(24, 465) + Me.lblCapacity.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCapacity.Name = "lblCapacity" - Me.lblCapacity.Size = New System.Drawing.Size(51, 13) + Me.lblCapacity.Size = New System.Drawing.Size(74, 20) Me.lblCapacity.TabIndex = 20 Me.lblCapacity.Tag = "Capacity:" Me.lblCapacity.Text = "Capacity:" @@ -129,54 +135,60 @@ Partial Class dlgEndOfRainsSeason 'lblRainfall ' Me.lblRainfall.AutoSize = True - Me.lblRainfall.Location = New System.Drawing.Point(306, 225) + Me.lblRainfall.Location = New System.Drawing.Point(459, 338) + Me.lblRainfall.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRainfall.Name = "lblRainfall" - Me.lblRainfall.Size = New System.Drawing.Size(70, 13) + Me.lblRainfall.Size = New System.Drawing.Size(104, 20) Me.lblRainfall.TabIndex = 9 Me.lblRainfall.Text = "Rain Column:" ' 'lblEvaporation ' Me.lblEvaporation.AutoSize = True - Me.lblEvaporation.Location = New System.Drawing.Point(25, 345) + Me.lblEvaporation.Location = New System.Drawing.Point(22, 517) + Me.lblEvaporation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblEvaporation.Name = "lblEvaporation" - Me.lblEvaporation.Size = New System.Drawing.Size(67, 13) + Me.lblEvaporation.Size = New System.Drawing.Size(98, 20) Me.lblEvaporation.TabIndex = 24 Me.lblEvaporation.Text = "Evaporation:" ' 'lblStation ' Me.lblStation.AutoSize = True - Me.lblStation.Location = New System.Drawing.Point(306, 46) + Me.lblStation.Location = New System.Drawing.Point(459, 69) + Me.lblStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblStation.Name = "lblStation" - Me.lblStation.Size = New System.Drawing.Size(43, 13) + Me.lblStation.Size = New System.Drawing.Size(64, 20) Me.lblStation.TabIndex = 1 Me.lblStation.Text = "Station:" ' 'lblAmount ' Me.lblAmount.AutoSize = True - Me.lblAmount.Location = New System.Drawing.Point(15, 310) + Me.lblAmount.Location = New System.Drawing.Point(22, 465) + Me.lblAmount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblAmount.Name = "lblAmount" - Me.lblAmount.Size = New System.Drawing.Size(46, 13) + Me.lblAmount.Size = New System.Drawing.Size(69, 20) Me.lblAmount.TabIndex = 14 Me.lblAmount.Text = "Amount:" ' 'lblTotalOverDays ' Me.lblTotalOverDays.AutoSize = True - Me.lblTotalOverDays.Location = New System.Drawing.Point(161, 310) + Me.lblTotalOverDays.Location = New System.Drawing.Point(242, 465) + Me.lblTotalOverDays.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblTotalOverDays.Name = "lblTotalOverDays" - Me.lblTotalOverDays.Size = New System.Drawing.Size(66, 13) + Me.lblTotalOverDays.Size = New System.Drawing.Size(96, 20) Me.lblTotalOverDays.TabIndex = 16 Me.lblTotalOverDays.Text = "Over Day(s):" ' 'lblWaterBalanceLessThan ' Me.lblWaterBalanceLessThan.AutoSize = True - Me.lblWaterBalanceLessThan.Location = New System.Drawing.Point(135, 310) + Me.lblWaterBalanceLessThan.Location = New System.Drawing.Point(202, 465) + Me.lblWaterBalanceLessThan.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblWaterBalanceLessThan.Name = "lblWaterBalanceLessThan" - Me.lblWaterBalanceLessThan.Size = New System.Drawing.Size(93, 13) + Me.lblWaterBalanceLessThan.Size = New System.Drawing.Size(136, 20) Me.lblWaterBalanceLessThan.TabIndex = 22 Me.lblWaterBalanceLessThan.Tag = "Water Balance <=" Me.lblWaterBalanceLessThan.Text = "Water Balance <=" @@ -184,9 +196,10 @@ Partial Class dlgEndOfRainsSeason 'cmdDoyRange ' Me.cmdDoyRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDoyRange.Location = New System.Drawing.Point(22, 270) + Me.cmdDoyRange.Location = New System.Drawing.Point(33, 405) + Me.cmdDoyRange.Margin = New System.Windows.Forms.Padding(4) Me.cmdDoyRange.Name = "cmdDoyRange" - Me.cmdDoyRange.Size = New System.Drawing.Size(105, 26) + Me.cmdDoyRange.Size = New System.Drawing.Size(158, 39) Me.cmdDoyRange.TabIndex = 11 Me.cmdDoyRange.Tag = "" Me.cmdDoyRange.Text = "Day Range" @@ -195,29 +208,32 @@ Partial Class dlgEndOfRainsSeason 'rdoVariableEvaporation ' Me.rdoVariableEvaporation.AutoSize = True - Me.rdoVariableEvaporation.Location = New System.Drawing.Point(107, 370) + Me.rdoVariableEvaporation.Location = New System.Drawing.Point(335, 513) + Me.rdoVariableEvaporation.Margin = New System.Windows.Forms.Padding(4) Me.rdoVariableEvaporation.Name = "rdoVariableEvaporation" - Me.rdoVariableEvaporation.Size = New System.Drawing.Size(66, 17) + Me.rdoVariableEvaporation.Size = New System.Drawing.Size(92, 24) Me.rdoVariableEvaporation.TabIndex = 28 - Me.rdoVariableEvaporation.Text = "Variable:" + Me.rdoVariableEvaporation.Text = "Variable" Me.rdoVariableEvaporation.UseVisualStyleBackColor = True ' 'rdoValueEvaporation ' Me.rdoValueEvaporation.AutoSize = True - Me.rdoValueEvaporation.Location = New System.Drawing.Point(107, 343) + Me.rdoValueEvaporation.Location = New System.Drawing.Point(144, 513) + Me.rdoValueEvaporation.Margin = New System.Windows.Forms.Padding(4) Me.rdoValueEvaporation.Name = "rdoValueEvaporation" - Me.rdoValueEvaporation.Size = New System.Drawing.Size(55, 17) + Me.rdoValueEvaporation.Size = New System.Drawing.Size(75, 24) Me.rdoValueEvaporation.TabIndex = 26 - Me.rdoValueEvaporation.Text = "Value:" + Me.rdoValueEvaporation.Text = "Value" Me.rdoValueEvaporation.UseVisualStyleBackColor = True ' 'lblReplaceNA ' Me.lblReplaceNA.AutoSize = True - Me.lblReplaceNA.Location = New System.Drawing.Point(81, 402) + 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(90, 13) + Me.lblReplaceNA.Size = New System.Drawing.Size(130, 20) Me.lblReplaceNA.TabIndex = 30 Me.lblReplaceNA.Text = "Replace NA with:" ' @@ -229,39 +245,26 @@ 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(3, 426) + Me.grpEndofSeason.Location = New System.Drawing.Point(4, 639) + Me.grpEndofSeason.Margin = New System.Windows.Forms.Padding(4) Me.grpEndofSeason.Name = "grpEndofSeason" - Me.grpEndofSeason.Size = New System.Drawing.Size(472, 41) + Me.grpEndofSeason.Padding = New System.Windows.Forms.Padding(4) + Me.grpEndofSeason.Size = New System.Drawing.Size(708, 62) Me.grpEndofSeason.TabIndex = 32 Me.grpEndofSeason.TabStop = False Me.grpEndofSeason.Text = "End of Season" ' - 'ucrChkEndofSeasonOccurence - ' - Me.ucrChkEndofSeasonOccurence.AutoSize = True - Me.ucrChkEndofSeasonOccurence.Checked = False - Me.ucrChkEndofSeasonOccurence.Location = New System.Drawing.Point(281, 17) - Me.ucrChkEndofSeasonOccurence.Name = "ucrChkEndofSeasonOccurence" - Me.ucrChkEndofSeasonOccurence.Size = New System.Drawing.Size(84, 23) - Me.ucrChkEndofSeasonOccurence.TabIndex = 48 - ' - 'ucrChkEndofSeasonDate - ' - Me.ucrChkEndofSeasonDate.AutoSize = True - Me.ucrChkEndofSeasonDate.Checked = False - Me.ucrChkEndofSeasonDate.Location = New System.Drawing.Point(121, 16) - Me.ucrChkEndofSeasonDate.Name = "ucrChkEndofSeasonDate" - Me.ucrChkEndofSeasonDate.Size = New System.Drawing.Size(53, 23) - Me.ucrChkEndofSeasonDate.TabIndex = 47 - ' - 'ucrChkEndofSeasonDoy + 'ucrInputEndofSeasonOccurence ' - Me.ucrChkEndofSeasonDoy.AutoSize = True - Me.ucrChkEndofSeasonDoy.Checked = False - Me.ucrChkEndofSeasonDoy.Location = New System.Drawing.Point(4, 16) - Me.ucrChkEndofSeasonDoy.Name = "ucrChkEndofSeasonDoy" - Me.ucrChkEndofSeasonDoy.Size = New System.Drawing.Size(58, 23) - Me.ucrChkEndofSeasonDoy.TabIndex = 46 + Me.ucrInputEndofSeasonOccurence.AddQuotesIfUnrecognised = True + 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.Name = "ucrInputEndofSeasonOccurence" + Me.ucrInputEndofSeasonOccurence.Size = New System.Drawing.Size(156, 32) + Me.ucrInputEndofSeasonOccurence.TabIndex = 38 ' 'ucrInputSeasonDoy ' @@ -269,9 +272,10 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputSeasonDoy.AutoSize = True Me.ucrInputSeasonDoy.IsMultiline = False Me.ucrInputSeasonDoy.IsReadOnly = False - Me.ucrInputSeasonDoy.Location = New System.Drawing.Point(49, 15) + Me.ucrInputSeasonDoy.Location = New System.Drawing.Point(74, 22) + Me.ucrInputSeasonDoy.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputSeasonDoy.Name = "ucrInputSeasonDoy" - Me.ucrInputSeasonDoy.Size = New System.Drawing.Size(67, 21) + Me.ucrInputSeasonDoy.Size = New System.Drawing.Size(100, 32) Me.ucrInputSeasonDoy.TabIndex = 32 ' 'ucrInputEndofSeasonDate @@ -280,21 +284,41 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofSeasonDate.AutoSize = True Me.ucrInputEndofSeasonDate.IsMultiline = False Me.ucrInputEndofSeasonDate.IsReadOnly = False - Me.ucrInputEndofSeasonDate.Location = New System.Drawing.Point(165, 15) + Me.ucrInputEndofSeasonDate.Location = New System.Drawing.Point(248, 22) + Me.ucrInputEndofSeasonDate.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputEndofSeasonDate.Name = "ucrInputEndofSeasonDate" - Me.ucrInputEndofSeasonDate.Size = New System.Drawing.Size(110, 21) + Me.ucrInputEndofSeasonDate.Size = New System.Drawing.Size(165, 32) Me.ucrInputEndofSeasonDate.TabIndex = 37 ' - 'ucrInputEndofSeasonOccurence + 'ucrChkEndofSeasonOccurence ' - Me.ucrInputEndofSeasonOccurence.AddQuotesIfUnrecognised = True - Me.ucrInputEndofSeasonOccurence.AutoSize = True - Me.ucrInputEndofSeasonOccurence.IsMultiline = False - Me.ucrInputEndofSeasonOccurence.IsReadOnly = False - Me.ucrInputEndofSeasonOccurence.Location = New System.Drawing.Point(361, 15) - Me.ucrInputEndofSeasonOccurence.Name = "ucrInputEndofSeasonOccurence" - Me.ucrInputEndofSeasonOccurence.Size = New System.Drawing.Size(104, 21) - Me.ucrInputEndofSeasonOccurence.TabIndex = 38 + 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.Name = "ucrChkEndofSeasonOccurence" + Me.ucrChkEndofSeasonOccurence.Size = New System.Drawing.Size(126, 51) + 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.Name = "ucrChkEndofSeasonDate" + Me.ucrChkEndofSeasonDate.Size = New System.Drawing.Size(80, 51) + 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.Name = "ucrChkEndofSeasonDoy" + Me.ucrChkEndofSeasonDoy.Size = New System.Drawing.Size(87, 51) + Me.ucrChkEndofSeasonDoy.TabIndex = 46 ' 'grpEndofRains ' @@ -304,73 +328,81 @@ 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(3, 426) + Me.grpEndofRains.Location = New System.Drawing.Point(4, 639) + Me.grpEndofRains.Margin = New System.Windows.Forms.Padding(4) Me.grpEndofRains.Name = "grpEndofRains" - Me.grpEndofRains.Size = New System.Drawing.Size(429, 40) + Me.grpEndofRains.Padding = New System.Windows.Forms.Padding(4) + Me.grpEndofRains.Size = New System.Drawing.Size(644, 60) Me.grpEndofRains.TabIndex = 18 Me.grpEndofRains.TabStop = False Me.grpEndofRains.Text = "End of Rains" ' + 'ucrInputEndofRainsDate + ' + Me.ucrInputEndofRainsDate.AddQuotesIfUnrecognised = True + 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.Name = "ucrInputEndofRainsDate" + Me.ucrInputEndofRainsDate.Size = New System.Drawing.Size(140, 26) + Me.ucrInputEndofRainsDate.TabIndex = 36 + ' + 'ucrInputEndofRainsOccurence + ' + Me.ucrInputEndofRainsOccurence.AddQuotesIfUnrecognised = True + 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.Name = "ucrInputEndofRainsOccurence" + Me.ucrInputEndofRainsOccurence.Size = New System.Drawing.Size(141, 30) + Me.ucrInputEndofRainsOccurence.TabIndex = 39 + ' 'ucrInputEndRainDoy ' Me.ucrInputEndRainDoy.AddQuotesIfUnrecognised = True Me.ucrInputEndRainDoy.AutoSize = True Me.ucrInputEndRainDoy.IsMultiline = False Me.ucrInputEndRainDoy.IsReadOnly = False - Me.ucrInputEndRainDoy.Location = New System.Drawing.Point(50, 17) + Me.ucrInputEndRainDoy.Location = New System.Drawing.Point(75, 26) + Me.ucrInputEndRainDoy.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputEndRainDoy.Name = "ucrInputEndRainDoy" - Me.ucrInputEndRainDoy.Size = New System.Drawing.Size(65, 21) + Me.ucrInputEndRainDoy.Size = New System.Drawing.Size(98, 32) Me.ucrInputEndRainDoy.TabIndex = 50 ' 'ucrChkEndofRainsDoy ' Me.ucrChkEndofRainsDoy.AutoSize = True Me.ucrChkEndofRainsDoy.Checked = False - Me.ucrChkEndofRainsDoy.Location = New System.Drawing.Point(5, 18) + Me.ucrChkEndofRainsDoy.Location = New System.Drawing.Point(8, 27) + Me.ucrChkEndofRainsDoy.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkEndofRainsDoy.Name = "ucrChkEndofRainsDoy" - Me.ucrChkEndofRainsDoy.Size = New System.Drawing.Size(60, 23) + Me.ucrChkEndofRainsDoy.Size = New System.Drawing.Size(90, 51) Me.ucrChkEndofRainsDoy.TabIndex = 49 ' 'ucrChkEndofRainsDate ' Me.ucrChkEndofRainsDate.AutoSize = True Me.ucrChkEndofRainsDate.Checked = False - Me.ucrChkEndofRainsDate.Location = New System.Drawing.Point(118, 17) + Me.ucrChkEndofRainsDate.Location = New System.Drawing.Point(177, 26) + Me.ucrChkEndofRainsDate.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkEndofRainsDate.Name = "ucrChkEndofRainsDate" - Me.ucrChkEndofRainsDate.Size = New System.Drawing.Size(52, 23) + Me.ucrChkEndofRainsDate.Size = New System.Drawing.Size(78, 51) Me.ucrChkEndofRainsDate.TabIndex = 48 ' 'ucrChkEndofRainsOccurence ' Me.ucrChkEndofRainsOccurence.AutoSize = True Me.ucrChkEndofRainsOccurence.Checked = False - Me.ucrChkEndofRainsOccurence.Location = New System.Drawing.Point(264, 16) + Me.ucrChkEndofRainsOccurence.Location = New System.Drawing.Point(396, 24) + Me.ucrChkEndofRainsOccurence.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkEndofRainsOccurence.Name = "ucrChkEndofRainsOccurence" - Me.ucrChkEndofRainsOccurence.Size = New System.Drawing.Size(91, 23) + Me.ucrChkEndofRainsOccurence.Size = New System.Drawing.Size(136, 51) Me.ucrChkEndofRainsOccurence.TabIndex = 47 ' - 'ucrInputEndofRainsDate - ' - Me.ucrInputEndofRainsDate.AddQuotesIfUnrecognised = True - Me.ucrInputEndofRainsDate.AutoSize = True - Me.ucrInputEndofRainsDate.IsMultiline = False - Me.ucrInputEndofRainsDate.IsReadOnly = False - Me.ucrInputEndofRainsDate.Location = New System.Drawing.Point(165, 17) - Me.ucrInputEndofRainsDate.Name = "ucrInputEndofRainsDate" - Me.ucrInputEndofRainsDate.Size = New System.Drawing.Size(93, 17) - Me.ucrInputEndofRainsDate.TabIndex = 36 - ' - 'ucrInputEndofRainsOccurence - ' - Me.ucrInputEndofRainsOccurence.AddQuotesIfUnrecognised = True - Me.ucrInputEndofRainsOccurence.AutoSize = True - Me.ucrInputEndofRainsOccurence.IsMultiline = False - Me.ucrInputEndofRainsOccurence.IsReadOnly = False - Me.ucrInputEndofRainsOccurence.Location = New System.Drawing.Point(341, 16) - Me.ucrInputEndofRainsOccurence.Name = "ucrInputEndofRainsOccurence" - Me.ucrInputEndofRainsOccurence.Size = New System.Drawing.Size(94, 20) - Me.ucrInputEndofRainsOccurence.TabIndex = 39 - ' 'rdoEndOfSeasons ' Me.rdoEndOfSeasons.Appearance = System.Windows.Forms.Appearance.Button @@ -379,9 +411,10 @@ 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(217, 10) + Me.rdoEndOfSeasons.Location = New System.Drawing.Point(326, 15) + Me.rdoEndOfSeasons.Margin = New System.Windows.Forms.Padding(4) Me.rdoEndOfSeasons.Name = "rdoEndOfSeasons" - Me.rdoEndOfSeasons.Size = New System.Drawing.Size(130, 27) + Me.rdoEndOfSeasons.Size = New System.Drawing.Size(195, 40) Me.rdoEndOfSeasons.TabIndex = 36 Me.rdoEndOfSeasons.Text = "End of Season" Me.rdoEndOfSeasons.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -395,9 +428,10 @@ 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(89, 10) + Me.rdoEndOfRains.Location = New System.Drawing.Point(134, 15) + Me.rdoEndOfRains.Margin = New System.Windows.Forms.Padding(4) Me.rdoEndOfRains.Name = "rdoEndOfRains" - Me.rdoEndOfRains.Size = New System.Drawing.Size(130, 27) + Me.rdoEndOfRains.Size = New System.Drawing.Size(195, 40) Me.rdoEndOfRains.TabIndex = 35 Me.rdoEndOfRains.Text = "End of Rains" Me.rdoEndOfRains.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -406,9 +440,10 @@ Partial Class dlgEndOfRainsSeason 'ucrPnlEndOfRainsAndSeasons ' Me.ucrPnlEndOfRainsAndSeasons.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlEndOfRainsAndSeasons.Location = New System.Drawing.Point(79, 9) + Me.ucrPnlEndOfRainsAndSeasons.Location = New System.Drawing.Point(118, 14) + Me.ucrPnlEndOfRainsAndSeasons.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlEndOfRainsAndSeasons.Name = "ucrPnlEndOfRainsAndSeasons" - Me.ucrPnlEndOfRainsAndSeasons.Size = New System.Drawing.Size(273, 35) + Me.ucrPnlEndOfRainsAndSeasons.Size = New System.Drawing.Size(410, 52) Me.ucrPnlEndOfRainsAndSeasons.TabIndex = 34 ' 'ucrInputReplaceNA @@ -417,20 +452,21 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputReplaceNA.AutoSize = True Me.ucrInputReplaceNA.IsMultiline = False Me.ucrInputReplaceNA.IsReadOnly = False - Me.ucrInputReplaceNA.Location = New System.Drawing.Point(176, 397) + 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(52, 21) + 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(176, 370) + Me.ucrReceiverEvaporation.Location = New System.Drawing.Point(431, 513) Me.ucrReceiverEvaporation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverEvaporation.Name = "ucrReceiverEvaporation" Me.ucrReceiverEvaporation.Selector = Nothing - Me.ucrReceiverEvaporation.Size = New System.Drawing.Size(139, 20) + Me.ucrReceiverEvaporation.Size = New System.Drawing.Size(210, 30) Me.ucrReceiverEvaporation.strNcFilePath = "" Me.ucrReceiverEvaporation.TabIndex = 29 Me.ucrReceiverEvaporation.ucrSelector = Nothing @@ -441,17 +477,19 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEvaporation.AutoSize = True Me.ucrInputEvaporation.IsMultiline = False Me.ucrInputEvaporation.IsReadOnly = False - Me.ucrInputEvaporation.Location = New System.Drawing.Point(176, 343) + Me.ucrInputEvaporation.Location = New System.Drawing.Point(230, 513) + Me.ucrInputEvaporation.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputEvaporation.Name = "ucrInputEvaporation" - Me.ucrInputEvaporation.Size = New System.Drawing.Size(52, 21) + Me.ucrInputEvaporation.Size = New System.Drawing.Size(96, 32) Me.ucrInputEvaporation.TabIndex = 27 ' 'ucrPnlEvaporation ' Me.ucrPnlEvaporation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlEvaporation.Location = New System.Drawing.Point(107, 337) + Me.ucrPnlEvaporation.Location = New System.Drawing.Point(144, 505) + Me.ucrPnlEvaporation.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlEvaporation.Name = "ucrPnlEvaporation" - Me.ucrPnlEvaporation.Size = New System.Drawing.Size(67, 62) + Me.ucrPnlEvaporation.Size = New System.Drawing.Size(518, 40) Me.ucrPnlEvaporation.TabIndex = 25 ' 'ucrInputFilterPreview @@ -460,9 +498,10 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputFilterPreview.AutoSize = True Me.ucrInputFilterPreview.IsMultiline = False Me.ucrInputFilterPreview.IsReadOnly = True - Me.ucrInputFilterPreview.Location = New System.Drawing.Point(131, 273) + Me.ucrInputFilterPreview.Location = New System.Drawing.Point(196, 410) + Me.ucrInputFilterPreview.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" - Me.ucrInputFilterPreview.Size = New System.Drawing.Size(242, 22) + Me.ucrInputFilterPreview.Size = New System.Drawing.Size(363, 33) Me.ucrInputFilterPreview.TabIndex = 12 ' 'ucrNudTotalOverDays @@ -470,11 +509,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(233, 308) + Me.ucrNudTotalOverDays.Location = New System.Drawing.Point(350, 462) + Me.ucrNudTotalOverDays.Margin = New System.Windows.Forms.Padding(9) 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(50, 20) + Me.ucrNudTotalOverDays.Size = New System.Drawing.Size(75, 30) Me.ucrNudTotalOverDays.TabIndex = 17 Me.ucrNudTotalOverDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -483,11 +523,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(68, 308) + Me.ucrNudAmount.Location = New System.Drawing.Point(102, 462) + Me.ucrNudAmount.Margin = New System.Windows.Forms.Padding(9) 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(50, 20) + Me.ucrNudAmount.Size = New System.Drawing.Size(75, 30) Me.ucrNudAmount.TabIndex = 15 Me.ucrNudAmount.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -496,11 +537,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(234, 308) + Me.ucrNudWBLessThan.Location = New System.Drawing.Point(351, 462) + Me.ucrNudWBLessThan.Margin = New System.Windows.Forms.Padding(9) 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(50, 20) + Me.ucrNudWBLessThan.Size = New System.Drawing.Size(75, 30) Me.ucrNudWBLessThan.TabIndex = 23 Me.ucrNudWBLessThan.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -509,11 +551,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(69, 308) + Me.ucrNudCapacity.Location = New System.Drawing.Point(104, 462) + Me.ucrNudCapacity.Margin = New System.Windows.Forms.Padding(9) 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(50, 20) + Me.ucrNudCapacity.Size = New System.Drawing.Size(75, 30) Me.ucrNudCapacity.TabIndex = 21 Me.ucrNudCapacity.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -521,11 +564,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverStation.AutoSize = True Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Location = New System.Drawing.Point(309, 59) + Me.ucrReceiverStation.Location = New System.Drawing.Point(464, 88) Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStation.Name = "ucrReceiverStation" Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(143, 20) + Me.ucrReceiverStation.Size = New System.Drawing.Size(214, 30) Me.ucrReceiverStation.strNcFilePath = "" Me.ucrReceiverStation.TabIndex = 2 Me.ucrReceiverStation.ucrSelector = Nothing @@ -534,11 +577,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverYear.AutoSize = True Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(309, 150) + Me.ucrReceiverYear.Location = New System.Drawing.Point(464, 225) Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYear.Name = "ucrReceiverYear" Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.Size = New System.Drawing.Size(143, 20) + Me.ucrReceiverYear.Size = New System.Drawing.Size(214, 30) Me.ucrReceiverYear.strNcFilePath = "" Me.ucrReceiverYear.TabIndex = 6 Me.ucrReceiverYear.ucrSelector = Nothing @@ -547,11 +590,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverDate.AutoSize = True Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(309, 104) + Me.ucrReceiverDate.Location = New System.Drawing.Point(464, 156) Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDate.Name = "ucrReceiverDate" Me.ucrReceiverDate.Selector = Nothing - Me.ucrReceiverDate.Size = New System.Drawing.Size(143, 20) + Me.ucrReceiverDate.Size = New System.Drawing.Size(214, 30) Me.ucrReceiverDate.strNcFilePath = "" Me.ucrReceiverDate.TabIndex = 4 Me.ucrReceiverDate.ucrSelector = Nothing @@ -560,11 +603,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverDOY.AutoSize = True Me.ucrReceiverDOY.frmParent = Me - Me.ucrReceiverDOY.Location = New System.Drawing.Point(309, 194) + Me.ucrReceiverDOY.Location = New System.Drawing.Point(464, 291) Me.ucrReceiverDOY.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDOY.Name = "ucrReceiverDOY" Me.ucrReceiverDOY.Selector = Nothing - Me.ucrReceiverDOY.Size = New System.Drawing.Size(143, 20) + Me.ucrReceiverDOY.Size = New System.Drawing.Size(214, 30) Me.ucrReceiverDOY.strNcFilePath = "" Me.ucrReceiverDOY.TabIndex = 8 Me.ucrReceiverDOY.ucrSelector = Nothing @@ -573,11 +616,11 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverRainfall.AutoSize = True Me.ucrReceiverRainfall.frmParent = Me - Me.ucrReceiverRainfall.Location = New System.Drawing.Point(309, 238) + Me.ucrReceiverRainfall.Location = New System.Drawing.Point(464, 357) Me.ucrReceiverRainfall.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRainfall.Name = "ucrReceiverRainfall" Me.ucrReceiverRainfall.Selector = Nothing - Me.ucrReceiverRainfall.Size = New System.Drawing.Size(143, 20) + Me.ucrReceiverRainfall.Size = New System.Drawing.Size(214, 30) Me.ucrReceiverRainfall.strNcFilePath = "" Me.ucrReceiverRainfall.TabIndex = 10 Me.ucrReceiverRainfall.ucrSelector = Nothing @@ -588,27 +631,54 @@ Partial Class dlgEndOfRainsSeason Me.ucrSelectorForWaterBalance.bDropUnusedFilterLevels = False Me.ucrSelectorForWaterBalance.bShowHiddenColumns = False Me.ucrSelectorForWaterBalance.bUseCurrentFilter = True - Me.ucrSelectorForWaterBalance.Location = New System.Drawing.Point(3, 69) + Me.ucrSelectorForWaterBalance.Location = New System.Drawing.Point(4, 104) Me.ucrSelectorForWaterBalance.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForWaterBalance.Name = "ucrSelectorForWaterBalance" - Me.ucrSelectorForWaterBalance.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorForWaterBalance.Size = New System.Drawing.Size(320, 274) Me.ucrSelectorForWaterBalance.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(3, 472) + Me.ucrBase.Location = New System.Drawing.Point(4, 708) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 33 ' + 'ucrNudWB + ' + 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.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.TabIndex = 47 + Me.ucrNudWB.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkWB + ' + 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.Name = "ucrChkWB" + Me.ucrChkWB.Size = New System.Drawing.Size(150, 34) + Me.ucrChkWB.TabIndex = 46 + ' 'dlgEndOfRainsSeason ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(477, 549) + Me.ClientSize = New System.Drawing.Size(716, 824) + 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) @@ -645,6 +715,7 @@ 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" @@ -707,4 +778,6 @@ Partial Class dlgEndOfRainsSeason Friend WithEvents rdoEndOfRains As RadioButton Friend WithEvents ucrPnlEndOfRainsAndSeasons As UcrPanel Friend WithEvents ucrInputEvaporation As ucrInputTextBox + Friend WithEvents ucrNudWB As ucrNud + Friend WithEvents ucrChkWB As ucrCheck End Class \ No newline at end of file diff --git a/instat/dlgEndOfRainsSeason.vb b/instat/dlgEndOfRainsSeason.vb index 61c95b06034..194d2d96e3f 100644 --- a/instat/dlgEndOfRainsSeason.vb +++ b/instat/dlgEndOfRainsSeason.vb @@ -298,12 +298,21 @@ Public Class dlgEndOfRainsSeason ucrInputEndofSeasonOccurence.SetDataFrameSelector(ucrSelectorForWaterBalance.ucrAvailableDataFrames) ucrInputEndofSeasonOccurence.SetValidationTypeAsRVariable() + 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.Increment = 0.01 '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) ucrPnlEvaporation.AddToLinkedControls(ucrInputEvaporation, {rdoValueEvaporation}, bNewLinkedHideIfParameterMissing:=True) ucrPnlEvaporation.AddToLinkedControls(ucrReceiverEvaporation, {rdoVariableEvaporation}, bNewLinkedHideIfParameterMissing:=True) ucrPnlEvaporation.AddToLinkedControls(ucrInputReplaceNA, {rdoVariableEvaporation}, bNewLinkedHideIfParameterMissing:=True) @@ -312,6 +321,7 @@ Public Class dlgEndOfRainsSeason 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) ucrChkEndofRainsDoy.SetLinkedDisplayControl(grpEndofRains) ucrPnlEvaporation.SetLinkedDisplayControl(lblEvaporation) diff --git a/instat/dlgTransformClimatic.Designer.vb b/instat/dlgTransformClimatic.Designer.vb index 7013f304a84..90233cefd17 100644 --- a/instat/dlgTransformClimatic.Designer.vb +++ b/instat/dlgTransformClimatic.Designer.vb @@ -114,6 +114,8 @@ Partial Class dlgTransformClimatic 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.grpTransform.SuspendLayout() Me.grpDegree.SuspendLayout() Me.SuspendLayout() @@ -199,6 +201,8 @@ Partial Class dlgTransformClimatic ' 'grpTransform ' + Me.grpTransform.Controls.Add(Me.ucrNudWB) + Me.grpTransform.Controls.Add(Me.ucrChkWB) Me.grpTransform.Controls.Add(Me.ucrInputSpellLower) Me.grpTransform.Controls.Add(Me.ucrChkOptions) Me.grpTransform.Controls.Add(Me.ucrReceiverEvap) @@ -670,6 +674,22 @@ Partial Class dlgTransformClimatic Me.ucrChkUseMaxMin.Checked = True Me.ucrChkUseMaxMin.Name = "ucrChkUseMaxMin" ' + 'ucrChkWB + ' + resources.ApplyResources(Me.ucrChkWB, "ucrChkWB") + Me.ucrChkWB.Checked = False + Me.ucrChkWB.Name = "ucrChkWB" + ' + '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}) + ' 'dlgTransformClimatic ' resources.ApplyResources(Me, "$this") @@ -789,4 +809,6 @@ Partial Class dlgTransformClimatic 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 End Class diff --git a/instat/dlgTransformClimatic.resx b/instat/dlgTransformClimatic.resx index b4905822802..b41733cce82 100644 --- a/instat/dlgTransformClimatic.resx +++ b/instat/dlgTransformClimatic.resx @@ -127,10 +127,13 @@ - 272, 167 + 408, 250 + + + 4, 0, 4, 0 - 32, 13 + 47, 20 12 @@ -157,10 +160,13 @@ NoControl - 272, 117 + 408, 176 + + + 4, 0, 4, 0 - 33, 13 + 48, 20 8 @@ -187,10 +193,13 @@ NoControl - 272, 67 + 408, 100 + + + 4, 0, 4, 0 - 43, 13 + 64, 20 6 @@ -217,10 +226,13 @@ NoControl - 272, 217 + 408, 326 + + + 4, 0, 4, 0 - 48, 13 + 72, 20 16 @@ -256,10 +268,13 @@ NoControl - 221, 15 + 332, 22 + + + 4, 4, 4, 4 - 71, 40 + 106, 60 3 @@ -298,10 +313,13 @@ NoControl - 152, 15 + 228, 22 + + + 4, 4, 4, 4 - 71, 40 + 106, 60 2 @@ -337,10 +355,13 @@ NoControl - 14, 15 + 21, 22 + + + 4, 4, 4, 4 - 71, 40 + 106, 60 1 @@ -379,10 +400,13 @@ NoControl - 359, 15 + 538, 22 + + + 4, 4, 4, 4 - 71, 40 + 106, 60 4 @@ -412,10 +436,13 @@ NoControl - 245, 24 + 368, 36 + + + 4, 0, 4, 0 - 34, 13 + 49, 20 5 @@ -433,7 +460,7 @@ grpTransform - 15 + 17 True @@ -442,10 +469,13 @@ NoControl - 157, 24 + 236, 36 + + + 4, 0, 4, 0 - 30, 13 + 42, 20 3 @@ -463,7 +493,7 @@ grpTransform - 24 + 26 True @@ -472,10 +502,13 @@ NoControl - 12, 24 + 18, 36 + + + 4, 0, 4, 0 - 106, 13 + 155, 20 8 @@ -493,16 +526,73 @@ grpTransform - 19 + 21 + + + True + + + 186, 122 + + + 9, 9, 9, 9 + + + 75, 30 + + + 45 + + + ucrNudWB + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 0 + + + True + + + 23, 122 + + + 6, 6, 6, 6 + + + 150, 34 + + + 44 + + + ucrChkWB + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 1 GrowAndShrink - 71, 51 + 106, 76 + + + 14, 14, 14, 14 - 49, 21 + 74, 32 43 @@ -517,16 +607,19 @@ grpTransform - 0 + 2 True - 266, 112 + 399, 168 + + + 9, 9, 9, 9 - 76, 23 + 114, 51 38 @@ -544,7 +637,7 @@ grpTransform - 1 + 3 True @@ -553,13 +646,13 @@ True - 96, 96 + 144, 144 True - 516, 490 + 1154, 735 Button @@ -577,10 +670,13 @@ NoControl - 428, 15 + 642, 22 + + + 4, 4, 4, 4 - 71, 40 + 106, 60 26 @@ -607,13 +703,13 @@ GrowAndShrink - 11, 411 + 16, 616 - 4, 5, 4, 5 + 6, 8, 6, 8 - 335, 21 + 502, 32 20 @@ -646,10 +742,13 @@ NoControl - 83, 15 + 124, 22 + + + 4, 4, 4, 4 - 71, 40 + 106, 60 25 @@ -688,10 +787,13 @@ NoControl - 290, 15 + 435, 22 + + + 4, 4, 4, 4 - 71, 40 + 106, 60 23 @@ -718,10 +820,13 @@ GrowAndShrink - 11, 9 + 16, 14 + + + 9, 9, 9, 9 - 497, 49 + 746, 74 0 @@ -742,13 +847,13 @@ True - 275, 130 + 412, 195 0, 0, 0, 0 - 137, 20 + 206, 30 9 @@ -769,13 +874,13 @@ True - 275, 80 + 412, 120 0, 0, 0, 0 - 137, 20 + 206, 30 7 @@ -796,13 +901,13 @@ True - 10, 61 + 15, 92 0, 0, 0, 0 - 213, 183 + 320, 274 5 @@ -826,10 +931,13 @@ GrowAndShrink - 10, 437 + 15, 656 + + + 6, 6, 6, 6 - 405, 52 + 611, 77 21 @@ -850,13 +958,13 @@ True - 275, 280 + 412, 420 0, 0, 0, 0 - 137, 20 + 206, 30 31 @@ -877,10 +985,13 @@ True - 177, 122 + 266, 183 + + + 9, 9, 9, 9 - 50, 20 + 75, 30 45 @@ -901,10 +1012,13 @@ True - 177, 97 + 266, 146 + + + 9, 9, 9, 9 - 50, 20 + 75, 30 44 @@ -928,10 +1042,13 @@ NoControl - 123, 100 + 184, 150 + + + 4, 0, 4, 0 - 50, 13 + 74, 20 45 @@ -958,10 +1075,13 @@ NoControl - 136, 124 + 204, 186 + + + 4, 0, 4, 0 - 31, 13 + 46, 20 44 @@ -988,10 +1108,13 @@ NoControl - 15, 122 + 22, 183 + + + 4, 4, 4, 4 - 95, 17 + 139, 24 41 @@ -1018,10 +1141,13 @@ NoControl - 123, 100 + 184, 150 + + + 4, 0, 4, 0 - 50, 13 + 74, 20 43 @@ -1048,10 +1174,13 @@ NoControl - 15, 99 + 22, 148 + + + 4, 4, 4, 4 - 52, 17 + 75, 24 40 @@ -1078,10 +1207,13 @@ NoControl - 123, 77 + 184, 116 + + + 4, 0, 4, 0 - 50, 13 + 74, 20 43 @@ -1108,10 +1240,13 @@ NoControl - 15, 76 + 22, 114 + + + 4, 4, 4, 4 - 52, 17 + 74, 24 39 @@ -1135,10 +1270,13 @@ True - 177, 97 + 266, 146 + + + 9, 9, 9, 9 - 50, 20 + 75, 30 43 @@ -1162,10 +1300,13 @@ NoControl - 15, 53 + 22, 80 + + + 4, 4, 4, 4 - 61, 17 + 87, 24 38 @@ -1189,10 +1330,13 @@ True - 177, 73 + 266, 110 + + + 9, 9, 9, 9 - 50, 20 + 75, 30 43 @@ -1216,10 +1360,13 @@ NoControl - 15, 30 + 22, 45 + + + 4, 4, 4, 4 - 96, 17 + 140, 24 37 @@ -1243,10 +1390,13 @@ GrowAndShrink - 6, 19 + 9, 28 + + + 9, 9, 9, 9 - 119, 127 + 178, 190 34 @@ -1264,10 +1414,16 @@ 13 - 9, 252 + 785, 176 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 237, 151 + 356, 226 42 @@ -1291,13 +1447,13 @@ True - 275, 230 + 412, 345 0, 0, 0, 0 - 137, 20 + 206, 30 33 @@ -1321,10 +1477,13 @@ NoControl - 272, 267 + 408, 400 + + + 4, 0, 4, 0 - 33, 13 + 47, 20 28 @@ -1351,10 +1510,13 @@ NoControl - 272, 217 + 408, 326 + + + 4, 0, 4, 0 - 36, 13 + 51, 20 30 @@ -1378,13 +1540,13 @@ True - 275, 230 + 412, 345 0, 0, 0, 0 - 137, 20 + 206, 30 29 @@ -1405,13 +1567,13 @@ True - 275, 230 + 412, 345 0, 0, 0, 0 - 137, 20 + 206, 30 17 @@ -1432,13 +1594,13 @@ True - 275, 180 + 412, 270 0, 0, 0, 0 - 137, 20 + 206, 30 13 @@ -1459,10 +1621,13 @@ True - 275, 180 + 412, 270 + + + 9, 9, 9, 9 - 137, 24 + 206, 36 27 @@ -1486,10 +1651,13 @@ NoControl - 272, 217 + 408, 326 + + + 4, 0, 4, 0 - 43, 13 + 62, 20 32 @@ -1509,6 +1677,9 @@ 25 + + 4, 4, 4, 4 + CenterScreen @@ -1552,13 +1723,13 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 155, 79 + 530, 80 0, 0, 0, 0 - 103, 20 + 154, 30 37 @@ -1573,16 +1744,19 @@ grpTransform - 2 + 4 True - 155, 53 + 232, 80 + + + 14, 14, 14, 14 - 103, 21 + 154, 32 31 @@ -1597,16 +1771,19 @@ grpTransform - 3 + 5 True - 24, 112 + 36, 168 + + + 9, 9, 9, 9 - 174, 23 + 261, 51 22 @@ -1621,7 +1798,7 @@ grpTransform - 4 + 6 True @@ -1630,16 +1807,19 @@ NoControl - 82, 81 + 430, 83 + + + 4, 4, 4, 4 - 66, 17 + 92, 24 36 - Variable: + Variable rdoEvapVariable @@ -1651,7 +1831,7 @@ grpTransform - 5 + 7 True @@ -1660,16 +1840,19 @@ NoControl - 86, 55 + 129, 82 + + + 4, 4, 4, 4 - 55, 17 + 75, 24 35 - Value: + Value rdoEvapValue @@ -1681,16 +1864,19 @@ grpTransform - 6 + 8 GrowAndShrink - 82, 47 + 123, 70 + + + 9, 9, 9, 9 - 67, 57 + 578, 44 29 @@ -1705,16 +1891,19 @@ grpTransform - 7 + 9 GrowAndShrink - 199, 55 + 298, 82 + + + 14, 14, 14, 14 - 137, 21 + 206, 32 27 @@ -1729,7 +1918,7 @@ grpTransform - 8 + 10 True @@ -1738,10 +1927,13 @@ NoControl - 151, 59 + 226, 88 + + + 4, 0, 4, 0 - 47, 13 + 69, 20 25 @@ -1759,16 +1951,19 @@ grpTransform - 9 + 11 GrowAndShrink - 199, 55 + 298, 82 + + + 14, 14, 14, 14 - 137, 21 + 206, 32 24 @@ -1783,16 +1978,19 @@ grpTransform - 10 + 12 True - 24, 58 + 36, 87 + + + 9, 9, 9, 9 - 100, 23 + 150, 51 26 @@ -1807,16 +2005,19 @@ grpTransform - 11 + 13 True - 194, 21 + 291, 32 + + + 9, 9, 9, 9 - 50, 20 + 75, 30 15 @@ -1831,7 +2032,7 @@ grpTransform - 12 + 14 True @@ -1840,10 +2041,13 @@ NoControl - 12, 25 + 18, 38 + + + 4, 0, 4, 0 - 126, 13 + 180, 20 14 @@ -1861,16 +2065,19 @@ grpTransform - 13 + 15 True - 285, 50 + 428, 75 + + + 14, 14, 14, 14 - 49, 21 + 74, 32 13 @@ -1885,16 +2092,19 @@ grpTransform - 14 + 16 GrowAndShrink - 124, 50 + 186, 75 + + + 14, 14, 14, 14 - 155, 21 + 232, 32 12 @@ -1909,7 +2119,7 @@ grpTransform - 16 + 18 True @@ -1918,10 +2128,13 @@ NoControl - 12, 53 + 18, 80 + + + 4, 0, 4, 0 - 54, 13 + 80, 20 10 @@ -1939,7 +2152,7 @@ grpTransform - 17 + 19 True @@ -1948,10 +2161,13 @@ NoControl - 13, 55 + 20, 82 + + + 4, 0, 4, 0 - 67, 13 + 98, 20 6 @@ -1969,16 +2185,19 @@ grpTransform - 18 + 20 True - 193, 21 + 290, 32 + + + 9, 9, 9, 9 - 50, 20 + 75, 30 4 @@ -1993,7 +2212,7 @@ grpTransform - 20 + 22 True @@ -2002,10 +2221,13 @@ NoControl - 13, 25 + 20, 38 + + + 4, 0, 4, 0 - 51, 13 + 74, 20 1 @@ -2023,16 +2245,19 @@ grpTransform - 21 + 23 True - 86, 21 + 129, 32 + + + 9, 9, 9, 9 - 50, 20 + 75, 30 2 @@ -2047,16 +2272,19 @@ grpTransform - 22 + 24 GrowAndShrink - 24, 21 + 36, 32 + + + 14, 14, 14, 14 - 112, 21 + 168, 32 0 @@ -2071,16 +2299,19 @@ grpTransform - 23 + 25 True - 134, 21 + 201, 32 + + + 9, 9, 9, 9 - 50, 20 + 75, 30 9 @@ -2095,16 +2326,19 @@ grpTransform - 25 + 27 GrowAndShrink - 24, 21 + 36, 32 + + + 14, 14, 14, 14 - 112, 21 + 168, 32 26 @@ -2119,13 +2353,19 @@ grpTransform - 26 + 28 - 10, 261 + 15, 392 + + + 4, 4, 4, 4 + + + 4, 4, 4, 4 - 376, 142 + 733, 213 18 diff --git a/instat/dlgTransformClimatic.vb b/instat/dlgTransformClimatic.vb index 5b9865b3994..1aefa1e19c8 100644 --- a/instat/dlgTransformClimatic.vb +++ b/instat/dlgTransformClimatic.vb @@ -226,6 +226,14 @@ Public Class dlgTransformClimatic ucrChkCircular.SetText("Circular") ucrChkCircular.SetLinkedDisplayControl(lblPosition) + ucrChkWB.SetParameter(New RParameter("WB_evap")) + ucrChkWB.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkWB.SetText("Reducing") + + ucrNudWB.SetParameter(New RParameter("WB_evap_value")) + ucrNudWB.SetMinMax(0, 1) + ucrNudWB.Increment = 0.01 + ' Count ucrNudCountOver.SetParameter(New RParameter("width", 1)) ucrNudCountOver.SetMinMax(1, 366) @@ -314,6 +322,8 @@ 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) + ucrPnlTransform.AddToLinkedControls({ucrInputCumulative}, {rdoCumulative}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Sum") ucrPnlTransform.AddToLinkedControls({ucrNudCountOver}, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=1) ucrPnlTransform.AddToLinkedControls({ucrInputCondition}, {rdoCount, rdoSpell, rdoMultSpells}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=">=") @@ -326,6 +336,7 @@ Public Class dlgTransformClimatic ucrPnlTransform.AddToLinkedControls(ucrChkGroupByYear, {rdoCount, rdoMoving, rdoSpell, rdoMultSpells, rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) 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) From b888e94eca0102a29b44f638ac29e4b6c29cec3d Mon Sep 17 00:00:00 2001 From: lilyclements Date: Thu, 22 Jun 2023 14:20:22 +0300 Subject: [PATCH 02/12] add water balance function, decimal places --- instat/dlgEndOfRainsSeason.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgEndOfRainsSeason.vb b/instat/dlgEndOfRainsSeason.vb index 194d2d96e3f..52cd221bf40 100644 --- a/instat/dlgEndOfRainsSeason.vb +++ b/instat/dlgEndOfRainsSeason.vb @@ -305,6 +305,7 @@ Public Class dlgEndOfRainsSeason ucrNudWB.SetParameter(New RParameter("WB_evap_value")) ucrNudWB.SetMinMax(0, 1) + ucrNudWB.DecimalPlaces = 0.01 ucrNudWB.Increment = 0.01 'linking controls From e44c905ba7be197419ff84ca63f8662ad62c964d Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Tue, 12 Dec 2023 15:13:37 +0300 Subject: [PATCH 03/12] TabIndex_changes --- instat/dlgDisplayDailyData.Designer.vb | 72 ++++++++++---------------- 1 file changed, 28 insertions(+), 44 deletions(-) diff --git a/instat/dlgDisplayDailyData.Designer.vb b/instat/dlgDisplayDailyData.Designer.vb index 326fc5626e8..147d7808113 100644 --- a/instat/dlgDisplayDailyData.Designer.vb +++ b/instat/dlgDisplayDailyData.Designer.vb @@ -84,7 +84,6 @@ Partial Class dlgDisplayDailyData Me.ucrPnlFrequencyDisplay = New instat.UcrPanel() Me.ucrSelectorDisplayDailyClimaticData = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() - Me.ucrReceiverSingleElements = New instat.ucrReceiverSingle() Me.ucrChkZero = New instat.ucrCheck() Me.ucrInputComboZero = New instat.ucrInputComboBox() Me.ucrSaveGraph = New instat.ucrSave() @@ -106,7 +105,7 @@ Partial Class dlgDisplayDailyData Me.rdoTable.Location = New System.Drawing.Point(268, 12) Me.rdoTable.Name = "rdoTable" Me.rdoTable.Size = New System.Drawing.Size(124, 29) - Me.rdoTable.TabIndex = 1 + Me.rdoTable.TabIndex = 2 Me.rdoTable.Text = "Table" Me.rdoTable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoTable.UseVisualStyleBackColor = True @@ -125,7 +124,7 @@ Partial Class dlgDisplayDailyData Me.rdoGraph.Location = New System.Drawing.Point(24, 12) Me.rdoGraph.Name = "rdoGraph" Me.rdoGraph.Size = New System.Drawing.Size(124, 29) - Me.rdoGraph.TabIndex = 2 + Me.rdoGraph.TabIndex = 0 Me.rdoGraph.Text = "Graph" Me.rdoGraph.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoGraph.UseVisualStyleBackColor = True @@ -137,7 +136,7 @@ Partial Class dlgDisplayDailyData Me.lblStation.Location = New System.Drawing.Point(283, 64) Me.lblStation.Name = "lblStation" Me.lblStation.Size = New System.Drawing.Size(43, 13) - Me.lblStation.TabIndex = 4 + Me.lblStation.TabIndex = 15 Me.lblStation.Text = "Station:" ' 'lblElement @@ -147,7 +146,7 @@ Partial Class dlgDisplayDailyData Me.lblElement.Location = New System.Drawing.Point(283, 237) Me.lblElement.Name = "lblElement" Me.lblElement.Size = New System.Drawing.Size(48, 13) - Me.lblElement.TabIndex = 12 + Me.lblElement.TabIndex = 7 Me.lblElement.Text = "Element:" ' 'lblDate @@ -157,7 +156,7 @@ Partial Class dlgDisplayDailyData Me.lblDate.Location = New System.Drawing.Point(283, 109) Me.lblDate.Name = "lblDate" Me.lblDate.Size = New System.Drawing.Size(33, 13) - Me.lblDate.TabIndex = 6 + Me.lblDate.TabIndex = 13 Me.lblDate.Text = "Date:" ' 'lblYear @@ -167,7 +166,7 @@ Partial Class dlgDisplayDailyData Me.lblYear.Location = New System.Drawing.Point(283, 193) Me.lblYear.Name = "lblYear" Me.lblYear.Size = New System.Drawing.Size(32, 13) - Me.lblYear.TabIndex = 10 + Me.lblYear.TabIndex = 9 Me.lblYear.Text = "Year:" ' 'lblDayOfTheYear @@ -177,7 +176,7 @@ Partial Class dlgDisplayDailyData Me.lblDayOfTheYear.Location = New System.Drawing.Point(283, 150) Me.lblDayOfTheYear.Name = "lblDayOfTheYear" Me.lblDayOfTheYear.Size = New System.Drawing.Size(29, 13) - Me.lblDayOfTheYear.TabIndex = 8 + Me.lblDayOfTheYear.TabIndex = 11 Me.lblDayOfTheYear.Text = "Doy:" ' 'lblYaxisUpper @@ -187,7 +186,7 @@ Partial Class dlgDisplayDailyData Me.lblYaxisUpper.Location = New System.Drawing.Point(9, 16) Me.lblYaxisUpper.Name = "lblYaxisUpper" Me.lblYaxisUpper.Size = New System.Drawing.Size(70, 13) - Me.lblYaxisUpper.TabIndex = 0 + Me.lblYaxisUpper.TabIndex = 25 Me.lblYaxisUpper.Text = "Y-axis Upper:" ' 'grpGraph @@ -244,7 +243,7 @@ Partial Class dlgDisplayDailyData Me.lblBarColour.Location = New System.Drawing.Point(9, 48) Me.lblBarColour.Name = "lblBarColour" Me.lblBarColour.Size = New System.Drawing.Size(59, 13) - Me.lblBarColour.TabIndex = 2 + Me.lblBarColour.TabIndex = 26 Me.lblBarColour.Text = "Bar Colour:" ' 'ucrNudUpperYaxis @@ -268,7 +267,7 @@ Partial Class dlgDisplayDailyData Me.lblElements.Location = New System.Drawing.Point(283, 237) Me.lblElements.Name = "lblElements" Me.lblElements.Size = New System.Drawing.Size(59, 13) - Me.lblElements.TabIndex = 12 + Me.lblElements.TabIndex = 5 Me.lblElements.Text = "Element(s):" ' 'grpSummary @@ -283,7 +282,7 @@ Partial Class dlgDisplayDailyData Me.grpSummary.Location = New System.Drawing.Point(9, 256) Me.grpSummary.Name = "grpSummary" Me.grpSummary.Size = New System.Drawing.Size(235, 118) - Me.grpSummary.TabIndex = 14 + Me.grpSummary.TabIndex = 16 Me.grpSummary.TabStop = False Me.grpSummary.Text = "Summary" ' @@ -369,7 +368,7 @@ Partial Class dlgDisplayDailyData ' Me.lblScales.AutoSize = True Me.lblScales.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblScales.Location = New System.Drawing.Point(6, 16) + Me.lblScales.Location = New System.Drawing.Point(6, -86) Me.lblScales.Name = "lblScales" Me.lblScales.Size = New System.Drawing.Size(37, 13) Me.lblScales.TabIndex = 36 @@ -443,7 +442,7 @@ Partial Class dlgDisplayDailyData Me.rdoGraphByYear.Location = New System.Drawing.Point(146, 12) Me.rdoGraphByYear.Name = "rdoGraphByYear" Me.rdoGraphByYear.Size = New System.Drawing.Size(124, 29) - Me.rdoGraphByYear.TabIndex = 23 + Me.rdoGraphByYear.TabIndex = 1 Me.rdoGraphByYear.Text = "Graph by Year" Me.rdoGraphByYear.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoGraphByYear.UseVisualStyleBackColor = True @@ -479,7 +478,7 @@ Partial Class dlgDisplayDailyData Me.ucrReceiverMultipleElements.Selector = Nothing Me.ucrReceiverMultipleElements.Size = New System.Drawing.Size(126, 100) Me.ucrReceiverMultipleElements.strNcFilePath = "" - Me.ucrReceiverMultipleElements.TabIndex = 25 + Me.ucrReceiverMultipleElements.TabIndex = 4 Me.ucrReceiverMultipleElements.ucrSelector = Nothing ' 'ucrReceiverElement @@ -492,7 +491,7 @@ Partial Class dlgDisplayDailyData Me.ucrReceiverElement.Selector = Nothing Me.ucrReceiverElement.Size = New System.Drawing.Size(122, 20) Me.ucrReceiverElement.strNcFilePath = "" - Me.ucrReceiverElement.TabIndex = 1 + Me.ucrReceiverElement.TabIndex = 6 Me.ucrReceiverElement.ucrSelector = Nothing ' 'ucrInputComboMissing @@ -504,7 +503,7 @@ Partial Class dlgDisplayDailyData Me.ucrInputComboMissing.Location = New System.Drawing.Point(155, 380) Me.ucrInputComboMissing.Name = "ucrInputComboMissing" Me.ucrInputComboMissing.Size = New System.Drawing.Size(99, 21) - Me.ucrInputComboMissing.TabIndex = 16 + Me.ucrInputComboMissing.TabIndex = 17 ' 'ucrInputComboTrace ' @@ -524,7 +523,7 @@ Partial Class dlgDisplayDailyData Me.ucrChkMissing.Location = New System.Drawing.Point(10, 380) Me.ucrChkMissing.Name = "ucrChkMissing" Me.ucrChkMissing.Size = New System.Drawing.Size(141, 23) - Me.ucrChkMissing.TabIndex = 15 + Me.ucrChkMissing.TabIndex = 27 ' 'ucrChkTrace ' @@ -533,7 +532,7 @@ Partial Class dlgDisplayDailyData Me.ucrChkTrace.Location = New System.Drawing.Point(10, 428) Me.ucrChkTrace.Name = "ucrChkTrace" Me.ucrChkTrace.Size = New System.Drawing.Size(141, 23) - Me.ucrChkTrace.TabIndex = 17 + Me.ucrChkTrace.TabIndex = 18 ' 'ucrReceiverYear ' @@ -545,7 +544,7 @@ Partial Class dlgDisplayDailyData Me.ucrReceiverYear.Selector = Nothing Me.ucrReceiverYear.Size = New System.Drawing.Size(122, 20) Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.TabIndex = 11 + Me.ucrReceiverYear.TabIndex = 8 Me.ucrReceiverYear.ucrSelector = Nothing ' 'ucrReceiverDayOfYear @@ -558,7 +557,7 @@ Partial Class dlgDisplayDailyData Me.ucrReceiverDayOfYear.Selector = Nothing Me.ucrReceiverDayOfYear.Size = New System.Drawing.Size(122, 20) Me.ucrReceiverDayOfYear.strNcFilePath = "" - Me.ucrReceiverDayOfYear.TabIndex = 9 + Me.ucrReceiverDayOfYear.TabIndex = 10 Me.ucrReceiverDayOfYear.ucrSelector = Nothing ' 'ucrReceiverDate @@ -571,7 +570,7 @@ Partial Class dlgDisplayDailyData Me.ucrReceiverDate.Selector = Nothing Me.ucrReceiverDate.Size = New System.Drawing.Size(122, 20) Me.ucrReceiverDate.strNcFilePath = "" - Me.ucrReceiverDate.TabIndex = 7 + Me.ucrReceiverDate.TabIndex = 12 Me.ucrReceiverDate.ucrSelector = Nothing ' 'ucrReceiverStations @@ -584,7 +583,7 @@ Partial Class dlgDisplayDailyData Me.ucrReceiverStations.Selector = Nothing Me.ucrReceiverStations.Size = New System.Drawing.Size(122, 20) Me.ucrReceiverStations.strNcFilePath = "" - Me.ucrReceiverStations.TabIndex = 5 + Me.ucrReceiverStations.TabIndex = 14 Me.ucrReceiverStations.ucrSelector = Nothing ' 'ucrPnlFrequencyDisplay @@ -615,22 +614,9 @@ Partial Class dlgDisplayDailyData Me.ucrBase.Location = New System.Drawing.Point(10, 452) Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) 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 = 22 ' - 'ucrReceiverSingleElements - ' - Me.ucrReceiverSingleElements.AutoSize = True - Me.ucrReceiverSingleElements.frmParent = Me - Me.ucrReceiverSingleElements.Location = New System.Drawing.Point(280, 253) - Me.ucrReceiverSingleElements.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSingleElements.Name = "ucrReceiverSingleElements" - Me.ucrReceiverSingleElements.Selector = Nothing - Me.ucrReceiverSingleElements.Size = New System.Drawing.Size(122, 20) - Me.ucrReceiverSingleElements.strNcFilePath = "" - Me.ucrReceiverSingleElements.TabIndex = 24 - Me.ucrReceiverSingleElements.ucrSelector = Nothing - ' 'ucrChkZero ' Me.ucrChkZero.AutoSize = True @@ -658,7 +644,7 @@ Partial Class dlgDisplayDailyData Me.ucrSaveGraph.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveGraph.Name = "ucrSaveGraph" Me.ucrSaveGraph.Size = New System.Drawing.Size(320, 23) - Me.ucrSaveGraph.TabIndex = 4 + Me.ucrSaveGraph.TabIndex = 58 ' 'cmdDispalyDailyOptions ' @@ -677,14 +663,14 @@ Partial Class dlgDisplayDailyData Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(416, 511) + Me.Controls.Add(Me.lblElements) + Me.Controls.Add(Me.lblElement) + Me.Controls.Add(Me.ucrReceiverMultipleElements) Me.Controls.Add(Me.cmdDispalyDailyOptions) Me.Controls.Add(Me.ucrSaveGraph) Me.Controls.Add(Me.ucrInputGraphRugColur) Me.Controls.Add(Me.lblGRugColour) - Me.Controls.Add(Me.ucrReceiverMultipleElements) Me.Controls.Add(Me.rdoGraphByYear) - Me.Controls.Add(Me.lblElements) - Me.Controls.Add(Me.ucrReceiverElement) Me.Controls.Add(Me.ucrInputComboZero) Me.Controls.Add(Me.ucrInputComboMissing) Me.Controls.Add(Me.ucrInputComboTrace) @@ -697,7 +683,6 @@ Partial Class dlgDisplayDailyData Me.Controls.Add(Me.lblDayOfTheYear) Me.Controls.Add(Me.ucrReceiverDayOfYear) Me.Controls.Add(Me.ucrReceiverDate) - Me.Controls.Add(Me.lblElement) Me.Controls.Add(Me.lblStation) Me.Controls.Add(Me.ucrReceiverStations) Me.Controls.Add(Me.rdoTable) @@ -705,10 +690,10 @@ Partial Class dlgDisplayDailyData Me.Controls.Add(Me.ucrPnlFrequencyDisplay) Me.Controls.Add(Me.ucrSelectorDisplayDailyClimaticData) Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.ucrReceiverSingleElements) Me.Controls.Add(Me.grpGraph) Me.Controls.Add(Me.grpSummary) Me.Controls.Add(Me.grpFacet) + Me.Controls.Add(Me.ucrReceiverElement) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -762,7 +747,6 @@ Partial Class dlgDisplayDailyData Friend WithEvents grpSummary As GroupBox Friend WithEvents ucrChkSumMissing As ucrCheck Friend WithEvents rdoGraphByYear As RadioButton - Friend WithEvents ucrReceiverSingleElements As ucrReceiverSingle Friend WithEvents ucrReceiverMultipleElements As ucrReceiverMultiple Friend WithEvents lblFacetby As Label Friend WithEvents ucrInputFacetBy As ucrInputComboBox From 3573f1f35810f0009e717d1592de0778ad71859b Mon Sep 17 00:00:00 2001 From: n-thony Date: Wed, 13 Dec 2023 10:13:04 +0300 Subject: [PATCH 04/12] fixed bug in add link --- instat/dlgAddLink.vb | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/instat/dlgAddLink.vb b/instat/dlgAddLink.vb index 673889f4981..08815c2d597 100644 --- a/instat/dlgAddLink.vb +++ b/instat/dlgAddLink.vb @@ -26,8 +26,6 @@ Public Class dlgAddLink If bFirstLoad Then InitialiseDialog() bFirstLoad = False - Else - ReopenDialog() End If If bReset Then SetDefaults() @@ -68,8 +66,6 @@ Public Class dlgAddLink ucrDataSelectorTo.Reset() ucrSaveLink.Reset() - UpdateKeys() - clsAddLink.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_link") clsAddLink.AddParameter("type", Chr(34) & "keyed_link" & Chr(34), iPosition:=3) @@ -95,11 +91,7 @@ Public Class dlgAddLink TestOKEnabled() End Sub - Private Sub ReopenDialog() - UpdateKeys() ' currently I may open the dialog, then realise I haven't set my keys, make my key, reopen this dlg and my key doesn't show up until I reset it. - End Sub - - Public Sub UpdateKeys() + Private Sub UpdateKeys() Dim clsColumnNames As New RFunction Dim lstKeys As GenericVector Dim chrKeyColumns As CharacterVector @@ -108,17 +100,19 @@ Public Class dlgAddLink Dim bCanAutoLink As Boolean Dim strColumnNames As String() Dim clsGetKeys As New RFunction + Dim strDataFrameTo As String = ucrDataSelectorTo.cboAvailableDataFrames.Text + Dim strDataFrameFrom As String = ucrDataSelectorFrom.cboAvailableDataFrames.Text - If ucrDataSelectorTo.cboAvailableDataFrames.Text <> "" Then + If Not String.IsNullOrEmpty(strDataFrameFrom) AndAlso Not String.IsNullOrEmpty(strDataFrameTo) Then lvwLinkViewBox.Items.Clear() - lblKeys.Text = ucrDataSelectorTo.cboAvailableDataFrames.SelectedItem & GetTranslation(" Keys:") + lblKeys.Text = strDataFrameTo & GetTranslation(" Keys:") clsGetKeys.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_keys") - clsGetKeys.AddParameter("data_name", Chr(34) & ucrDataSelectorTo.cboAvailableDataFrames.SelectedItem & Chr(34)) + clsGetKeys.AddParameter("data_name", Chr(34) & strDataFrameTo & Chr(34)) lstKeys = frmMain.clsRLink.RunInternalScriptGetValue(clsGetKeys.ToScript).AsList clsColumnNames.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_column_names") - clsColumnNames.AddParameter("data_name", Chr(34) & ucrDataSelectorFrom.cboAvailableDataFrames.SelectedItem & Chr(34)) + clsColumnNames.AddParameter("data_name", Chr(34) & strDataFrameFrom & Chr(34)) strColumnNames = frmMain.clsRLink.RunInternalScriptGetValue(clsColumnNames.ToScript).AsCharacter().ToArray For i = 0 To lstKeys.Count - 1 @@ -169,7 +163,7 @@ Public Class dlgAddLink End If End Function - Private Sub ucrDataSelectorTo_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrDataSelectorTo.ControlValueChanged + Private Sub ucrDataSelectorTo_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrDataSelectorTo.ControlValueChanged, ucrDataSelectorFrom.ControlValueChanged UpdateKeys() End Sub From 2c725d9579a0825edfc5f00898fcf0978586ec53 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 18 Dec 2023 17:24:20 +0100 Subject: [PATCH 05/12] Added drown arrow --- instat/dlgGeneralForGraphics.Designer.vb | 200 ++++++++++++----------- instat/dlgGeneralForGraphics.resx | 3 + instat/dlgGeneralForGraphics.vb | 70 ++++++-- 3 files changed, 163 insertions(+), 110 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index 7b585b8bc6c..c05ec37485a 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -39,12 +39,6 @@ Partial Class dlgGeneralForGraphics Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Me.cmdOptions = New System.Windows.Forms.Button() - Me.cmdFacets = New System.Windows.Forms.Button() - Me.cmdTheme = New System.Windows.Forms.Button() - Me.cmdYAxis = New System.Windows.Forms.Button() - Me.cmdXAxis = New System.Windows.Forms.Button() - Me.cmdTitles = New System.Windows.Forms.Button() Me.grpAethetics = New System.Windows.Forms.GroupBox() Me.ucrChkUseasNumeric = New instat.ucrCheck() Me.ucrReceiverY = New instat.ucrReceiverSingle() @@ -90,77 +84,23 @@ Partial Class dlgGeneralForGraphics Me.ucrGraphicsSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrAdditionalLayers = New instat.ucrAdditionalLayers() Me.ucrBase = New instat.ucrButtons() - Me.cmdColour = New System.Windows.Forms.Button() + Me.contextMenuStripOptions = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.toolStripMenuItemPlotOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemFacets = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemLayers = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemTitles = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemXaxis = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemYaxis = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemThemes = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemCoordinates = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemColour = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemAnnotation = New System.Windows.Forms.ToolStripMenuItem() + Me.cmdOptions = New instat.ucrSplitButton() Me.grpAethetics.SuspendLayout() Me.ContextMenuPackagesList.SuspendLayout() + Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' - 'cmdOptions - ' - Me.cmdOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOptions.Location = New System.Drawing.Point(6, 401) - Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Size = New System.Drawing.Size(60, 25) - Me.cmdOptions.TabIndex = 7 - Me.cmdOptions.Tag = "Options" - Me.cmdOptions.Text = "Options" - Me.cmdOptions.UseVisualStyleBackColor = True - ' - 'cmdFacets - ' - Me.cmdFacets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFacets.Location = New System.Drawing.Point(65, 401) - Me.cmdFacets.Name = "cmdFacets" - Me.cmdFacets.Size = New System.Drawing.Size(57, 25) - Me.cmdFacets.TabIndex = 17 - Me.cmdFacets.Tag = "Facets" - Me.cmdFacets.Text = "Facets" - Me.cmdFacets.UseVisualStyleBackColor = True - ' - 'cmdTheme - ' - Me.cmdTheme.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTheme.Location = New System.Drawing.Point(303, 401) - Me.cmdTheme.Name = "cmdTheme" - Me.cmdTheme.Size = New System.Drawing.Size(65, 25) - Me.cmdTheme.TabIndex = 21 - Me.cmdTheme.Tag = "Theme" - Me.cmdTheme.Text = "Themes" - Me.cmdTheme.UseVisualStyleBackColor = True - ' - 'cmdYAxis - ' - Me.cmdYAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYAxis.Location = New System.Drawing.Point(240, 401) - Me.cmdYAxis.Name = "cmdYAxis" - Me.cmdYAxis.Size = New System.Drawing.Size(64, 25) - Me.cmdYAxis.TabIndex = 20 - Me.cmdYAxis.Tag = "" - Me.cmdYAxis.Text = "Y-Axis" - Me.cmdYAxis.UseVisualStyleBackColor = True - ' - 'cmdXAxis - ' - Me.cmdXAxis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdXAxis.Location = New System.Drawing.Point(180, 401) - Me.cmdXAxis.Name = "cmdXAxis" - Me.cmdXAxis.Size = New System.Drawing.Size(61, 25) - Me.cmdXAxis.TabIndex = 19 - Me.cmdXAxis.Tag = "" - Me.cmdXAxis.Text = "X-Axis" - Me.cmdXAxis.UseVisualStyleBackColor = True - ' - 'cmdTitles - ' - Me.cmdTitles.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTitles.Location = New System.Drawing.Point(121, 401) - Me.cmdTitles.Name = "cmdTitles" - Me.cmdTitles.Size = New System.Drawing.Size(60, 25) - Me.cmdTitles.TabIndex = 18 - Me.cmdTitles.Tag = "" - Me.cmdTitles.Text = "Titles" - Me.cmdTitles.UseVisualStyleBackColor = True - ' 'grpAethetics ' Me.grpAethetics.Controls.Add(Me.ucrChkUseasNumeric) @@ -540,16 +480,84 @@ Partial Class dlgGeneralForGraphics Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 9 ' - 'cmdColour + 'contextMenuStripOptions + ' + Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemFacets, Me.toolStripMenuItemLayers, Me.toolStripMenuItemTitles, Me.toolStripMenuItemXaxis, Me.toolStripMenuItemYaxis, Me.toolStripMenuItemThemes, Me.toolStripMenuItemCoordinates, Me.toolStripMenuItemColour, Me.toolStripMenuItemAnnotation}) + Me.contextMenuStripOptions.Name = "contextMenuStripOk" + Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 246) + ' + 'toolStripMenuItemPlotOptions + ' + Me.toolStripMenuItemPlotOptions.Name = "toolStripMenuItemPlotOptions" + Me.toolStripMenuItemPlotOptions.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemPlotOptions.Text = "Plot Options" + ' + 'toolStripMenuItemFacets + ' + Me.toolStripMenuItemFacets.Name = "toolStripMenuItemFacets" + Me.toolStripMenuItemFacets.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemFacets.Text = "Facets" + ' + 'toolStripMenuItemLayers + ' + Me.toolStripMenuItemLayers.Name = "toolStripMenuItemLayers" + Me.toolStripMenuItemLayers.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemLayers.Text = "Layers" + ' + 'toolStripMenuItemTitles + ' + Me.toolStripMenuItemTitles.Name = "toolStripMenuItemTitles" + Me.toolStripMenuItemTitles.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemTitles.Text = "Titles" + ' + 'toolStripMenuItemXaxis + ' + Me.toolStripMenuItemXaxis.Name = "toolStripMenuItemXaxis" + Me.toolStripMenuItemXaxis.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemXaxis.Text = "X-Axis" ' - Me.cmdColour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdColour.Location = New System.Drawing.Point(367, 401) - Me.cmdColour.Name = "cmdColour" - Me.cmdColour.Size = New System.Drawing.Size(65, 25) - Me.cmdColour.TabIndex = 214 - Me.cmdColour.Tag = "Colour" - Me.cmdColour.Text = "Colour" - Me.cmdColour.UseVisualStyleBackColor = True + 'toolStripMenuItemYaxis + ' + Me.toolStripMenuItemYaxis.Name = "toolStripMenuItemYaxis" + Me.toolStripMenuItemYaxis.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemYaxis.Text = "Y-Axis" + ' + 'toolStripMenuItemThemes + ' + Me.toolStripMenuItemThemes.Name = "toolStripMenuItemThemes" + Me.toolStripMenuItemThemes.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemThemes.Text = "Themes" + ' + 'toolStripMenuItemCoordinates + ' + Me.toolStripMenuItemCoordinates.Name = "toolStripMenuItemCoordinates" + Me.toolStripMenuItemCoordinates.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemCoordinates.Text = "Coordinates" + ' + 'toolStripMenuItemColour + ' + Me.toolStripMenuItemColour.Name = "toolStripMenuItemColour" + Me.toolStripMenuItemColour.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemColour.Text = "Colour" + ' + 'toolStripMenuItemAnnotation + ' + Me.toolStripMenuItemAnnotation.Name = "toolStripMenuItemAnnotation" + Me.toolStripMenuItemAnnotation.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemAnnotation.Text = "Annotation" + ' + 'cmdOptions + ' + Me.cmdOptions.AutoSize = True + Me.cmdOptions.ContextMenuStrip = Me.contextMenuStripOptions + Me.cmdOptions.Location = New System.Drawing.Point(6, 401) + Me.cmdOptions.Name = "cmdOptions" + Me.cmdOptions.Size = New System.Drawing.Size(122, 25) + Me.cmdOptions.SplitMenuStrip = Me.contextMenuStripOptions + Me.cmdOptions.TabIndex = 216 + Me.cmdOptions.Tag = "Plot Options" + Me.cmdOptions.Text = "Plot Options" + Me.cmdOptions.UseVisualStyleBackColor = True ' 'dlgGeneralForGraphics ' @@ -557,20 +565,14 @@ Partial Class dlgGeneralForGraphics Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(478, 547) - Me.Controls.Add(Me.cmdColour) + Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.cmdRHelp) Me.Controls.Add(Me.grpAethetics) Me.Controls.Add(Me.ucrInputLegendPosition) Me.Controls.Add(Me.ucrChkFlipCoordinates) Me.Controls.Add(Me.ucrChkLegend) - Me.Controls.Add(Me.cmdTitles) - Me.Controls.Add(Me.cmdXAxis) - Me.Controls.Add(Me.cmdYAxis) - Me.Controls.Add(Me.cmdTheme) - Me.Controls.Add(Me.cmdFacets) Me.Controls.Add(Me.ucrSave) Me.Controls.Add(Me.ucrGraphicsSelector) - Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.ucrAdditionalLayers) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow @@ -583,6 +585,7 @@ Partial Class dlgGeneralForGraphics Me.grpAethetics.ResumeLayout(False) Me.grpAethetics.PerformLayout() Me.ContextMenuPackagesList.ResumeLayout(False) + Me.contextMenuStripOptions.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -590,14 +593,8 @@ Partial Class dlgGeneralForGraphics Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrAdditionalLayers As ucrAdditionalLayers - Friend WithEvents cmdOptions As Button Friend WithEvents ucrGraphicsSelector As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrSave As ucrSave - Friend WithEvents cmdTheme As Button - Friend WithEvents cmdFacets As Button - Friend WithEvents cmdTitles As Button - Friend WithEvents cmdXAxis As Button - Friend WithEvents cmdYAxis As Button Friend WithEvents ucrChkLegend As ucrCheck Friend WithEvents ucrChkFlipCoordinates As ucrCheck Friend WithEvents ucrInputLegendPosition As ucrInputComboBox @@ -639,5 +636,16 @@ Partial Class dlgGeneralForGraphics Friend WithEvents lblYVariable As Label Friend WithEvents lblXVariable As Label Friend WithEvents ucrReceiverX As ucrReceiverSingle - Friend WithEvents cmdColour As Button + Friend WithEvents cmdOptions As ucrSplitButton + Friend WithEvents contextMenuStripOptions As ContextMenuStrip + Friend WithEvents toolStripMenuItemPlotOptions As ToolStripMenuItem + Friend WithEvents toolStripMenuItemFacets As ToolStripMenuItem + Friend WithEvents toolStripMenuItemLayers As ToolStripMenuItem + Friend WithEvents toolStripMenuItemTitles As ToolStripMenuItem + Friend WithEvents toolStripMenuItemXaxis As ToolStripMenuItem + Friend WithEvents toolStripMenuItemYaxis As ToolStripMenuItem + Friend WithEvents toolStripMenuItemThemes As ToolStripMenuItem + Friend WithEvents toolStripMenuItemCoordinates As ToolStripMenuItem + Friend WithEvents toolStripMenuItemColour As ToolStripMenuItem + Friend WithEvents toolStripMenuItemAnnotation As ToolStripMenuItem End Class diff --git a/instat/dlgGeneralForGraphics.resx b/instat/dlgGeneralForGraphics.resx index f8d7bd09a9c..1b8bf479b35 100644 --- a/instat/dlgGeneralForGraphics.resx +++ b/instat/dlgGeneralForGraphics.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 415, 13 + 217, 12 diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 25dd0a6d244..fd522d4d44a 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -244,7 +244,7 @@ Public Class dlgGeneralForGraphics End If End Sub - Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, toolStripMenuItemPlotOptions.Click sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, @@ -260,7 +260,7 @@ Public Class dlgGeneralForGraphics VariableXType() End Sub - Private Sub cmdFacets_Click(sender As Object, e As EventArgs) Handles cmdFacets.Click + Private Sub toolStripMenuItemFacets_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemFacets.Click sdgPlots.DisableLayersTab() sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, @@ -273,21 +273,20 @@ Public Class dlgGeneralForGraphics bResetOptionsSubdialog = False End Sub - Private Sub cmdTheme_Click(sender As Object, e As EventArgs) Handles cmdTheme.Click - sdgPlots.DisableLayersTab() + Private Sub toolStripMenuItemLayers_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemLayers.Click sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, - clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, - clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, - clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) - sdgPlots.tbpPlotsOptions.SelectedIndex = 5 + clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, + clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, + clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) + sdgPlots.tbpPlotsOptions.SelectedIndex = 1 sdgPlots.ShowDialog() sdgPlots.tbpPlotsOptions.SelectedIndex = 0 sdgPlots.EnableLayersTab() bResetSubdialog = False End Sub - Private Sub cmdTitles_Click(sender As Object, e As EventArgs) Handles cmdTitles.Click + Private Sub toolStripMenuItemTitles_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemTitles.Click sdgPlots.DisableLayersTab() sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, @@ -300,7 +299,7 @@ Public Class dlgGeneralForGraphics bResetSubdialog = False End Sub - Private Sub cmdXAxis_Click(sender As Object, e As EventArgs) Handles cmdXAxis.Click + Private Sub toolStripMenuItemXaxis_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemXaxis.Click sdgPlots.DisableLayersTab() sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, @@ -313,7 +312,7 @@ Public Class dlgGeneralForGraphics sdgPlots.EnableLayersTab() End Sub - Private Sub cmdYAxis_Click(sender As Object, e As EventArgs) Handles cmdYAxis.Click + Private Sub toolStripMenuItemYaxis_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemYaxis.Click sdgPlots.DisableLayersTab() sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, @@ -326,7 +325,36 @@ Public Class dlgGeneralForGraphics sdgPlots.EnableLayersTab() End Sub - Private Sub cmdColour_Click(sender As Object, e As EventArgs) Handles cmdColour.Click + Private Sub toolStripMenuItemThemes_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemThemes.Click + sdgPlots.DisableLayersTab() + sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, + clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, + clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, + clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) + sdgPlots.tbpPlotsOptions.SelectedIndex = 5 + sdgPlots.ShowDialog() + sdgPlots.tbpPlotsOptions.SelectedIndex = 0 + sdgPlots.EnableLayersTab() + bResetSubdialog = False + End Sub + + Private Sub toolStripMenuItemCoordinates_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemCoordinates.Click + sdgPlots.DisableLayersTab() + sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, + clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, + clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, + clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) + sdgPlots.tbpPlotsOptions.SelectedIndex = 6 + sdgPlots.ShowDialog() + bResetOptionsSubdialog = False + sdgPlots.tbpPlotsOptions.SelectedIndex = 0 + sdgPlots.EnableLayersTab() + bResetSubdialog = False + End Sub + + Private Sub toolStripMenuItemColour_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemColour.Click sdgPlots.DisableLayersTab() sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, @@ -338,6 +366,20 @@ Public Class dlgGeneralForGraphics bResetOptionsSubdialog = False sdgPlots.EnableLayersTab() End Sub + + Private Sub toolStripMenuItemAnnotation_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemAnnotation.Click + sdgPlots.DisableLayersTab() + sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, + clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction, + clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction, + clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetOptionsSubdialog) + sdgPlots.tbpPlotsOptions.SelectedIndex = 8 + sdgPlots.ShowDialog() + bResetOptionsSubdialog = False + sdgPlots.EnableLayersTab() + End Sub + Private Sub ucrReceiverY_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverY.ControlValueChanged, ucrReceiverX.ControlValueChanged If Not ucrReceiverY.IsEmpty Then clsGlobalAesFunction.AddParameter("y", ucrReceiverY.GetVariableNames(False), iPosition:=1) @@ -381,7 +423,7 @@ Public Class dlgGeneralForGraphics ucrChkUseasNumeric.Visible = False If Not ucrReceiverX.IsEmpty Then clsGlobalAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) - ucrChkUseasNumeric.Visible = ucrReceiverX.strCurrDataType = "factor" + ucrChkUseasNumeric.Visible = ucrReceiverX.strCurrDataType = "factor" OrElse ucrReceiverX.strCurrDataType = "ordered,factor" If ucrChkUseasNumeric.Checked Then clsGlobalAesFunction.AddParameter("group", "1", iPosition:=2) Else From 7f8ce326a6df1963181fff0cd711738b73334eea Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 18 Dec 2023 17:31:09 +0100 Subject: [PATCH 06/12] minor change --- instat/sdgPlots.vb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 82e0f26e6ea..d8452a96bac 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -5537,4 +5537,8 @@ Public Class sdgPlots HideShowCanvaFill() GroupeColorScale() End Sub + + Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn + dlgGeneralForGraphics.ucrAdditionalLayers.SetRCodeForControl(clsNewBaseOperator:=clsBaseOperator, clsRNewggplotFunc:=clsRggplotFunction, clsNewAesFunc:=clsGlobalAesFunction, strNewGlobalDataFrame:=strDataFrame, bReset:=True) + End Sub End Class \ No newline at end of file From 777a1206e268a4455601a72a8cf07e4e10a10bc2 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 19 Dec 2023 09:46:37 +0300 Subject: [PATCH 07/12] Have a look of this --- instat/dlgGeneralForGraphics.vb | 1 + instat/sdgPlots.vb | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index fd522d4d44a..fd3aab338ab 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -251,6 +251,7 @@ Public Class dlgGeneralForGraphics clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog) sdgPlots.ShowDialog() + ucrAdditionalLayers.SetRCodeForControl(clsNewBaseOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewAesFunc:=clsGlobalAesFunction, bReset:=True) bResetSubdialog = False End Sub diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index d8452a96bac..38f83c1c661 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -5538,7 +5538,4 @@ Public Class sdgPlots GroupeColorScale() End Sub - Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn - dlgGeneralForGraphics.ucrAdditionalLayers.SetRCodeForControl(clsNewBaseOperator:=clsBaseOperator, clsRNewggplotFunc:=clsRggplotFunction, clsNewAesFunc:=clsGlobalAesFunction, strNewGlobalDataFrame:=strDataFrame, bReset:=True) - End Sub End Class \ No newline at end of file From 83a315ac89b6d63c401ed1e745a6c688b66ee7e7 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 19 Dec 2023 10:13:28 +0300 Subject: [PATCH 08/12] Handling layers from layers toolstrip --- instat/dlgGeneralForGraphics.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index fd3aab338ab..edfb1e0537f 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -284,6 +284,7 @@ Public Class dlgGeneralForGraphics sdgPlots.ShowDialog() sdgPlots.tbpPlotsOptions.SelectedIndex = 0 sdgPlots.EnableLayersTab() + ucrAdditionalLayers.SetRCodeForControl(clsNewBaseOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewAesFunc:=clsGlobalAesFunction, bReset:=True) bResetSubdialog = False End Sub From 5c403c049cda2b383bcfab90fd4c29c171ddeef4 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 20 Dec 2023 10:45:03 +0100 Subject: [PATCH 09/12] Corrected the message when running the Tools > Install R Package --- instat/dlgRPackages.Designer.vb | 8 ++++---- instat/dlgRPackages.vb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/instat/dlgRPackages.Designer.vb b/instat/dlgRPackages.Designer.vb index 212bb462a65..c8fd71c7a55 100644 --- a/instat/dlgRPackages.Designer.vb +++ b/instat/dlgRPackages.Designer.vb @@ -55,18 +55,18 @@ Partial Class dlgInstallRPackage Me.ucrInputMessage.AutoSize = True Me.ucrInputMessage.IsMultiline = False Me.ucrInputMessage.IsReadOnly = True - Me.ucrInputMessage.Location = New System.Drawing.Point(105, 81) + Me.ucrInputMessage.Location = New System.Drawing.Point(95, 81) Me.ucrInputMessage.Name = "ucrInputMessage" - Me.ucrInputMessage.Size = New System.Drawing.Size(319, 22) + Me.ucrInputMessage.Size = New System.Drawing.Size(337, 22) Me.ucrInputMessage.TabIndex = 17 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(14, 130) + Me.ucrBase.Location = New System.Drawing.Point(24, 130) 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 = 15 ' 'ucrInputTextBoxRPackage diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index 79363d1682c..3ef639aaa9a 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -106,7 +106,7 @@ Public Class dlgInstallRPackage ucrInputMessage.SetText("Package is installed but not a current CRAN package") ucrInputMessage.txtInput.BackColor = Color.LightBlue Case "4" - ucrInputMessage.SetText("Not a current CRAN package. Perhaps it has been archived") + ucrInputMessage.SetText("Not a current CRAN package. Perhaps spelled wrongly, or archived?") ucrInputMessage.txtInput.BackColor = Color.LightSkyBlue Case "5" ucrInputMessage.SetText("No internet connection.Try reconnecting") From 2691121e0f97e1a1c3c59569e7b08e737fe303c4 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Wed, 20 Dec 2023 13:32:01 +0300 Subject: [PATCH 10/12] recent_changes --- instat/dlgAutoSaveRecovery.Designer.vb | 110 ++++++++++++------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/instat/dlgAutoSaveRecovery.Designer.vb b/instat/dlgAutoSaveRecovery.Designer.vb index bc6950b86bc..bedf12266fd 100644 --- a/instat/dlgAutoSaveRecovery.Designer.vb +++ b/instat/dlgAutoSaveRecovery.Designer.vb @@ -49,15 +49,15 @@ Partial Class dlgAutoSaveRecovery Me.cmdSaveData = New System.Windows.Forms.Button() Me.lblBackupDataDetected = New System.Windows.Forms.Label() Me.lblDataSavedTo = New System.Windows.Forms.Label() - Me.ucrInputSavedPathData = New instat.ucrInputTextBox() - Me.ucrInputSavedPathLog = New instat.ucrInputTextBox() Me.lblLogSavedTo = New System.Windows.Forms.Label() - Me.ucrInputSavedPathInternalLog = New instat.ucrInputTextBox() Me.lblInternalLogSavedTo = New System.Windows.Forms.Label() - Me.ucrChkSendInternalLog = New instat.ucrCheck() Me.cmdHelp = New System.Windows.Forms.Button() Me.grpSavingOptions = New System.Windows.Forms.GroupBox() Me.grpEndChoice = New System.Windows.Forms.GroupBox() + Me.ucrInputSavedPathInternalLog = New instat.ucrInputTextBox() + Me.ucrInputSavedPathLog = New instat.ucrInputTextBox() + Me.ucrInputSavedPathData = New instat.ucrInputTextBox() + Me.ucrChkSendInternalLog = New instat.ucrCheck() Me.grpSavingOptions.SuspendLayout() Me.grpEndChoice.SuspendLayout() Me.SuspendLayout() @@ -68,7 +68,7 @@ Partial Class dlgAutoSaveRecovery Me.lblAutoRecoverMessage.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAutoRecoverMessage.Location = New System.Drawing.Point(0, 0) Me.lblAutoRecoverMessage.Name = "lblAutoRecoverMessage" - Me.lblAutoRecoverMessage.Size = New System.Drawing.Size(762, 91) + Me.lblAutoRecoverMessage.Size = New System.Drawing.Size(847, 91) Me.lblAutoRecoverMessage.TabIndex = 0 Me.lblAutoRecoverMessage.Text = "We have detected that R-Instat may have closed unexpectedly." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Below are your auto" & " recovery options." @@ -112,7 +112,7 @@ Partial Class dlgAutoSaveRecovery ' 'cmdSaveLog ' - Me.cmdSaveLog.Location = New System.Drawing.Point(203, 68) + Me.cmdSaveLog.Location = New System.Drawing.Point(269, 68) Me.cmdSaveLog.Name = "cmdSaveLog" Me.cmdSaveLog.Size = New System.Drawing.Size(176, 29) Me.cmdSaveLog.TabIndex = 5 @@ -121,7 +121,7 @@ Partial Class dlgAutoSaveRecovery ' 'cmdSaveInternalLog ' - Me.cmdSaveInternalLog.Location = New System.Drawing.Point(203, 115) + Me.cmdSaveInternalLog.Location = New System.Drawing.Point(268, 115) Me.cmdSaveInternalLog.Name = "cmdSaveInternalLog" Me.cmdSaveInternalLog.Size = New System.Drawing.Size(176, 29) Me.cmdSaveInternalLog.TabIndex = 7 @@ -139,7 +139,7 @@ Partial Class dlgAutoSaveRecovery ' 'cmdSaveData ' - Me.cmdSaveData.Location = New System.Drawing.Point(203, 21) + Me.cmdSaveData.Location = New System.Drawing.Point(270, 21) Me.cmdSaveData.Name = "cmdSaveData" Me.cmdSaveData.Size = New System.Drawing.Size(176, 29) Me.cmdSaveData.TabIndex = 9 @@ -158,72 +158,30 @@ Partial Class dlgAutoSaveRecovery 'lblDataSavedTo ' Me.lblDataSavedTo.AutoSize = True - Me.lblDataSavedTo.Location = New System.Drawing.Point(398, 29) + Me.lblDataSavedTo.Location = New System.Drawing.Point(466, 29) Me.lblDataSavedTo.Name = "lblDataSavedTo" Me.lblDataSavedTo.Size = New System.Drawing.Size(55, 13) Me.lblDataSavedTo.TabIndex = 11 Me.lblDataSavedTo.Text = "Saving at:" ' - 'ucrInputSavedPathData - ' - Me.ucrInputSavedPathData.AddQuotesIfUnrecognised = True - Me.ucrInputSavedPathData.AutoSize = True - Me.ucrInputSavedPathData.IsMultiline = False - Me.ucrInputSavedPathData.IsReadOnly = False - Me.ucrInputSavedPathData.Location = New System.Drawing.Point(468, 27) - Me.ucrInputSavedPathData.Name = "ucrInputSavedPathData" - Me.ucrInputSavedPathData.Size = New System.Drawing.Size(258, 21) - Me.ucrInputSavedPathData.TabIndex = 12 - ' - 'ucrInputSavedPathLog - ' - Me.ucrInputSavedPathLog.AddQuotesIfUnrecognised = True - Me.ucrInputSavedPathLog.AutoSize = True - Me.ucrInputSavedPathLog.IsMultiline = False - Me.ucrInputSavedPathLog.IsReadOnly = False - Me.ucrInputSavedPathLog.Location = New System.Drawing.Point(468, 76) - Me.ucrInputSavedPathLog.Name = "ucrInputSavedPathLog" - Me.ucrInputSavedPathLog.Size = New System.Drawing.Size(258, 21) - Me.ucrInputSavedPathLog.TabIndex = 14 - ' 'lblLogSavedTo ' Me.lblLogSavedTo.AutoSize = True - Me.lblLogSavedTo.Location = New System.Drawing.Point(398, 78) + Me.lblLogSavedTo.Location = New System.Drawing.Point(466, 78) Me.lblLogSavedTo.Name = "lblLogSavedTo" Me.lblLogSavedTo.Size = New System.Drawing.Size(55, 13) Me.lblLogSavedTo.TabIndex = 13 Me.lblLogSavedTo.Text = "Saving at:" ' - 'ucrInputSavedPathInternalLog - ' - Me.ucrInputSavedPathInternalLog.AddQuotesIfUnrecognised = True - Me.ucrInputSavedPathInternalLog.AutoSize = True - Me.ucrInputSavedPathInternalLog.IsMultiline = False - Me.ucrInputSavedPathInternalLog.IsReadOnly = False - Me.ucrInputSavedPathInternalLog.Location = New System.Drawing.Point(468, 123) - Me.ucrInputSavedPathInternalLog.Name = "ucrInputSavedPathInternalLog" - Me.ucrInputSavedPathInternalLog.Size = New System.Drawing.Size(258, 21) - Me.ucrInputSavedPathInternalLog.TabIndex = 16 - ' 'lblInternalLogSavedTo ' Me.lblInternalLogSavedTo.AutoSize = True - Me.lblInternalLogSavedTo.Location = New System.Drawing.Point(398, 125) + Me.lblInternalLogSavedTo.Location = New System.Drawing.Point(466, 125) Me.lblInternalLogSavedTo.Name = "lblInternalLogSavedTo" Me.lblInternalLogSavedTo.Size = New System.Drawing.Size(55, 13) Me.lblInternalLogSavedTo.TabIndex = 15 Me.lblInternalLogSavedTo.Text = "Saving at:" ' - 'ucrChkSendInternalLog - ' - Me.ucrChkSendInternalLog.AutoSize = True - Me.ucrChkSendInternalLog.Checked = False - Me.ucrChkSendInternalLog.Location = New System.Drawing.Point(12, 254) - Me.ucrChkSendInternalLog.Name = "ucrChkSendInternalLog" - Me.ucrChkSendInternalLog.Size = New System.Drawing.Size(266, 23) - Me.ucrChkSendInternalLog.TabIndex = 17 - ' 'cmdHelp ' Me.cmdHelp.Location = New System.Drawing.Point(660, 254) @@ -249,7 +207,7 @@ Partial Class dlgAutoSaveRecovery Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathData) Me.grpSavingOptions.Location = New System.Drawing.Point(12, 85) Me.grpSavingOptions.Name = "grpSavingOptions" - Me.grpSavingOptions.Size = New System.Drawing.Size(738, 154) + Me.grpSavingOptions.Size = New System.Drawing.Size(823, 154) Me.grpSavingOptions.TabIndex = 19 Me.grpSavingOptions.TabStop = False Me.grpSavingOptions.Text = "Saving Options" @@ -266,12 +224,54 @@ Partial Class dlgAutoSaveRecovery Me.grpEndChoice.TabStop = False Me.grpEndChoice.Text = "Choose one of the following to proceed" ' + 'ucrInputSavedPathInternalLog + ' + Me.ucrInputSavedPathInternalLog.AddQuotesIfUnrecognised = True + Me.ucrInputSavedPathInternalLog.AutoSize = True + Me.ucrInputSavedPathInternalLog.IsMultiline = False + Me.ucrInputSavedPathInternalLog.IsReadOnly = False + Me.ucrInputSavedPathInternalLog.Location = New System.Drawing.Point(562, 123) + Me.ucrInputSavedPathInternalLog.Name = "ucrInputSavedPathInternalLog" + Me.ucrInputSavedPathInternalLog.Size = New System.Drawing.Size(258, 21) + Me.ucrInputSavedPathInternalLog.TabIndex = 16 + ' + 'ucrInputSavedPathLog + ' + Me.ucrInputSavedPathLog.AddQuotesIfUnrecognised = True + Me.ucrInputSavedPathLog.AutoSize = True + Me.ucrInputSavedPathLog.IsMultiline = False + Me.ucrInputSavedPathLog.IsReadOnly = False + Me.ucrInputSavedPathLog.Location = New System.Drawing.Point(561, 76) + Me.ucrInputSavedPathLog.Name = "ucrInputSavedPathLog" + Me.ucrInputSavedPathLog.Size = New System.Drawing.Size(258, 21) + Me.ucrInputSavedPathLog.TabIndex = 14 + ' + 'ucrInputSavedPathData + ' + Me.ucrInputSavedPathData.AddQuotesIfUnrecognised = True + Me.ucrInputSavedPathData.AutoSize = True + Me.ucrInputSavedPathData.IsMultiline = False + Me.ucrInputSavedPathData.IsReadOnly = False + Me.ucrInputSavedPathData.Location = New System.Drawing.Point(561, 27) + Me.ucrInputSavedPathData.Name = "ucrInputSavedPathData" + Me.ucrInputSavedPathData.Size = New System.Drawing.Size(258, 21) + Me.ucrInputSavedPathData.TabIndex = 12 + ' + 'ucrChkSendInternalLog + ' + Me.ucrChkSendInternalLog.AutoSize = True + Me.ucrChkSendInternalLog.Checked = False + Me.ucrChkSendInternalLog.Location = New System.Drawing.Point(12, 254) + Me.ucrChkSendInternalLog.Name = "ucrChkSendInternalLog" + Me.ucrChkSendInternalLog.Size = New System.Drawing.Size(266, 23) + Me.ucrChkSendInternalLog.TabIndex = 17 + ' 'dlgAutoSaveRecovery ' 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(762, 371) + Me.ClientSize = New System.Drawing.Size(847, 371) Me.Controls.Add(Me.grpEndChoice) Me.Controls.Add(Me.grpSavingOptions) Me.Controls.Add(Me.cmdHelp) From fb5656cb54bb758cfc5289562b29861e4bcea0d2 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Wed, 20 Dec 2023 14:05:38 +0300 Subject: [PATCH 11/12] more_changes --- instat/dlgAutoSaveRecovery.Designer.vb | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/instat/dlgAutoSaveRecovery.Designer.vb b/instat/dlgAutoSaveRecovery.Designer.vb index bedf12266fd..cf6ec8dbdcd 100644 --- a/instat/dlgAutoSaveRecovery.Designer.vb +++ b/instat/dlgAutoSaveRecovery.Designer.vb @@ -68,7 +68,7 @@ Partial Class dlgAutoSaveRecovery Me.lblAutoRecoverMessage.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAutoRecoverMessage.Location = New System.Drawing.Point(0, 0) Me.lblAutoRecoverMessage.Name = "lblAutoRecoverMessage" - Me.lblAutoRecoverMessage.Size = New System.Drawing.Size(847, 91) + Me.lblAutoRecoverMessage.Size = New System.Drawing.Size(896, 91) Me.lblAutoRecoverMessage.TabIndex = 0 Me.lblAutoRecoverMessage.Text = "We have detected that R-Instat may have closed unexpectedly." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Below are your auto" & " recovery options." @@ -112,18 +112,18 @@ Partial Class dlgAutoSaveRecovery ' 'cmdSaveLog ' - Me.cmdSaveLog.Location = New System.Drawing.Point(269, 68) + Me.cmdSaveLog.Location = New System.Drawing.Point(261, 68) Me.cmdSaveLog.Name = "cmdSaveLog" - Me.cmdSaveLog.Size = New System.Drawing.Size(176, 29) + Me.cmdSaveLog.Size = New System.Drawing.Size(241, 29) Me.cmdSaveLog.TabIndex = 5 Me.cmdSaveLog.Text = "Save Backup Log..." Me.cmdSaveLog.UseVisualStyleBackColor = True ' 'cmdSaveInternalLog ' - Me.cmdSaveInternalLog.Location = New System.Drawing.Point(268, 115) + Me.cmdSaveInternalLog.Location = New System.Drawing.Point(262, 115) Me.cmdSaveInternalLog.Name = "cmdSaveInternalLog" - Me.cmdSaveInternalLog.Size = New System.Drawing.Size(176, 29) + Me.cmdSaveInternalLog.Size = New System.Drawing.Size(240, 29) Me.cmdSaveInternalLog.TabIndex = 7 Me.cmdSaveInternalLog.Text = "Save Backup Internal Log..." Me.cmdSaveInternalLog.UseVisualStyleBackColor = True @@ -139,9 +139,9 @@ Partial Class dlgAutoSaveRecovery ' 'cmdSaveData ' - Me.cmdSaveData.Location = New System.Drawing.Point(270, 21) + Me.cmdSaveData.Location = New System.Drawing.Point(262, 21) Me.cmdSaveData.Name = "cmdSaveData" - Me.cmdSaveData.Size = New System.Drawing.Size(176, 29) + Me.cmdSaveData.Size = New System.Drawing.Size(240, 29) Me.cmdSaveData.TabIndex = 9 Me.cmdSaveData.Text = "Save Backup Data..." Me.cmdSaveData.UseVisualStyleBackColor = True @@ -158,7 +158,7 @@ Partial Class dlgAutoSaveRecovery 'lblDataSavedTo ' Me.lblDataSavedTo.AutoSize = True - Me.lblDataSavedTo.Location = New System.Drawing.Point(466, 29) + Me.lblDataSavedTo.Location = New System.Drawing.Point(508, 29) Me.lblDataSavedTo.Name = "lblDataSavedTo" Me.lblDataSavedTo.Size = New System.Drawing.Size(55, 13) Me.lblDataSavedTo.TabIndex = 11 @@ -167,7 +167,7 @@ Partial Class dlgAutoSaveRecovery 'lblLogSavedTo ' Me.lblLogSavedTo.AutoSize = True - Me.lblLogSavedTo.Location = New System.Drawing.Point(466, 78) + Me.lblLogSavedTo.Location = New System.Drawing.Point(509, 78) Me.lblLogSavedTo.Name = "lblLogSavedTo" Me.lblLogSavedTo.Size = New System.Drawing.Size(55, 13) Me.lblLogSavedTo.TabIndex = 13 @@ -176,7 +176,7 @@ Partial Class dlgAutoSaveRecovery 'lblInternalLogSavedTo ' Me.lblInternalLogSavedTo.AutoSize = True - Me.lblInternalLogSavedTo.Location = New System.Drawing.Point(466, 125) + Me.lblInternalLogSavedTo.Location = New System.Drawing.Point(509, 125) Me.lblInternalLogSavedTo.Name = "lblInternalLogSavedTo" Me.lblInternalLogSavedTo.Size = New System.Drawing.Size(55, 13) Me.lblInternalLogSavedTo.TabIndex = 15 @@ -207,7 +207,7 @@ Partial Class dlgAutoSaveRecovery Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathData) Me.grpSavingOptions.Location = New System.Drawing.Point(12, 85) Me.grpSavingOptions.Name = "grpSavingOptions" - Me.grpSavingOptions.Size = New System.Drawing.Size(823, 154) + Me.grpSavingOptions.Size = New System.Drawing.Size(877, 154) Me.grpSavingOptions.TabIndex = 19 Me.grpSavingOptions.TabStop = False Me.grpSavingOptions.Text = "Saving Options" @@ -230,7 +230,7 @@ Partial Class dlgAutoSaveRecovery Me.ucrInputSavedPathInternalLog.AutoSize = True Me.ucrInputSavedPathInternalLog.IsMultiline = False Me.ucrInputSavedPathInternalLog.IsReadOnly = False - Me.ucrInputSavedPathInternalLog.Location = New System.Drawing.Point(562, 123) + Me.ucrInputSavedPathInternalLog.Location = New System.Drawing.Point(605, 123) Me.ucrInputSavedPathInternalLog.Name = "ucrInputSavedPathInternalLog" Me.ucrInputSavedPathInternalLog.Size = New System.Drawing.Size(258, 21) Me.ucrInputSavedPathInternalLog.TabIndex = 16 @@ -241,7 +241,7 @@ Partial Class dlgAutoSaveRecovery Me.ucrInputSavedPathLog.AutoSize = True Me.ucrInputSavedPathLog.IsMultiline = False Me.ucrInputSavedPathLog.IsReadOnly = False - Me.ucrInputSavedPathLog.Location = New System.Drawing.Point(561, 76) + Me.ucrInputSavedPathLog.Location = New System.Drawing.Point(604, 76) Me.ucrInputSavedPathLog.Name = "ucrInputSavedPathLog" Me.ucrInputSavedPathLog.Size = New System.Drawing.Size(258, 21) Me.ucrInputSavedPathLog.TabIndex = 14 @@ -252,7 +252,7 @@ Partial Class dlgAutoSaveRecovery Me.ucrInputSavedPathData.AutoSize = True Me.ucrInputSavedPathData.IsMultiline = False Me.ucrInputSavedPathData.IsReadOnly = False - Me.ucrInputSavedPathData.Location = New System.Drawing.Point(561, 27) + Me.ucrInputSavedPathData.Location = New System.Drawing.Point(604, 27) Me.ucrInputSavedPathData.Name = "ucrInputSavedPathData" Me.ucrInputSavedPathData.Size = New System.Drawing.Size(258, 21) Me.ucrInputSavedPathData.TabIndex = 12 @@ -271,7 +271,7 @@ Partial Class dlgAutoSaveRecovery 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(847, 371) + Me.ClientSize = New System.Drawing.Size(896, 371) Me.Controls.Add(Me.grpEndChoice) Me.Controls.Add(Me.grpSavingOptions) Me.Controls.Add(Me.cmdHelp) From ecf1ebf4d7d82369e8cb53ff69d254c9f94d7fb9 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Thu, 21 Dec 2023 11:05:47 +0300 Subject: [PATCH 12/12] small_changes --- instat/dlgAutoSaveRecovery.Designer.vb | 38 +++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/instat/dlgAutoSaveRecovery.Designer.vb b/instat/dlgAutoSaveRecovery.Designer.vb index cf6ec8dbdcd..f5a0cdab7d9 100644 --- a/instat/dlgAutoSaveRecovery.Designer.vb +++ b/instat/dlgAutoSaveRecovery.Designer.vb @@ -53,10 +53,10 @@ Partial Class dlgAutoSaveRecovery Me.lblInternalLogSavedTo = New System.Windows.Forms.Label() Me.cmdHelp = New System.Windows.Forms.Button() Me.grpSavingOptions = New System.Windows.Forms.GroupBox() - Me.grpEndChoice = New System.Windows.Forms.GroupBox() Me.ucrInputSavedPathInternalLog = New instat.ucrInputTextBox() Me.ucrInputSavedPathLog = New instat.ucrInputTextBox() Me.ucrInputSavedPathData = New instat.ucrInputTextBox() + Me.grpEndChoice = New System.Windows.Forms.GroupBox() Me.ucrChkSendInternalLog = New instat.ucrCheck() Me.grpSavingOptions.SuspendLayout() Me.grpEndChoice.SuspendLayout() @@ -76,27 +76,27 @@ Partial Class dlgAutoSaveRecovery ' 'cmdRunLog ' - Me.cmdRunLog.Location = New System.Drawing.Point(39, 24) + Me.cmdRunLog.Location = New System.Drawing.Point(11, 24) Me.cmdRunLog.Name = "cmdRunLog" - Me.cmdRunLog.Size = New System.Drawing.Size(131, 29) + Me.cmdRunLog.Size = New System.Drawing.Size(190, 29) Me.cmdRunLog.TabIndex = 1 Me.cmdRunLog.Text = "Run Backup Log" Me.cmdRunLog.UseVisualStyleBackColor = True ' 'cmdNewSession ' - Me.cmdNewSession.Location = New System.Drawing.Point(341, 24) + Me.cmdNewSession.Location = New System.Drawing.Point(415, 24) Me.cmdNewSession.Name = "cmdNewSession" - Me.cmdNewSession.Size = New System.Drawing.Size(131, 29) + Me.cmdNewSession.Size = New System.Drawing.Size(181, 29) Me.cmdNewSession.TabIndex = 2 Me.cmdNewSession.Text = "Start New Session" Me.cmdNewSession.UseVisualStyleBackColor = True ' 'cmdLoadData ' - Me.cmdLoadData.Location = New System.Drawing.Point(190, 24) + Me.cmdLoadData.Location = New System.Drawing.Point(213, 24) Me.cmdLoadData.Name = "cmdLoadData" - Me.cmdLoadData.Size = New System.Drawing.Size(131, 29) + Me.cmdLoadData.Size = New System.Drawing.Size(195, 29) Me.cmdLoadData.TabIndex = 3 Me.cmdLoadData.Text = "Load Backup Data" Me.cmdLoadData.UseVisualStyleBackColor = True @@ -212,18 +212,6 @@ Partial Class dlgAutoSaveRecovery Me.grpSavingOptions.TabStop = False Me.grpSavingOptions.Text = "Saving Options" ' - 'grpEndChoice - ' - Me.grpEndChoice.Controls.Add(Me.cmdRunLog) - Me.grpEndChoice.Controls.Add(Me.cmdNewSession) - Me.grpEndChoice.Controls.Add(Me.cmdLoadData) - Me.grpEndChoice.Location = New System.Drawing.Point(124, 294) - Me.grpEndChoice.Name = "grpEndChoice" - Me.grpEndChoice.Size = New System.Drawing.Size(509, 66) - Me.grpEndChoice.TabIndex = 20 - Me.grpEndChoice.TabStop = False - Me.grpEndChoice.Text = "Choose one of the following to proceed" - ' 'ucrInputSavedPathInternalLog ' Me.ucrInputSavedPathInternalLog.AddQuotesIfUnrecognised = True @@ -257,6 +245,18 @@ Partial Class dlgAutoSaveRecovery Me.ucrInputSavedPathData.Size = New System.Drawing.Size(258, 21) Me.ucrInputSavedPathData.TabIndex = 12 ' + 'grpEndChoice + ' + Me.grpEndChoice.Controls.Add(Me.cmdRunLog) + Me.grpEndChoice.Controls.Add(Me.cmdNewSession) + Me.grpEndChoice.Controls.Add(Me.cmdLoadData) + Me.grpEndChoice.Location = New System.Drawing.Point(107, 294) + Me.grpEndChoice.Name = "grpEndChoice" + Me.grpEndChoice.Size = New System.Drawing.Size(602, 66) + Me.grpEndChoice.TabIndex = 20 + Me.grpEndChoice.TabStop = False + Me.grpEndChoice.Text = "Choose one of the following to proceed" + ' 'ucrChkSendInternalLog ' Me.ucrChkSendInternalLog.AutoSize = True