diff --git a/instat/DlgDefineClimaticData.vb b/instat/DlgDefineClimaticData.vb index f392852cd60..f5eca3cef4e 100644 --- a/instat/DlgDefineClimaticData.vb +++ b/instat/DlgDefineClimaticData.vb @@ -54,8 +54,8 @@ Public Class DlgDefineClimaticData Dim kvpLongitude As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("lon", {"lon", "lont", "longitude"}.ToList()) Dim kvpLatitude As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("lat", {"lat", "latitude"}.ToList()) Dim kvpCloudCover As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("cloud_cover", {"cloud"}.ToList()) - Dim kvpTempMax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"tmax", "tx", "tempmax", "tmp_max"}.ToList()) - Dim kvpTempMin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"tmin", "tn", "tempmin", "tmp_min"}.ToList()) + Dim kvpTempMax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"tmax", "tx", "tempmax", "tmp_max", "tmpmax"}.ToList()) + Dim kvpTempMin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"tmin", "tn", "tempmin", "tmp_min", "tmpmin"}.ToList()) Dim kvpRadiation As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("radiation", {"radiation", "rad"}.ToList()) Dim kvpSunshineHours As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("sunshine_hours", {"sunshine", "sunh", "sunhrs"}.ToList()) Dim kvpWindDirection As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("wind_direction", {"winddirection"}.ToList()) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index 52822e1cdf7..b12f61d9ae4 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -44,7 +44,7 @@ Public Class dlgCalculator SetDefaults() bFirstLoad = False End If - SetHelpOptions() + SetStructuredMenu() ReopenDialog() TestOKEnabled() autoTranslate(Me) @@ -75,7 +75,7 @@ Public Class dlgCalculator bInsertColumnBefore:=ucrBase.clsRsyntax.clsBaseCommandString.bInsertColumnBefore, bRequireCorrectLength:=ucrBase.clsRsyntax.clsBaseCommandString.bRequireCorrectLength) ucrBase.Visible = True - SetHelpOptions() + SetStructuredMenu() End Sub Private Sub ReopenDialog() @@ -85,6 +85,8 @@ Public Class dlgCalculator End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 14 + ucrCalc.ucrReceiverForCalculation.SetMeAsReceiver() ucrCalc.ucrTryCalculator.SetIsCommand() ucrCalc.ucrTryCalculator.SetReceiver(ucrCalc.ucrReceiverForCalculation) @@ -259,10 +261,8 @@ Public Class dlgCalculator End If End Sub - Private Sub SetHelpOptions() + Private Sub SetStructuredMenu() Select Case enumCalculatorMode - Case CalculatorMode.Prepare - ucrBase.iHelpTopicID = 14 Case CalculatorMode.Structured ucrCalc.ucrInputCalOptions.SetName("Circular") ucrBase.iHelpTopicID = 677 @@ -322,7 +322,7 @@ Public Class dlgCalculator Case "Symbols" Me.Width = iBasicWidth * 2.56 Case "Goodness of Fit" - Me.Width = iBasicWidth * 1.27 + Me.Width = iBasicWidth * 1.25 ucrBase.iHelpTopicID = 717 Case "Integer" Me.Width = iBasicWidth * 1.5 @@ -335,6 +335,7 @@ Public Class dlgCalculator ucrBase.iHelpTopicID = 439 Case Else Me.Width = iBasicWidth + ucrBase.iHelpTopicID = 14 End Select End Sub End Class diff --git a/instat/dlgExportClimaticDefinitions.Designer.vb b/instat/dlgExportClimaticDefinitions.Designer.vb index 0e33704c4e6..feadbea35c8 100644 --- a/instat/dlgExportClimaticDefinitions.Designer.vb +++ b/instat/dlgExportClimaticDefinitions.Designer.vb @@ -22,193 +22,256 @@ Partial Class dlgExportClimaticDefinitions 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.lblStationID = New System.Windows.Forms.Label() + Me.ucrReceiverYear = New instat.ucrReceiverSingle() + Me.lblExport = New System.Windows.Forms.Label() + Me.cmdChooseFile = New System.Windows.Forms.Button() + Me.ucrInputTokenPath = New instat.ucrInputTextBox() + Me.rdoUploadSummaries = New System.Windows.Forms.RadioButton() + Me.rdoUpdateMetadata = New System.Windows.Forms.RadioButton() + Me.ucrPnlExportGoogle = New instat.UcrPanel() + Me.ucrReceiverStation = New instat.ucrReceiverSingle() + Me.lblDefinitionsID = New System.Windows.Forms.Label() + Me.ucrInputDefinitionsID = New instat.ucrInputTextBox() + Me.cmdDefine = New System.Windows.Forms.Button() + Me.lblStation = New System.Windows.Forms.Label() Me.lblCountry = New System.Windows.Forms.Label() Me.ucrInputCountry = New instat.ucrInputTextBox() - Me.ucrInputStationID = New instat.ucrInputTextBox() - Me.ucrChkSeasonStartProp = New instat.ucrCheck() - Me.ucrChkExtremes = New instat.ucrCheck() - Me.ucrChkCropSuccessProp = New instat.ucrCheck() - Me.ucrChkAnnualTemp = New instat.ucrCheck() - Me.ucrChkAnnualRainfall = New instat.ucrCheck() Me.lblMonth = New System.Windows.Forms.Label() Me.lblYear = New System.Windows.Forms.Label() Me.ucrReceiverMonth = New instat.ucrReceiverSingle() - Me.ucrReceiverYear = New instat.ucrReceiverSingle() Me.ucrChkIncludeSummaryData = New instat.ucrCheck() Me.grpSummaries = New System.Windows.Forms.GroupBox() Me.ucrChkMonthlyTemp = New instat.ucrCheck() + Me.ucrChkSeasonStartProp = New instat.ucrCheck() + Me.ucrChkExtremes = New instat.ucrCheck() + Me.ucrChkCropSuccessProp = New instat.ucrCheck() + Me.ucrChkAnnualTemp = New instat.ucrCheck() + Me.ucrChkAnnualRainfall = New instat.ucrCheck() Me.lblCropData = New System.Windows.Forms.Label() Me.lblDataByYearMonth = New System.Windows.Forms.Label() Me.lblDataByYear = New System.Windows.Forms.Label() Me.lblRain = New System.Windows.Forms.Label() - Me.lblData = New System.Windows.Forms.Label() Me.ucrReceiverRain = New instat.ucrReceiverSingle() - Me.ucrReceiverData = New instat.ucrReceiverSingle() Me.ucrSelectorExportDefinitions = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrReceiverDataYear = New instat.ucrReceiverSingle() Me.ucrReceiverDataYearMonth = New instat.ucrReceiverSingle() Me.ucrReceiverCropData = New instat.ucrReceiverSingle() - Me.lblExport = New System.Windows.Forms.Label() - Me.cmdChooseFile = New System.Windows.Forms.Button() - Me.ucrInputTokenPath = New instat.ucrInputTextBox() - Me.cmdDefine = New System.Windows.Forms.Button() - Me.lblDefinitionsID = New System.Windows.Forms.Label() - Me.ucrInputDefinitionsID = New instat.ucrInputTextBox() + Me.lblDistrict = New System.Windows.Forms.Label() + Me.lblElavation = New System.Windows.Forms.Label() + Me.lblLatitude = New System.Windows.Forms.Label() + Me.lblLongitude = New System.Windows.Forms.Label() + Me.ucrReceiverLongititude = New instat.ucrReceiverSingle() + Me.ucrReceiverLatitude = New instat.ucrReceiverSingle() + Me.ucrReceiverElavation = New instat.ucrReceiverSingle() + Me.ucrReceiverDistrict = New instat.ucrReceiverSingle() + Me.ucrReceiverStationName = New instat.ucrReceiverSingle() + Me.lblStationName = New System.Windows.Forms.Label() + Me.lblCountryMetada = New System.Windows.Forms.Label() + Me.ucrInputCountryMetadata = New instat.ucrInputTextBox() Me.grpSummaries.SuspendLayout() Me.SuspendLayout() ' - 'lblStationID + 'ucrReceiverYear ' - Me.lblStationID.AutoSize = True - Me.lblStationID.Location = New System.Drawing.Point(498, 259) - Me.lblStationID.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblStationID.Name = "lblStationID" - Me.lblStationID.Size = New System.Drawing.Size(85, 20) - Me.lblStationID.TabIndex = 9 - Me.lblStationID.Text = "Station ID:" + Me.ucrReceiverYear.AutoSize = True + Me.ucrReceiverYear.frmParent = Me + Me.ucrReceiverYear.Location = New System.Drawing.Point(330, 126) + Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYear.Name = "ucrReceiverYear" + Me.ucrReceiverYear.Selector = Nothing + Me.ucrReceiverYear.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.TabIndex = 52 + Me.ucrReceiverYear.ucrSelector = Nothing ' - 'lblCountry + 'lblExport ' - Me.lblCountry.AutoSize = True - Me.lblCountry.Location = New System.Drawing.Point(498, 321) - Me.lblCountry.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblCountry.Name = "lblCountry" - Me.lblCountry.Size = New System.Drawing.Size(68, 20) - Me.lblCountry.TabIndex = 11 - Me.lblCountry.Text = "Country:" + Me.lblExport.AutoSize = True + Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblExport.Location = New System.Drawing.Point(64, 46) + Me.lblExport.Name = "lblExport" + Me.lblExport.Size = New System.Drawing.Size(41, 13) + Me.lblExport.TabIndex = 81 + Me.lblExport.Text = "Token:" ' - 'ucrInputCountry + 'cmdChooseFile ' - Me.ucrInputCountry.AddQuotesIfUnrecognised = True - Me.ucrInputCountry.AutoSize = True - Me.ucrInputCountry.IsMultiline = False - Me.ucrInputCountry.IsReadOnly = False - Me.ucrInputCountry.Location = New System.Drawing.Point(498, 346) - Me.ucrInputCountry.Margin = New System.Windows.Forms.Padding(14) - Me.ucrInputCountry.Name = "ucrInputCountry" - Me.ucrInputCountry.Size = New System.Drawing.Size(177, 32) - Me.ucrInputCountry.TabIndex = 12 + Me.cmdChooseFile.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdChooseFile.Location = New System.Drawing.Point(311, 40) + Me.cmdChooseFile.Name = "cmdChooseFile" + Me.cmdChooseFile.Size = New System.Drawing.Size(80, 23) + Me.cmdChooseFile.TabIndex = 83 + Me.cmdChooseFile.Text = "Browse" + Me.cmdChooseFile.UseVisualStyleBackColor = True ' - 'ucrInputStationID + 'ucrInputTokenPath ' - Me.ucrInputStationID.AddQuotesIfUnrecognised = True - Me.ucrInputStationID.AutoSize = True - Me.ucrInputStationID.IsMultiline = False - Me.ucrInputStationID.IsReadOnly = False - Me.ucrInputStationID.Location = New System.Drawing.Point(498, 284) - Me.ucrInputStationID.Margin = New System.Windows.Forms.Padding(14) - Me.ucrInputStationID.Name = "ucrInputStationID" - Me.ucrInputStationID.Size = New System.Drawing.Size(177, 32) - Me.ucrInputStationID.TabIndex = 10 + Me.ucrInputTokenPath.AddQuotesIfUnrecognised = True + Me.ucrInputTokenPath.AutoSize = True + Me.ucrInputTokenPath.IsMultiline = False + Me.ucrInputTokenPath.IsReadOnly = False + Me.ucrInputTokenPath.Location = New System.Drawing.Point(111, 43) + Me.ucrInputTokenPath.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputTokenPath.Name = "ucrInputTokenPath" + Me.ucrInputTokenPath.Size = New System.Drawing.Size(191, 21) + Me.ucrInputTokenPath.TabIndex = 82 + ' + 'rdoUploadSummaries + ' + Me.rdoUploadSummaries.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoUploadSummaries.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoUploadSummaries.FlatAppearance.BorderSize = 2 + Me.rdoUploadSummaries.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoUploadSummaries.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoUploadSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoUploadSummaries.Location = New System.Drawing.Point(227, 7) + Me.rdoUploadSummaries.Name = "rdoUploadSummaries" + Me.rdoUploadSummaries.Size = New System.Drawing.Size(122, 27) + Me.rdoUploadSummaries.TabIndex = 47 + Me.rdoUploadSummaries.Text = "Upload Summaries" + Me.rdoUploadSummaries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoUploadSummaries.UseVisualStyleBackColor = True + ' + 'rdoUpdateMetadata + ' + Me.rdoUpdateMetadata.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoUpdateMetadata.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoUpdateMetadata.FlatAppearance.BorderSize = 2 + Me.rdoUpdateMetadata.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoUpdateMetadata.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoUpdateMetadata.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoUpdateMetadata.Location = New System.Drawing.Point(114, 7) + Me.rdoUpdateMetadata.Name = "rdoUpdateMetadata" + Me.rdoUpdateMetadata.Size = New System.Drawing.Size(116, 27) + Me.rdoUpdateMetadata.TabIndex = 46 + Me.rdoUpdateMetadata.Text = "Update Metadata" + Me.rdoUpdateMetadata.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoUpdateMetadata.UseVisualStyleBackColor = True + ' + 'ucrPnlExportGoogle + ' + Me.ucrPnlExportGoogle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlExportGoogle.Location = New System.Drawing.Point(111, 2) + Me.ucrPnlExportGoogle.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlExportGoogle.Name = "ucrPnlExportGoogle" + Me.ucrPnlExportGoogle.Size = New System.Drawing.Size(249, 33) + Me.ucrPnlExportGoogle.TabIndex = 45 + ' + 'ucrReceiverStation + ' + Me.ucrReceiverStation.AutoSize = True + Me.ucrReceiverStation.frmParent = Me + Me.ucrReceiverStation.Location = New System.Drawing.Point(330, 92) + Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStation.Name = "ucrReceiverStation" + Me.ucrReceiverStation.Selector = Nothing + Me.ucrReceiverStation.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.TabIndex = 50 + Me.ucrReceiverStation.ucrSelector = Nothing ' - 'ucrChkSeasonStartProp + 'lblDefinitionsID ' - Me.ucrChkSeasonStartProp.AutoSize = True - Me.ucrChkSeasonStartProp.Checked = False - Me.ucrChkSeasonStartProp.Location = New System.Drawing.Point(236, 71) - Me.ucrChkSeasonStartProp.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkSeasonStartProp.Name = "ucrChkSeasonStartProp" - Me.ucrChkSeasonStartProp.Size = New System.Drawing.Size(226, 52) - Me.ucrChkSeasonStartProp.TabIndex = 3 + Me.lblDefinitionsID.AutoSize = True + Me.lblDefinitionsID.Location = New System.Drawing.Point(335, 344) + Me.lblDefinitionsID.Name = "lblDefinitionsID" + Me.lblDefinitionsID.Size = New System.Drawing.Size(73, 13) + Me.lblDefinitionsID.TabIndex = 63 + Me.lblDefinitionsID.Text = "Definitions ID:" ' - 'ucrChkExtremes + 'ucrInputDefinitionsID ' - Me.ucrChkExtremes.AutoSize = True - Me.ucrChkExtremes.Checked = False - Me.ucrChkExtremes.Location = New System.Drawing.Point(236, 120) - Me.ucrChkExtremes.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkExtremes.Name = "ucrChkExtremes" - Me.ucrChkExtremes.Size = New System.Drawing.Size(220, 52) - Me.ucrChkExtremes.TabIndex = 5 - Me.ucrChkExtremes.Visible = False + Me.ucrInputDefinitionsID.AddQuotesIfUnrecognised = True + Me.ucrInputDefinitionsID.AutoSize = True + Me.ucrInputDefinitionsID.IsMultiline = False + Me.ucrInputDefinitionsID.IsReadOnly = False + Me.ucrInputDefinitionsID.Location = New System.Drawing.Point(331, 359) + Me.ucrInputDefinitionsID.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputDefinitionsID.Name = "ucrInputDefinitionsID" + Me.ucrInputDefinitionsID.Size = New System.Drawing.Size(118, 21) + Me.ucrInputDefinitionsID.TabIndex = 64 ' - 'ucrChkCropSuccessProp + 'cmdDefine ' - Me.ucrChkCropSuccessProp.AutoSize = True - Me.ucrChkCropSuccessProp.Checked = False - Me.ucrChkCropSuccessProp.Location = New System.Drawing.Point(236, 28) - Me.ucrChkCropSuccessProp.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkCropSuccessProp.Name = "ucrChkCropSuccessProp" - Me.ucrChkCropSuccessProp.Size = New System.Drawing.Size(230, 52) - Me.ucrChkCropSuccessProp.TabIndex = 1 + Me.cmdDefine.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdDefine.Location = New System.Drawing.Point(223, 397) + Me.cmdDefine.Name = "cmdDefine" + Me.cmdDefine.Size = New System.Drawing.Size(80, 29) + Me.cmdDefine.TabIndex = 69 + Me.cmdDefine.Text = "Define" + Me.cmdDefine.UseVisualStyleBackColor = True ' - 'ucrChkAnnualTemp + 'lblStation ' - Me.ucrChkAnnualTemp.AutoSize = True - Me.ucrChkAnnualTemp.Checked = False - Me.ucrChkAnnualTemp.Location = New System.Drawing.Point(12, 71) - Me.ucrChkAnnualTemp.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkAnnualTemp.Name = "ucrChkAnnualTemp" - Me.ucrChkAnnualTemp.Size = New System.Drawing.Size(224, 52) - Me.ucrChkAnnualTemp.TabIndex = 2 + Me.lblStation.AutoSize = True + Me.lblStation.Location = New System.Drawing.Point(330, 79) + Me.lblStation.Name = "lblStation" + Me.lblStation.Size = New System.Drawing.Size(43, 13) + Me.lblStation.TabIndex = 49 + Me.lblStation.Text = "Station:" ' - 'ucrChkAnnualRainfall + 'lblCountry ' - Me.ucrChkAnnualRainfall.AutoSize = True - Me.ucrChkAnnualRainfall.Checked = False - Me.ucrChkAnnualRainfall.Location = New System.Drawing.Point(12, 28) - Me.ucrChkAnnualRainfall.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkAnnualRainfall.Name = "ucrChkAnnualRainfall" - Me.ucrChkAnnualRainfall.Size = New System.Drawing.Size(224, 52) - Me.ucrChkAnnualRainfall.TabIndex = 0 + Me.lblCountry.AutoSize = True + Me.lblCountry.Location = New System.Drawing.Point(330, 384) + Me.lblCountry.Name = "lblCountry" + Me.lblCountry.Size = New System.Drawing.Size(46, 13) + Me.lblCountry.TabIndex = 65 + Me.lblCountry.Text = "Country:" + ' + 'ucrInputCountry + ' + Me.ucrInputCountry.AddQuotesIfUnrecognised = True + Me.ucrInputCountry.AutoSize = True + Me.ucrInputCountry.IsMultiline = False + Me.ucrInputCountry.IsReadOnly = False + Me.ucrInputCountry.Location = New System.Drawing.Point(330, 400) + Me.ucrInputCountry.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputCountry.Name = "ucrInputCountry" + Me.ucrInputCountry.Size = New System.Drawing.Size(118, 21) + Me.ucrInputCountry.TabIndex = 66 ' 'lblMonth ' Me.lblMonth.AutoSize = True - Me.lblMonth.Location = New System.Drawing.Point(498, 136) - Me.lblMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMonth.Location = New System.Drawing.Point(330, 151) Me.lblMonth.Name = "lblMonth" - Me.lblMonth.Size = New System.Drawing.Size(58, 20) - Me.lblMonth.TabIndex = 5 + Me.lblMonth.Size = New System.Drawing.Size(40, 13) + Me.lblMonth.TabIndex = 53 Me.lblMonth.Text = "Month:" ' 'lblYear ' Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(498, 75) - Me.lblYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblYear.Location = New System.Drawing.Point(330, 111) Me.lblYear.Name = "lblYear" - Me.lblYear.Size = New System.Drawing.Size(47, 20) - Me.lblYear.TabIndex = 3 + Me.lblYear.Size = New System.Drawing.Size(32, 13) + Me.lblYear.TabIndex = 51 Me.lblYear.Text = "Year:" ' 'ucrReceiverMonth ' Me.ucrReceiverMonth.AutoSize = True Me.ucrReceiverMonth.frmParent = Me - Me.ucrReceiverMonth.Location = New System.Drawing.Point(498, 161) + Me.ucrReceiverMonth.Location = New System.Drawing.Point(330, 167) Me.ucrReceiverMonth.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMonth.Name = "ucrReceiverMonth" Me.ucrReceiverMonth.Selector = Nothing - Me.ucrReceiverMonth.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverMonth.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverMonth.strNcFilePath = "" - Me.ucrReceiverMonth.TabIndex = 6 + Me.ucrReceiverMonth.TabIndex = 54 Me.ucrReceiverMonth.ucrSelector = Nothing ' - 'ucrReceiverYear - ' - Me.ucrReceiverYear.AutoSize = True - Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(498, 100) - Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverYear.Name = "ucrReceiverYear" - Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.Size = New System.Drawing.Size(180, 31) - Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.TabIndex = 4 - Me.ucrReceiverYear.ucrSelector = Nothing - ' 'ucrChkIncludeSummaryData ' Me.ucrChkIncludeSummaryData.AutoSize = True Me.ucrChkIncludeSummaryData.Checked = False - Me.ucrChkIncludeSummaryData.Location = New System.Drawing.Point(6, 513) - Me.ucrChkIncludeSummaryData.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkIncludeSummaryData.Location = New System.Drawing.Point(2, 398) + Me.ucrChkIncludeSummaryData.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkIncludeSummaryData.Name = "ucrChkIncludeSummaryData" - Me.ucrChkIncludeSummaryData.Size = New System.Drawing.Size(332, 48) - Me.ucrChkIncludeSummaryData.TabIndex = 26 + Me.ucrChkIncludeSummaryData.Size = New System.Drawing.Size(221, 31) + Me.ucrChkIncludeSummaryData.TabIndex = 68 ' 'grpSummaries ' @@ -218,12 +281,10 @@ Partial Class dlgExportClimaticDefinitions Me.grpSummaries.Controls.Add(Me.ucrChkCropSuccessProp) Me.grpSummaries.Controls.Add(Me.ucrChkAnnualTemp) Me.grpSummaries.Controls.Add(Me.ucrChkAnnualRainfall) - Me.grpSummaries.Location = New System.Drawing.Point(6, 325) - Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.grpSummaries.Location = New System.Drawing.Point(2, 264) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.grpSummaries.Size = New System.Drawing.Size(470, 177) - Me.grpSummaries.TabIndex = 25 + Me.grpSummaries.Size = New System.Drawing.Size(313, 116) + Me.grpSummaries.TabIndex = 67 Me.grpSummaries.TabStop = False Me.grpSummaries.Text = "Summaries" ' @@ -231,256 +292,361 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrChkMonthlyTemp.AutoSize = True Me.ucrChkMonthlyTemp.Checked = False - Me.ucrChkMonthlyTemp.Location = New System.Drawing.Point(12, 120) - Me.ucrChkMonthlyTemp.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkMonthlyTemp.Location = New System.Drawing.Point(8, 77) + Me.ucrChkMonthlyTemp.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkMonthlyTemp.Name = "ucrChkMonthlyTemp" - Me.ucrChkMonthlyTemp.Size = New System.Drawing.Size(220, 52) + Me.ucrChkMonthlyTemp.Size = New System.Drawing.Size(147, 34) Me.ucrChkMonthlyTemp.TabIndex = 4 ' + 'ucrChkSeasonStartProp + ' + Me.ucrChkSeasonStartProp.AutoSize = True + Me.ucrChkSeasonStartProp.Checked = False + Me.ucrChkSeasonStartProp.Location = New System.Drawing.Point(157, 44) + Me.ucrChkSeasonStartProp.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkSeasonStartProp.Name = "ucrChkSeasonStartProp" + Me.ucrChkSeasonStartProp.Size = New System.Drawing.Size(151, 34) + Me.ucrChkSeasonStartProp.TabIndex = 3 + ' + 'ucrChkExtremes + ' + Me.ucrChkExtremes.AutoSize = True + Me.ucrChkExtremes.Checked = False + Me.ucrChkExtremes.Location = New System.Drawing.Point(157, 77) + Me.ucrChkExtremes.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkExtremes.Name = "ucrChkExtremes" + Me.ucrChkExtremes.Size = New System.Drawing.Size(147, 34) + Me.ucrChkExtremes.TabIndex = 5 + Me.ucrChkExtremes.Visible = False + ' + 'ucrChkCropSuccessProp + ' + Me.ucrChkCropSuccessProp.AutoSize = True + Me.ucrChkCropSuccessProp.Checked = False + Me.ucrChkCropSuccessProp.Location = New System.Drawing.Point(157, 13) + Me.ucrChkCropSuccessProp.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkCropSuccessProp.Name = "ucrChkCropSuccessProp" + Me.ucrChkCropSuccessProp.Size = New System.Drawing.Size(153, 34) + Me.ucrChkCropSuccessProp.TabIndex = 1 + ' + 'ucrChkAnnualTemp + ' + Me.ucrChkAnnualTemp.AutoSize = True + Me.ucrChkAnnualTemp.Checked = False + Me.ucrChkAnnualTemp.Location = New System.Drawing.Point(8, 45) + Me.ucrChkAnnualTemp.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkAnnualTemp.Name = "ucrChkAnnualTemp" + Me.ucrChkAnnualTemp.Size = New System.Drawing.Size(149, 34) + Me.ucrChkAnnualTemp.TabIndex = 2 + ' + 'ucrChkAnnualRainfall + ' + Me.ucrChkAnnualRainfall.AutoSize = True + Me.ucrChkAnnualRainfall.Checked = False + Me.ucrChkAnnualRainfall.Location = New System.Drawing.Point(8, 13) + Me.ucrChkAnnualRainfall.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkAnnualRainfall.Name = "ucrChkAnnualRainfall" + Me.ucrChkAnnualRainfall.Size = New System.Drawing.Size(149, 34) + Me.ucrChkAnnualRainfall.TabIndex = 0 + ' 'lblCropData ' Me.lblCropData.AutoSize = True - Me.lblCropData.Location = New System.Drawing.Point(498, 505) - Me.lblCropData.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblCropData.Location = New System.Drawing.Point(330, 307) Me.lblCropData.Name = "lblCropData" - Me.lblCropData.Size = New System.Drawing.Size(86, 20) - Me.lblCropData.TabIndex = 17 + Me.lblCropData.Size = New System.Drawing.Size(58, 13) + Me.lblCropData.TabIndex = 61 Me.lblCropData.Text = "Crop Data:" ' 'lblDataByYearMonth ' Me.lblDataByYearMonth.AutoSize = True - Me.lblDataByYearMonth.Location = New System.Drawing.Point(498, 444) - Me.lblDataByYearMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblDataByYearMonth.Location = New System.Drawing.Point(330, 267) Me.lblDataByYearMonth.Name = "lblDataByYearMonth" - Me.lblDataByYearMonth.Size = New System.Drawing.Size(188, 20) - Me.lblDataByYearMonth.TabIndex = 15 + Me.lblDataByYearMonth.Size = New System.Drawing.Size(127, 13) + Me.lblDataByYearMonth.TabIndex = 59 Me.lblDataByYearMonth.Text = "Data By Year and Month:" ' 'lblDataByYear ' Me.lblDataByYear.AutoSize = True - Me.lblDataByYear.Location = New System.Drawing.Point(498, 383) - Me.lblDataByYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblDataByYear.Location = New System.Drawing.Point(330, 227) Me.lblDataByYear.Name = "lblDataByYear" - Me.lblDataByYear.Size = New System.Drawing.Size(108, 20) - Me.lblDataByYear.TabIndex = 13 + Me.lblDataByYear.Size = New System.Drawing.Size(73, 13) + Me.lblDataByYear.TabIndex = 57 Me.lblDataByYear.Text = "Data By Year:" ' 'lblRain ' Me.lblRain.AutoSize = True - Me.lblRain.Location = New System.Drawing.Point(498, 566) - Me.lblRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblRain.Location = New System.Drawing.Point(330, 191) Me.lblRain.Name = "lblRain" - Me.lblRain.Size = New System.Drawing.Size(46, 20) - Me.lblRain.TabIndex = 19 + Me.lblRain.Size = New System.Drawing.Size(32, 13) + Me.lblRain.TabIndex = 55 Me.lblRain.Text = "Rain:" ' - 'lblData - ' - Me.lblData.AutoSize = True - Me.lblData.Location = New System.Drawing.Point(498, 14) - Me.lblData.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblData.Name = "lblData" - Me.lblData.Size = New System.Drawing.Size(48, 20) - Me.lblData.TabIndex = 1 - Me.lblData.Text = "Data:" - ' 'ucrReceiverRain ' Me.ucrReceiverRain.AutoSize = True Me.ucrReceiverRain.frmParent = Me - Me.ucrReceiverRain.Location = New System.Drawing.Point(498, 591) + Me.ucrReceiverRain.Location = New System.Drawing.Point(330, 207) Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRain.Name = "ucrReceiverRain" Me.ucrReceiverRain.Selector = Nothing - Me.ucrReceiverRain.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverRain.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverRain.strNcFilePath = "" - Me.ucrReceiverRain.TabIndex = 20 + Me.ucrReceiverRain.TabIndex = 56 Me.ucrReceiverRain.ucrSelector = Nothing ' - 'ucrReceiverData - ' - Me.ucrReceiverData.AutoSize = True - Me.ucrReceiverData.frmParent = Me - Me.ucrReceiverData.Location = New System.Drawing.Point(498, 39) - Me.ucrReceiverData.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverData.Name = "ucrReceiverData" - Me.ucrReceiverData.Selector = Nothing - Me.ucrReceiverData.Size = New System.Drawing.Size(180, 31) - Me.ucrReceiverData.strNcFilePath = "" - Me.ucrReceiverData.TabIndex = 2 - Me.ucrReceiverData.ucrSelector = Nothing - ' 'ucrSelectorExportDefinitions ' Me.ucrSelectorExportDefinitions.AutoSize = True Me.ucrSelectorExportDefinitions.bDropUnusedFilterLevels = False Me.ucrSelectorExportDefinitions.bShowHiddenColumns = False Me.ucrSelectorExportDefinitions.bUseCurrentFilter = True - Me.ucrSelectorExportDefinitions.Location = New System.Drawing.Point(6, 12) + Me.ucrSelectorExportDefinitions.Location = New System.Drawing.Point(2, 78) Me.ucrSelectorExportDefinitions.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorExportDefinitions.Name = "ucrSelectorExportDefinitions" - Me.ucrSelectorExportDefinitions.Size = New System.Drawing.Size(320, 282) - Me.ucrSelectorExportDefinitions.TabIndex = 0 + Me.ucrSelectorExportDefinitions.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorExportDefinitions.TabIndex = 48 ' 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(6, 684) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Location = New System.Drawing.Point(2, 438) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(615, 92) - Me.ucrBase.TabIndex = 31 + Me.ucrBase.Size = New System.Drawing.Size(410, 60) + Me.ucrBase.TabIndex = 70 ' 'ucrReceiverDataYear ' Me.ucrReceiverDataYear.AutoSize = True Me.ucrReceiverDataYear.frmParent = Me - Me.ucrReceiverDataYear.Location = New System.Drawing.Point(498, 408) + Me.ucrReceiverDataYear.Location = New System.Drawing.Point(330, 244) Me.ucrReceiverDataYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDataYear.Name = "ucrReceiverDataYear" Me.ucrReceiverDataYear.Selector = Nothing - Me.ucrReceiverDataYear.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverDataYear.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverDataYear.strNcFilePath = "" - Me.ucrReceiverDataYear.TabIndex = 14 + Me.ucrReceiverDataYear.TabIndex = 58 Me.ucrReceiverDataYear.ucrSelector = Nothing ' 'ucrReceiverDataYearMonth ' Me.ucrReceiverDataYearMonth.AutoSize = True Me.ucrReceiverDataYearMonth.frmParent = Me - Me.ucrReceiverDataYearMonth.Location = New System.Drawing.Point(498, 469) + Me.ucrReceiverDataYearMonth.Location = New System.Drawing.Point(330, 283) Me.ucrReceiverDataYearMonth.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDataYearMonth.Name = "ucrReceiverDataYearMonth" Me.ucrReceiverDataYearMonth.Selector = Nothing - Me.ucrReceiverDataYearMonth.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverDataYearMonth.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverDataYearMonth.strNcFilePath = "" - Me.ucrReceiverDataYearMonth.TabIndex = 16 + Me.ucrReceiverDataYearMonth.TabIndex = 60 Me.ucrReceiverDataYearMonth.ucrSelector = Nothing ' 'ucrReceiverCropData ' Me.ucrReceiverCropData.AutoSize = True Me.ucrReceiverCropData.frmParent = Me - Me.ucrReceiverCropData.Location = New System.Drawing.Point(498, 530) + Me.ucrReceiverCropData.Location = New System.Drawing.Point(330, 323) Me.ucrReceiverCropData.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverCropData.Name = "ucrReceiverCropData" Me.ucrReceiverCropData.Selector = Nothing - Me.ucrReceiverCropData.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverCropData.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverCropData.strNcFilePath = "" - Me.ucrReceiverCropData.TabIndex = 18 + Me.ucrReceiverCropData.TabIndex = 62 Me.ucrReceiverCropData.ucrSelector = Nothing ' - 'lblExport - ' - Me.lblExport.AutoSize = True - Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExport.Location = New System.Drawing.Point(14, 645) - Me.lblExport.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblExport.Name = "lblExport" - Me.lblExport.Size = New System.Drawing.Size(57, 20) - Me.lblExport.TabIndex = 28 - Me.lblExport.Text = "Token:" - ' - 'cmdChooseFile - ' - Me.cmdChooseFile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdChooseFile.Location = New System.Drawing.Point(384, 638) - Me.cmdChooseFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.cmdChooseFile.Name = "cmdChooseFile" - Me.cmdChooseFile.Size = New System.Drawing.Size(120, 35) - Me.cmdChooseFile.TabIndex = 30 - Me.cmdChooseFile.Text = "Browse" - Me.cmdChooseFile.UseVisualStyleBackColor = True - ' - 'ucrInputTokenPath - ' - Me.ucrInputTokenPath.AddQuotesIfUnrecognised = True - Me.ucrInputTokenPath.AutoSize = True - Me.ucrInputTokenPath.IsMultiline = False - Me.ucrInputTokenPath.IsReadOnly = False - Me.ucrInputTokenPath.Location = New System.Drawing.Point(84, 641) - Me.ucrInputTokenPath.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) - Me.ucrInputTokenPath.Name = "ucrInputTokenPath" - Me.ucrInputTokenPath.Size = New System.Drawing.Size(287, 32) - Me.ucrInputTokenPath.TabIndex = 29 - ' - 'cmdDefine - ' - Me.cmdDefine.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDefine.Location = New System.Drawing.Point(338, 512) - Me.cmdDefine.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.cmdDefine.Name = "cmdDefine" - Me.cmdDefine.Size = New System.Drawing.Size(120, 45) - Me.cmdDefine.TabIndex = 27 - Me.cmdDefine.Text = "Define" - Me.cmdDefine.UseVisualStyleBackColor = True - ' - 'lblDefinitionsID - ' - Me.lblDefinitionsID.AutoSize = True - Me.lblDefinitionsID.Location = New System.Drawing.Point(503, 198) - Me.lblDefinitionsID.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblDefinitionsID.Name = "lblDefinitionsID" - Me.lblDefinitionsID.Size = New System.Drawing.Size(109, 20) - Me.lblDefinitionsID.TabIndex = 7 - Me.lblDefinitionsID.Text = "Definitions ID:" - ' - 'ucrInputDefinitionsID - ' - Me.ucrInputDefinitionsID.AddQuotesIfUnrecognised = True - Me.ucrInputDefinitionsID.AutoSize = True - Me.ucrInputDefinitionsID.IsMultiline = False - Me.ucrInputDefinitionsID.IsReadOnly = False - Me.ucrInputDefinitionsID.Location = New System.Drawing.Point(498, 222) - Me.ucrInputDefinitionsID.Margin = New System.Windows.Forms.Padding(14) - Me.ucrInputDefinitionsID.Name = "ucrInputDefinitionsID" - Me.ucrInputDefinitionsID.Size = New System.Drawing.Size(177, 32) - Me.ucrInputDefinitionsID.TabIndex = 8 + 'lblDistrict + ' + Me.lblDistrict.AutoSize = True + Me.lblDistrict.Location = New System.Drawing.Point(324, 270) + Me.lblDistrict.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblDistrict.Name = "lblDistrict" + Me.lblDistrict.Size = New System.Drawing.Size(39, 13) + Me.lblDistrict.TabIndex = 79 + Me.lblDistrict.Text = "District" + ' + 'lblElavation + ' + Me.lblElavation.AutoSize = True + Me.lblElavation.Location = New System.Drawing.Point(323, 222) + Me.lblElavation.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblElavation.Name = "lblElavation" + Me.lblElavation.Size = New System.Drawing.Size(51, 13) + Me.lblElavation.TabIndex = 77 + Me.lblElavation.Text = "Elevation" + ' + 'lblLatitude + ' + Me.lblLatitude.AutoSize = True + Me.lblLatitude.Location = New System.Drawing.Point(322, 173) + Me.lblLatitude.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblLatitude.Name = "lblLatitude" + Me.lblLatitude.Size = New System.Drawing.Size(45, 13) + Me.lblLatitude.TabIndex = 75 + Me.lblLatitude.Text = "Latitude" + ' + 'lblLongitude + ' + Me.lblLongitude.AutoSize = True + Me.lblLongitude.Location = New System.Drawing.Point(321, 123) + Me.lblLongitude.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblLongitude.Name = "lblLongitude" + Me.lblLongitude.Size = New System.Drawing.Size(57, 13) + Me.lblLongitude.TabIndex = 73 + Me.lblLongitude.Text = "Longitude " + ' + 'ucrReceiverLongititude + ' + Me.ucrReceiverLongititude.AutoSize = True + Me.ucrReceiverLongititude.frmParent = Me + Me.ucrReceiverLongititude.Location = New System.Drawing.Point(319, 140) + Me.ucrReceiverLongititude.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLongititude.Name = "ucrReceiverLongititude" + Me.ucrReceiverLongititude.Selector = Nothing + Me.ucrReceiverLongititude.Size = New System.Drawing.Size(120, 23) + Me.ucrReceiverLongititude.strNcFilePath = "" + Me.ucrReceiverLongititude.TabIndex = 74 + Me.ucrReceiverLongititude.ucrSelector = Nothing + ' + 'ucrReceiverLatitude + ' + Me.ucrReceiverLatitude.AutoSize = True + Me.ucrReceiverLatitude.frmParent = Me + Me.ucrReceiverLatitude.Location = New System.Drawing.Point(319, 192) + Me.ucrReceiverLatitude.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLatitude.Name = "ucrReceiverLatitude" + Me.ucrReceiverLatitude.Selector = Nothing + Me.ucrReceiverLatitude.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverLatitude.strNcFilePath = "" + Me.ucrReceiverLatitude.TabIndex = 76 + Me.ucrReceiverLatitude.ucrSelector = Nothing + ' + 'ucrReceiverElavation + ' + Me.ucrReceiverElavation.AutoSize = True + Me.ucrReceiverElavation.frmParent = Me + Me.ucrReceiverElavation.Location = New System.Drawing.Point(319, 240) + Me.ucrReceiverElavation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverElavation.Name = "ucrReceiverElavation" + Me.ucrReceiverElavation.Selector = Nothing + Me.ucrReceiverElavation.Size = New System.Drawing.Size(120, 23) + Me.ucrReceiverElavation.strNcFilePath = "" + Me.ucrReceiverElavation.TabIndex = 78 + Me.ucrReceiverElavation.ucrSelector = Nothing + ' + 'ucrReceiverDistrict + ' + Me.ucrReceiverDistrict.AutoSize = True + Me.ucrReceiverDistrict.frmParent = Me + Me.ucrReceiverDistrict.Location = New System.Drawing.Point(319, 289) + Me.ucrReceiverDistrict.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverDistrict.Name = "ucrReceiverDistrict" + Me.ucrReceiverDistrict.Selector = Nothing + Me.ucrReceiverDistrict.Size = New System.Drawing.Size(120, 28) + Me.ucrReceiverDistrict.strNcFilePath = "" + Me.ucrReceiverDistrict.TabIndex = 80 + Me.ucrReceiverDistrict.ucrSelector = Nothing + ' + 'ucrReceiverStationName + ' + Me.ucrReceiverStationName.AutoSize = True + Me.ucrReceiverStationName.frmParent = Me + Me.ucrReceiverStationName.Location = New System.Drawing.Point(319, 93) + Me.ucrReceiverStationName.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStationName.Name = "ucrReceiverStationName" + Me.ucrReceiverStationName.Selector = Nothing + Me.ucrReceiverStationName.Size = New System.Drawing.Size(120, 27) + Me.ucrReceiverStationName.strNcFilePath = "" + Me.ucrReceiverStationName.TabIndex = 72 + Me.ucrReceiverStationName.ucrSelector = Nothing + ' + 'lblStationName + ' + Me.lblStationName.AutoSize = True + Me.lblStationName.Location = New System.Drawing.Point(321, 78) + Me.lblStationName.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblStationName.Name = "lblStationName" + Me.lblStationName.Size = New System.Drawing.Size(71, 13) + Me.lblStationName.TabIndex = 71 + Me.lblStationName.Text = "Station Name" + ' + 'lblCountryMetada + ' + Me.lblCountryMetada.AutoSize = True + Me.lblCountryMetada.Location = New System.Drawing.Point(323, 316) + Me.lblCountryMetada.Name = "lblCountryMetada" + Me.lblCountryMetada.Size = New System.Drawing.Size(46, 13) + Me.lblCountryMetada.TabIndex = 85 + Me.lblCountryMetada.Text = "Country:" + ' + 'ucrInputCountryMetadata + ' + Me.ucrInputCountryMetadata.AddQuotesIfUnrecognised = True + Me.ucrInputCountryMetadata.AutoSize = True + Me.ucrInputCountryMetadata.IsMultiline = False + Me.ucrInputCountryMetadata.IsReadOnly = False + Me.ucrInputCountryMetadata.Location = New System.Drawing.Point(319, 334) + Me.ucrInputCountryMetadata.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputCountryMetadata.Name = "ucrInputCountryMetadata" + Me.ucrInputCountryMetadata.Size = New System.Drawing.Size(118, 21) + Me.ucrInputCountryMetadata.TabIndex = 84 ' 'dlgExportClimaticDefinitions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(688, 772) - Me.Controls.Add(Me.lblDefinitionsID) - Me.Controls.Add(Me.ucrInputDefinitionsID) - Me.Controls.Add(Me.cmdDefine) + Me.ClientSize = New System.Drawing.Size(459, 500) + Me.Controls.Add(Me.ucrReceiverYear) Me.Controls.Add(Me.lblExport) Me.Controls.Add(Me.cmdChooseFile) Me.Controls.Add(Me.ucrInputTokenPath) - Me.Controls.Add(Me.lblStationID) + Me.Controls.Add(Me.rdoUploadSummaries) + Me.Controls.Add(Me.rdoUpdateMetadata) + Me.Controls.Add(Me.ucrPnlExportGoogle) + Me.Controls.Add(Me.ucrReceiverStation) + Me.Controls.Add(Me.lblDefinitionsID) + Me.Controls.Add(Me.ucrInputDefinitionsID) + Me.Controls.Add(Me.cmdDefine) + Me.Controls.Add(Me.lblStation) Me.Controls.Add(Me.lblCountry) Me.Controls.Add(Me.ucrInputCountry) - Me.Controls.Add(Me.ucrInputStationID) Me.Controls.Add(Me.lblMonth) Me.Controls.Add(Me.lblYear) Me.Controls.Add(Me.ucrReceiverMonth) - Me.Controls.Add(Me.ucrReceiverYear) Me.Controls.Add(Me.ucrChkIncludeSummaryData) Me.Controls.Add(Me.grpSummaries) Me.Controls.Add(Me.lblCropData) Me.Controls.Add(Me.lblDataByYearMonth) Me.Controls.Add(Me.lblDataByYear) Me.Controls.Add(Me.lblRain) - Me.Controls.Add(Me.lblData) Me.Controls.Add(Me.ucrReceiverRain) - Me.Controls.Add(Me.ucrReceiverData) Me.Controls.Add(Me.ucrSelectorExportDefinitions) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrReceiverDataYear) Me.Controls.Add(Me.ucrReceiverDataYearMonth) Me.Controls.Add(Me.ucrReceiverCropData) + Me.Controls.Add(Me.lblDistrict) + Me.Controls.Add(Me.lblElavation) + Me.Controls.Add(Me.lblLatitude) + Me.Controls.Add(Me.lblLongitude) + Me.Controls.Add(Me.ucrReceiverLongititude) + Me.Controls.Add(Me.ucrReceiverLatitude) + Me.Controls.Add(Me.ucrReceiverElavation) + Me.Controls.Add(Me.ucrReceiverDistrict) + Me.Controls.Add(Me.ucrReceiverStationName) + Me.Controls.Add(Me.lblStationName) + Me.Controls.Add(Me.lblCountryMetada) + Me.Controls.Add(Me.ucrInputCountryMetadata) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgExportClimaticDefinitions" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Export Climatic Definitions" + Me.Text = "Export to Google Buckets" Me.grpSummaries.ResumeLayout(False) Me.grpSummaries.PerformLayout() Me.ResumeLayout(False) @@ -488,38 +654,51 @@ Partial Class dlgExportClimaticDefinitions End Sub - Friend WithEvents lblStationID As Label + Friend WithEvents ucrReceiverYear As ucrReceiverSingle + Friend WithEvents lblExport As Label + Friend WithEvents cmdChooseFile As Button + Friend WithEvents ucrInputTokenPath As ucrInputTextBox + Friend WithEvents rdoUploadSummaries As RadioButton + Friend WithEvents rdoUpdateMetadata As RadioButton + Friend WithEvents ucrPnlExportGoogle As UcrPanel + Friend WithEvents ucrReceiverStation As ucrReceiverSingle + Friend WithEvents lblDefinitionsID As Label + Friend WithEvents ucrInputDefinitionsID As ucrInputTextBox + Friend WithEvents cmdDefine As Button + Friend WithEvents lblStation As Label Friend WithEvents lblCountry As Label Friend WithEvents ucrInputCountry As ucrInputTextBox - Friend WithEvents ucrInputStationID As ucrInputTextBox - Friend WithEvents ucrChkSeasonStartProp As ucrCheck - Friend WithEvents ucrChkExtremes As ucrCheck - Friend WithEvents ucrChkCropSuccessProp As ucrCheck - Friend WithEvents ucrChkAnnualTemp As ucrCheck - Friend WithEvents ucrChkAnnualRainfall As ucrCheck Friend WithEvents lblMonth As Label Friend WithEvents lblYear As Label Friend WithEvents ucrReceiverMonth As ucrReceiverSingle - Friend WithEvents ucrReceiverYear As ucrReceiverSingle Friend WithEvents ucrChkIncludeSummaryData As ucrCheck Friend WithEvents grpSummaries As GroupBox Friend WithEvents ucrChkMonthlyTemp As ucrCheck + Friend WithEvents ucrChkSeasonStartProp As ucrCheck + Friend WithEvents ucrChkExtremes As ucrCheck + Friend WithEvents ucrChkCropSuccessProp As ucrCheck + Friend WithEvents ucrChkAnnualTemp As ucrCheck + Friend WithEvents ucrChkAnnualRainfall As ucrCheck Friend WithEvents lblCropData As Label Friend WithEvents lblDataByYearMonth As Label Friend WithEvents lblDataByYear As Label Friend WithEvents lblRain As Label - Friend WithEvents lblData As Label Friend WithEvents ucrReceiverRain As ucrReceiverSingle - Friend WithEvents ucrReceiverData As ucrReceiverSingle Friend WithEvents ucrSelectorExportDefinitions As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrReceiverDataYear As ucrReceiverSingle Friend WithEvents ucrReceiverDataYearMonth As ucrReceiverSingle Friend WithEvents ucrReceiverCropData As ucrReceiverSingle - Friend WithEvents lblExport As Label - Friend WithEvents cmdChooseFile As Button - Friend WithEvents ucrInputTokenPath As ucrInputTextBox - Friend WithEvents cmdDefine As Button - Friend WithEvents lblDefinitionsID As Label - Friend WithEvents ucrInputDefinitionsID As ucrInputTextBox + Friend WithEvents lblDistrict As Label + Friend WithEvents lblElavation As Label + Friend WithEvents lblLatitude As Label + Friend WithEvents lblLongitude As Label + Friend WithEvents ucrReceiverLongititude As ucrReceiverSingle + Friend WithEvents ucrReceiverLatitude As ucrReceiverSingle + Friend WithEvents ucrReceiverElavation As ucrReceiverSingle + Friend WithEvents ucrReceiverDistrict As ucrReceiverSingle + Friend WithEvents ucrReceiverStationName As ucrReceiverSingle + Friend WithEvents lblStationName As Label + Friend WithEvents lblCountryMetada As Label + Friend WithEvents ucrInputCountryMetadata As ucrInputTextBox End Class diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index 76f0e71db2c..2ca03ba31ea 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -21,7 +21,9 @@ Public Class dlgExportClimaticDefinitions Private bReset As Boolean = True Private bResetSubdialog As Boolean = False Private clsDummyFunction As New RFunction - Public clsExportRinstatToBucketFunction, ClsGcsAuthFileFunction, clsSummariesFunction As New RFunction + Private clsGetDataFrameFunction, clsUpdateMetadataInfoFunction, ClsGcsAuthFileFunction As New RFunction + Public clsRsyntax As New RSyntax + Public clsExportRinstatToBucketFunction, clsSummariesFunction As New RFunction Public clsReforMattAnnualSummariesFunction, clsReformatCropSuccessFunction, clsReformatSeasonStartFunction, clsReformatTempSummariesFunction, clsReformatMonthlyTempSummaries As New RFunction Private Sub dlgExportClimaticDefinitions_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -36,16 +38,21 @@ Public Class dlgExportClimaticDefinitions bReset = False TestOkEnabled() autoTranslate(Me) + DialogSize() End Sub Private Sub InitialiseDialog() - - ucrReceiverData.SetParameter(New RParameter("data", 0)) - ucrReceiverData.Selector = ucrSelectorExportDefinitions - ucrReceiverData.SetParameterIsString() - ucrReceiverData.SetMeAsReceiver() - ucrReceiverData.SetItemType("dataframe") - ucrReceiverData.strSelectorHeading = "Data Sets" + ucrPnlExportGoogle.AddRadioButton(rdoUpdateMetadata) + ucrPnlExportGoogle.AddRadioButton(rdoUploadSummaries) + ucrPnlExportGoogle.AddParameterValuesCondition(rdoUpdateMetadata, "checked", "metadata") + ucrPnlExportGoogle.AddParameterValuesCondition(rdoUploadSummaries, "checked", "summary") + + ucrReceiverStation.SetParameter(New RParameter("station", 0)) + ucrReceiverStation.Selector = ucrSelectorExportDefinitions + ucrReceiverStation.SetParameterIsString() + ucrReceiverStation.SetClimaticType("station") + ucrReceiverStation.bAutoFill = True + ucrReceiverStation.SetLinkedDisplayControl(lblStation) ucrReceiverDataYear.SetParameter(New RParameter("data_by_year", 1)) ucrReceiverDataYear.Selector = ucrSelectorExportDefinitions @@ -71,16 +78,22 @@ Public Class dlgExportClimaticDefinitions ucrReceiverRain.SetParameter(New RParameter("rain", 6)) ucrReceiverRain.Selector = ucrSelectorExportDefinitions ucrReceiverRain.SetParameterIsString() + ucrReceiverRain.SetClimaticType("rain") + ucrReceiverRain.bAutoFill = True ucrReceiverRain.SetLinkedDisplayControl(lblRain) ucrReceiverYear.SetParameter(New RParameter("year", 7)) ucrReceiverYear.Selector = ucrSelectorExportDefinitions ucrReceiverYear.SetParameterIsString() + ucrReceiverYear.SetClimaticType("year") + ucrReceiverYear.bAutoFill = True ucrReceiverYear.SetLinkedDisplayControl(lblYear) ucrReceiverMonth.SetParameter(New RParameter("month", 8)) ucrReceiverMonth.Selector = ucrSelectorExportDefinitions ucrReceiverMonth.SetParameterIsString() + ucrReceiverMonth.SetClimaticType("month") + ucrReceiverMonth.bAutoFill = True ucrReceiverMonth.SetLinkedDisplayControl(lblMonth) ucrChkAnnualRainfall.SetText("Annual Rainfall") @@ -112,12 +125,57 @@ Public Class dlgExportClimaticDefinitions ucrChkIncludeSummaryData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkIncludeSummaryData.SetRDefault("FALSE") - ucrInputStationID.SetParameter(New RParameter("station_id", 18)) ucrInputDefinitionsID.SetParameter(New RParameter("definitions_id", 19)) + ucrInputDefinitionsID.SetLinkedDisplayControl(lblDefinitionsID) + ucrInputCountry.SetParameter(New RParameter("country", 20)) + ucrInputCountry.SetLinkedDisplayControl(lblCountry) ucrInputTokenPath.SetParameter(New RParameter("filename", 0)) - + ucrInputTokenPath.SetLinkedDisplayControl(lblExport) + + ucrReceiverStationName.SetParameter(New RParameter("station_var", 1)) + ucrReceiverStationName.Selector = ucrSelectorExportDefinitions + ucrReceiverStationName.SetParameterIsString() + ucrReceiverStationName.SetClimaticType("station") + ucrReceiverStationName.bAutoFill = True + ucrReceiverStationName.SetLinkedDisplayControl(lblStationName) + + ucrReceiverLongititude.SetParameter(New RParameter("longitude_var", 2)) + ucrReceiverLongititude.Selector = ucrSelectorExportDefinitions + ucrReceiverLongititude.SetParameterIsString() + ucrReceiverLongititude.SetClimaticType("lon") + ucrReceiverLongititude.bAutoFill = True + ucrReceiverLongititude.SetLinkedDisplayControl(lblLongitude) + + ucrReceiverLatitude.SetParameter(New RParameter("latitude_var", 3)) + ucrReceiverLatitude.Selector = ucrSelectorExportDefinitions + ucrReceiverLatitude.SetParameterIsString() + ucrReceiverLatitude.SetClimaticType("lat") + ucrReceiverLatitude.bAutoFill = True + ucrReceiverLatitude.SetLinkedDisplayControl(lblLatitude) + + ucrReceiverElavation.SetParameter(New RParameter("elevation_var", 4)) + ucrReceiverElavation.Selector = ucrSelectorExportDefinitions + ucrReceiverElavation.SetParameterIsString() + ucrReceiverElavation.SetClimaticType("alt") + ucrReceiverElavation.bAutoFill = True + ucrReceiverElavation.SetLinkedDisplayControl(lblElavation) + + ucrReceiverDistrict.SetParameter(New RParameter("district_var", 5)) + ucrReceiverDistrict.Selector = ucrSelectorExportDefinitions + ucrReceiverDistrict.SetParameterIsString() + ucrReceiverDistrict.SetClimaticType("district") + ucrReceiverDistrict.bAutoFill = True + ucrReceiverDistrict.SetLinkedDisplayControl(lblDistrict) + + ucrInputCountryMetadata.SetParameter(New RParameter("country", 6)) + ucrInputCountryMetadata.SetLinkedDisplayControl(lblCountryMetada) + + ucrPnlExportGoogle.AddToLinkedControls({ucrReceiverMonth, ucrReceiverYear, ucrReceiverStation}, {rdoUploadSummaries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlExportGoogle.AddToLinkedControls({ucrReceiverDistrict, ucrReceiverElavation, ucrReceiverLatitude, ucrInputCountryMetadata, ucrReceiverLongititude, ucrReceiverStationName}, {rdoUpdateMetadata}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlExportGoogle.AddToLinkedControls({ucrInputCountry, ucrChkIncludeSummaryData, ucrInputDefinitionsID}, {rdoUploadSummaries}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + DialogSize() End Sub Private Sub SetDefaults() @@ -129,7 +187,9 @@ Public Class dlgExportClimaticDefinitions clsReforMattAnnualSummariesFunction = New RFunction clsReformatTempSummariesFunction = New RFunction ClsGcsAuthFileFunction = New RFunction + clsUpdateMetadataInfoFunction = New RFunction clsDummyFunction = New RFunction + clsGetDataFrameFunction = New RFunction bResetSubdialog = True ucrSelectorExportDefinitions.Reset() @@ -140,6 +200,9 @@ Public Class dlgExportClimaticDefinitions clsDummyFunction.AddParameter("extrem", "False", iPosition:=3) clsDummyFunction.AddParameter("season", "False", iPosition:=4) clsDummyFunction.AddParameter("crop", "False", iPosition:=5) + clsDummyFunction.AddParameter("checked", "metadata", iPosition:=6) + + clsGetDataFrameFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_frame") clsReformatTempSummariesFunction.SetPackageName("epicsawrap") clsReformatTempSummariesFunction.SetRCommand("reformat_temperature_summaries") @@ -169,14 +232,14 @@ Public Class dlgExportClimaticDefinitions ClsGcsAuthFileFunction.SetPackageName("epicsawrap") ClsGcsAuthFileFunction.SetRCommand("gcs_auth_file") + clsUpdateMetadataInfoFunction.SetPackageName("epicsawrap") + clsUpdateMetadataInfoFunction.SetRCommand("update_metadata_info") ucrBase.clsRsyntax.ClearCodes() - ucrBase.clsRsyntax.AddToBeforeCodes(ClsGcsAuthFileFunction, 0) - ucrBase.clsRsyntax.SetBaseRFunction(clsExportRinstatToBucketFunction) End Sub Private Sub SetRCodeForControls(bReset As Boolean) ucrReceiverCropData.SetRCode(clsExportRinstatToBucketFunction, bReset) - ucrReceiverData.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverStation.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverDataYear.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverDataYearMonth.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverMonth.SetRCode(clsExportRinstatToBucketFunction, bReset) @@ -185,10 +248,17 @@ Public Class dlgExportClimaticDefinitions ucrSelectorExportDefinitions.SetRCode(clsExportRinstatToBucketFunction) ucrInputTokenPath.SetRCode(ClsGcsAuthFileFunction, bReset) - ucrInputStationID.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrInputDefinitionsID.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrInputCountry.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrChkIncludeSummaryData.SetRCode(clsExportRinstatToBucketFunction, bReset) + + ucrReceiverDistrict.SetRCode(clsUpdateMetadataInfoFunction, bReset) + ucrReceiverElavation.SetRCode(clsUpdateMetadataInfoFunction, bReset) + ucrReceiverLatitude.SetRCode(clsUpdateMetadataInfoFunction, bReset) + ucrReceiverLongititude.SetRCode(clsUpdateMetadataInfoFunction, bReset) + ucrReceiverStationName.SetRCode(clsUpdateMetadataInfoFunction, bReset) + ucrInputCountryMetadata.SetRCode(clsUpdateMetadataInfoFunction, bReset) + If bReset Then ucrChkAnnualRainfall.SetRCode(clsDummyFunction, bReset) ucrChkAnnualTemp.SetRCode(clsDummyFunction, bReset) @@ -196,37 +266,45 @@ Public Class dlgExportClimaticDefinitions ucrChkExtremes.SetRCode(clsDummyFunction, bReset) ucrChkMonthlyTemp.SetRCode(clsDummyFunction, bReset) ucrChkSeasonStartProp.SetRCode(clsDummyFunction, bReset) + ucrPnlExportGoogle.SetRCode(clsDummyFunction, bReset) End If AddRemoveSummary() EnableDisableDefineButton() End Sub Private Sub TestOkEnabled() - If Not ucrReceiverData.IsEmpty AndAlso + If rdoUploadSummaries.Checked Then + If Not ucrReceiverStation.IsEmpty AndAlso Not ucrReceiverYear.IsEmpty AndAlso Not ucrInputCountry.IsEmpty AndAlso - Not ucrInputStationID.IsEmpty AndAlso Not ucrInputDefinitionsID.IsEmpty AndAlso Not ucrInputTokenPath.IsEmpty Then - If (ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked) AndAlso - Not ucrReceiverCropData.IsEmpty Then - ucrBase.OKEnabled(True) - ElseIf ucrChkAnnualRainfall.Checked AndAlso - Not ucrReceiverRain.IsEmpty Then - ucrBase.OKEnabled(True) - ElseIf (ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked) AndAlso - Not ucrReceiverDataYear.IsEmpty Then - ucrBase.OKEnabled(True) - ElseIf ucrChkMonthlyTemp.Checked AndAlso - Not ucrReceiverMonth.IsEmpty AndAlso - Not ucrReceiverDataYearMonth.IsEmpty Then - ucrBase.OKEnabled(True) + If (ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked) AndAlso + Not ucrReceiverCropData.IsEmpty Then + ucrBase.OKEnabled(True) + ElseIf ucrChkAnnualRainfall.Checked AndAlso + Not ucrReceiverRain.IsEmpty Then + ucrBase.OKEnabled(True) + ElseIf (ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked) AndAlso + Not ucrReceiverDataYear.IsEmpty Then + ucrBase.OKEnabled(True) + ElseIf ucrChkMonthlyTemp.Checked AndAlso + Not ucrReceiverMonth.IsEmpty AndAlso + Not ucrReceiverDataYearMonth.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If Else ucrBase.OKEnabled(False) End If Else - ucrBase.OKEnabled(False) + If Not ucrReceiverStationName.IsEmpty AndAlso Not ucrInputTokenPath.IsEmpty AndAlso Not ucrInputCountryMetadata.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If End If End Sub @@ -325,14 +403,6 @@ Public Class dlgExportClimaticDefinitions End If End Sub - Private Sub ucrInputStationID_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputStationID.ControlValueChanged - If Not ucrInputStationID.IsEmpty Then - clsExportRinstatToBucketFunction.AddParameter("station_id", Chr(34) & ucrInputStationID.GetText & Chr(34), iPosition:=18) - Else - clsExportRinstatToBucketFunction.RemoveParameterByName("station_id") - End If - End Sub - Private Sub ucrInputDefinitionsID_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputDefinitionsID.ControlValueChanged If Not ucrInputDefinitionsID.IsEmpty Then clsExportRinstatToBucketFunction.AddParameter("definitions_id", Chr(34) & ucrInputDefinitionsID.GetText & Chr(34), iPosition:=19) @@ -342,18 +412,21 @@ Public Class dlgExportClimaticDefinitions End Sub Private Sub EnableDisableDefineButton() - ucrReceiverDataYearMonth.Visible = ucrChkMonthlyTemp.Checked - ucrReceiverDataYear.Visible = ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked - ucrReceiverRain.Visible = ucrChkAnnualRainfall.Checked - ucrReceiverCropData.Visible = ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked - - End Sub + If rdoUploadSummaries.Checked Then + ucrReceiverDataYearMonth.Visible = ucrChkMonthlyTemp.Checked + ucrReceiverDataYear.Visible = ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked + ucrReceiverRain.Visible = ucrChkAnnualRainfall.Checked + ucrReceiverCropData.Visible = ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked + Else + ucrReceiverDataYearMonth.Visible = False + ucrReceiverDataYear.Visible = False + ucrReceiverRain.Visible = False + ucrReceiverCropData.Visible = False + End If - Private Sub ucrChkIncludeSummaryData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeSummaryData.ControlValueChanged - EnableDisableDefineButton() End Sub - Private Sub cmdChooseFile_Click(sender As Object, e As EventArgs) Handles cmdChooseFile.Click + Private Sub cmdChooseFile_Click_1(sender As Object, e As EventArgs) Handles cmdChooseFile.Click Using dlgOpen As New OpenFileDialog dlgOpen.Filter = "JSON Files|*.json" dlgOpen.Title = "Import JSON File" @@ -364,16 +437,61 @@ Public Class dlgExportClimaticDefinitions ucrInputTokenPath.SetName(Replace(dlgOpen.FileName, "\", "/")) End If End Using + End Sub + + Private Sub ucrChkIncludeSummaryData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeSummaryData.ControlValueChanged + EnableDisableDefineButton() + End Sub + Private Sub ucrSelectorExportDefinitions_DataFrameChanged() Handles ucrSelectorExportDefinitions.DataFrameChanged + TestOkEnabled() End Sub - Private Sub ucrReceiverData_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverCropData.ControlContentsChanged, ucrReceiverDataYearMonth.ControlContentsChanged, ucrReceiverDataYear.ControlContentsChanged, - ucrReceiverMonth.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrChkSeasonStartProp.ControlContentsChanged, ucrInputCountry.ControlContentsChanged, ucrInputStationID.ControlContentsChanged, ucrInputDefinitionsID.ControlContentsChanged, ucrChkIncludeSummaryData.ControlContentsChanged, - ucrChkMonthlyTemp.ControlContentsChanged, ucrChkCropSuccessProp.ControlContentsChanged, ucrChkAnnualTemp.ControlContentsChanged, ucrChkAnnualRainfall.ControlContentsChanged, ucrInputTokenPath.ControlContentsChanged, ucrSelectorExportDefinitions.ControlContentsChanged + Private Sub ucrPnlExportGoogle_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlExportGoogle.ControlValueChanged, ucrInputTokenPath.ControlValueChanged + ucrBase.clsRsyntax.AddToBeforeCodes(ClsGcsAuthFileFunction, 0) + If rdoUpdateMetadata.Checked Then + grpSummaries.Visible = False + cmdDefine.Visible = False + ucrBase.clsRsyntax.SetBaseRFunction(clsUpdateMetadataInfoFunction) + ucrReceiverStationName.SetMeAsReceiver() + Else + grpSummaries.Visible = True + cmdDefine.Visible = True + ucrBase.clsRsyntax.SetBaseRFunction(clsExportRinstatToBucketFunction) + ucrReceiverStation.SetMeAsReceiver() + End If + EnableDisableDefineButton() + DialogSize() TestOkEnabled() End Sub - Private Sub ucrReceiverData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlValueChanged - ucrReceiverData.SetMeAsReceiver() + Private Sub DialogSize() + If rdoUpdateMetadata.Checked Then + Me.Size = New Size(475, 455) + Me.ucrBase.Location = New Point(4, 360) + Else + Me.Size = New Size(475, 539) + Me.ucrBase.Location = New Point(4, 434) + End If + End Sub + + Private Sub ucrSelectorExportDefinitions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorExportDefinitions.ControlValueChanged + clsGetDataFrameFunction.AddParameter("data_name", Chr(34) & ucrSelectorExportDefinitions.strCurrentDataFrame & Chr(34), iPosition:=0) + clsGetDataFrameFunction.SetAssignTo(ucrSelectorExportDefinitions.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + clsUpdateMetadataInfoFunction.AddParameter("metadata_data", clsRFunctionParameter:=clsGetDataFrameFunction, iPosition:=0) + End Sub + + Private Sub ucrReceiverData_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRain.ControlContentsChanged, ucrReceiverCropData.ControlContentsChanged, ucrReceiverDataYearMonth.ControlContentsChanged, ucrReceiverDataYear.ControlContentsChanged, ucrReceiverStation.ControlContentsChanged, ucrInputTokenPath.ControlContentsChanged, ucrInputCountryMetadata.ControlContentsChanged, + ucrReceiverMonth.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrChkSeasonStartProp.ControlContentsChanged, ucrInputCountry.ControlContentsChanged, ucrInputDefinitionsID.ControlContentsChanged, ucrChkIncludeSummaryData.ControlContentsChanged, ucrReceiverLongititude.ControlContentsChanged, ucrReceiverLatitude.ControlContentsChanged, + ucrChkMonthlyTemp.ControlContentsChanged, ucrChkCropSuccessProp.ControlContentsChanged, ucrChkAnnualTemp.ControlContentsChanged, ucrChkAnnualRainfall.ControlContentsChanged, ucrSelectorExportDefinitions.ControlContentsChanged, ucrReceiverElavation.ControlContentsChanged, ucrReceiverDistrict.ControlContentsChanged, ucrReceiverStationName.ControlContentsChanged + TestOkEnabled() + End Sub + + Private Sub ucrInputCountryMetadata_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCountryMetadata.ControlValueChanged + If Not ucrInputCountryMetadata.IsEmpty Then + clsUpdateMetadataInfoFunction.AddParameter("country", Chr(34) & ucrInputCountryMetadata.GetText & Chr(34), iPosition:=6) + Else + clsUpdateMetadataInfoFunction.RemoveParameterByName("country") + End If End Sub End Class \ No newline at end of file diff --git a/instat/dlgFindInVariableOrFilter.Designer.vb b/instat/dlgFindInVariableOrFilter.Designer.vb index 5417a14424f..ccb4f07ef7f 100644 --- a/instat/dlgFindInVariableOrFilter.Designer.vb +++ b/instat/dlgFindInVariableOrFilter.Designer.vb @@ -28,7 +28,6 @@ Partial Class dlgFindInVariableOrFilter Me.grpSelect = New System.Windows.Forms.GroupBox() Me.rdoRow = New System.Windows.Forms.RadioButton() Me.rdoCell = New System.Windows.Forms.RadioButton() - Me.ucrPnlSelect = New instat.UcrPanel() Me.lblLabel = New System.Windows.Forms.Label() Me.rdoVariable = New System.Windows.Forms.RadioButton() Me.rdoInFilter = New System.Windows.Forms.RadioButton() @@ -44,10 +43,12 @@ Partial Class dlgFindInVariableOrFilter Me.ucrBase = New instat.ucrButtons() Me.ucrChkIncludeRegularExpressions = New instat.ucrCheck() Me.ucrChkIgnoreCase = New instat.ucrCheck() + Me.ucrPnlSelect = New instat.UcrPanel() Me.ucrPnlOptions = New instat.UcrPanel() Me.ucrSelectorFind = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverVariable = New instat.ucrReceiverSingle() Me.ucrInputPattern = New instat.ucrInputComboBox() + Me.ucrWholeValue = New instat.ucrCheck() Me.grpSelect.SuspendLayout() Me.SuspendLayout() ' @@ -108,15 +109,6 @@ Partial Class dlgFindInVariableOrFilter Me.rdoCell.Text = "Cell" Me.rdoCell.UseVisualStyleBackColor = True ' - 'ucrPnlSelect - ' - Me.ucrPnlSelect.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlSelect.Location = New System.Drawing.Point(6, 13) - Me.ucrPnlSelect.Margin = New System.Windows.Forms.Padding(4) - Me.ucrPnlSelect.Name = "ucrPnlSelect" - Me.ucrPnlSelect.Size = New System.Drawing.Size(121, 31) - Me.ucrPnlSelect.TabIndex = 0 - ' 'lblLabel ' Me.lblLabel.AutoSize = True @@ -276,6 +268,15 @@ Partial Class dlgFindInVariableOrFilter Me.ucrChkIgnoreCase.Size = New System.Drawing.Size(131, 23) Me.ucrChkIgnoreCase.TabIndex = 66 ' + 'ucrPnlSelect + ' + Me.ucrPnlSelect.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSelect.Location = New System.Drawing.Point(6, 13) + Me.ucrPnlSelect.Margin = New System.Windows.Forms.Padding(4) + Me.ucrPnlSelect.Name = "ucrPnlSelect" + Me.ucrPnlSelect.Size = New System.Drawing.Size(121, 31) + Me.ucrPnlSelect.TabIndex = 0 + ' 'ucrPnlOptions ' Me.ucrPnlOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -322,12 +323,23 @@ Partial Class dlgFindInVariableOrFilter Me.ucrInputPattern.Size = New System.Drawing.Size(127, 21) Me.ucrInputPattern.TabIndex = 65 ' + 'ucrWholeValue + ' + Me.ucrWholeValue.AutoSize = True + Me.ucrWholeValue.Checked = False + Me.ucrWholeValue.Location = New System.Drawing.Point(139, 230) + Me.ucrWholeValue.Margin = New System.Windows.Forms.Padding(4) + Me.ucrWholeValue.Name = "ucrWholeValue" + Me.ucrWholeValue.Size = New System.Drawing.Size(131, 23) + Me.ucrWholeValue.TabIndex = 76 + ' 'dlgFindInVariableOrFilter ' 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(417, 350) + Me.Controls.Add(Me.ucrWholeValue) Me.Controls.Add(Me.lblLabel) Me.Controls.Add(Me.lblName) Me.Controls.Add(Me.lblVariableFound) @@ -387,4 +399,5 @@ Partial Class dlgFindInVariableOrFilter Friend WithEvents lblVariableFound As Label Friend WithEvents cmdFindNext As Button Friend WithEvents ttLabels As ToolTip + Friend WithEvents ucrWholeValue As ucrCheck End Class diff --git a/instat/dlgFindInVariableOrFilter.vb b/instat/dlgFindInVariableOrFilter.vb index b4964cbbc12..0a33c2fe132 100644 --- a/instat/dlgFindInVariableOrFilter.vb +++ b/instat/dlgFindInVariableOrFilter.vb @@ -77,12 +77,16 @@ Public Class dlgFindInVariableOrFilter ucrChkIncludeRegularExpressions.SetParameter(New RParameter("use_regex", 4)) ucrChkIncludeRegularExpressions.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - ucrPnlOptions.AddToLinkedControls({ucrInputPattern, ucrPnlSelect, ucrChkIgnoreCase, ucrChkIncludeRegularExpressions}, {rdoVariable}, bNewLinkedHideIfParameterMissing:=True) + ucrWholeValue.SetText("Whole Value") + ucrWholeValue.SetParameter(New RParameter("match_entire_cell", 5)) + ucrWholeValue.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + + ucrPnlOptions.AddToLinkedControls({ucrInputPattern, ucrPnlSelect, ucrChkIgnoreCase, ucrChkIncludeRegularExpressions, ucrWholeValue}, {rdoVariable}, bNewLinkedHideIfParameterMissing:=True) ucrInputPattern.SetLinkedDisplayControl(lblPattern) ucrPnlSelect.SetLinkedDisplayControl(grpSelect) ucrBase.OKEnabled(False) - ucrBase.cmdReset.Enabled = False + ucrBase.cmdReset.Enabled = True End Sub Private Sub SetDefaults() @@ -113,6 +117,7 @@ Public Class dlgFindInVariableOrFilter clsGetRowHeadersFunction.AddParameter("data", clsRFunctionParameter:=clsGetDataFrameFunction, iPosition:=0) clsGetRowHeadersFunction.AddParameter("ignore_case", "TRUE", iPosition:=3) clsGetRowHeadersFunction.AddParameter("use_regex", "FALSE", iPosition:=4) + clsGetRowHeadersFunction.AddParameter("match_entire_cell", "FALSE", iPosition:=5) ucrReceiverVariable.SetMeAsReceiver() cmdFindNext.Enabled = False @@ -126,6 +131,7 @@ Public Class dlgFindInVariableOrFilter ucrSelectorFind.SetRCode(clsGetDataFrameFunction, bReset) ucrReceiverVariable.SetRCode(clsGetRowHeadersFunction, bReset) ucrChkIgnoreCase.SetRCode(clsGetRowHeadersFunction, bReset) + ucrWholeValue.SetRCode(clsGetRowHeadersFunction, bReset) ucrChkIncludeRegularExpressions.SetRCode(clsGetRowHeadersFunction, bReset) ucrPnlOptions.SetRCode(clsDummyFunction, bReset) ucrPnlSelect.SetRCode(clsDummyFunction, bReset) @@ -155,6 +161,14 @@ Public Class dlgFindInVariableOrFilter End If End Function + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + ucrSelectorFind.Reset() + rdoVariable.Checked = True + rdoCell.Checked = True + ucrReceiverVariable.Clear() + ucrInputPattern.cboInput.ResetText() + End Sub + Private Sub cmdFind_Click(sender As Object, e As EventArgs) Handles cmdFind.Click Try If rdoVariable.Checked OrElse rdoInFilter.Checked Then diff --git a/instat/dlgInventoryPlot.vb b/instat/dlgInventoryPlot.vb index a750178ff13..a9505fc0dc9 100644 --- a/instat/dlgInventoryPlot.vb +++ b/instat/dlgInventoryPlot.vb @@ -317,7 +317,6 @@ Public Class dlgInventoryPlot SetDefaults() SetRCodeForControls(True) TestOkEnabled() - End Sub Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged @@ -335,6 +334,7 @@ Public Class dlgInventoryPlot clsInventoryPlot.iCallType = 3 clsInventoryPlot.bExcludeAssignedFunctionOutput = False End If + AddClimateMissingFunction() End Sub Private Sub AddOrRemoveKeyFunctions() @@ -347,13 +347,17 @@ Public Class dlgInventoryPlot End If End Sub - Private Sub ucrChkSummary_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSummary.ControlValueChanged - If ucrChkSummary.Checked Then + Private Sub AddClimateMissingFunction() + If rdoMissing.Checked AndAlso ucrChkSummary.Checked Then ucrBase.clsRsyntax.AddToAfterCodes(clsClimaticMissing, iPosition:=1) clsClimaticMissing.iCallType = 2 Else ucrBase.clsRsyntax.RemoveFromAfterCodes(clsClimaticMissing) - End If + End If + End Sub + + Private Sub ucrChkSummary_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSummary.ControlValueChanged, ucrChkOmitEnd.ControlValueChanged, ucrChkOmitStart.ControlValueChanged + AddClimateMissingFunction() AddOrRemoveKeyFunctions() End Sub diff --git a/instat/dlgMerge.vb b/instat/dlgMerge.vb index 3ddbab1caa8..a93fdeafbb1 100644 --- a/instat/dlgMerge.vb +++ b/instat/dlgMerge.vb @@ -18,12 +18,6 @@ Imports instat Imports instat.Translations Public Class dlgMerge - Public enumMergeMode As String = MergeMode.Prepare - Public Enum MergeMode - Prepare - Climatic - End Enum - Private bFirstLoad As Boolean = True Private clsMergeFunction As New RFunction Private clsByListFunction As New RFunction @@ -48,7 +42,6 @@ Public Class dlgMerge SetDefaults() End If SetRCodeForControls(bReset) - SetHelpOptions() bReset = False SetMergingBy() TestOKEnabled() @@ -155,15 +148,6 @@ Public Class dlgMerge SetMergingBy() End Sub - Private Sub SetHelpOptions() - Select Case enumMergeMode - Case MergeMode.Prepare - ucrBase.iHelpTopicID = 60 - Case MergeMode.Climatic - ucrBase.iHelpTopicID = 609 - End Select - End Sub - Private Sub ucrInputJoinType_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputJoinType.ControlValueChanged Dim bFound As Boolean = True diff --git a/instat/dlgMergeAdditionalData.vb b/instat/dlgMergeAdditionalData.vb index 3248859496b..e61e9a9e594 100644 --- a/instat/dlgMergeAdditionalData.vb +++ b/instat/dlgMergeAdditionalData.vb @@ -18,6 +18,12 @@ Imports instat.Translations Imports RDotNet Public Class dlgMergeAdditionalData + Public enumMergeMode As String = MergeMode.Prepare + Public Enum MergeMode + Prepare + Climatic + End Enum + Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsInsertColumnFunction, clsGetColumnsFromData, clsListFunction, clsImportDataFunction As New RFunction @@ -39,13 +45,13 @@ Public Class dlgMergeAdditionalData End If SetRCodeforControls(bReset) bReset = False + SetHelpOptions() SetMergingBy() autoTranslate(Me) TestOkEnabled() End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 186 ucrToDataFrame.SetParameter(New RParameter("x", 0)) ucrToDataFrame.SetParameterIsRFunction() ucrToDataFrame.SetLabelText("To Data Frame:") @@ -111,6 +117,15 @@ Public Class dlgMergeAdditionalData ucrChkSaveDataFrame.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) End Sub + Private Sub SetHelpOptions() + Select Case enumMergeMode + Case MergeMode.Prepare + ucrBase.iHelpTopicID = 186 + Case MergeMode.Climatic + ucrBase.iHelpTopicID = 609 + End Select + End Sub + Private Sub TestOkEnabled() If ucrToDataFrame.cboAvailableDataFrames.Text <> "" AndAlso ucrFromDataFrame.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso Not ucrReceiverSecond.IsEmpty() AndAlso bBySpecified AndAlso bJoinColsAreUnique Then diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index c0909e4c30b..4b5909ef8c6 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -700,6 +700,7 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() + Me.RInstatResourcesSiteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -1549,7 +1550,7 @@ Partial Class frmMain ' 'mnuHelp ' - Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.mnuHelpData, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.ToolStripSeparator81, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.mnuHelpPackagesDocumentation}) + Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.mnuHelpData, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.ToolStripSeparator81, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.RInstatResourcesSiteToolStripMenuItem, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" Me.mnuHelp.Size = New System.Drawing.Size(44, 22) Me.mnuHelp.Tag = "Help" @@ -1599,90 +1600,90 @@ Partial Class frmMain ' Me.mnuHelpMenus.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenusAndDialogsToolStripMenuItem, Me.ToolStripSeparator82, Me.FileToolStripMenuItem, Me.EditToolStripMenuItem, Me.PrepareToolStripMenuItem, Me.DescribeToolStripMenuItem, Me.ModelToolStripMenuItem, Me.ToolStripSeparator83, Me.StructuredToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.ProcurementToolStripMenuItem, Me.ExperimentsToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.ViewToolStripMenuItem}) Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpMenus.Size = New System.Drawing.Size(230, 22) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'MenusAndDialogsToolStripMenuItem ' Me.MenusAndDialogsToolStripMenuItem.Name = "MenusAndDialogsToolStripMenuItem" - Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(175, 22) - Me.MenusAndDialogsToolStripMenuItem.Text = "Menus and Dialogs" + Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.MenusAndDialogsToolStripMenuItem.Text = "Menus and Dialogs..." ' 'ToolStripSeparator82 ' Me.ToolStripSeparator82.Name = "ToolStripSeparator82" - Me.ToolStripSeparator82.Size = New System.Drawing.Size(172, 6) + Me.ToolStripSeparator82.Size = New System.Drawing.Size(181, 6) ' 'FileToolStripMenuItem ' Me.FileToolStripMenuItem.Name = "FileToolStripMenuItem" - Me.FileToolStripMenuItem.Size = New System.Drawing.Size(175, 22) - Me.FileToolStripMenuItem.Text = "File" + Me.FileToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.FileToolStripMenuItem.Text = "File..." ' 'EditToolStripMenuItem ' Me.EditToolStripMenuItem.Name = "EditToolStripMenuItem" - Me.EditToolStripMenuItem.Size = New System.Drawing.Size(175, 22) - Me.EditToolStripMenuItem.Text = "Edit" + Me.EditToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.EditToolStripMenuItem.Text = "Edit..." ' 'PrepareToolStripMenuItem ' Me.PrepareToolStripMenuItem.Name = "PrepareToolStripMenuItem" - Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(175, 22) - Me.PrepareToolStripMenuItem.Text = "Prepare" + Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.PrepareToolStripMenuItem.Text = "Prepare..." ' 'DescribeToolStripMenuItem ' Me.DescribeToolStripMenuItem.Name = "DescribeToolStripMenuItem" - Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(175, 22) - Me.DescribeToolStripMenuItem.Text = "Describe" + Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.DescribeToolStripMenuItem.Text = "Describe..." ' 'ModelToolStripMenuItem ' Me.ModelToolStripMenuItem.Name = "ModelToolStripMenuItem" - Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(175, 22) - Me.ModelToolStripMenuItem.Text = "Model" + Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ModelToolStripMenuItem.Text = "Model..." ' 'ToolStripSeparator83 ' Me.ToolStripSeparator83.Name = "ToolStripSeparator83" - Me.ToolStripSeparator83.Size = New System.Drawing.Size(172, 6) + Me.ToolStripSeparator83.Size = New System.Drawing.Size(181, 6) ' 'StructuredToolStripMenuItem ' Me.StructuredToolStripMenuItem.Name = "StructuredToolStripMenuItem" - Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(175, 22) - Me.StructuredToolStripMenuItem.Text = "Structured" + Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.StructuredToolStripMenuItem.Text = "Structured..." ' 'ClimaticToolStripMenuItem ' Me.ClimaticToolStripMenuItem.Name = "ClimaticToolStripMenuItem" - Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(175, 22) - Me.ClimaticToolStripMenuItem.Text = "Climatic" + Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ClimaticToolStripMenuItem.Text = "Climatic..." ' 'ProcurementToolStripMenuItem ' Me.ProcurementToolStripMenuItem.Name = "ProcurementToolStripMenuItem" - Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(175, 22) - Me.ProcurementToolStripMenuItem.Text = "Procurement" + Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ProcurementToolStripMenuItem.Text = "Procurement..." ' 'ExperimentsToolStripMenuItem ' Me.ExperimentsToolStripMenuItem.Name = "ExperimentsToolStripMenuItem" - Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(175, 22) - Me.ExperimentsToolStripMenuItem.Text = "Experiments" + Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ExperimentsToolStripMenuItem.Text = "Experiments..." ' 'ToolsToolStripMenuItem ' Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" - Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(175, 22) - Me.ToolsToolStripMenuItem.Text = "Tools" + Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ToolsToolStripMenuItem.Text = "Tools..." ' 'ViewToolStripMenuItem ' Me.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem" - Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(175, 22) - Me.ViewToolStripMenuItem.Text = "View" + Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ViewToolStripMenuItem.Text = "View..." ' 'mnuHelpAboutR ' @@ -1725,8 +1726,8 @@ Partial Class frmMain 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(218, 22) - Me.mnuHelpPackagesDocumentation.Text = "Packages Documentation..." + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpPackagesDocumentation.Text = "R-Packages Documentation..." ' 'ToolStripSeparator16 ' @@ -1919,87 +1920,87 @@ Partial Class frmMain 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator80.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(197, 22) - Me.mnuClimaticTidyandExamineMerge.Text = "Merge..." + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineMerge.Text = "Add (Merge) Columns..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(197, 22) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' 'mnuClimaticDates @@ -5225,6 +5226,12 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' + 'RInstatResourcesSiteToolStripMenuItem + ' + Me.RInstatResourcesSiteToolStripMenuItem.Name = "RInstatResourcesSiteToolStripMenuItem" + Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(230, 22) + Me.RInstatResourcesSiteToolStripMenuItem.Text = "R-Instat Resources Site" + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5946,4 +5953,5 @@ Partial Class frmMain Friend WithEvents ViewToolStripMenuItem As ToolStripMenuItem Friend WithEvents mnuSwapDataLogScript As ToolStripMenuItem Friend WithEvents mnuSwapDataMetadata As ToolStripMenuItem + Friend WithEvents RInstatResourcesSiteToolStripMenuItem As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index c2351ac4d28..5dcc43a4420 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -733,7 +733,6 @@ Public Class frmMain End Sub Private Sub mnuPrepareReshapeMerge_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnReshapeMerge.Click - dlgMerge.enumMergeMode = dlgMerge.MergeMode.Prepare dlgMerge.ShowDialog() End Sub @@ -2103,8 +2102,8 @@ Public Class frmMain End Sub Private Sub mnuClimaticTidyandExamineMerge_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineMerge.Click - dlgMerge.enumMergeMode = dlgMerge.MergeMode.Climatic - dlgMerge.ShowDialog() + dlgMergeAdditionalData.enumMergeMode = dlgMergeAdditionalData.MergeMode.Climatic + dlgMergeAdditionalData.ShowDialog() End Sub Private Sub mnuClimaticCMSAFExporttoCMSAFRToolbox_Click(sender As Object, e As EventArgs) Handles mnuClimaticCMSAFExporttoCMSAFRToolbox.Click @@ -2604,6 +2603,7 @@ Public Class frmMain End Sub Private Sub mnuPrepareDataFrameAddMergeColumns_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataFrameAddMergeColumns.Click + dlgMergeAdditionalData.enumMergeMode = dlgMergeAdditionalData.MergeMode.Prepare dlgMergeAdditionalData.ShowDialog() End Sub @@ -2843,4 +2843,8 @@ Public Class frmMain UpdateSwapDataAndScript() UpdateLayout() End Sub + + Private Sub RInstatResourcesSiteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RInstatResourcesSiteToolStripMenuItem.Click + Process.Start("https://ecampus.r-instat.org/course/view.php?id=14") + End Sub End Class diff --git a/instat/sdgClimsoft.Designer.vb b/instat/sdgClimsoft.Designer.vb index 66902102eb5..a615738425c 100644 --- a/instat/sdgClimsoft.Designer.vb +++ b/instat/sdgClimsoft.Designer.vb @@ -28,6 +28,10 @@ Partial Class sdgClimsoft Me.ucrChkImportStationsMetadata = New instat.ucrCheck() Me.tbColumns = New System.Windows.Forms.TabPage() Me.grpColumnsToInclude = New System.Windows.Forms.GroupBox() + Me.ucrChkIncludeElementName = New instat.ucrCheck() + Me.ucrChkIncludeDateTime = New instat.ucrCheck() + Me.ucrChkIncludeElementId = New instat.ucrCheck() + Me.ucrChkIncludeStationId = New instat.ucrCheck() Me.ucrChkIncludeQCLog = New instat.ucrCheck() Me.ucrChkIncludeCapturedBy = New instat.ucrCheck() Me.ucrChkIncludeQCStatus = New instat.ucrCheck() @@ -39,10 +43,6 @@ Partial Class sdgClimsoft Me.ucrChkIncludeFlag = New instat.ucrCheck() Me.tbpMoreOptions = New System.Windows.Forms.TabControl() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.ucrChkIncludeElementId = New instat.ucrCheck() - Me.ucrChkIncludeStationId = New instat.ucrCheck() - Me.ucrChkIncludeDateTime = New instat.ucrCheck() - Me.ucrChkIncludeElementName = New instat.ucrCheck() Me.tbpTitles.SuspendLayout() Me.grpMetadataToImport.SuspendLayout() Me.tbColumns.SuspendLayout() @@ -56,7 +56,7 @@ Partial Class sdgClimsoft Me.tbpTitles.Location = New System.Drawing.Point(4, 22) Me.tbpTitles.Name = "tbpTitles" Me.tbpTitles.Padding = New System.Windows.Forms.Padding(3) - Me.tbpTitles.Size = New System.Drawing.Size(409, 303) + Me.tbpTitles.Size = New System.Drawing.Size(409, 367) Me.tbpTitles.TabIndex = 2 Me.tbpTitles.Tag = "" Me.tbpTitles.Text = "Metadata" @@ -125,6 +125,42 @@ Partial Class sdgClimsoft Me.grpColumnsToInclude.TabStop = False Me.grpColumnsToInclude.Text = "Columns to Include" ' + 'ucrChkIncludeElementName + ' + Me.ucrChkIncludeElementName.AutoSize = True + Me.ucrChkIncludeElementName.Checked = False + Me.ucrChkIncludeElementName.Location = New System.Drawing.Point(7, 141) + Me.ucrChkIncludeElementName.Name = "ucrChkIncludeElementName" + Me.ucrChkIncludeElementName.Size = New System.Drawing.Size(295, 23) + Me.ucrChkIncludeElementName.TabIndex = 25 + ' + 'ucrChkIncludeDateTime + ' + Me.ucrChkIncludeDateTime.AutoSize = True + Me.ucrChkIncludeDateTime.Checked = True + Me.ucrChkIncludeDateTime.Location = New System.Drawing.Point(7, 89) + Me.ucrChkIncludeDateTime.Name = "ucrChkIncludeDateTime" + Me.ucrChkIncludeDateTime.Size = New System.Drawing.Size(295, 23) + Me.ucrChkIncludeDateTime.TabIndex = 24 + ' + 'ucrChkIncludeElementId + ' + Me.ucrChkIncludeElementId.AutoSize = True + Me.ucrChkIncludeElementId.Checked = False + Me.ucrChkIncludeElementId.Location = New System.Drawing.Point(7, 116) + Me.ucrChkIncludeElementId.Name = "ucrChkIncludeElementId" + Me.ucrChkIncludeElementId.Size = New System.Drawing.Size(295, 23) + Me.ucrChkIncludeElementId.TabIndex = 23 + ' + 'ucrChkIncludeStationId + ' + Me.ucrChkIncludeStationId.AutoSize = True + Me.ucrChkIncludeStationId.Checked = True + Me.ucrChkIncludeStationId.Location = New System.Drawing.Point(7, 19) + Me.ucrChkIncludeStationId.Name = "ucrChkIncludeStationId" + Me.ucrChkIncludeStationId.Size = New System.Drawing.Size(295, 23) + Me.ucrChkIncludeStationId.TabIndex = 22 + ' 'ucrChkIncludeQCLog ' Me.ucrChkIncludeQCLog.AutoSize = True @@ -165,7 +201,7 @@ Partial Class sdgClimsoft ' Me.ucrChkIncludeElementAbbrv.AutoSize = True Me.ucrChkIncludeElementAbbrv.Checked = True - Me.ucrChkIncludeElementAbbrv.Location = New System.Drawing.Point(6, 42) + Me.ucrChkIncludeElementAbbrv.Location = New System.Drawing.Point(6, 65) Me.ucrChkIncludeElementAbbrv.Name = "ucrChkIncludeElementAbbrv" Me.ucrChkIncludeElementAbbrv.Size = New System.Drawing.Size(295, 23) Me.ucrChkIncludeElementAbbrv.TabIndex = 18 @@ -174,7 +210,7 @@ Partial Class sdgClimsoft ' Me.ucrChkIncludeStationName.AutoSize = True Me.ucrChkIncludeStationName.Checked = True - Me.ucrChkIncludeStationName.Location = New System.Drawing.Point(6, 20) + Me.ucrChkIncludeStationName.Location = New System.Drawing.Point(6, 43) Me.ucrChkIncludeStationName.Name = "ucrChkIncludeStationName" Me.ucrChkIncludeStationName.Size = New System.Drawing.Size(295, 23) Me.ucrChkIncludeStationName.TabIndex = 17 @@ -224,42 +260,6 @@ Partial Class sdgClimsoft Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 3 ' - 'ucrChkIncludeElementId - ' - Me.ucrChkIncludeElementId.AutoSize = True - Me.ucrChkIncludeElementId.Checked = False - Me.ucrChkIncludeElementId.Location = New System.Drawing.Point(7, 116) - Me.ucrChkIncludeElementId.Name = "ucrChkIncludeElementId" - Me.ucrChkIncludeElementId.Size = New System.Drawing.Size(295, 23) - Me.ucrChkIncludeElementId.TabIndex = 23 - ' - 'ucrChkIncludeStationId - ' - Me.ucrChkIncludeStationId.AutoSize = True - Me.ucrChkIncludeStationId.Checked = False - Me.ucrChkIncludeStationId.Location = New System.Drawing.Point(7, 92) - Me.ucrChkIncludeStationId.Name = "ucrChkIncludeStationId" - Me.ucrChkIncludeStationId.Size = New System.Drawing.Size(295, 23) - Me.ucrChkIncludeStationId.TabIndex = 22 - ' - 'ucrChkIncludeDateTime - ' - Me.ucrChkIncludeDateTime.AutoSize = True - Me.ucrChkIncludeDateTime.Checked = True - Me.ucrChkIncludeDateTime.Location = New System.Drawing.Point(7, 66) - Me.ucrChkIncludeDateTime.Name = "ucrChkIncludeDateTime" - Me.ucrChkIncludeDateTime.Size = New System.Drawing.Size(295, 23) - Me.ucrChkIncludeDateTime.TabIndex = 24 - ' - 'ucrChkIncludeElementName - ' - Me.ucrChkIncludeElementName.AutoSize = True - Me.ucrChkIncludeElementName.Checked = False - Me.ucrChkIncludeElementName.Location = New System.Drawing.Point(7, 141) - Me.ucrChkIncludeElementName.Name = "ucrChkIncludeElementName" - Me.ucrChkIncludeElementName.Size = New System.Drawing.Size(295, 23) - Me.ucrChkIncludeElementName.TabIndex = 25 - ' 'sdgClimsoft ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/instat/sdgClimsoft.vb b/instat/sdgClimsoft.vb index c1a48427aa3..e23c63a5b8f 100644 --- a/instat/sdgClimsoft.vb +++ b/instat/sdgClimsoft.vb @@ -30,6 +30,9 @@ Public Class sdgClimsoft 'Columns to include '--------------------------------------- + ucrChkIncludeStationId.SetText("Station Id") + ucrChkIncludeStationId.Enabled = False + ucrChkIncludeStationName.SetText("Station Name") ucrChkIncludeStationName.Enabled = False @@ -39,10 +42,6 @@ Public Class sdgClimsoft ucrChkIncludeDateTime.SetText("Date Time") ucrChkIncludeDateTime.Enabled = False - ucrChkIncludeStationId.SetText("Station Id") - ucrChkIncludeStationId.SetParameter(New RParameter("include_station_id", 13)) - ucrChkIncludeStationId.SetRDefault("FALSE") - ucrChkIncludeElementId.SetText("Element Id") ucrChkIncludeElementId.SetParameter(New RParameter("include_element_id", 14)) ucrChkIncludeElementId.SetRDefault("FALSE") @@ -102,7 +101,6 @@ Public Class sdgClimsoft 'Columns '--------------------------------------- - ucrChkIncludeStationId.SetRCode(clsRFunction, bReset) ucrChkIncludeElementId.SetRCode(clsRFunction, bReset) ucrChkIncludeElementName.SetRCode(clsRFunction, bReset) ucrChkIncludeAquistion.SetRCode(clsRFunction, bReset) diff --git a/instat/sdgDefineAnnualRainfall.Designer.vb b/instat/sdgDefineAnnualRainfall.Designer.vb index 91bb5b1cb29..b44111f4361 100644 --- a/instat/sdgDefineAnnualRainfall.Designer.vb +++ b/instat/sdgDefineAnnualRainfall.Designer.vb @@ -22,22 +22,13 @@ Partial Class sdgDefineAnnualRainfall 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.ucrReceiverMaxMinMonthly = New instat.ucrReceiverSingle() - Me.ucrReceiverYearMonthly = New instat.ucrReceiverSingle() - Me.ucrReceiverMonthlyTemp = New instat.ucrReceiverSingle() - Me.ucrSelecetorMonthlyTemp = New instat.ucrSelectorByDataFrame() Me.lblSeasonPlantingDay = New System.Windows.Forms.Label() - Me.ucrSelectorSeasonStartProp = New instat.ucrSelectorByDataFrame() Me.tbSummaries = New System.Windows.Forms.TabControl() Me.tbAnnualRainfall = New System.Windows.Forms.TabPage() Me.lblStartRainStatus = New System.Windows.Forms.Label() - Me.ucrReceiverStartRainStatus = New instat.ucrReceiverSingle() Me.lblEndRainStatus = New System.Windows.Forms.Label() - Me.ucrReceiverEndRainStatus = New instat.ucrReceiverSingle() Me.lblEndSeasonStatus = New System.Windows.Forms.Label() - Me.ucrReceiverEndSeasonStatus = New instat.ucrReceiverSingle() Me.lblRainyDaysYear = New System.Windows.Forms.Label() - Me.ucrReceiverRainDaysYear = New instat.ucrReceiverSingle() Me.lblNoRainDaysSeason = New System.Windows.Forms.Label() Me.lblSeasonalLength = New System.Windows.Forms.Label() Me.lblSeasonalRain = New System.Windows.Forms.Label() @@ -50,6 +41,39 @@ Partial Class sdgDefineAnnualRainfall Me.lblStartRainDOY = New System.Windows.Forms.Label() Me.lblYear = New System.Windows.Forms.Label() Me.lblStation = New System.Windows.Forms.Label() + Me.tbCropSuccessProp = New System.Windows.Forms.TabPage() + Me.lblPlantingLength = New System.Windows.Forms.Label() + Me.lblPlantingDay = New System.Windows.Forms.Label() + Me.lblProbSuccess = New System.Windows.Forms.Label() + Me.lblTotalRain = New System.Windows.Forms.Label() + Me.lblCropStation = New System.Windows.Forms.Label() + Me.tbSeasonStartProb = New System.Windows.Forms.TabPage() + Me.lblPlantingDayCond = New System.Windows.Forms.Label() + Me.lblSeasonYear = New System.Windows.Forms.Label() + Me.lblStationSeasonProb = New System.Windows.Forms.Label() + Me.tbAnnualTempSummaries = New System.Windows.Forms.TabPage() + Me.lblMinMinAnnual = New System.Windows.Forms.Label() + Me.lblMeanAnnualTemp = New System.Windows.Forms.Label() + Me.lblMaxMinAnnual = New System.Windows.Forms.Label() + Me.lblAnnualTempYear = New System.Windows.Forms.Label() + Me.lblAnnualTempStation = New System.Windows.Forms.Label() + Me.lblMaxMaxAnnual = New System.Windows.Forms.Label() + Me.lblMinMaxAnnual = New System.Windows.Forms.Label() + Me.lblMeanMaxAnnual = New System.Windows.Forms.Label() + Me.tbMonthlyTemp = New System.Windows.Forms.TabPage() + Me.lblMonth = New System.Windows.Forms.Label() + Me.lblMinMInMonthly = New System.Windows.Forms.Label() + Me.lblMeanMinMonthly = New System.Windows.Forms.Label() + Me.lblMaxMinMonthly = New System.Windows.Forms.Label() + Me.lblYearMonthTemp = New System.Windows.Forms.Label() + Me.lblStationMonthTemp = New System.Windows.Forms.Label() + Me.lblMaxMaxMonthly = New System.Windows.Forms.Label() + Me.lblMinMaxMonthly = New System.Windows.Forms.Label() + Me.lblMeanMaxMonthly = New System.Windows.Forms.Label() + Me.ucrReceiverStartRainStatus = New instat.ucrReceiverSingle() + Me.ucrReceiverEndRainStatus = New instat.ucrReceiverSingle() + Me.ucrReceiverEndSeasonStatus = New instat.ucrReceiverSingle() + Me.ucrReceiverRainDaysYear = New instat.ucrReceiverSingle() Me.ucrReceiverStartRainDate = New instat.ucrReceiverSingle() Me.ucrReceiverStartRainDOY = New instat.ucrReceiverSingle() Me.ucrReceiverYear = New instat.ucrReceiverSingle() @@ -63,35 +87,17 @@ Partial Class sdgDefineAnnualRainfall Me.ucrReceiverSeasonalRain = New instat.ucrReceiverSingle() Me.ucrReceiverAnnualRain = New instat.ucrReceiverSingle() Me.ucrSelectorDefineAnnualRain = New instat.ucrSelectorByDataFrame() - Me.tbCropSuccessProp = New System.Windows.Forms.TabPage() - Me.lblPlantingLength = New System.Windows.Forms.Label() - Me.lblPlantingDay = New System.Windows.Forms.Label() - Me.lblProbSuccess = New System.Windows.Forms.Label() - Me.lblTotalRain = New System.Windows.Forms.Label() - Me.lblCropStation = New System.Windows.Forms.Label() Me.ucrReceiverPlantingLenghth = New instat.ucrReceiverSingle() Me.ucrReceiverPropSuccess = New instat.ucrReceiverSingle() Me.ucrReceiverPlantingDay = New instat.ucrReceiverSingle() Me.ucrReceiverTotalRain = New instat.ucrReceiverSingle() Me.ucrReceiverStationCrop = New instat.ucrReceiverSingle() Me.ucrSelectorCropProp = New instat.ucrSelectorByDataFrame() - Me.tbSeasonStartProb = New System.Windows.Forms.TabPage() - Me.lblPlantingDayCond = New System.Windows.Forms.Label() - Me.lblSeasonYear = New System.Windows.Forms.Label() - Me.lblStationSeasonProb = New System.Windows.Forms.Label() Me.ucrReceiverPlantingDayCondition = New instat.ucrReceiverSingle() Me.ucrReceiverSeasonPlantingDay = New instat.ucrReceiverSingle() Me.ucrReceiverSeasonYear = New instat.ucrReceiverSingle() Me.ucrReceiverSeasonStationProb = New instat.ucrReceiverSingle() - Me.tbAnnualTempSummaries = New System.Windows.Forms.TabPage() - Me.lblMinMinAnnual = New System.Windows.Forms.Label() - Me.lblMeanAnnualTemp = New System.Windows.Forms.Label() - Me.lblMaxMinAnnual = New System.Windows.Forms.Label() - Me.lblAnnualTempYear = New System.Windows.Forms.Label() - Me.lblAnnualTempStation = New System.Windows.Forms.Label() - Me.lblMaxMaxAnnual = New System.Windows.Forms.Label() - Me.lblMinMaxAnnual = New System.Windows.Forms.Label() - Me.lblMeanMaxAnnual = New System.Windows.Forms.Label() + Me.ucrSelectorSeasonStartProp = New instat.ucrSelectorByDataFrame() Me.ucrReceiverMinMinAnnual = New instat.ucrReceiverSingle() Me.ucrReceiverMaxMaxAnnual = New instat.ucrReceiverSingle() Me.ucrReceiverMeanMaxAnnual = New instat.ucrReceiverSingle() @@ -101,22 +107,16 @@ Partial Class sdgDefineAnnualRainfall Me.ucrReceiverAnnualTempYr = New instat.ucrReceiverSingle() Me.ucrReceiverAnnualTempStation = New instat.ucrReceiverSingle() Me.ucrSelectorAnnualTemp = New instat.ucrSelectorByDataFrame() - Me.tbMonthlyTemp = New System.Windows.Forms.TabPage() - Me.lblMonth = New System.Windows.Forms.Label() - Me.lblMinMInMonthly = New System.Windows.Forms.Label() - Me.lblMeanMinMonthly = New System.Windows.Forms.Label() - Me.lblMaxMinMonthly = New System.Windows.Forms.Label() - Me.lblYearMonthTemp = New System.Windows.Forms.Label() - Me.lblStationMonthTemp = New System.Windows.Forms.Label() - Me.lblMaxMaxMonthly = New System.Windows.Forms.Label() - Me.lblMinMaxMonthly = New System.Windows.Forms.Label() - Me.lblMeanMaxMonthly = New System.Windows.Forms.Label() Me.ucrReceiverMonthMonthly = New instat.ucrReceiverSingle() Me.ucrReceiverMinMinMonthly = New instat.ucrReceiverSingle() Me.ucrReceiverMaxMaxMonthly = New instat.ucrReceiverSingle() Me.ucrReceiverMeanmaxMonthly = New instat.ucrReceiverSingle() Me.ucrReceiverMinMaxMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxMinMonthly = New instat.ucrReceiverSingle() Me.ucrReceiverMeanminMontly = New instat.ucrReceiverSingle() + Me.ucrReceiverYearMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMonthlyTemp = New instat.ucrReceiverSingle() + Me.ucrSelecetorMonthlyTemp = New instat.ucrSelectorByDataFrame() Me.ucrBase = New instat.ucrButtonsSubdialogue() Me.tbSummaries.SuspendLayout() Me.tbAnnualRainfall.SuspendLayout() @@ -126,79 +126,15 @@ Partial Class sdgDefineAnnualRainfall Me.tbMonthlyTemp.SuspendLayout() Me.SuspendLayout() ' - 'ucrReceiverMaxMinMonthly - ' - Me.ucrReceiverMaxMinMonthly.AutoSize = True - Me.ucrReceiverMaxMinMonthly.frmParent = Nothing - Me.ucrReceiverMaxMinMonthly.Location = New System.Drawing.Point(372, 366) - Me.ucrReceiverMaxMinMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxMinMonthly.Name = "ucrReceiverMaxMinMonthly" - Me.ucrReceiverMaxMinMonthly.Selector = Nothing - Me.ucrReceiverMaxMinMonthly.Size = New System.Drawing.Size(180, 38) - Me.ucrReceiverMaxMinMonthly.strNcFilePath = "" - Me.ucrReceiverMaxMinMonthly.TabIndex = 12 - Me.ucrReceiverMaxMinMonthly.ucrSelector = Nothing - ' - 'ucrReceiverYearMonthly - ' - Me.ucrReceiverYearMonthly.AutoSize = True - Me.ucrReceiverYearMonthly.frmParent = Nothing - Me.ucrReceiverYearMonthly.Location = New System.Drawing.Point(369, 109) - Me.ucrReceiverYearMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverYearMonthly.Name = "ucrReceiverYearMonthly" - Me.ucrReceiverYearMonthly.Selector = Nothing - Me.ucrReceiverYearMonthly.Size = New System.Drawing.Size(180, 38) - Me.ucrReceiverYearMonthly.strNcFilePath = "" - Me.ucrReceiverYearMonthly.TabIndex = 4 - Me.ucrReceiverYearMonthly.ucrSelector = Nothing - ' - 'ucrReceiverMonthlyTemp - ' - Me.ucrReceiverMonthlyTemp.AutoSize = True - Me.ucrReceiverMonthlyTemp.frmParent = Nothing - Me.ucrReceiverMonthlyTemp.Location = New System.Drawing.Point(368, 49) - Me.ucrReceiverMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMonthlyTemp.Name = "ucrReceiverMonthlyTemp" - Me.ucrReceiverMonthlyTemp.Selector = Nothing - Me.ucrReceiverMonthlyTemp.Size = New System.Drawing.Size(180, 38) - Me.ucrReceiverMonthlyTemp.strNcFilePath = "" - Me.ucrReceiverMonthlyTemp.TabIndex = 2 - Me.ucrReceiverMonthlyTemp.ucrSelector = Nothing - ' - 'ucrSelecetorMonthlyTemp - ' - Me.ucrSelecetorMonthlyTemp.AutoSize = True - Me.ucrSelecetorMonthlyTemp.bDropUnusedFilterLevels = False - Me.ucrSelecetorMonthlyTemp.bShowHiddenColumns = False - Me.ucrSelecetorMonthlyTemp.bUseCurrentFilter = True - Me.ucrSelecetorMonthlyTemp.Location = New System.Drawing.Point(15, 18) - Me.ucrSelecetorMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelecetorMonthlyTemp.Name = "ucrSelecetorMonthlyTemp" - Me.ucrSelecetorMonthlyTemp.Size = New System.Drawing.Size(339, 412) - Me.ucrSelecetorMonthlyTemp.TabIndex = 0 - ' 'lblSeasonPlantingDay ' Me.lblSeasonPlantingDay.AutoSize = True - Me.lblSeasonPlantingDay.Location = New System.Drawing.Point(370, 149) - Me.lblSeasonPlantingDay.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSeasonPlantingDay.Location = New System.Drawing.Point(250, 97) Me.lblSeasonPlantingDay.Name = "lblSeasonPlantingDay" - Me.lblSeasonPlantingDay.Size = New System.Drawing.Size(102, 20) + Me.lblSeasonPlantingDay.Size = New System.Drawing.Size(70, 13) Me.lblSeasonPlantingDay.TabIndex = 5 Me.lblSeasonPlantingDay.Text = "Planting Day:" ' - 'ucrSelectorSeasonStartProp - ' - Me.ucrSelectorSeasonStartProp.AutoSize = True - Me.ucrSelectorSeasonStartProp.bDropUnusedFilterLevels = False - Me.ucrSelectorSeasonStartProp.bShowHiddenColumns = False - Me.ucrSelectorSeasonStartProp.bUseCurrentFilter = True - Me.ucrSelectorSeasonStartProp.Location = New System.Drawing.Point(20, 15) - Me.ucrSelectorSeasonStartProp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorSeasonStartProp.Name = "ucrSelectorSeasonStartProp" - Me.ucrSelectorSeasonStartProp.Size = New System.Drawing.Size(339, 412) - Me.ucrSelectorSeasonStartProp.TabIndex = 0 - ' 'tbSummaries ' Me.tbSummaries.Controls.Add(Me.tbAnnualRainfall) @@ -206,11 +142,10 @@ Partial Class sdgDefineAnnualRainfall Me.tbSummaries.Controls.Add(Me.tbSeasonStartProb) Me.tbSummaries.Controls.Add(Me.tbAnnualTempSummaries) Me.tbSummaries.Controls.Add(Me.tbMonthlyTemp) - Me.tbSummaries.Location = New System.Drawing.Point(18, 21) - Me.tbSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbSummaries.Location = New System.Drawing.Point(12, 14) Me.tbSummaries.Name = "tbSummaries" Me.tbSummaries.SelectedIndex = 0 - Me.tbSummaries.Size = New System.Drawing.Size(784, 728) + Me.tbSummaries.Size = New System.Drawing.Size(523, 473) Me.tbSummaries.TabIndex = 34 ' 'tbAnnualRainfall @@ -248,11 +183,10 @@ Partial Class sdgDefineAnnualRainfall Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverSeasonalRain) Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverAnnualRain) Me.tbAnnualRainfall.Controls.Add(Me.ucrSelectorDefineAnnualRain) - Me.tbAnnualRainfall.Location = New System.Drawing.Point(4, 29) - Me.tbAnnualRainfall.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbAnnualRainfall.Location = New System.Drawing.Point(4, 22) Me.tbAnnualRainfall.Name = "tbAnnualRainfall" - Me.tbAnnualRainfall.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbAnnualRainfall.Size = New System.Drawing.Size(776, 695) + Me.tbAnnualRainfall.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.tbAnnualRainfall.Size = New System.Drawing.Size(515, 447) Me.tbAnnualRainfall.TabIndex = 0 Me.tbAnnualRainfall.Text = "Annual Rainfall" Me.tbAnnualRainfall.UseVisualStyleBackColor = True @@ -260,289 +194,594 @@ Partial Class sdgDefineAnnualRainfall 'lblStartRainStatus ' Me.lblStartRainStatus.AutoSize = True - Me.lblStartRainStatus.Location = New System.Drawing.Point(398, 501) - Me.lblStartRainStatus.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStartRainStatus.Location = New System.Drawing.Point(264, 326) Me.lblStartRainStatus.Name = "lblStartRainStatus" - Me.lblStartRainStatus.Size = New System.Drawing.Size(144, 20) + Me.lblStartRainStatus.Size = New System.Drawing.Size(95, 13) Me.lblStartRainStatus.TabIndex = 27 Me.lblStartRainStatus.Text = "Start Rains Status:" ' - 'ucrReceiverStartRainStatus - ' - Me.ucrReceiverStartRainStatus.AutoSize = True - Me.ucrReceiverStartRainStatus.frmParent = Nothing - Me.ucrReceiverStartRainStatus.Location = New System.Drawing.Point(392, 527) - Me.ucrReceiverStartRainStatus.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStartRainStatus.Name = "ucrReceiverStartRainStatus" - Me.ucrReceiverStartRainStatus.Selector = Nothing - Me.ucrReceiverStartRainStatus.Size = New System.Drawing.Size(180, 38) - Me.ucrReceiverStartRainStatus.strNcFilePath = "" - Me.ucrReceiverStartRainStatus.TabIndex = 28 - Me.ucrReceiverStartRainStatus.ucrSelector = Nothing - ' 'lblEndRainStatus ' Me.lblEndRainStatus.AutoSize = True - Me.lblEndRainStatus.Location = New System.Drawing.Point(396, 565) - Me.lblEndRainStatus.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndRainStatus.Location = New System.Drawing.Point(264, 367) Me.lblEndRainStatus.Name = "lblEndRainStatus" - Me.lblEndRainStatus.Size = New System.Drawing.Size(138, 20) + Me.lblEndRainStatus.Size = New System.Drawing.Size(92, 13) Me.lblEndRainStatus.TabIndex = 29 Me.lblEndRainStatus.Text = "End Rains Status:" ' - 'ucrReceiverEndRainStatus - ' - Me.ucrReceiverEndRainStatus.AutoSize = True - Me.ucrReceiverEndRainStatus.frmParent = Nothing - Me.ucrReceiverEndRainStatus.Location = New System.Drawing.Point(392, 590) - Me.ucrReceiverEndRainStatus.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEndRainStatus.Name = "ucrReceiverEndRainStatus" - Me.ucrReceiverEndRainStatus.Selector = Nothing - Me.ucrReceiverEndRainStatus.Size = New System.Drawing.Size(180, 38) - Me.ucrReceiverEndRainStatus.strNcFilePath = "" - Me.ucrReceiverEndRainStatus.TabIndex = 30 - Me.ucrReceiverEndRainStatus.ucrSelector = Nothing - ' 'lblEndSeasonStatus ' Me.lblEndSeasonStatus.AutoSize = True - Me.lblEndSeasonStatus.Location = New System.Drawing.Point(396, 627) - Me.lblEndSeasonStatus.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndSeasonStatus.Location = New System.Drawing.Point(264, 408) Me.lblEndSeasonStatus.Name = "lblEndSeasonStatus" - Me.lblEndSeasonStatus.Size = New System.Drawing.Size(152, 20) + Me.lblEndSeasonStatus.Size = New System.Drawing.Size(101, 13) Me.lblEndSeasonStatus.TabIndex = 31 Me.lblEndSeasonStatus.Text = "End Season Status:" ' - 'ucrReceiverEndSeasonStatus - ' - Me.ucrReceiverEndSeasonStatus.AutoSize = True - Me.ucrReceiverEndSeasonStatus.frmParent = Nothing - Me.ucrReceiverEndSeasonStatus.Location = New System.Drawing.Point(392, 649) - Me.ucrReceiverEndSeasonStatus.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEndSeasonStatus.Name = "ucrReceiverEndSeasonStatus" - Me.ucrReceiverEndSeasonStatus.Selector = Nothing - Me.ucrReceiverEndSeasonStatus.Size = New System.Drawing.Size(180, 39) - Me.ucrReceiverEndSeasonStatus.strNcFilePath = "" - Me.ucrReceiverEndSeasonStatus.TabIndex = 32 - Me.ucrReceiverEndSeasonStatus.ucrSelector = Nothing - ' 'lblRainyDaysYear ' Me.lblRainyDaysYear.AutoSize = True - Me.lblRainyDaysYear.Location = New System.Drawing.Point(396, 132) - Me.lblRainyDaysYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblRainyDaysYear.Location = New System.Drawing.Point(264, 86) Me.lblRainyDaysYear.Name = "lblRainyDaysYear" - Me.lblRainyDaysYear.Size = New System.Drawing.Size(151, 20) + Me.lblRainyDaysYear.Size = New System.Drawing.Size(103, 13) Me.lblRainyDaysYear.TabIndex = 15 Me.lblRainyDaysYear.Text = " Rainy Days in Year:" ' - 'ucrReceiverRainDaysYear - ' - Me.ucrReceiverRainDaysYear.AutoSize = True - Me.ucrReceiverRainDaysYear.frmParent = Nothing - Me.ucrReceiverRainDaysYear.Location = New System.Drawing.Point(392, 156) - Me.ucrReceiverRainDaysYear.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverRainDaysYear.Name = "ucrReceiverRainDaysYear" - Me.ucrReceiverRainDaysYear.Selector = Nothing - Me.ucrReceiverRainDaysYear.Size = New System.Drawing.Size(180, 38) - Me.ucrReceiverRainDaysYear.strNcFilePath = "" - Me.ucrReceiverRainDaysYear.TabIndex = 16 - Me.ucrReceiverRainDaysYear.ucrSelector = Nothing - ' 'lblNoRainDaysSeason ' Me.lblNoRainDaysSeason.AutoSize = True - Me.lblNoRainDaysSeason.Location = New System.Drawing.Point(396, 63) - Me.lblNoRainDaysSeason.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblNoRainDaysSeason.Location = New System.Drawing.Point(264, 41) Me.lblNoRainDaysSeason.Name = "lblNoRainDaysSeason" - Me.lblNoRainDaysSeason.Size = New System.Drawing.Size(172, 20) + Me.lblNoRainDaysSeason.Size = New System.Drawing.Size(117, 13) Me.lblNoRainDaysSeason.TabIndex = 13 Me.lblNoRainDaysSeason.Text = " Rainy Days in Season:" ' 'lblSeasonalLength ' Me.lblSeasonalLength.AutoSize = True - Me.lblSeasonalLength.Location = New System.Drawing.Point(396, 191) - Me.lblSeasonalLength.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSeasonalLength.Location = New System.Drawing.Point(264, 124) Me.lblSeasonalLength.Name = "lblSeasonalLength" - Me.lblSeasonalLength.Size = New System.Drawing.Size(134, 20) + Me.lblSeasonalLength.Size = New System.Drawing.Size(90, 13) Me.lblSeasonalLength.TabIndex = 17 Me.lblSeasonalLength.Text = "Seasonal Length:" ' 'lblSeasonalRain ' Me.lblSeasonalRain.AutoSize = True - Me.lblSeasonalRain.Location = New System.Drawing.Point(18, 615) - Me.lblSeasonalRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSeasonalRain.Location = New System.Drawing.Point(12, 400) Me.lblSeasonalRain.Name = "lblSeasonalRain" - Me.lblSeasonalRain.Size = New System.Drawing.Size(117, 20) + Me.lblSeasonalRain.Size = New System.Drawing.Size(79, 13) Me.lblSeasonalRain.TabIndex = 11 Me.lblSeasonalRain.Text = "Seasonal Rain:" ' 'lblAnnualRain ' Me.lblAnnualRain.AutoSize = True - Me.lblAnnualRain.Location = New System.Drawing.Point(19, 547) - Me.lblAnnualRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblAnnualRain.Location = New System.Drawing.Point(13, 356) Me.lblAnnualRain.Name = "lblAnnualRain" - Me.lblAnnualRain.Size = New System.Drawing.Size(100, 20) + Me.lblAnnualRain.Size = New System.Drawing.Size(68, 13) Me.lblAnnualRain.TabIndex = 9 Me.lblAnnualRain.Text = "Annual Rain:" ' 'lblEndSeasonDate ' Me.lblEndSeasonDate.AutoSize = True - Me.lblEndSeasonDate.Location = New System.Drawing.Point(396, 439) - Me.lblEndSeasonDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndSeasonDate.Location = New System.Drawing.Point(264, 285) Me.lblEndSeasonDate.Name = "lblEndSeasonDate" - Me.lblEndSeasonDate.Size = New System.Drawing.Size(146, 20) + Me.lblEndSeasonDate.Size = New System.Drawing.Size(97, 13) Me.lblEndSeasonDate.TabIndex = 25 Me.lblEndSeasonDate.Text = "End Season(Date):" ' 'lblEndSeasonDOY ' Me.lblEndSeasonDOY.AutoSize = True - Me.lblEndSeasonDOY.Location = New System.Drawing.Point(396, 384) - Me.lblEndSeasonDOY.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndSeasonDOY.Location = New System.Drawing.Point(264, 250) Me.lblEndSeasonDOY.Name = "lblEndSeasonDOY" - Me.lblEndSeasonDOY.Size = New System.Drawing.Size(146, 20) + Me.lblEndSeasonDOY.Size = New System.Drawing.Size(97, 13) Me.lblEndSeasonDOY.TabIndex = 23 Me.lblEndSeasonDOY.Text = "End Season(DOY):" ' 'lblEndRainDate ' Me.lblEndRainDate.AutoSize = True - Me.lblEndRainDate.Location = New System.Drawing.Point(396, 318) - Me.lblEndRainDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndRainDate.Location = New System.Drawing.Point(264, 207) Me.lblEndRainDate.Name = "lblEndRainDate" - Me.lblEndRainDate.Size = New System.Drawing.Size(124, 20) + Me.lblEndRainDate.Size = New System.Drawing.Size(83, 13) Me.lblEndRainDate.TabIndex = 21 Me.lblEndRainDate.Text = "End Rain(Date):" ' 'lblEndRainsDOY ' Me.lblEndRainsDOY.AutoSize = True - Me.lblEndRainsDOY.Location = New System.Drawing.Point(396, 257) - Me.lblEndRainsDOY.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndRainsDOY.Location = New System.Drawing.Point(264, 167) Me.lblEndRainsDOY.Name = "lblEndRainsDOY" - Me.lblEndRainsDOY.Size = New System.Drawing.Size(124, 20) + Me.lblEndRainsDOY.Size = New System.Drawing.Size(83, 13) Me.lblEndRainsDOY.TabIndex = 19 Me.lblEndRainsDOY.Text = "End Rain(DOY):" ' 'lblStartRainDate ' Me.lblStartRainDate.AutoSize = True - Me.lblStartRainDate.Location = New System.Drawing.Point(16, 486) - Me.lblStartRainDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStartRainDate.Location = New System.Drawing.Point(11, 316) Me.lblStartRainDate.Name = "lblStartRainDate" - Me.lblStartRainDate.Size = New System.Drawing.Size(130, 20) + Me.lblStartRainDate.Size = New System.Drawing.Size(86, 13) Me.lblStartRainDate.TabIndex = 7 Me.lblStartRainDate.Text = "Start Rain(Date):" ' 'lblStartRainDOY ' Me.lblStartRainDOY.AutoSize = True - Me.lblStartRainDOY.Location = New System.Drawing.Point(18, 422) - Me.lblStartRainDOY.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStartRainDOY.Location = New System.Drawing.Point(12, 274) Me.lblStartRainDOY.Name = "lblStartRainDOY" - Me.lblStartRainDOY.Size = New System.Drawing.Size(130, 20) + Me.lblStartRainDOY.Size = New System.Drawing.Size(86, 13) Me.lblStartRainDOY.TabIndex = 5 Me.lblStartRainDOY.Text = "Start Rain(DOY):" ' 'lblYear ' Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(21, 355) - Me.lblYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblYear.Location = New System.Drawing.Point(14, 231) Me.lblYear.Name = "lblYear" - Me.lblYear.Size = New System.Drawing.Size(47, 20) + Me.lblYear.Size = New System.Drawing.Size(32, 13) Me.lblYear.TabIndex = 3 Me.lblYear.Text = "Year:" ' 'lblStation ' Me.lblStation.AutoSize = True - Me.lblStation.Location = New System.Drawing.Point(22, 288) - Me.lblStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStation.Location = New System.Drawing.Point(15, 187) Me.lblStation.Name = "lblStation" - Me.lblStation.Size = New System.Drawing.Size(64, 20) + Me.lblStation.Size = New System.Drawing.Size(43, 13) Me.lblStation.TabIndex = 1 Me.lblStation.Text = "Station:" ' - 'ucrReceiverStartRainDate + 'tbCropSuccessProp ' - Me.ucrReceiverStartRainDate.AutoSize = True - Me.ucrReceiverStartRainDate.frmParent = Nothing - Me.ucrReceiverStartRainDate.Location = New System.Drawing.Point(14, 513) - Me.ucrReceiverStartRainDate.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStartRainDate.Name = "ucrReceiverStartRainDate" - Me.ucrReceiverStartRainDate.Selector = Nothing - Me.ucrReceiverStartRainDate.Size = New System.Drawing.Size(180, 38) - Me.ucrReceiverStartRainDate.strNcFilePath = "" - Me.ucrReceiverStartRainDate.TabIndex = 8 - Me.ucrReceiverStartRainDate.ucrSelector = Nothing + Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingLength) + Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingDay) + Me.tbCropSuccessProp.Controls.Add(Me.lblProbSuccess) + Me.tbCropSuccessProp.Controls.Add(Me.lblTotalRain) + Me.tbCropSuccessProp.Controls.Add(Me.lblCropStation) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingLenghth) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPropSuccess) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingDay) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverTotalRain) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverStationCrop) + Me.tbCropSuccessProp.Controls.Add(Me.ucrSelectorCropProp) + Me.tbCropSuccessProp.Location = New System.Drawing.Point(4, 22) + Me.tbCropSuccessProp.Name = "tbCropSuccessProp" + Me.tbCropSuccessProp.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.tbCropSuccessProp.Size = New System.Drawing.Size(515, 447) + Me.tbCropSuccessProp.TabIndex = 1 + Me.tbCropSuccessProp.Text = "Crop Success Prop" + Me.tbCropSuccessProp.UseVisualStyleBackColor = True ' - 'ucrReceiverStartRainDOY + 'lblPlantingLength ' - Me.ucrReceiverStartRainDOY.AutoSize = True - Me.ucrReceiverStartRainDOY.frmParent = Nothing - Me.ucrReceiverStartRainDOY.Location = New System.Drawing.Point(14, 449) - Me.ucrReceiverStartRainDOY.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStartRainDOY.Name = "ucrReceiverStartRainDOY" - Me.ucrReceiverStartRainDOY.Selector = Nothing - Me.ucrReceiverStartRainDOY.Size = New System.Drawing.Size(180, 38) - Me.ucrReceiverStartRainDOY.strNcFilePath = "" - Me.ucrReceiverStartRainDOY.TabIndex = 6 - Me.ucrReceiverStartRainDOY.ucrSelector = Nothing + Me.lblPlantingLength.AutoSize = True + Me.lblPlantingLength.Location = New System.Drawing.Point(248, 137) + Me.lblPlantingLength.Name = "lblPlantingLength" + Me.lblPlantingLength.Size = New System.Drawing.Size(84, 13) + Me.lblPlantingLength.TabIndex = 7 + Me.lblPlantingLength.Text = "Planting Length:" ' - 'ucrReceiverYear + 'lblPlantingDay ' - Me.ucrReceiverYear.AutoSize = True - Me.ucrReceiverYear.frmParent = Nothing - Me.ucrReceiverYear.Location = New System.Drawing.Point(14, 382) - Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverYear.Name = "ucrReceiverYear" - Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.Size = New System.Drawing.Size(180, 38) - Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.TabIndex = 4 - Me.ucrReceiverYear.ucrSelector = Nothing + Me.lblPlantingDay.AutoSize = True + Me.lblPlantingDay.Location = New System.Drawing.Point(248, 95) + Me.lblPlantingDay.Name = "lblPlantingDay" + Me.lblPlantingDay.Size = New System.Drawing.Size(70, 13) + Me.lblPlantingDay.TabIndex = 5 + Me.lblPlantingDay.Text = "Planting Day:" ' - 'ucrReceiverStation + 'lblProbSuccess ' - Me.ucrReceiverStation.AutoSize = True - Me.ucrReceiverStation.frmParent = Nothing - Me.ucrReceiverStation.Location = New System.Drawing.Point(16, 314) - Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStation.Name = "ucrReceiverStation" - Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(180, 38) - Me.ucrReceiverStation.strNcFilePath = "" - Me.ucrReceiverStation.TabIndex = 2 - Me.ucrReceiverStation.ucrSelector = Nothing + Me.lblProbSuccess.AutoSize = True + Me.lblProbSuccess.Location = New System.Drawing.Point(248, 176) + Me.lblProbSuccess.Name = "lblProbSuccess" + Me.lblProbSuccess.Size = New System.Drawing.Size(117, 13) + Me.lblProbSuccess.TabIndex = 9 + Me.lblProbSuccess.Text = "Proportion of Success :" ' - 'ucrReceiverEndSeasonDate + 'lblTotalRain ' - Me.ucrReceiverEndSeasonDate.AutoSize = True - Me.ucrReceiverEndSeasonDate.frmParent = Nothing - Me.ucrReceiverEndSeasonDate.Location = New System.Drawing.Point(392, 465) - Me.ucrReceiverEndSeasonDate.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEndSeasonDate.Name = "ucrReceiverEndSeasonDate" - Me.ucrReceiverEndSeasonDate.Selector = Nothing - Me.ucrReceiverEndSeasonDate.Size = New System.Drawing.Size(180, 38) - Me.ucrReceiverEndSeasonDate.strNcFilePath = "" - Me.ucrReceiverEndSeasonDate.TabIndex = 26 - Me.ucrReceiverEndSeasonDate.ucrSelector = Nothing + Me.lblTotalRain.AutoSize = True + Me.lblTotalRain.Location = New System.Drawing.Point(248, 54) + Me.lblTotalRain.Name = "lblTotalRain" + Me.lblTotalRain.Size = New System.Drawing.Size(59, 13) + Me.lblTotalRain.TabIndex = 3 + Me.lblTotalRain.Text = "Total Rain:" ' - 'ucrReceiverEndSeasonDOY + 'lblCropStation ' - Me.ucrReceiverEndSeasonDOY.AutoSize = True - Me.ucrReceiverEndSeasonDOY.frmParent = Nothing - Me.ucrReceiverEndSeasonDOY.Location = New System.Drawing.Point(392, 404) - Me.ucrReceiverEndSeasonDOY.Margin = New System.Windows.Forms.Padding(0) + Me.lblCropStation.AutoSize = True + Me.lblCropStation.Location = New System.Drawing.Point(248, 11) + Me.lblCropStation.Name = "lblCropStation" + Me.lblCropStation.Size = New System.Drawing.Size(43, 13) + Me.lblCropStation.TabIndex = 1 + Me.lblCropStation.Text = "Station:" + ' + 'tbSeasonStartProb + ' + Me.tbSeasonStartProb.Controls.Add(Me.lblPlantingDayCond) + Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonPlantingDay) + Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonYear) + Me.tbSeasonStartProb.Controls.Add(Me.lblStationSeasonProb) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverPlantingDayCondition) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonPlantingDay) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonYear) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonStationProb) + Me.tbSeasonStartProb.Controls.Add(Me.ucrSelectorSeasonStartProp) + Me.tbSeasonStartProb.Location = New System.Drawing.Point(4, 22) + Me.tbSeasonStartProb.Name = "tbSeasonStartProb" + Me.tbSeasonStartProb.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.tbSeasonStartProb.Size = New System.Drawing.Size(515, 447) + Me.tbSeasonStartProb.TabIndex = 2 + Me.tbSeasonStartProb.Text = "Season Start Prob" + Me.tbSeasonStartProb.UseVisualStyleBackColor = True + ' + 'lblPlantingDayCond + ' + Me.lblPlantingDayCond.AutoSize = True + Me.lblPlantingDayCond.Location = New System.Drawing.Point(250, 139) + Me.lblPlantingDayCond.Name = "lblPlantingDayCond" + Me.lblPlantingDayCond.Size = New System.Drawing.Size(117, 13) + Me.lblPlantingDayCond.TabIndex = 7 + Me.lblPlantingDayCond.Text = "Planting Day Condition:" + ' + 'lblSeasonYear + ' + Me.lblSeasonYear.AutoSize = True + Me.lblSeasonYear.Location = New System.Drawing.Point(250, 56) + Me.lblSeasonYear.Name = "lblSeasonYear" + Me.lblSeasonYear.Size = New System.Drawing.Size(32, 13) + Me.lblSeasonYear.TabIndex = 3 + Me.lblSeasonYear.Text = "Year:" + ' + 'lblStationSeasonProb + ' + Me.lblStationSeasonProb.AutoSize = True + Me.lblStationSeasonProb.Location = New System.Drawing.Point(250, 13) + Me.lblStationSeasonProb.Name = "lblStationSeasonProb" + Me.lblStationSeasonProb.Size = New System.Drawing.Size(43, 13) + Me.lblStationSeasonProb.TabIndex = 1 + Me.lblStationSeasonProb.Text = "Station:" + ' + 'tbAnnualTempSummaries + ' + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanAnnualTemp) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempYear) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempStation) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempYr) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempStation) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrSelectorAnnualTemp) + Me.tbAnnualTempSummaries.Location = New System.Drawing.Point(4, 22) + Me.tbAnnualTempSummaries.Name = "tbAnnualTempSummaries" + Me.tbAnnualTempSummaries.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.tbAnnualTempSummaries.Size = New System.Drawing.Size(515, 447) + Me.tbAnnualTempSummaries.TabIndex = 3 + Me.tbAnnualTempSummaries.Text = "Annual Temperature" + Me.tbAnnualTempSummaries.UseVisualStyleBackColor = True + ' + 'lblMinMinAnnual + ' + Me.lblMinMinAnnual.AutoSize = True + Me.lblMinMinAnnual.Location = New System.Drawing.Point(248, 135) + Me.lblMinMinAnnual.Name = "lblMinMinAnnual" + Me.lblMinMinAnnual.Size = New System.Drawing.Size(98, 13) + Me.lblMinMinAnnual.TabIndex = 7 + Me.lblMinMinAnnual.Text = "Min Minimum Temp" + ' + 'lblMeanAnnualTemp + ' + Me.lblMeanAnnualTemp.AutoSize = True + Me.lblMeanAnnualTemp.Location = New System.Drawing.Point(248, 93) + Me.lblMeanAnnualTemp.Name = "lblMeanAnnualTemp" + Me.lblMeanAnnualTemp.Size = New System.Drawing.Size(108, 13) + Me.lblMeanAnnualTemp.TabIndex = 5 + Me.lblMeanAnnualTemp.Text = "Mean Minimum Temp" + ' + 'lblMaxMinAnnual + ' + Me.lblMaxMinAnnual.AutoSize = True + Me.lblMaxMinAnnual.Location = New System.Drawing.Point(248, 174) + Me.lblMaxMinAnnual.Name = "lblMaxMinAnnual" + Me.lblMaxMinAnnual.Size = New System.Drawing.Size(101, 13) + Me.lblMaxMinAnnual.TabIndex = 9 + Me.lblMaxMinAnnual.Text = "Max Minimum Temp" + ' + 'lblAnnualTempYear + ' + Me.lblAnnualTempYear.AutoSize = True + Me.lblAnnualTempYear.Location = New System.Drawing.Point(248, 52) + Me.lblAnnualTempYear.Name = "lblAnnualTempYear" + Me.lblAnnualTempYear.Size = New System.Drawing.Size(32, 13) + Me.lblAnnualTempYear.TabIndex = 3 + Me.lblAnnualTempYear.Text = "Year:" + ' + 'lblAnnualTempStation + ' + Me.lblAnnualTempStation.AutoSize = True + Me.lblAnnualTempStation.Location = New System.Drawing.Point(248, 9) + Me.lblAnnualTempStation.Name = "lblAnnualTempStation" + Me.lblAnnualTempStation.Size = New System.Drawing.Size(43, 13) + Me.lblAnnualTempStation.TabIndex = 1 + Me.lblAnnualTempStation.Text = "Station:" + ' + 'lblMaxMaxAnnual + ' + Me.lblMaxMaxAnnual.AutoSize = True + Me.lblMaxMaxAnnual.Location = New System.Drawing.Point(248, 295) + Me.lblMaxMaxAnnual.Name = "lblMaxMaxAnnual" + Me.lblMaxMaxAnnual.Size = New System.Drawing.Size(104, 13) + Me.lblMaxMaxAnnual.TabIndex = 15 + Me.lblMaxMaxAnnual.Text = "Max Maximum Temp" + ' + 'lblMinMaxAnnual + ' + Me.lblMinMaxAnnual.AutoSize = True + Me.lblMinMaxAnnual.Location = New System.Drawing.Point(248, 253) + Me.lblMinMaxAnnual.Name = "lblMinMaxAnnual" + Me.lblMinMaxAnnual.Size = New System.Drawing.Size(104, 13) + Me.lblMinMaxAnnual.TabIndex = 13 + Me.lblMinMaxAnnual.Text = "Min Maximum Temp:" + ' + 'lblMeanMaxAnnual + ' + Me.lblMeanMaxAnnual.AutoSize = True + Me.lblMeanMaxAnnual.Location = New System.Drawing.Point(248, 214) + Me.lblMeanMaxAnnual.Name = "lblMeanMaxAnnual" + Me.lblMeanMaxAnnual.Size = New System.Drawing.Size(111, 13) + Me.lblMeanMaxAnnual.TabIndex = 11 + Me.lblMeanMaxAnnual.Text = "Mean Maximum Temp" + ' + 'tbMonthlyTemp + ' + Me.tbMonthlyTemp.Controls.Add(Me.lblMonth) + Me.tbMonthlyTemp.Controls.Add(Me.lblMinMInMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblYearMonthTemp) + Me.tbMonthlyTemp.Controls.Add(Me.lblStationMonthTemp) + Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMinMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanmaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanminMontly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverYearMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthlyTemp) + Me.tbMonthlyTemp.Controls.Add(Me.ucrSelecetorMonthlyTemp) + Me.tbMonthlyTemp.Location = New System.Drawing.Point(4, 22) + Me.tbMonthlyTemp.Name = "tbMonthlyTemp" + Me.tbMonthlyTemp.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.tbMonthlyTemp.Size = New System.Drawing.Size(515, 447) + Me.tbMonthlyTemp.TabIndex = 4 + Me.tbMonthlyTemp.Text = "Monthly Temperature" + Me.tbMonthlyTemp.UseVisualStyleBackColor = True + ' + 'lblMonth + ' + Me.lblMonth.AutoSize = True + Me.lblMonth.Location = New System.Drawing.Point(247, 95) + Me.lblMonth.Name = "lblMonth" + Me.lblMonth.Size = New System.Drawing.Size(40, 13) + Me.lblMonth.TabIndex = 5 + Me.lblMonth.Text = "Month:" + ' + 'lblMinMInMonthly + ' + Me.lblMinMInMonthly.AutoSize = True + Me.lblMinMInMonthly.Location = New System.Drawing.Point(247, 181) + Me.lblMinMInMonthly.Name = "lblMinMInMonthly" + Me.lblMinMInMonthly.Size = New System.Drawing.Size(98, 13) + Me.lblMinMInMonthly.TabIndex = 9 + Me.lblMinMInMonthly.Text = "Min Minimum Temp" + ' + 'lblMeanMinMonthly + ' + Me.lblMeanMinMonthly.AutoSize = True + Me.lblMeanMinMonthly.Location = New System.Drawing.Point(247, 139) + Me.lblMeanMinMonthly.Name = "lblMeanMinMonthly" + Me.lblMeanMinMonthly.Size = New System.Drawing.Size(108, 13) + Me.lblMeanMinMonthly.TabIndex = 7 + Me.lblMeanMinMonthly.Text = "Mean Minimum Temp" + ' + 'lblMaxMinMonthly + ' + Me.lblMaxMinMonthly.AutoSize = True + Me.lblMaxMinMonthly.Location = New System.Drawing.Point(247, 220) + Me.lblMaxMinMonthly.Name = "lblMaxMinMonthly" + Me.lblMaxMinMonthly.Size = New System.Drawing.Size(101, 13) + Me.lblMaxMinMonthly.TabIndex = 11 + Me.lblMaxMinMonthly.Text = "Max Minimum Temp" + ' + 'lblYearMonthTemp + ' + Me.lblYearMonthTemp.AutoSize = True + Me.lblYearMonthTemp.Location = New System.Drawing.Point(247, 54) + Me.lblYearMonthTemp.Name = "lblYearMonthTemp" + Me.lblYearMonthTemp.Size = New System.Drawing.Size(32, 13) + Me.lblYearMonthTemp.TabIndex = 3 + Me.lblYearMonthTemp.Text = "Year:" + ' + 'lblStationMonthTemp + ' + Me.lblStationMonthTemp.AutoSize = True + Me.lblStationMonthTemp.Location = New System.Drawing.Point(247, 15) + Me.lblStationMonthTemp.Name = "lblStationMonthTemp" + Me.lblStationMonthTemp.Size = New System.Drawing.Size(43, 13) + Me.lblStationMonthTemp.TabIndex = 1 + Me.lblStationMonthTemp.Text = "Station:" + ' + 'lblMaxMaxMonthly + ' + Me.lblMaxMaxMonthly.AutoSize = True + Me.lblMaxMaxMonthly.Location = New System.Drawing.Point(247, 341) + Me.lblMaxMaxMonthly.Name = "lblMaxMaxMonthly" + Me.lblMaxMaxMonthly.Size = New System.Drawing.Size(104, 13) + Me.lblMaxMaxMonthly.TabIndex = 17 + Me.lblMaxMaxMonthly.Text = "Max Maximum Temp" + ' + 'lblMinMaxMonthly + ' + Me.lblMinMaxMonthly.AutoSize = True + Me.lblMinMaxMonthly.Location = New System.Drawing.Point(247, 299) + Me.lblMinMaxMonthly.Name = "lblMinMaxMonthly" + Me.lblMinMaxMonthly.Size = New System.Drawing.Size(104, 13) + Me.lblMinMaxMonthly.TabIndex = 15 + Me.lblMinMaxMonthly.Text = "Min Maximum Temp:" + ' + 'lblMeanMaxMonthly + ' + Me.lblMeanMaxMonthly.AutoSize = True + Me.lblMeanMaxMonthly.Location = New System.Drawing.Point(247, 260) + Me.lblMeanMaxMonthly.Name = "lblMeanMaxMonthly" + Me.lblMeanMaxMonthly.Size = New System.Drawing.Size(111, 13) + Me.lblMeanMaxMonthly.TabIndex = 13 + Me.lblMeanMaxMonthly.Text = "Mean Maximum Temp" + ' + 'ucrReceiverStartRainStatus + ' + Me.ucrReceiverStartRainStatus.AutoSize = True + Me.ucrReceiverStartRainStatus.frmParent = Nothing + Me.ucrReceiverStartRainStatus.Location = New System.Drawing.Point(264, 343) + Me.ucrReceiverStartRainStatus.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStartRainStatus.Name = "ucrReceiverStartRainStatus" + Me.ucrReceiverStartRainStatus.Selector = Nothing + Me.ucrReceiverStartRainStatus.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverStartRainStatus.strNcFilePath = "" + Me.ucrReceiverStartRainStatus.TabIndex = 28 + Me.ucrReceiverStartRainStatus.ucrSelector = Nothing + ' + 'ucrReceiverEndRainStatus + ' + Me.ucrReceiverEndRainStatus.AutoSize = True + Me.ucrReceiverEndRainStatus.frmParent = Nothing + Me.ucrReceiverEndRainStatus.Location = New System.Drawing.Point(264, 383) + Me.ucrReceiverEndRainStatus.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndRainStatus.Name = "ucrReceiverEndRainStatus" + Me.ucrReceiverEndRainStatus.Selector = Nothing + Me.ucrReceiverEndRainStatus.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverEndRainStatus.strNcFilePath = "" + Me.ucrReceiverEndRainStatus.TabIndex = 30 + Me.ucrReceiverEndRainStatus.ucrSelector = Nothing + ' + 'ucrReceiverEndSeasonStatus + ' + Me.ucrReceiverEndSeasonStatus.AutoSize = True + Me.ucrReceiverEndSeasonStatus.frmParent = Nothing + Me.ucrReceiverEndSeasonStatus.Location = New System.Drawing.Point(261, 422) + Me.ucrReceiverEndSeasonStatus.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndSeasonStatus.Name = "ucrReceiverEndSeasonStatus" + Me.ucrReceiverEndSeasonStatus.Selector = Nothing + Me.ucrReceiverEndSeasonStatus.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverEndSeasonStatus.strNcFilePath = "" + Me.ucrReceiverEndSeasonStatus.TabIndex = 32 + Me.ucrReceiverEndSeasonStatus.ucrSelector = Nothing + ' + 'ucrReceiverRainDaysYear + ' + Me.ucrReceiverRainDaysYear.AutoSize = True + Me.ucrReceiverRainDaysYear.frmParent = Nothing + Me.ucrReceiverRainDaysYear.Location = New System.Drawing.Point(264, 101) + Me.ucrReceiverRainDaysYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRainDaysYear.Name = "ucrReceiverRainDaysYear" + Me.ucrReceiverRainDaysYear.Selector = Nothing + Me.ucrReceiverRainDaysYear.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverRainDaysYear.strNcFilePath = "" + Me.ucrReceiverRainDaysYear.TabIndex = 16 + Me.ucrReceiverRainDaysYear.ucrSelector = Nothing + ' + 'ucrReceiverStartRainDate + ' + Me.ucrReceiverStartRainDate.AutoSize = True + Me.ucrReceiverStartRainDate.frmParent = Nothing + Me.ucrReceiverStartRainDate.Location = New System.Drawing.Point(9, 333) + Me.ucrReceiverStartRainDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStartRainDate.Name = "ucrReceiverStartRainDate" + Me.ucrReceiverStartRainDate.Selector = Nothing + Me.ucrReceiverStartRainDate.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverStartRainDate.strNcFilePath = "" + Me.ucrReceiverStartRainDate.TabIndex = 8 + Me.ucrReceiverStartRainDate.ucrSelector = Nothing + ' + 'ucrReceiverStartRainDOY + ' + Me.ucrReceiverStartRainDOY.AutoSize = True + Me.ucrReceiverStartRainDOY.frmParent = Nothing + Me.ucrReceiverStartRainDOY.Location = New System.Drawing.Point(9, 292) + Me.ucrReceiverStartRainDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStartRainDOY.Name = "ucrReceiverStartRainDOY" + Me.ucrReceiverStartRainDOY.Selector = Nothing + Me.ucrReceiverStartRainDOY.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverStartRainDOY.strNcFilePath = "" + Me.ucrReceiverStartRainDOY.TabIndex = 6 + Me.ucrReceiverStartRainDOY.ucrSelector = Nothing + ' + 'ucrReceiverYear + ' + Me.ucrReceiverYear.AutoSize = True + Me.ucrReceiverYear.frmParent = Nothing + Me.ucrReceiverYear.Location = New System.Drawing.Point(9, 248) + Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYear.Name = "ucrReceiverYear" + Me.ucrReceiverYear.Selector = Nothing + Me.ucrReceiverYear.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.TabIndex = 4 + Me.ucrReceiverYear.ucrSelector = Nothing + ' + 'ucrReceiverStation + ' + Me.ucrReceiverStation.AutoSize = True + Me.ucrReceiverStation.frmParent = Nothing + Me.ucrReceiverStation.Location = New System.Drawing.Point(11, 204) + Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStation.Name = "ucrReceiverStation" + Me.ucrReceiverStation.Selector = Nothing + Me.ucrReceiverStation.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.TabIndex = 2 + Me.ucrReceiverStation.ucrSelector = Nothing + ' + 'ucrReceiverEndSeasonDate + ' + Me.ucrReceiverEndSeasonDate.AutoSize = True + Me.ucrReceiverEndSeasonDate.frmParent = Nothing + Me.ucrReceiverEndSeasonDate.Location = New System.Drawing.Point(264, 302) + Me.ucrReceiverEndSeasonDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndSeasonDate.Name = "ucrReceiverEndSeasonDate" + Me.ucrReceiverEndSeasonDate.Selector = Nothing + Me.ucrReceiverEndSeasonDate.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverEndSeasonDate.strNcFilePath = "" + Me.ucrReceiverEndSeasonDate.TabIndex = 26 + Me.ucrReceiverEndSeasonDate.ucrSelector = Nothing + ' + 'ucrReceiverEndSeasonDOY + ' + Me.ucrReceiverEndSeasonDOY.AutoSize = True + Me.ucrReceiverEndSeasonDOY.frmParent = Nothing + Me.ucrReceiverEndSeasonDOY.Location = New System.Drawing.Point(264, 263) + Me.ucrReceiverEndSeasonDOY.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverEndSeasonDOY.Name = "ucrReceiverEndSeasonDOY" Me.ucrReceiverEndSeasonDOY.Selector = Nothing - Me.ucrReceiverEndSeasonDOY.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverEndSeasonDOY.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverEndSeasonDOY.strNcFilePath = "" Me.ucrReceiverEndSeasonDOY.TabIndex = 24 Me.ucrReceiverEndSeasonDOY.ucrSelector = Nothing @@ -551,11 +790,11 @@ Partial Class sdgDefineAnnualRainfall ' Me.ucrReceiverEndRainsDOY.AutoSize = True Me.ucrReceiverEndRainsDOY.frmParent = Nothing - Me.ucrReceiverEndRainsDOY.Location = New System.Drawing.Point(392, 283) + Me.ucrReceiverEndRainsDOY.Location = New System.Drawing.Point(264, 184) Me.ucrReceiverEndRainsDOY.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverEndRainsDOY.Name = "ucrReceiverEndRainsDOY" Me.ucrReceiverEndRainsDOY.Selector = Nothing - Me.ucrReceiverEndRainsDOY.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverEndRainsDOY.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverEndRainsDOY.strNcFilePath = "" Me.ucrReceiverEndRainsDOY.TabIndex = 20 Me.ucrReceiverEndRainsDOY.ucrSelector = Nothing @@ -564,11 +803,11 @@ Partial Class sdgDefineAnnualRainfall ' Me.ucrReceiverEndRainsDate.AutoSize = True Me.ucrReceiverEndRainsDate.frmParent = Nothing - Me.ucrReceiverEndRainsDate.Location = New System.Drawing.Point(392, 346) + Me.ucrReceiverEndRainsDate.Location = New System.Drawing.Point(264, 225) Me.ucrReceiverEndRainsDate.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverEndRainsDate.Name = "ucrReceiverEndRainsDate" Me.ucrReceiverEndRainsDate.Selector = Nothing - Me.ucrReceiverEndRainsDate.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverEndRainsDate.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverEndRainsDate.strNcFilePath = "" Me.ucrReceiverEndRainsDate.TabIndex = 22 Me.ucrReceiverEndRainsDate.ucrSelector = Nothing @@ -577,11 +816,11 @@ Partial Class sdgDefineAnnualRainfall ' Me.ucrReceiverSeasonalLength.AutoSize = True Me.ucrReceiverSeasonalLength.frmParent = Nothing - Me.ucrReceiverSeasonalLength.Location = New System.Drawing.Point(392, 218) + Me.ucrReceiverSeasonalLength.Location = New System.Drawing.Point(264, 142) Me.ucrReceiverSeasonalLength.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSeasonalLength.Name = "ucrReceiverSeasonalLength" Me.ucrReceiverSeasonalLength.Selector = Nothing - Me.ucrReceiverSeasonalLength.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonalLength.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverSeasonalLength.strNcFilePath = "" Me.ucrReceiverSeasonalLength.TabIndex = 18 Me.ucrReceiverSeasonalLength.ucrSelector = Nothing @@ -590,11 +829,11 @@ Partial Class sdgDefineAnnualRainfall ' Me.ucrReceiverRainDaysSeason.AutoSize = True Me.ucrReceiverRainDaysSeason.frmParent = Nothing - Me.ucrReceiverRainDaysSeason.Location = New System.Drawing.Point(392, 90) + Me.ucrReceiverRainDaysSeason.Location = New System.Drawing.Point(264, 58) Me.ucrReceiverRainDaysSeason.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRainDaysSeason.Name = "ucrReceiverRainDaysSeason" Me.ucrReceiverRainDaysSeason.Selector = Nothing - Me.ucrReceiverRainDaysSeason.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverRainDaysSeason.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverRainDaysSeason.strNcFilePath = "" Me.ucrReceiverRainDaysSeason.TabIndex = 14 Me.ucrReceiverRainDaysSeason.ucrSelector = Nothing @@ -603,11 +842,11 @@ Partial Class sdgDefineAnnualRainfall ' Me.ucrReceiverSeasonalRain.AutoSize = True Me.ucrReceiverSeasonalRain.frmParent = Nothing - Me.ucrReceiverSeasonalRain.Location = New System.Drawing.Point(14, 641) + Me.ucrReceiverSeasonalRain.Location = New System.Drawing.Point(9, 417) Me.ucrReceiverSeasonalRain.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSeasonalRain.Name = "ucrReceiverSeasonalRain" Me.ucrReceiverSeasonalRain.Selector = Nothing - Me.ucrReceiverSeasonalRain.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonalRain.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverSeasonalRain.strNcFilePath = "" Me.ucrReceiverSeasonalRain.TabIndex = 12 Me.ucrReceiverSeasonalRain.ucrSelector = Nothing @@ -616,11 +855,11 @@ Partial Class sdgDefineAnnualRainfall ' Me.ucrReceiverAnnualRain.AutoSize = True Me.ucrReceiverAnnualRain.frmParent = Nothing - Me.ucrReceiverAnnualRain.Location = New System.Drawing.Point(16, 573) + Me.ucrReceiverAnnualRain.Location = New System.Drawing.Point(11, 372) Me.ucrReceiverAnnualRain.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverAnnualRain.Name = "ucrReceiverAnnualRain" Me.ucrReceiverAnnualRain.Selector = Nothing - Me.ucrReceiverAnnualRain.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverAnnualRain.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverAnnualRain.strNcFilePath = "" Me.ucrReceiverAnnualRain.TabIndex = 10 Me.ucrReceiverAnnualRain.ucrSelector = Nothing @@ -630,94 +869,22 @@ Partial Class sdgDefineAnnualRainfall Me.ucrSelectorDefineAnnualRain.AutoSize = True Me.ucrSelectorDefineAnnualRain.bDropUnusedFilterLevels = False Me.ucrSelectorDefineAnnualRain.bShowHiddenColumns = False - Me.ucrSelectorDefineAnnualRain.bUseCurrentFilter = True - Me.ucrSelectorDefineAnnualRain.Location = New System.Drawing.Point(10, 7) - Me.ucrSelectorDefineAnnualRain.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorDefineAnnualRain.Name = "ucrSelectorDefineAnnualRain" - Me.ucrSelectorDefineAnnualRain.Size = New System.Drawing.Size(339, 293) - Me.ucrSelectorDefineAnnualRain.TabIndex = 0 - ' - 'tbCropSuccessProp - ' - Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingLength) - Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingDay) - Me.tbCropSuccessProp.Controls.Add(Me.lblProbSuccess) - Me.tbCropSuccessProp.Controls.Add(Me.lblTotalRain) - Me.tbCropSuccessProp.Controls.Add(Me.lblCropStation) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingLenghth) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPropSuccess) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingDay) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverTotalRain) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverStationCrop) - Me.tbCropSuccessProp.Controls.Add(Me.ucrSelectorCropProp) - Me.tbCropSuccessProp.Location = New System.Drawing.Point(4, 29) - Me.tbCropSuccessProp.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbCropSuccessProp.Name = "tbCropSuccessProp" - Me.tbCropSuccessProp.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbCropSuccessProp.Size = New System.Drawing.Size(776, 695) - Me.tbCropSuccessProp.TabIndex = 1 - Me.tbCropSuccessProp.Text = "Crop Success Prop" - Me.tbCropSuccessProp.UseVisualStyleBackColor = True - ' - 'lblPlantingLength - ' - Me.lblPlantingLength.AutoSize = True - Me.lblPlantingLength.Location = New System.Drawing.Point(378, 211) - Me.lblPlantingLength.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblPlantingLength.Name = "lblPlantingLength" - Me.lblPlantingLength.Size = New System.Drawing.Size(124, 20) - Me.lblPlantingLength.TabIndex = 7 - Me.lblPlantingLength.Text = "Planting Length:" - ' - 'lblPlantingDay - ' - Me.lblPlantingDay.AutoSize = True - Me.lblPlantingDay.Location = New System.Drawing.Point(368, 146) - Me.lblPlantingDay.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblPlantingDay.Name = "lblPlantingDay" - Me.lblPlantingDay.Size = New System.Drawing.Size(102, 20) - Me.lblPlantingDay.TabIndex = 5 - Me.lblPlantingDay.Text = "Planting Day:" - ' - 'lblProbSuccess - ' - Me.lblProbSuccess.AutoSize = True - Me.lblProbSuccess.Location = New System.Drawing.Point(376, 271) - Me.lblProbSuccess.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblProbSuccess.Name = "lblProbSuccess" - Me.lblProbSuccess.Size = New System.Drawing.Size(173, 20) - Me.lblProbSuccess.TabIndex = 9 - Me.lblProbSuccess.Text = "Proportion of Success :" - ' - 'lblTotalRain - ' - Me.lblTotalRain.AutoSize = True - Me.lblTotalRain.Location = New System.Drawing.Point(374, 83) - Me.lblTotalRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblTotalRain.Name = "lblTotalRain" - Me.lblTotalRain.Size = New System.Drawing.Size(85, 20) - Me.lblTotalRain.TabIndex = 3 - Me.lblTotalRain.Text = "Total Rain:" - ' - 'lblCropStation - ' - Me.lblCropStation.AutoSize = True - Me.lblCropStation.Location = New System.Drawing.Point(372, 17) - Me.lblCropStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblCropStation.Name = "lblCropStation" - Me.lblCropStation.Size = New System.Drawing.Size(64, 20) - Me.lblCropStation.TabIndex = 1 - Me.lblCropStation.Text = "Station:" + Me.ucrSelectorDefineAnnualRain.bUseCurrentFilter = True + Me.ucrSelectorDefineAnnualRain.Location = New System.Drawing.Point(7, 5) + Me.ucrSelectorDefineAnnualRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorDefineAnnualRain.Name = "ucrSelectorDefineAnnualRain" + Me.ucrSelectorDefineAnnualRain.Size = New System.Drawing.Size(226, 190) + Me.ucrSelectorDefineAnnualRain.TabIndex = 0 ' 'ucrReceiverPlantingLenghth ' Me.ucrReceiverPlantingLenghth.AutoSize = True - Me.ucrReceiverPlantingLenghth.frmParent = Nothing - Me.ucrReceiverPlantingLenghth.Location = New System.Drawing.Point(375, 235) + Me.ucrReceiverPlantingLenghth.frmParent = Me + Me.ucrReceiverPlantingLenghth.Location = New System.Drawing.Point(248, 153) Me.ucrReceiverPlantingLenghth.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPlantingLenghth.Name = "ucrReceiverPlantingLenghth" Me.ucrReceiverPlantingLenghth.Selector = Nothing - Me.ucrReceiverPlantingLenghth.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverPlantingLenghth.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverPlantingLenghth.strNcFilePath = "" Me.ucrReceiverPlantingLenghth.TabIndex = 8 Me.ucrReceiverPlantingLenghth.ucrSelector = Nothing @@ -725,12 +892,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverPropSuccess ' Me.ucrReceiverPropSuccess.AutoSize = True - Me.ucrReceiverPropSuccess.frmParent = Nothing - Me.ucrReceiverPropSuccess.Location = New System.Drawing.Point(374, 298) + Me.ucrReceiverPropSuccess.frmParent = Me + Me.ucrReceiverPropSuccess.Location = New System.Drawing.Point(248, 194) Me.ucrReceiverPropSuccess.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPropSuccess.Name = "ucrReceiverPropSuccess" Me.ucrReceiverPropSuccess.Selector = Nothing - Me.ucrReceiverPropSuccess.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverPropSuccess.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverPropSuccess.strNcFilePath = "" Me.ucrReceiverPropSuccess.TabIndex = 10 Me.ucrReceiverPropSuccess.ucrSelector = Nothing @@ -738,12 +905,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverPlantingDay ' Me.ucrReceiverPlantingDay.AutoSize = True - Me.ucrReceiverPlantingDay.frmParent = Nothing - Me.ucrReceiverPlantingDay.Location = New System.Drawing.Point(372, 175) + Me.ucrReceiverPlantingDay.frmParent = Me + Me.ucrReceiverPlantingDay.Location = New System.Drawing.Point(248, 114) Me.ucrReceiverPlantingDay.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPlantingDay.Name = "ucrReceiverPlantingDay" Me.ucrReceiverPlantingDay.Selector = Nothing - Me.ucrReceiverPlantingDay.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverPlantingDay.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverPlantingDay.strNcFilePath = "" Me.ucrReceiverPlantingDay.TabIndex = 6 Me.ucrReceiverPlantingDay.ucrSelector = Nothing @@ -751,12 +918,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverTotalRain ' Me.ucrReceiverTotalRain.AutoSize = True - Me.ucrReceiverTotalRain.frmParent = Nothing - Me.ucrReceiverTotalRain.Location = New System.Drawing.Point(370, 109) + Me.ucrReceiverTotalRain.frmParent = Me + Me.ucrReceiverTotalRain.Location = New System.Drawing.Point(248, 71) Me.ucrReceiverTotalRain.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverTotalRain.Name = "ucrReceiverTotalRain" Me.ucrReceiverTotalRain.Selector = Nothing - Me.ucrReceiverTotalRain.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverTotalRain.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverTotalRain.strNcFilePath = "" Me.ucrReceiverTotalRain.TabIndex = 4 Me.ucrReceiverTotalRain.ucrSelector = Nothing @@ -764,12 +931,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverStationCrop ' Me.ucrReceiverStationCrop.AutoSize = True - Me.ucrReceiverStationCrop.frmParent = Nothing - Me.ucrReceiverStationCrop.Location = New System.Drawing.Point(369, 43) + Me.ucrReceiverStationCrop.frmParent = Me + Me.ucrReceiverStationCrop.Location = New System.Drawing.Point(248, 28) Me.ucrReceiverStationCrop.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStationCrop.Name = "ucrReceiverStationCrop" Me.ucrReceiverStationCrop.Selector = Nothing - Me.ucrReceiverStationCrop.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverStationCrop.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverStationCrop.strNcFilePath = "" Me.ucrReceiverStationCrop.TabIndex = 2 Me.ucrReceiverStationCrop.ucrSelector = Nothing @@ -780,71 +947,21 @@ Partial Class sdgDefineAnnualRainfall Me.ucrSelectorCropProp.bDropUnusedFilterLevels = False Me.ucrSelectorCropProp.bShowHiddenColumns = False Me.ucrSelectorCropProp.bUseCurrentFilter = True - Me.ucrSelectorCropProp.Location = New System.Drawing.Point(16, 12) + Me.ucrSelectorCropProp.Location = New System.Drawing.Point(11, 8) Me.ucrSelectorCropProp.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorCropProp.Name = "ucrSelectorCropProp" - Me.ucrSelectorCropProp.Size = New System.Drawing.Size(339, 412) + Me.ucrSelectorCropProp.Size = New System.Drawing.Size(226, 268) Me.ucrSelectorCropProp.TabIndex = 0 ' - 'tbSeasonStartProb - ' - Me.tbSeasonStartProb.Controls.Add(Me.lblPlantingDayCond) - Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonPlantingDay) - Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonYear) - Me.tbSeasonStartProb.Controls.Add(Me.lblStationSeasonProb) - Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverPlantingDayCondition) - Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonPlantingDay) - Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonYear) - Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonStationProb) - Me.tbSeasonStartProb.Controls.Add(Me.ucrSelectorSeasonStartProp) - Me.tbSeasonStartProb.Location = New System.Drawing.Point(4, 29) - Me.tbSeasonStartProb.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbSeasonStartProb.Name = "tbSeasonStartProb" - Me.tbSeasonStartProb.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbSeasonStartProb.Size = New System.Drawing.Size(776, 695) - Me.tbSeasonStartProb.TabIndex = 2 - Me.tbSeasonStartProb.Text = "Season Start Prob" - Me.tbSeasonStartProb.UseVisualStyleBackColor = True - ' - 'lblPlantingDayCond - ' - Me.lblPlantingDayCond.AutoSize = True - Me.lblPlantingDayCond.Location = New System.Drawing.Point(381, 214) - Me.lblPlantingDayCond.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblPlantingDayCond.Name = "lblPlantingDayCond" - Me.lblPlantingDayCond.Size = New System.Drawing.Size(173, 20) - Me.lblPlantingDayCond.TabIndex = 7 - Me.lblPlantingDayCond.Text = "Planting Day Condition:" - ' - 'lblSeasonYear - ' - Me.lblSeasonYear.AutoSize = True - Me.lblSeasonYear.Location = New System.Drawing.Point(376, 86) - Me.lblSeasonYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblSeasonYear.Name = "lblSeasonYear" - Me.lblSeasonYear.Size = New System.Drawing.Size(47, 20) - Me.lblSeasonYear.TabIndex = 3 - Me.lblSeasonYear.Text = "Year:" - ' - 'lblStationSeasonProb - ' - Me.lblStationSeasonProb.AutoSize = True - Me.lblStationSeasonProb.Location = New System.Drawing.Point(375, 20) - Me.lblStationSeasonProb.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblStationSeasonProb.Name = "lblStationSeasonProb" - Me.lblStationSeasonProb.Size = New System.Drawing.Size(64, 20) - Me.lblStationSeasonProb.TabIndex = 1 - Me.lblStationSeasonProb.Text = "Station:" - ' 'ucrReceiverPlantingDayCondition ' Me.ucrReceiverPlantingDayCondition.AutoSize = True - Me.ucrReceiverPlantingDayCondition.frmParent = Nothing - Me.ucrReceiverPlantingDayCondition.Location = New System.Drawing.Point(378, 238) + Me.ucrReceiverPlantingDayCondition.frmParent = Me + Me.ucrReceiverPlantingDayCondition.Location = New System.Drawing.Point(250, 155) Me.ucrReceiverPlantingDayCondition.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPlantingDayCondition.Name = "ucrReceiverPlantingDayCondition" Me.ucrReceiverPlantingDayCondition.Selector = Nothing - Me.ucrReceiverPlantingDayCondition.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverPlantingDayCondition.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverPlantingDayCondition.strNcFilePath = "" Me.ucrReceiverPlantingDayCondition.TabIndex = 8 Me.ucrReceiverPlantingDayCondition.ucrSelector = Nothing @@ -852,12 +969,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverSeasonPlantingDay ' Me.ucrReceiverSeasonPlantingDay.AutoSize = True - Me.ucrReceiverSeasonPlantingDay.frmParent = Nothing - Me.ucrReceiverSeasonPlantingDay.Location = New System.Drawing.Point(375, 178) + Me.ucrReceiverSeasonPlantingDay.frmParent = Me + Me.ucrReceiverSeasonPlantingDay.Location = New System.Drawing.Point(250, 116) Me.ucrReceiverSeasonPlantingDay.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSeasonPlantingDay.Name = "ucrReceiverSeasonPlantingDay" Me.ucrReceiverSeasonPlantingDay.Selector = Nothing - Me.ucrReceiverSeasonPlantingDay.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonPlantingDay.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverSeasonPlantingDay.strNcFilePath = "" Me.ucrReceiverSeasonPlantingDay.TabIndex = 6 Me.ucrReceiverSeasonPlantingDay.ucrSelector = Nothing @@ -865,12 +982,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverSeasonYear ' Me.ucrReceiverSeasonYear.AutoSize = True - Me.ucrReceiverSeasonYear.frmParent = Nothing - Me.ucrReceiverSeasonYear.Location = New System.Drawing.Point(374, 112) + Me.ucrReceiverSeasonYear.frmParent = Me + Me.ucrReceiverSeasonYear.Location = New System.Drawing.Point(250, 73) Me.ucrReceiverSeasonYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSeasonYear.Name = "ucrReceiverSeasonYear" Me.ucrReceiverSeasonYear.Selector = Nothing - Me.ucrReceiverSeasonYear.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonYear.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverSeasonYear.strNcFilePath = "" Me.ucrReceiverSeasonYear.TabIndex = 4 Me.ucrReceiverSeasonYear.ucrSelector = Nothing @@ -878,133 +995,37 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverSeasonStationProb ' Me.ucrReceiverSeasonStationProb.AutoSize = True - Me.ucrReceiverSeasonStationProb.frmParent = Nothing - Me.ucrReceiverSeasonStationProb.Location = New System.Drawing.Point(372, 46) + Me.ucrReceiverSeasonStationProb.frmParent = Me + Me.ucrReceiverSeasonStationProb.Location = New System.Drawing.Point(250, 30) Me.ucrReceiverSeasonStationProb.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSeasonStationProb.Name = "ucrReceiverSeasonStationProb" Me.ucrReceiverSeasonStationProb.Selector = Nothing - Me.ucrReceiverSeasonStationProb.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonStationProb.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverSeasonStationProb.strNcFilePath = "" Me.ucrReceiverSeasonStationProb.TabIndex = 2 Me.ucrReceiverSeasonStationProb.ucrSelector = Nothing ' - 'tbAnnualTempSummaries - ' - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMinAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanAnnualTemp) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMinAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempYear) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempStation) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMinAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMinAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempYr) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempStation) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrSelectorAnnualTemp) - Me.tbAnnualTempSummaries.Location = New System.Drawing.Point(4, 29) - Me.tbAnnualTempSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbAnnualTempSummaries.Name = "tbAnnualTempSummaries" - Me.tbAnnualTempSummaries.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbAnnualTempSummaries.Size = New System.Drawing.Size(776, 695) - Me.tbAnnualTempSummaries.TabIndex = 3 - Me.tbAnnualTempSummaries.Text = "Annual Temperature" - Me.tbAnnualTempSummaries.UseVisualStyleBackColor = True - ' - 'lblMinMinAnnual - ' - Me.lblMinMinAnnual.AutoSize = True - Me.lblMinMinAnnual.Location = New System.Drawing.Point(374, 208) - Me.lblMinMinAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMinMinAnnual.Name = "lblMinMinAnnual" - Me.lblMinMinAnnual.Size = New System.Drawing.Size(145, 20) - Me.lblMinMinAnnual.TabIndex = 7 - Me.lblMinMinAnnual.Text = "Min Minimum Temp" - ' - 'lblMeanAnnualTemp - ' - Me.lblMeanAnnualTemp.AutoSize = True - Me.lblMeanAnnualTemp.Location = New System.Drawing.Point(368, 143) - Me.lblMeanAnnualTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMeanAnnualTemp.Name = "lblMeanAnnualTemp" - Me.lblMeanAnnualTemp.Size = New System.Drawing.Size(160, 20) - Me.lblMeanAnnualTemp.TabIndex = 5 - Me.lblMeanAnnualTemp.Text = "Mean Minimum Temp" - ' - 'lblMaxMinAnnual - ' - Me.lblMaxMinAnnual.AutoSize = True - Me.lblMaxMinAnnual.Location = New System.Drawing.Point(376, 268) - Me.lblMaxMinAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMaxMinAnnual.Name = "lblMaxMinAnnual" - Me.lblMaxMinAnnual.Size = New System.Drawing.Size(149, 20) - Me.lblMaxMinAnnual.TabIndex = 9 - Me.lblMaxMinAnnual.Text = "Max Minimum Temp" - ' - 'lblAnnualTempYear - ' - Me.lblAnnualTempYear.AutoSize = True - Me.lblAnnualTempYear.Location = New System.Drawing.Point(374, 80) - Me.lblAnnualTempYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblAnnualTempYear.Name = "lblAnnualTempYear" - Me.lblAnnualTempYear.Size = New System.Drawing.Size(47, 20) - Me.lblAnnualTempYear.TabIndex = 3 - Me.lblAnnualTempYear.Text = "Year:" - ' - 'lblAnnualTempStation - ' - Me.lblAnnualTempStation.AutoSize = True - Me.lblAnnualTempStation.Location = New System.Drawing.Point(372, 14) - Me.lblAnnualTempStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblAnnualTempStation.Name = "lblAnnualTempStation" - Me.lblAnnualTempStation.Size = New System.Drawing.Size(64, 20) - Me.lblAnnualTempStation.TabIndex = 1 - Me.lblAnnualTempStation.Text = "Station:" - ' - 'lblMaxMaxAnnual - ' - Me.lblMaxMaxAnnual.AutoSize = True - Me.lblMaxMaxAnnual.Location = New System.Drawing.Point(382, 454) - Me.lblMaxMaxAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMaxMaxAnnual.Name = "lblMaxMaxAnnual" - Me.lblMaxMaxAnnual.Size = New System.Drawing.Size(153, 20) - Me.lblMaxMaxAnnual.TabIndex = 15 - Me.lblMaxMaxAnnual.Text = "Max Maximum Temp" - ' - 'lblMinMaxAnnual - ' - Me.lblMinMaxAnnual.AutoSize = True - Me.lblMinMaxAnnual.Location = New System.Drawing.Point(381, 389) - Me.lblMinMaxAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMinMaxAnnual.Name = "lblMinMaxAnnual" - Me.lblMinMaxAnnual.Size = New System.Drawing.Size(153, 20) - Me.lblMinMaxAnnual.TabIndex = 13 - Me.lblMinMaxAnnual.Text = "Min Maximum Temp:" - ' - 'lblMeanMaxAnnual + 'ucrSelectorSeasonStartProp ' - Me.lblMeanMaxAnnual.AutoSize = True - Me.lblMeanMaxAnnual.Location = New System.Drawing.Point(381, 329) - Me.lblMeanMaxAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMeanMaxAnnual.Name = "lblMeanMaxAnnual" - Me.lblMeanMaxAnnual.Size = New System.Drawing.Size(164, 20) - Me.lblMeanMaxAnnual.TabIndex = 11 - Me.lblMeanMaxAnnual.Text = "Mean Maximum Temp" + Me.ucrSelectorSeasonStartProp.AutoSize = True + Me.ucrSelectorSeasonStartProp.bDropUnusedFilterLevels = False + Me.ucrSelectorSeasonStartProp.bShowHiddenColumns = False + Me.ucrSelectorSeasonStartProp.bUseCurrentFilter = True + Me.ucrSelectorSeasonStartProp.Location = New System.Drawing.Point(13, 10) + Me.ucrSelectorSeasonStartProp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorSeasonStartProp.Name = "ucrSelectorSeasonStartProp" + Me.ucrSelectorSeasonStartProp.Size = New System.Drawing.Size(226, 268) + Me.ucrSelectorSeasonStartProp.TabIndex = 0 ' 'ucrReceiverMinMinAnnual ' Me.ucrReceiverMinMinAnnual.AutoSize = True - Me.ucrReceiverMinMinAnnual.frmParent = Nothing - Me.ucrReceiverMinMinAnnual.Location = New System.Drawing.Point(375, 232) + Me.ucrReceiverMinMinAnnual.frmParent = Me + Me.ucrReceiverMinMinAnnual.Location = New System.Drawing.Point(248, 151) Me.ucrReceiverMinMinAnnual.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinMinAnnual.Name = "ucrReceiverMinMinAnnual" Me.ucrReceiverMinMinAnnual.Selector = Nothing - Me.ucrReceiverMinMinAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMinMinAnnual.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverMinMinAnnual.strNcFilePath = "" Me.ucrReceiverMinMinAnnual.TabIndex = 8 Me.ucrReceiverMinMinAnnual.ucrSelector = Nothing @@ -1012,12 +1033,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverMaxMaxAnnual ' Me.ucrReceiverMaxMaxAnnual.AutoSize = True - Me.ucrReceiverMaxMaxAnnual.frmParent = Nothing - Me.ucrReceiverMaxMaxAnnual.Location = New System.Drawing.Point(381, 474) + Me.ucrReceiverMaxMaxAnnual.frmParent = Me + Me.ucrReceiverMaxMaxAnnual.Location = New System.Drawing.Point(248, 308) Me.ucrReceiverMaxMaxAnnual.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxMaxAnnual.Name = "ucrReceiverMaxMaxAnnual" Me.ucrReceiverMaxMaxAnnual.Selector = Nothing - Me.ucrReceiverMaxMaxAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMaxMaxAnnual.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverMaxMaxAnnual.strNcFilePath = "" Me.ucrReceiverMaxMaxAnnual.TabIndex = 16 Me.ucrReceiverMaxMaxAnnual.ucrSelector = Nothing @@ -1025,12 +1046,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverMeanMaxAnnual ' Me.ucrReceiverMeanMaxAnnual.AutoSize = True - Me.ucrReceiverMeanMaxAnnual.frmParent = Nothing - Me.ucrReceiverMeanMaxAnnual.Location = New System.Drawing.Point(380, 355) + Me.ucrReceiverMeanMaxAnnual.frmParent = Me + Me.ucrReceiverMeanMaxAnnual.Location = New System.Drawing.Point(248, 231) Me.ucrReceiverMeanMaxAnnual.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMeanMaxAnnual.Name = "ucrReceiverMeanMaxAnnual" Me.ucrReceiverMeanMaxAnnual.Selector = Nothing - Me.ucrReceiverMeanMaxAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMeanMaxAnnual.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverMeanMaxAnnual.strNcFilePath = "" Me.ucrReceiverMeanMaxAnnual.TabIndex = 12 Me.ucrReceiverMeanMaxAnnual.ucrSelector = Nothing @@ -1038,12 +1059,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverMinMaxAnnual ' Me.ucrReceiverMinMaxAnnual.AutoSize = True - Me.ucrReceiverMinMaxAnnual.frmParent = Nothing - Me.ucrReceiverMinMaxAnnual.Location = New System.Drawing.Point(376, 417) + Me.ucrReceiverMinMaxAnnual.frmParent = Me + Me.ucrReceiverMinMaxAnnual.Location = New System.Drawing.Point(248, 271) Me.ucrReceiverMinMaxAnnual.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinMaxAnnual.Name = "ucrReceiverMinMaxAnnual" Me.ucrReceiverMinMaxAnnual.Selector = Nothing - Me.ucrReceiverMinMaxAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMinMaxAnnual.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverMinMaxAnnual.strNcFilePath = "" Me.ucrReceiverMinMaxAnnual.TabIndex = 14 Me.ucrReceiverMinMaxAnnual.ucrSelector = Nothing @@ -1051,12 +1072,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverMaxMinAnnual ' Me.ucrReceiverMaxMinAnnual.AutoSize = True - Me.ucrReceiverMaxMinAnnual.frmParent = Nothing - Me.ucrReceiverMaxMinAnnual.Location = New System.Drawing.Point(374, 295) + Me.ucrReceiverMaxMinAnnual.frmParent = Me + Me.ucrReceiverMaxMinAnnual.Location = New System.Drawing.Point(248, 192) Me.ucrReceiverMaxMinAnnual.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxMinAnnual.Name = "ucrReceiverMaxMinAnnual" Me.ucrReceiverMaxMinAnnual.Selector = Nothing - Me.ucrReceiverMaxMinAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMaxMinAnnual.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverMaxMinAnnual.strNcFilePath = "" Me.ucrReceiverMaxMinAnnual.TabIndex = 10 Me.ucrReceiverMaxMinAnnual.ucrSelector = Nothing @@ -1064,12 +1085,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverMeanAnnual ' Me.ucrReceiverMeanAnnual.AutoSize = True - Me.ucrReceiverMeanAnnual.frmParent = Nothing - Me.ucrReceiverMeanAnnual.Location = New System.Drawing.Point(372, 172) + Me.ucrReceiverMeanAnnual.frmParent = Me + Me.ucrReceiverMeanAnnual.Location = New System.Drawing.Point(248, 112) Me.ucrReceiverMeanAnnual.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMeanAnnual.Name = "ucrReceiverMeanAnnual" Me.ucrReceiverMeanAnnual.Selector = Nothing - Me.ucrReceiverMeanAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMeanAnnual.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverMeanAnnual.strNcFilePath = "" Me.ucrReceiverMeanAnnual.TabIndex = 6 Me.ucrReceiverMeanAnnual.ucrSelector = Nothing @@ -1077,12 +1098,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverAnnualTempYr ' Me.ucrReceiverAnnualTempYr.AutoSize = True - Me.ucrReceiverAnnualTempYr.frmParent = Nothing - Me.ucrReceiverAnnualTempYr.Location = New System.Drawing.Point(370, 106) + Me.ucrReceiverAnnualTempYr.frmParent = Me + Me.ucrReceiverAnnualTempYr.Location = New System.Drawing.Point(248, 69) Me.ucrReceiverAnnualTempYr.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverAnnualTempYr.Name = "ucrReceiverAnnualTempYr" Me.ucrReceiverAnnualTempYr.Selector = Nothing - Me.ucrReceiverAnnualTempYr.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverAnnualTempYr.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverAnnualTempYr.strNcFilePath = "" Me.ucrReceiverAnnualTempYr.TabIndex = 4 Me.ucrReceiverAnnualTempYr.ucrSelector = Nothing @@ -1090,12 +1111,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverAnnualTempStation ' Me.ucrReceiverAnnualTempStation.AutoSize = True - Me.ucrReceiverAnnualTempStation.frmParent = Nothing - Me.ucrReceiverAnnualTempStation.Location = New System.Drawing.Point(369, 40) + Me.ucrReceiverAnnualTempStation.frmParent = Me + Me.ucrReceiverAnnualTempStation.Location = New System.Drawing.Point(248, 26) Me.ucrReceiverAnnualTempStation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverAnnualTempStation.Name = "ucrReceiverAnnualTempStation" Me.ucrReceiverAnnualTempStation.Selector = Nothing - Me.ucrReceiverAnnualTempStation.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverAnnualTempStation.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverAnnualTempStation.strNcFilePath = "" Me.ucrReceiverAnnualTempStation.TabIndex = 2 Me.ucrReceiverAnnualTempStation.ucrSelector = Nothing @@ -1106,141 +1127,21 @@ Partial Class sdgDefineAnnualRainfall Me.ucrSelectorAnnualTemp.bDropUnusedFilterLevels = False Me.ucrSelectorAnnualTemp.bShowHiddenColumns = False Me.ucrSelectorAnnualTemp.bUseCurrentFilter = True - Me.ucrSelectorAnnualTemp.Location = New System.Drawing.Point(16, 9) + Me.ucrSelectorAnnualTemp.Location = New System.Drawing.Point(11, 6) Me.ucrSelectorAnnualTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorAnnualTemp.Name = "ucrSelectorAnnualTemp" - Me.ucrSelectorAnnualTemp.Size = New System.Drawing.Size(339, 412) + Me.ucrSelectorAnnualTemp.Size = New System.Drawing.Size(226, 268) Me.ucrSelectorAnnualTemp.TabIndex = 0 ' - 'tbMonthlyTemp - ' - Me.tbMonthlyTemp.Controls.Add(Me.lblMonth) - Me.tbMonthlyTemp.Controls.Add(Me.lblMinMInMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMinMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMinMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblYearMonthTemp) - Me.tbMonthlyTemp.Controls.Add(Me.lblStationMonthTemp) - Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMinMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMinMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanmaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMinMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanminMontly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverYearMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthlyTemp) - Me.tbMonthlyTemp.Controls.Add(Me.ucrSelecetorMonthlyTemp) - Me.tbMonthlyTemp.Location = New System.Drawing.Point(4, 29) - Me.tbMonthlyTemp.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbMonthlyTemp.Name = "tbMonthlyTemp" - Me.tbMonthlyTemp.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbMonthlyTemp.Size = New System.Drawing.Size(776, 695) - Me.tbMonthlyTemp.TabIndex = 4 - Me.tbMonthlyTemp.Text = "Monthly Temperature" - Me.tbMonthlyTemp.UseVisualStyleBackColor = True - ' - 'lblMonth - ' - Me.lblMonth.AutoSize = True - Me.lblMonth.Location = New System.Drawing.Point(370, 146) - Me.lblMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMonth.Name = "lblMonth" - Me.lblMonth.Size = New System.Drawing.Size(58, 20) - Me.lblMonth.TabIndex = 5 - Me.lblMonth.Text = "Month:" - ' - 'lblMinMInMonthly - ' - Me.lblMinMInMonthly.AutoSize = True - Me.lblMinMInMonthly.Location = New System.Drawing.Point(372, 278) - Me.lblMinMInMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMinMInMonthly.Name = "lblMinMInMonthly" - Me.lblMinMInMonthly.Size = New System.Drawing.Size(145, 20) - Me.lblMinMInMonthly.TabIndex = 9 - Me.lblMinMInMonthly.Text = "Min Minimum Temp" - ' - 'lblMeanMinMonthly - ' - Me.lblMeanMinMonthly.AutoSize = True - Me.lblMeanMinMonthly.Location = New System.Drawing.Point(366, 214) - Me.lblMeanMinMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMeanMinMonthly.Name = "lblMeanMinMonthly" - Me.lblMeanMinMonthly.Size = New System.Drawing.Size(160, 20) - Me.lblMeanMinMonthly.TabIndex = 7 - Me.lblMeanMinMonthly.Text = "Mean Minimum Temp" - ' - 'lblMaxMinMonthly - ' - Me.lblMaxMinMonthly.AutoSize = True - Me.lblMaxMinMonthly.Location = New System.Drawing.Point(375, 338) - Me.lblMaxMinMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMaxMinMonthly.Name = "lblMaxMinMonthly" - Me.lblMaxMinMonthly.Size = New System.Drawing.Size(149, 20) - Me.lblMaxMinMonthly.TabIndex = 11 - Me.lblMaxMinMonthly.Text = "Max Minimum Temp" - ' - 'lblYearMonthTemp - ' - Me.lblYearMonthTemp.AutoSize = True - Me.lblYearMonthTemp.Location = New System.Drawing.Point(372, 83) - Me.lblYearMonthTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblYearMonthTemp.Name = "lblYearMonthTemp" - Me.lblYearMonthTemp.Size = New System.Drawing.Size(47, 20) - Me.lblYearMonthTemp.TabIndex = 3 - Me.lblYearMonthTemp.Text = "Year:" - ' - 'lblStationMonthTemp - ' - Me.lblStationMonthTemp.AutoSize = True - Me.lblStationMonthTemp.Location = New System.Drawing.Point(370, 23) - Me.lblStationMonthTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblStationMonthTemp.Name = "lblStationMonthTemp" - Me.lblStationMonthTemp.Size = New System.Drawing.Size(64, 20) - Me.lblStationMonthTemp.TabIndex = 1 - Me.lblStationMonthTemp.Text = "Station:" - ' - 'lblMaxMaxMonthly - ' - Me.lblMaxMaxMonthly.AutoSize = True - Me.lblMaxMaxMonthly.Location = New System.Drawing.Point(381, 525) - Me.lblMaxMaxMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMaxMaxMonthly.Name = "lblMaxMaxMonthly" - Me.lblMaxMaxMonthly.Size = New System.Drawing.Size(153, 20) - Me.lblMaxMaxMonthly.TabIndex = 17 - Me.lblMaxMaxMonthly.Text = "Max Maximum Temp" - ' - 'lblMinMaxMonthly - ' - Me.lblMinMaxMonthly.AutoSize = True - Me.lblMinMaxMonthly.Location = New System.Drawing.Point(380, 460) - Me.lblMinMaxMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMinMaxMonthly.Name = "lblMinMaxMonthly" - Me.lblMinMaxMonthly.Size = New System.Drawing.Size(153, 20) - Me.lblMinMaxMonthly.TabIndex = 15 - Me.lblMinMaxMonthly.Text = "Min Maximum Temp:" - ' - 'lblMeanMaxMonthly - ' - Me.lblMeanMaxMonthly.AutoSize = True - Me.lblMeanMaxMonthly.Location = New System.Drawing.Point(380, 400) - Me.lblMeanMaxMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMeanMaxMonthly.Name = "lblMeanMaxMonthly" - Me.lblMeanMaxMonthly.Size = New System.Drawing.Size(164, 20) - Me.lblMeanMaxMonthly.TabIndex = 13 - Me.lblMeanMaxMonthly.Text = "Mean Maximum Temp" - ' 'ucrReceiverMonthMonthly ' Me.ucrReceiverMonthMonthly.AutoSize = True - Me.ucrReceiverMonthMonthly.frmParent = Nothing - Me.ucrReceiverMonthMonthly.Location = New System.Drawing.Point(368, 172) + Me.ucrReceiverMonthMonthly.frmParent = Me + Me.ucrReceiverMonthMonthly.Location = New System.Drawing.Point(247, 112) Me.ucrReceiverMonthMonthly.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMonthMonthly.Name = "ucrReceiverMonthMonthly" Me.ucrReceiverMonthMonthly.Selector = Nothing - Me.ucrReceiverMonthMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMonthMonthly.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverMonthMonthly.strNcFilePath = "" Me.ucrReceiverMonthMonthly.TabIndex = 6 Me.ucrReceiverMonthMonthly.ucrSelector = Nothing @@ -1248,12 +1149,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverMinMinMonthly ' Me.ucrReceiverMinMinMonthly.AutoSize = True - Me.ucrReceiverMinMinMonthly.frmParent = Nothing - Me.ucrReceiverMinMinMonthly.Location = New System.Drawing.Point(374, 303) + Me.ucrReceiverMinMinMonthly.frmParent = Me + Me.ucrReceiverMinMinMonthly.Location = New System.Drawing.Point(247, 197) Me.ucrReceiverMinMinMonthly.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinMinMonthly.Name = "ucrReceiverMinMinMonthly" Me.ucrReceiverMinMinMonthly.Selector = Nothing - Me.ucrReceiverMinMinMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMinMinMonthly.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverMinMinMonthly.strNcFilePath = "" Me.ucrReceiverMinMinMonthly.TabIndex = 10 Me.ucrReceiverMinMinMonthly.ucrSelector = Nothing @@ -1261,12 +1162,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverMaxMaxMonthly ' Me.ucrReceiverMaxMaxMonthly.AutoSize = True - Me.ucrReceiverMaxMaxMonthly.frmParent = Nothing - Me.ucrReceiverMaxMaxMonthly.Location = New System.Drawing.Point(380, 545) + Me.ucrReceiverMaxMaxMonthly.frmParent = Me + Me.ucrReceiverMaxMaxMonthly.Location = New System.Drawing.Point(247, 354) Me.ucrReceiverMaxMaxMonthly.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMaxMaxMonthly.Name = "ucrReceiverMaxMaxMonthly" Me.ucrReceiverMaxMaxMonthly.Selector = Nothing - Me.ucrReceiverMaxMaxMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMaxMaxMonthly.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverMaxMaxMonthly.strNcFilePath = "" Me.ucrReceiverMaxMaxMonthly.TabIndex = 18 Me.ucrReceiverMaxMaxMonthly.ucrSelector = Nothing @@ -1274,12 +1175,12 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverMeanmaxMonthly ' Me.ucrReceiverMeanmaxMonthly.AutoSize = True - Me.ucrReceiverMeanmaxMonthly.frmParent = Nothing - Me.ucrReceiverMeanmaxMonthly.Location = New System.Drawing.Point(378, 426) + Me.ucrReceiverMeanmaxMonthly.frmParent = Me + Me.ucrReceiverMeanmaxMonthly.Location = New System.Drawing.Point(247, 277) Me.ucrReceiverMeanmaxMonthly.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMeanmaxMonthly.Name = "ucrReceiverMeanmaxMonthly" Me.ucrReceiverMeanmaxMonthly.Selector = Nothing - Me.ucrReceiverMeanmaxMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMeanmaxMonthly.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverMeanmaxMonthly.strNcFilePath = "" Me.ucrReceiverMeanmaxMonthly.TabIndex = 14 Me.ucrReceiverMeanmaxMonthly.ucrSelector = Nothing @@ -1287,48 +1188,98 @@ Partial Class sdgDefineAnnualRainfall 'ucrReceiverMinMaxMonthly ' Me.ucrReceiverMinMaxMonthly.AutoSize = True - Me.ucrReceiverMinMaxMonthly.frmParent = Nothing - Me.ucrReceiverMinMaxMonthly.Location = New System.Drawing.Point(375, 488) + Me.ucrReceiverMinMaxMonthly.frmParent = Me + Me.ucrReceiverMinMaxMonthly.Location = New System.Drawing.Point(247, 317) Me.ucrReceiverMinMaxMonthly.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMinMaxMonthly.Name = "ucrReceiverMinMaxMonthly" Me.ucrReceiverMinMaxMonthly.Selector = Nothing - Me.ucrReceiverMinMaxMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMinMaxMonthly.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverMinMaxMonthly.strNcFilePath = "" Me.ucrReceiverMinMaxMonthly.TabIndex = 16 Me.ucrReceiverMinMaxMonthly.ucrSelector = Nothing ' + 'ucrReceiverMaxMinMonthly + ' + Me.ucrReceiverMaxMinMonthly.AutoSize = True + Me.ucrReceiverMaxMinMonthly.frmParent = Me + Me.ucrReceiverMaxMinMonthly.Location = New System.Drawing.Point(247, 238) + Me.ucrReceiverMaxMinMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMinMonthly.Name = "ucrReceiverMaxMinMonthly" + Me.ucrReceiverMaxMinMonthly.Selector = Nothing + Me.ucrReceiverMaxMinMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMaxMinMonthly.strNcFilePath = "" + Me.ucrReceiverMaxMinMonthly.TabIndex = 12 + Me.ucrReceiverMaxMinMonthly.ucrSelector = Nothing + ' 'ucrReceiverMeanminMontly ' Me.ucrReceiverMeanminMontly.AutoSize = True - Me.ucrReceiverMeanminMontly.frmParent = Nothing - Me.ucrReceiverMeanminMontly.Location = New System.Drawing.Point(370, 243) + Me.ucrReceiverMeanminMontly.frmParent = Me + Me.ucrReceiverMeanminMontly.Location = New System.Drawing.Point(247, 158) Me.ucrReceiverMeanminMontly.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMeanminMontly.Name = "ucrReceiverMeanminMontly" Me.ucrReceiverMeanminMontly.Selector = Nothing - Me.ucrReceiverMeanminMontly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMeanminMontly.Size = New System.Drawing.Size(120, 25) Me.ucrReceiverMeanminMontly.strNcFilePath = "" Me.ucrReceiverMeanminMontly.TabIndex = 8 Me.ucrReceiverMeanminMontly.ucrSelector = Nothing ' + 'ucrReceiverYearMonthly + ' + Me.ucrReceiverYearMonthly.AutoSize = True + Me.ucrReceiverYearMonthly.frmParent = Me + Me.ucrReceiverYearMonthly.Location = New System.Drawing.Point(247, 71) + Me.ucrReceiverYearMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYearMonthly.Name = "ucrReceiverYearMonthly" + Me.ucrReceiverYearMonthly.Selector = Nothing + Me.ucrReceiverYearMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverYearMonthly.strNcFilePath = "" + Me.ucrReceiverYearMonthly.TabIndex = 4 + Me.ucrReceiverYearMonthly.ucrSelector = Nothing + ' + 'ucrReceiverMonthlyTemp + ' + Me.ucrReceiverMonthlyTemp.AutoSize = True + Me.ucrReceiverMonthlyTemp.frmParent = Me + Me.ucrReceiverMonthlyTemp.Location = New System.Drawing.Point(247, 32) + Me.ucrReceiverMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonthlyTemp.Name = "ucrReceiverMonthlyTemp" + Me.ucrReceiverMonthlyTemp.Selector = Nothing + Me.ucrReceiverMonthlyTemp.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMonthlyTemp.strNcFilePath = "" + Me.ucrReceiverMonthlyTemp.TabIndex = 2 + Me.ucrReceiverMonthlyTemp.ucrSelector = Nothing + ' + 'ucrSelecetorMonthlyTemp + ' + Me.ucrSelecetorMonthlyTemp.AutoSize = True + Me.ucrSelecetorMonthlyTemp.bDropUnusedFilterLevels = False + Me.ucrSelecetorMonthlyTemp.bShowHiddenColumns = False + Me.ucrSelecetorMonthlyTemp.bUseCurrentFilter = True + Me.ucrSelecetorMonthlyTemp.Location = New System.Drawing.Point(10, 12) + Me.ucrSelecetorMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelecetorMonthlyTemp.Name = "ucrSelecetorMonthlyTemp" + Me.ucrSelecetorMonthlyTemp.Size = New System.Drawing.Size(226, 268) + Me.ucrSelecetorMonthlyTemp.TabIndex = 0 + ' 'ucrBase ' Me.ucrBase.AutoSize = True - Me.ucrBase.Location = New System.Drawing.Point(236, 751) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Location = New System.Drawing.Point(157, 488) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(336, 46) + Me.ucrBase.Size = New System.Drawing.Size(224, 30) Me.ucrBase.TabIndex = 35 ' 'sdgDefineAnnualRainfall ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(820, 819) + Me.ClientSize = New System.Drawing.Size(547, 456) Me.Controls.Add(Me.tbSummaries) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgDefineAnnualRainfall" diff --git a/instat/sdgDefineAnnualRainfall.vb b/instat/sdgDefineAnnualRainfall.vb index bf4f6bf23c8..c7b4ff46d31 100644 --- a/instat/sdgDefineAnnualRainfall.vb +++ b/instat/sdgDefineAnnualRainfall.vb @@ -44,10 +44,14 @@ Public Class sdgDefineAnnualRainfall ucrReceiverStation.SetParameter(New RParameter("station_col", 1)) ucrReceiverStation.Selector = ucrSelectorDefineAnnualRain ucrReceiverStation.SetParameterIsString() + ucrReceiverStation.SetClimaticType("station") + ucrReceiverStation.bAutoFill = True ucrReceiverYear.SetParameter(New RParameter("year_col", 2)) ucrReceiverYear.Selector = ucrSelectorDefineAnnualRain ucrReceiverYear.SetParameterIsString() + ucrReceiverYear.SetClimaticType("year") + ucrReceiverYear.bAutoFill = True ucrReceiverStartRainDOY.SetParameter(New RParameter("start_rains_doy_col", 3)) ucrReceiverStartRainDOY.Selector = ucrSelectorDefineAnnualRain @@ -108,6 +112,8 @@ Public Class sdgDefineAnnualRainfall ucrReceiverStationCrop.SetParameter(New RParameter("station_col", 1)) ucrReceiverStationCrop.Selector = ucrSelectorCropProp ucrReceiverStationCrop.SetParameterIsString() + ucrReceiverStationCrop.SetClimaticType("station") + ucrReceiverStationCrop.bAutoFill = True ucrReceiverTotalRain.SetParameter(New RParameter("total_rain_col", 2)) ucrReceiverTotalRain.Selector = ucrSelectorCropProp @@ -129,10 +135,14 @@ Public Class sdgDefineAnnualRainfall ucrReceiverSeasonStationProb.SetParameter(New RParameter("station_col", 1)) ucrReceiverSeasonStationProb.Selector = ucrSelectorSeasonStartProp ucrReceiverSeasonStationProb.SetParameterIsString() + ucrReceiverSeasonStationProb.SetClimaticType("station") + ucrReceiverSeasonStationProb.bAutoFill = True ucrReceiverSeasonYear.SetParameter(New RParameter("year_col", 2)) ucrReceiverSeasonYear.Selector = ucrSelectorSeasonStartProp ucrReceiverSeasonYear.SetParameterIsString() + ucrReceiverSeasonYear.SetClimaticType("year") + ucrReceiverSeasonYear.bAutoFill = True ucrReceiverSeasonPlantingDay.SetParameter(New RParameter("plant_day_col", 3)) ucrReceiverSeasonPlantingDay.Selector = ucrSelectorSeasonStartProp @@ -146,10 +156,14 @@ Public Class sdgDefineAnnualRainfall ucrReceiverAnnualTempStation.SetParameter(New RParameter("station_col", 1)) ucrReceiverAnnualTempStation.Selector = ucrSelectorAnnualTemp ucrReceiverAnnualTempStation.SetParameterIsString() + ucrReceiverAnnualTempStation.SetClimaticType("station") + ucrReceiverAnnualTempStation.bAutoFill = True ucrReceiverAnnualTempYr.SetParameter(New RParameter("year_col", 2)) ucrReceiverAnnualTempYr.Selector = ucrSelectorAnnualTemp ucrReceiverAnnualTempYr.SetParameterIsString() + ucrReceiverAnnualTempYr.SetClimaticType("year") + ucrReceiverAnnualTempYr.bAutoFill = True ucrReceiverMeanAnnual.SetParameter(New RParameter("mean_tmin_col", 3)) ucrReceiverMeanAnnual.Selector = ucrSelectorAnnualTemp @@ -179,14 +193,20 @@ Public Class sdgDefineAnnualRainfall ucrReceiverMonthlyTemp.SetParameter(New RParameter("station_col", 1)) ucrReceiverMonthlyTemp.Selector = ucrSelecetorMonthlyTemp ucrReceiverMonthlyTemp.SetParameterIsString() + ucrReceiverMonthlyTemp.SetClimaticType("station") + ucrReceiverMonthlyTemp.bAutoFill = True ucrReceiverYearMonthly.SetParameter(New RParameter("year_col", 2)) ucrReceiverYearMonthly.Selector = ucrSelecetorMonthlyTemp ucrReceiverYearMonthly.SetParameterIsString() + ucrReceiverYearMonthly.SetClimaticType("year") + ucrReceiverYearMonthly.bAutoFill = True ucrReceiverMonthMonthly.SetParameter(New RParameter("month_col", 3)) ucrReceiverMonthMonthly.Selector = ucrSelecetorMonthlyTemp ucrReceiverMonthMonthly.SetParameterIsString() + ucrReceiverMonthMonthly.SetClimaticType("month") + ucrReceiverMonthMonthly.bAutoFill = True ucrReceiverMeanminMontly.SetParameter(New RParameter("mean_tmin_col", 4)) ucrReceiverMeanminMontly.Selector = ucrSelecetorMonthlyTemp @@ -294,11 +314,16 @@ Public Class sdgDefineAnnualRainfall ucrReceiverEndSeasonDOY.ControlValueChanged, ucrReceiverRainDaysSeason.ControlValueChanged, ucrReceiverRainDaysYear.ControlValueChanged, ucrReceiverSeasonalLength.ControlValueChanged, ucrReceiverSeasonalRain.ControlValueChanged, ucrReceiverStartRainDate.ControlValueChanged, ucrReceiverStartRainDOY.ControlValueChanged, ucrReceiverStation.ControlValueChanged, ucrReceiverYear.ControlValueChanged - If Not (ucrReceiverAnnualRain.IsEmpty AndAlso ucrReceiverEndRainsDate.IsEmpty AndAlso ucrReceiverEndRainsDOY.IsEmpty AndAlso ucrReceiverSeasonalLength.IsEmpty AndAlso ucrReceiverSeasonalRain.IsEmpty AndAlso - ucrReceiverEndSeasonDate.IsEmpty AndAlso ucrReceiverEndSeasonDOY.IsEmpty AndAlso ucrReceiverRainDaysSeason.IsEmpty AndAlso ucrReceiverRainDaysYear.IsEmpty AndAlso ucrReceiverStartRainDate.IsEmpty AndAlso - ucrReceiverStartRainDOY.IsEmpty AndAlso ucrReceiverStation.IsEmpty AndAlso ucrReceiverYear.IsEmpty) Then - clsExportRinstatToBucketFunction.AddParameter("annual_rainfall_data", clsRFunctionParameter:=clsReforMattAnnualSummariesFunction, iPosition:=1) + If dlgExportClimaticDefinitions.ucrChkAnnualRainfall.Checked Then + If Not ucrReceiverStation.IsEmpty AndAlso Not ucrReceiverYear.IsEmpty AndAlso (Not ucrReceiverAnnualRain.IsEmpty OrElse Not ucrReceiverEndRainsDate.IsEmpty OrElse Not ucrReceiverEndRainsDOY.IsEmpty OrElse ucrReceiverSeasonalLength.IsEmpty OrElse Not ucrReceiverSeasonalRain.IsEmpty OrElse + Not ucrReceiverEndSeasonDate.IsEmpty OrElse Not ucrReceiverEndSeasonDOY.IsEmpty OrElse Not ucrReceiverRainDaysSeason.IsEmpty OrElse Not ucrReceiverRainDaysYear.IsEmpty OrElse Not ucrReceiverStartRainDate.IsEmpty OrElse + Not ucrReceiverStartRainDOY.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("annual_rainfall_data", clsRFunctionParameter:=clsReforMattAnnualSummariesFunction, iPosition:=1) + + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("annual_rainfall_data") + End If Else clsExportRinstatToBucketFunction.RemoveParameterByName("annual_rainfall_data") End If @@ -307,34 +332,51 @@ Public Class sdgDefineAnnualRainfall Private Sub ucrReceiverStationCrop_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStationCrop.ControlValueChanged, ucrReceiverTotalRain.ControlValueChanged, ucrReceiverPlantingDay.ControlValueChanged, ucrReceiverPlantingLenghth.ControlValueChanged, ucrReceiverPropSuccess.ControlValueChanged - If Not (ucrReceiverStationCrop.IsEmpty AndAlso ucrReceiverTotalRain.IsEmpty AndAlso ucrReceiverPlantingDay.IsEmpty AndAlso ucrReceiverPlantingLenghth.IsEmpty AndAlso ucrReceiverPropSuccess.IsEmpty) Then - clsExportRinstatToBucketFunction.AddParameter("crop_success_data", clsRFunctionParameter:=clsReformatCropSuccessFunction, iPosition:=9) + If dlgExportClimaticDefinitions.ucrChkCropSuccessProp.Checked Then + + If Not ucrReceiverStationCrop.IsEmpty AndAlso (Not ucrReceiverTotalRain.IsEmpty OrElse Not ucrReceiverPlantingDay.IsEmpty OrElse Not ucrReceiverPlantingLenghth.IsEmpty OrElse Not ucrReceiverPropSuccess.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("crop_success_data", clsRFunctionParameter:=clsReformatCropSuccessFunction, iPosition:=9) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("crop_success_data") + End If Else clsExportRinstatToBucketFunction.RemoveParameterByName("crop_success_data") End If End Sub Private Sub ucrReceiverSeasonStationProb_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSeasonStationProb.ControlValueChanged, ucrReceiverSeasonPlantingDay.ControlValueChanged, ucrReceiverPlantingDayCondition.ControlValueChanged, ucrReceiverSeasonYear.ControlValueChanged - - If Not (ucrReceiverSeasonStationProb.IsEmpty AndAlso ucrReceiverSeasonPlantingDay.IsEmpty AndAlso ucrReceiverPlantingDayCondition.IsEmpty AndAlso ucrReceiverSeasonYear.IsEmpty) Then - clsExportRinstatToBucketFunction.AddParameter("season_start_data", clsRFunctionParameter:=clsReformatSeasonStartFunction, iPosition:=10) + If dlgExportClimaticDefinitions.ucrChkSeasonStartProp.Checked Then + If Not ucrReceiverSeasonStationProb.IsEmpty AndAlso Not ucrReceiverSeasonYear.IsEmpty AndAlso (Not ucrReceiverSeasonPlantingDay.IsEmpty OrElse Not ucrReceiverPlantingDayCondition.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("season_start_data", clsRFunctionParameter:=clsReformatSeasonStartFunction, iPosition:=10) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("season_start_data") + End If Else clsExportRinstatToBucketFunction.RemoveParameterByName("season_start_data") End If End Sub Private Sub ucrReceiverAnnualTempStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverAnnualTempStation.ControlValueChanged, ucrReceiverAnnualTempYr.ControlValueChanged, ucrReceiverMaxMaxAnnual.ControlValueChanged, ucrReceiverMaxMinAnnual.ControlValueChanged, ucrReceiverMeanAnnual.ControlValueChanged, ucrReceiverMeanMaxAnnual.ControlValueChanged, ucrReceiverMinMaxAnnual.ControlValueChanged, ucrReceiverMinMinAnnual.ControlValueChanged - If Not (ucrReceiverAnnualTempStation.IsEmpty AndAlso ucrReceiverAnnualTempYr.IsEmpty AndAlso ucrReceiverMaxMaxAnnual.IsEmpty AndAlso - ucrReceiverMaxMinAnnual.IsEmpty AndAlso ucrReceiverMeanAnnual.IsEmpty AndAlso ucrReceiverMeanMaxAnnual.IsEmpty AndAlso ucrReceiverMinMaxAnnual.IsEmpty AndAlso ucrReceiverMinMinAnnual.IsEmpty) Then - clsExportRinstatToBucketFunction.AddParameter("annual_temperature_data", clsRFunctionParameter:=clsReformatTempSummariesFunction, iPosition:=11) + + If dlgExportClimaticDefinitions.ucrChkAnnualTemp.Checked Then + If Not ucrReceiverAnnualTempStation.IsEmpty AndAlso Not ucrReceiverAnnualTempYr.IsEmpty AndAlso (Not ucrReceiverMaxMaxAnnual.IsEmpty OrElse + Not ucrReceiverMaxMinAnnual.IsEmpty OrElse Not ucrReceiverMeanAnnual.IsEmpty OrElse Not ucrReceiverMeanMaxAnnual.IsEmpty OrElse Not ucrReceiverMinMaxAnnual.IsEmpty OrElse Not ucrReceiverMinMinAnnual.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("annual_temperature_data", clsRFunctionParameter:=clsReformatTempSummariesFunction, iPosition:=11) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("annual_temperature_data") + End If Else clsExportRinstatToBucketFunction.RemoveParameterByName("annual_temperature_data") End If End Sub Private Sub ucrReceiverMonthlyTemp_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMonthlyTemp.ControlValueChanged, ucrReceiverYearMonthly.ControlValueChanged, ucrReceiverMonthMonthly.ControlValueChanged, ucrReceiverMeanmaxMonthly.ControlValueChanged, ucrReceiverMeanminMontly.ControlValueChanged, ucrReceiverMinMaxMonthly.ControlValueChanged, ucrReceiverMinMinMonthly.ControlValueChanged, ucrReceiverMaxMinMonthly.ControlValueChanged, ucrReceiverMaxMaxMonthly.ControlValueChanged - If Not (ucrReceiverMonthlyTemp.IsEmpty AndAlso ucrReceiverYearMonthly.IsEmpty AndAlso ucrReceiverMonthMonthly.IsEmpty AndAlso ucrReceiverMeanmaxMonthly.IsEmpty AndAlso ucrReceiverMeanminMontly.IsEmpty AndAlso ucrReceiverMinMaxMonthly.IsEmpty AndAlso ucrReceiverMinMinMonthly.IsEmpty AndAlso ucrReceiverMaxMinMonthly.IsEmpty AndAlso ucrReceiverMaxMaxMonthly.IsEmpty) Then - clsExportRinstatToBucketFunction.AddParameter("monthly_temperature_data", clsRFunctionParameter:=clsReformatMonthlyTempSummaries, iPosition:=18) + If dlgExportClimaticDefinitions.ucrChkMonthlyTemp.Checked Then + If Not ucrReceiverMonthlyTemp.IsEmpty AndAlso Not ucrReceiverYearMonthly.IsEmpty AndAlso Not ucrReceiverMonthMonthly.IsEmpty AndAlso (Not ucrReceiverMeanmaxMonthly.IsEmpty OrElse Not ucrReceiverMeanminMontly.IsEmpty OrElse Not ucrReceiverMinMaxMonthly.IsEmpty OrElse Not ucrReceiverMinMinMonthly.IsEmpty OrElse Not ucrReceiverMaxMinMonthly.IsEmpty OrElse Not ucrReceiverMaxMaxMonthly.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("monthly_temperature_data", clsRFunctionParameter:=clsReformatMonthlyTempSummaries, iPosition:=18) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("monthly_temperature_data") + End If Else clsExportRinstatToBucketFunction.RemoveParameterByName("monthly_temperature_data") End If diff --git a/instat/sdgMerge.vb b/instat/sdgMerge.vb index 6a33452f39a..9ec6c6ff849 100644 --- a/instat/sdgMerge.vb +++ b/instat/sdgMerge.vb @@ -28,6 +28,8 @@ Public Class sdgMerge End Sub Public Sub InitiatiseControls() + ucrSubBase.iHelpTopicID = 51 + ucrSelectorFirstDF.SetLabelText("First Data Frame") ucrSelectorSecondDF.SetLabelText("Second Data Frame") @@ -95,10 +97,10 @@ Public Class sdgMerge End Sub Private Sub SetHelpOptions() - Select Case dlgMerge.enumMergeMode - Case dlgMerge.MergeMode.Prepare + Select Case dlgMergeAdditionalData.enumMergeMode + Case dlgMergeAdditionalData.MergeMode.Prepare ucrSubBase.iHelpTopicID = 51 - Case dlgMerge.MergeMode.Climatic + Case dlgMergeAdditionalData.MergeMode.Climatic ucrSubBase.iHelpTopicID = 624 End Select End Sub diff --git a/instat/sdgMergeColumnsToInclude.vb b/instat/sdgMergeColumnsToInclude.vb index 29116770125..d78862f4f6b 100644 --- a/instat/sdgMergeColumnsToInclude.vb +++ b/instat/sdgMergeColumnsToInclude.vb @@ -23,11 +23,12 @@ Public Class sdgMergeColumnstoInclude Private clsMerge As RFunction Private Sub sdgMerge_Load(sender As Object, e As EventArgs) Handles MyBase.Load - SetHelpOptions() autoTranslate(Me) End Sub Public Sub InitiatiseControls() + ucrSubBase.iHelpTopicID = 154 + ucrChkMergeWithSubsetFirst.SetText("Choose Subset of Columns to Merge") ucrChkMergeWithSubsetFirst.AddToLinkedControls(ucrReceiverFirstSelected, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkMergeWithSubsetFirst.AddParameterValueFunctionNamesCondition(True, "x", frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") @@ -130,13 +131,4 @@ Public Class sdgMergeColumnstoInclude Next End If End Sub - - Private Sub SetHelpOptions() - Select Case dlgMerge.enumMergeMode - Case dlgMerge.MergeMode.Prepare - ucrSubBase.iHelpTopicID = 154 - Case dlgMerge.MergeMode.Climatic - ucrSubBase.iHelpTopicID = 636 - End Select - End Sub End Class diff --git a/instat/static/Help/R-Instat.chm b/instat/static/Help/R-Instat.chm index 24fca5f21b7..20e9de1bc37 100644 Binary files a/instat/static/Help/R-Instat.chm and b/instat/static/Help/R-Instat.chm differ diff --git a/instat/static/InstatObject/R/InstallPackages.R b/instat/static/InstatObject/R/InstallPackages.R index c1e29a3c110..a85dbafe642 100644 --- a/instat/static/InstatObject/R/InstallPackages.R +++ b/instat/static/InstatObject/R/InstallPackages.R @@ -161,4 +161,4 @@ devtools::install_github("ianmoran11/mmtable2") devtools::install_github("michael-franke/aida-package") devtools::install_github("rijaf-iri/CDT") devtools::install_github("IDEMSInternational/rapidpror") - +devtools::install_github("IDEMSInternational/epicsawrap") diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 8ab9363348a..5444243e367 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -3292,13 +3292,8 @@ DataSheet$set("public","infill_missing_dates", function(date_name, factors, star col_names_exp[[i]] <- lazyeval::interp(~ var, var = as.name(col_name)) } all_factors <- self$get_columns_from_data(factors, use_current_filter = FALSE) - factor_combinations <- combn(names(all_factors), 2, simplify = FALSE) - for (combo in factor_combinations) { - factors_check <- all_factors[, combo] - if (nrow(unique(factors_check)) != nrow(unique(all_factors))) { - stop("Two factors are essentially the same variable.") - } - } + first_factor <- self$get_columns_from_data(factors[1], use_current_filter = FALSE) + if(dplyr::n_distinct(interaction(all_factors, drop = TRUE))!= dplyr::n_distinct(first_factor)) stop("The multiple factor variables are not in sync. Should have same number of levels.") grouped_data <- self$get_data_frame(use_current_filter = FALSE) %>% dplyr::group_by_(.dots = col_names_exp) date_ranges <- grouped_data %>% dplyr::summarise_(.dots = setNames(list(lazyeval::interp(~ min(var), var = as.name(date_name)), lazyeval::interp(~ max(var), var = as.name(date_name))), c("min_date", "max_date"))) date_lengths <- grouped_data %>% dplyr::summarise(count = n()) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 78fe1743d8b..ee580e5519a 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1881,40 +1881,38 @@ DataBook$set("public", "import_climsoft_metadata", function(import_stations = FA data_list <- list() if(import_stations){ - stations_metadata_name <- next_default_item("stations_metadata", self$get_data_names(), include_index = FALSE) - #todo.(22/03/2023) 2 fields have been intentionally left out because they are yet to be released to Climsoft users. Namely; wsi and gtsWSI - #include them once the new Climsoft release has been supplied to users - data_list[[stations_metadata_name]] <- DBI::dbGetQuery(con, "SELECT stationId AS station_id, stationName AS station_name, wmoid, icaoid, latitude, longitude, elevation, qualifier, geoLocationMethod AS geo_location_method, geoLocationAccuracy AS geo_location_accuracy, openingDatetime AS opening_date_time, closingDatetime AS closing_date_time, authority, adminRegion AS admin_region, drainageBasin AS drainage_basin, wacaSelection AS waca_selection, cptSelection AS cpt_selection, stationOperational AS station_Operational, country AS country FROM station;") + # TODO.(22/03/2023) 2 fields have been intentionally left out because they are yet to be released to Climsoft users. Namely; wsi and gtsWSI + # include them once the new Climsoft release has been supplied to users + stations_df <- DBI::dbGetQuery(con, "SELECT stationId AS station_id, stationName AS station_name, wmoid, icaoid, latitude, longitude, elevation, qualifier, geoLocationMethod AS geo_location_method, geoLocationAccuracy AS geo_location_accuracy, openingDatetime AS opening_date_time, closingDatetime AS closing_date_time, wacaSelection AS waca_selection, cptSelection AS cpt_selection, stationOperational AS station_operational, drainageBasin AS drainage_basin, country AS country, authority, adminRegion AS admin_region_1, adminRegion2 AS admin_region_2, adminRegion3 AS admin_region_3, adminRegion4 AS admin_region_4 FROM station;") + + columns_to_convert <- c("station_id","station_name","qualifier", "station_operational", "drainage_basin", "country", "authority", "admin_region_1", "admin_region_2", "admin_region_3", "admin_region_4") + stations_df[columns_to_convert] <- lapply(stations_df[columns_to_convert], as.factor) + + stations_df_name <- next_default_item("stations_metadata", self$get_data_names(), include_index = FALSE) + data_list[[stations_df_name]] <- stations_df } if(import_elements){ - elements_metadata_name <- next_default_item("elements_metadata", self$get_data_names(), include_index = FALSE) - data_list[[elements_metadata_name]] <- DBI::dbGetQuery(con, "SELECT elementId AS element_id, elementName AS element_name, abbreviation, description, elementtype AS element_type, upperLimit AS upper_limit , lowerLimit AS lower_limit, units FROM obselement;") + elements_df <- DBI::dbGetQuery(con, "SELECT elementId AS element_id, elementName AS element_name, abbreviation, description, elementtype AS element_type, upperLimit AS upper_limit , lowerLimit AS lower_limit, units FROM obselement;") + + columns_to_convert <- c("element_id","element_name","abbreviation","element_type") + elements_df[columns_to_convert] <- lapply(elements_df[columns_to_convert], as.factor) + + elements_df_name <- next_default_item("elements_metadata", self$get_data_names(), include_index = FALSE) + data_list[[elements_df_name]] <- elements_df } if(import_flags){ - flags_metadata_name <- next_default_item("flags_metadata", self$get_data_names(), include_index = FALSE) - data_list[[flags_metadata_name]] <- DBI::dbGetQuery(con, "SELECT characterSymbol AS flag_name, description FROM flags;") + flags_df <- DBI::dbGetQuery(con, "SELECT characterSymbol AS flag_name, description FROM flags;") + + flags_df$flag_name <- as.factor(flags_df$flag_name) + flags_df_name <- next_default_item("flags_metadata", self$get_data_names(), include_index = FALSE) + data_list[[flags_df_name]] <- flags_df } + # Import the data frames into the data book self$import_data(data_tables = data_list) - #-------------------------------- - - #transform imported metadata - #-------------------------------- - if(import_stations){ - self$convert_column_to_type(data_name = stations_metadata_name, col_names = c("station_id","station_name","qualifier","authority","admin_region","drainage_basin","station_Operational","country"), to_type = "factor") - } - - if(import_elements){ - self$convert_column_to_type(data_name = elements_metadata_name, col_names = c("element_id","element_name","abbreviation","element_type"), to_type = "factor") - } - - if(import_flags){ - self$convert_column_to_type(data_name = flags_metadata_name, col_names = c("flag_name"), to_type = "factor") - } - #-------------------------------- }) @@ -1924,7 +1922,7 @@ DataBook$set("public", "import_climsoft_data", function(tableName, station_filter_column, stations = c(), element_filter_column, elements = c(), qc_status = -1, start_date = NULL, end_date = NULL, unstack_data = FALSE, - include_station_id = FALSE, include_element_id = FALSE, include_element_name = FALSE, + include_element_id = FALSE, include_element_name = FALSE, include_acquisition_type = FALSE, include_level = FALSE, include_entry_form = FALSE, include_captured_by = FALSE, include_qc_status = FALSE, include_qc_log = FALSE, include_flag = FALSE, import_selected_stations_metadata = FALSE, import_selected_elements_metadata = FALSE) { @@ -1951,14 +1949,7 @@ DataBook$set("public", "import_climsoft_data", function(tableName, #selects #-------------------------------- - sql_select<- "" - - if(include_station_id){ - sql_select <- paste0(tableName,".recordedFrom AS station_id") - sql_select <-paste0(sql_select,", station.stationName AS station_name") - }else{ - sql_select <-"station.stationName AS station_name" - } + sql_select<- paste0(tableName,".recordedFrom AS station_id",", station.stationName AS station_name") if(include_element_id){ sql_select <-paste0(sql_select, ", ", tableName,".describedBy AS element_id") @@ -1991,6 +1982,7 @@ DataBook$set("public", "import_climsoft_data", function(tableName, } sql_select <-paste0(sql_select,", ", tableName,".obsDatetime AS date_time") + sql_select <-paste0(sql_select,", DATE(", tableName,".obsDatetime) AS date") if(include_qc_log){ sql_select <-paste0(sql_select,", ", tableName,".qcTypeLog"," AS qc_log") @@ -2035,10 +2027,12 @@ DataBook$set("public", "import_climsoft_data", function(tableName, sql_order_by <- paste0(" ORDER BY ",tableName,".recordedFrom, ",tableName, ".describedBy, ",tableName, ".obsDatetime",";") #-------------------------------- - #import data - #-------------------------------- + # Data list to store all the imported data frames data_list <- list() + #import metadata + #-------------------------------- + if(import_selected_stations_metadata){ stations_metadata_name <- next_default_item("stations_metadata", self$get_data_names(), include_index = FALSE) data_list[[stations_metadata_name]] <- DBI::dbGetQuery(con, paste0("SELECT * FROM station WHERE", sql_stations_filter)) @@ -2049,60 +2043,67 @@ DataBook$set("public", "import_climsoft_data", function(tableName, data_list[[elements_metadata_name]] <- DBI::dbGetQuery(con, paste0("SELECT * FROM obselement WHERE", sql_elements_filter)) } - observations_data_name <- next_default_item("observations_data", self$get_data_names(), include_index = FALSE) - data_list[[observations_data_name]] <- DBI::dbGetQuery(con,paste0(sql_select, sql_filter, sql_order_by)) + #-------------------------------- - if(unstack_data){ - observations_unstacked_data_name <- next_default_item("observations_unstacked_data", self$get_data_names(), include_index = FALSE) - data_list[[observations_unstacked_data_name]] <- reshape2::dcast(data = data_list[[observations_data_name]], formula = station_name + date_time ~ element_abbrv, value.var = "value") - } + # import and transform observations data data + # -------------------------------- + # Get observations data from database + observations_df <- DBI::dbGetQuery(con, paste0(sql_select, sql_filter, sql_order_by)) - self$import_data(data_tables = data_list) - #-------------------------------- + # Convert station name and abbreviation columns to factor + columns_to_convert <- c("station_id", "station_name", "element_abbrv") + observations_df[columns_to_convert] <- lapply(observations_df[columns_to_convert], as.factor) - #transform imported data - #-------------------------------- - self$convert_column_to_type(data_name = observations_data_name, col_names = c("station_name","element_abbrv"), to_type = "factor") + # Convert the date_time column to POSIXct (date-time) format + observations_df$date_time <- as.POSIXct(observations_df$date_time, format = "%Y-%m-%d %H:%M:%S") - if(include_station_id){ - self$convert_column_to_type(data_name = observations_data_name, col_names = "station_id", to_type = "factor") - } + # convert the date column to date format + observations_df$date <- as.Date(x = observations_df$date) if(include_element_id){ - self$convert_column_to_type(data_name = observations_data_name, col_names = "element_id", to_type = "factor") + observations_df$element_id <- as.factor(observations_df$element_id) } if(include_element_name){ - self$convert_column_to_type(data_name = observations_data_name, col_names = "element_name", to_type = "factor") + observations_df$element_name <- as.factor(observations_df$element_name) } if(include_qc_status){ - self$convert_column_to_type(data_name = observations_data_name, col_names = "qc_status", to_type = "factor") + observations_df$qc_status <- as.factor(observations_df$qc_status) } if(include_acquisition_type){ - self$convert_column_to_type(data_name = observations_data_name, col_names = "acquisition_type", to_type = "factor") + observations_df$acquisition_type <- as.factor(observations_df$acquisition_type) } if(include_level){ - self$convert_column_to_type(data_name = observations_data_name, col_names = "level", to_type = "factor") + observations_df$level <- as.factor(observations_df$level) } if(include_flag){ - self$convert_column_to_type(data_name = observations_data_name, col_names = "flag", to_type = "factor") + observations_df$flag <- as.factor(observations_df$flag) } if(include_entry_form){ - self$convert_column_to_type(data_name = observations_data_name, col_names = "entry_form", to_type = "factor") + observations_df$entry_form <- as.factor(observations_df$entry_form) } - #todo. should this be done at this point?? Keeping in mind that we may have hourly data - #create a plain date column from the observation data datetime column values - #obsdate <- self$get_columns_from_data(data_name = observations_data_name, col_names = "date_time", use_current_filter = FALSE) - #self$add_columns_to_data(data_name = observations_data_name, col_name = "date", col_data = as.Date(x = obsdate), before = FALSE, adjacent_column = "date_time") #-------------------------------- + # Add observations data to list of data to be imported + # -------------------------------- + observations_data_name <- next_default_item("observations_data", self$get_data_names(), include_index = FALSE) + data_list[[observations_data_name]] <- observations_df + + if(unstack_data){ + observations_unstacked_data_name <- next_default_item("observations_unstacked_data", self$get_data_names(), include_index = FALSE) + data_list[[observations_unstacked_data_name]] <- tidyr::pivot_wider(data = observations_df, names_from=element_abbrv, values_from=value) + } + + # Import list of data frames to data book + self$import_data(data_tables = data_list) + }) #TODO. Deprecated. Delete this after after deleting the import from Climsoft wizard dialog diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 83c7eaa8091..79b7472c29f 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2977,14 +2977,23 @@ cumulative_inventory <- function(data, station = NULL, from, to){ return(data) } -getRowHeadersWithText <- function(data, column, searchText, ignore_case, use_regex) { - if(use_regex){ +getRowHeadersWithText <- function(data, column, searchText, ignore_case, use_regex, match_entire_cell) { + if (use_regex) { + # Adjust the search text to match the entire cell if required + if (match_entire_cell) { + searchText <- paste0("^", searchText, "$") + } # Find the rows that match the search text using regex matchingRows <- stringr::str_detect(data[[column]], stringr::regex(searchText, ignore_case = ignore_case)) - }else if (is.na(searchText)){ + } else if (is.na(searchText)) { matchingRows <- apply(data[, column, drop = FALSE], 1, function(row) any(is.na(row))) - }else{ - matchingRows <- grepl(searchText, data[[column]], ignore.case = ignore_case) + } else { + # Adjust the search text to match the entire cell if required + if (match_entire_cell) { + searchText <- paste0("^", searchText, "$") + } + # Find the rows that match the search text + matchingRows <- grepl(searchText, data[[column]], ignore.case = ignore_case, perl = TRUE) } # Get the row headers where the search text is found rowHeaders <- rownames(data)[matchingRows] diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 2425ae6c2ac..9f9e8ebd4de 100644 Binary files a/instat/translations/rInstatTranslations.db and b/instat/translations/rInstatTranslations.db differ diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 53d3cf0f929..91563cf0e2c 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -764,7 +764,7 @@ Partial Class ucrCalculator Me.cmdClear.Location = New System.Drawing.Point(150, 72) Me.cmdClear.Margin = New System.Windows.Forms.Padding(2) Me.cmdClear.Name = "cmdClear" - Me.cmdClear.Size = New System.Drawing.Size(50, 58) + Me.cmdClear.Size = New System.Drawing.Size(50, 59) Me.cmdClear.TabIndex = 190 Me.cmdClear.Text = "Clear" Me.cmdClear.UseVisualStyleBackColor = True @@ -823,7 +823,7 @@ Partial Class ucrCalculator Me.cmdPlus.Location = New System.Drawing.Point(113, 101) Me.cmdPlus.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlus.Name = "cmdPlus" - Me.cmdPlus.Size = New System.Drawing.Size(38, 29) + Me.cmdPlus.Size = New System.Drawing.Size(38, 30) Me.cmdPlus.TabIndex = 130 Me.cmdPlus.Text = "+" Me.cmdPlus.UseVisualStyleBackColor = True diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 889c1529593..3c948ec3073 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -1047,7 +1047,7 @@ Public Class ucrCalculator grpList.Visible = False cmdRhelpList.Visible = False cmdRhelpFunctions.Visible = False - Me.Size = New Size(iBasicWidth * 1.27, iBaseHeight) + Me.Size = New Size(iBasicWidth * 1.25, iBaseHeight) Case "Integer" strPackageName = "gmp" grpFunctions.Visible = False diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index 312d7b4de5d..72b122e3328 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -125,9 +125,6 @@ Partial Class ucrDataView Me.lblAdvanced = New System.Windows.Forms.Label() Me.linkStartRestoreBackup = New System.Windows.Forms.LinkLabel() Me.linkStartPasteScriptfromClipboard = New System.Windows.Forms.LinkLabel() - Me.panelSectionRecent = New System.Windows.Forms.Panel() - Me.lblRecent = New System.Windows.Forms.Label() - Me.panelRecentMenuItems = New System.Windows.Forms.Panel() Me.panelSectionHelp = New System.Windows.Forms.Panel() Me.linkHelpData = New System.Windows.Forms.LinkLabel() Me.linkHelpGettingStarted = New System.Windows.Forms.LinkLabel() @@ -139,6 +136,9 @@ Partial Class ucrDataView Me.linkStartNewDataFrame = New System.Windows.Forms.LinkLabel() Me.linkStartOpenFile = New System.Windows.Forms.LinkLabel() Me.linkStartOpenLibrary = New System.Windows.Forms.LinkLabel() + Me.panelSectionRecent = New System.Windows.Forms.Panel() + Me.lblRecent = New System.Windows.Forms.Label() + Me.panelRecentMenuItems = New System.Windows.Forms.Panel() Me.TblPanPageDisplay = New System.Windows.Forms.TableLayoutPanel() Me.lblColFirst = New System.Windows.Forms.Label() Me.lblColDisplay = New System.Windows.Forms.Label() @@ -160,9 +160,9 @@ Partial Class ucrDataView Me.tlpTableContainer.SuspendLayout() Me.panelSectionsAll.SuspendLayout() Me.panelSectionAdvanced.SuspendLayout() - Me.panelSectionRecent.SuspendLayout() Me.panelSectionHelp.SuspendLayout() Me.panelSectionStart.SuspendLayout() + Me.panelSectionRecent.SuspendLayout() Me.TblPanPageDisplay.SuspendLayout() Me.SuspendLayout() ' @@ -668,9 +668,9 @@ Partial Class ucrDataView 'panelSectionsAll ' Me.panelSectionsAll.Controls.Add(Me.panelSectionAdvanced) - Me.panelSectionsAll.Controls.Add(Me.panelSectionRecent) Me.panelSectionsAll.Controls.Add(Me.panelSectionHelp) Me.panelSectionsAll.Controls.Add(Me.panelSectionStart) + Me.panelSectionsAll.Controls.Add(Me.panelSectionRecent) Me.panelSectionsAll.Dock = System.Windows.Forms.DockStyle.Fill Me.panelSectionsAll.Location = New System.Drawing.Point(3, 23) Me.panelSectionsAll.Name = "panelSectionsAll" @@ -684,9 +684,9 @@ Partial Class ucrDataView Me.panelSectionAdvanced.Controls.Add(Me.lblAdvanced) Me.panelSectionAdvanced.Controls.Add(Me.linkStartRestoreBackup) Me.panelSectionAdvanced.Controls.Add(Me.linkStartPasteScriptfromClipboard) - Me.panelSectionAdvanced.Location = New System.Drawing.Point(28, 431) + Me.panelSectionAdvanced.Location = New System.Drawing.Point(27, 412) Me.panelSectionAdvanced.Name = "panelSectionAdvanced" - Me.panelSectionAdvanced.Size = New System.Drawing.Size(374, 105) + Me.panelSectionAdvanced.Size = New System.Drawing.Size(374, 83) Me.panelSectionAdvanced.TabIndex = 12 ' 'linkStartAddRPackage @@ -695,19 +695,19 @@ Partial Class ucrDataView Me.linkStartAddRPackage.AutoSize = True Me.linkStartAddRPackage.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartAddRPackage.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartAddRPackage.Location = New System.Drawing.Point(7, 65) + Me.linkStartAddRPackage.Location = New System.Drawing.Point(5, 64) Me.linkStartAddRPackage.Name = "linkStartAddRPackage" - Me.linkStartAddRPackage.Size = New System.Drawing.Size(143, 13) + Me.linkStartAddRPackage.Size = New System.Drawing.Size(187, 13) Me.linkStartAddRPackage.TabIndex = 6 Me.linkStartAddRPackage.TabStop = True - Me.linkStartAddRPackage.Text = "Add R package to R-Instat..." + Me.linkStartAddRPackage.Text = "Add R Package To R-Instat... (Online)" ' 'lblAdvanced ' Me.lblAdvanced.AutoSize = True Me.lblAdvanced.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAdvanced.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblAdvanced.Location = New System.Drawing.Point(5, 4) + Me.lblAdvanced.Location = New System.Drawing.Point(3, 4) Me.lblAdvanced.Name = "lblAdvanced" Me.lblAdvanced.Size = New System.Drawing.Size(108, 25) Me.lblAdvanced.TabIndex = 0 @@ -719,12 +719,12 @@ Partial Class ucrDataView Me.linkStartRestoreBackup.AutoSize = True Me.linkStartRestoreBackup.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartRestoreBackup.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartRestoreBackup.Location = New System.Drawing.Point(7, 47) + Me.linkStartRestoreBackup.Location = New System.Drawing.Point(5, 47) Me.linkStartRestoreBackup.Name = "linkStartRestoreBackup" - Me.linkStartRestoreBackup.Size = New System.Drawing.Size(166, 13) + Me.linkStartRestoreBackup.Size = New System.Drawing.Size(145, 13) Me.linkStartRestoreBackup.TabIndex = 4 Me.linkStartRestoreBackup.TabStop = True - Me.linkStartRestoreBackup.Text = "Restore Data or Log from Backup" + Me.linkStartRestoreBackup.Text = "Restore Data From Backup..." ' 'linkStartPasteScriptfromClipboard ' @@ -732,44 +732,12 @@ Partial Class ucrDataView Me.linkStartPasteScriptfromClipboard.AutoSize = True Me.linkStartPasteScriptfromClipboard.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartPasteScriptfromClipboard.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartPasteScriptfromClipboard.Location = New System.Drawing.Point(8, 30) + Me.linkStartPasteScriptfromClipboard.Location = New System.Drawing.Point(5, 30) Me.linkStartPasteScriptfromClipboard.Name = "linkStartPasteScriptfromClipboard" - Me.linkStartPasteScriptfromClipboard.Size = New System.Drawing.Size(134, 13) + Me.linkStartPasteScriptfromClipboard.Size = New System.Drawing.Size(137, 13) Me.linkStartPasteScriptfromClipboard.TabIndex = 5 Me.linkStartPasteScriptfromClipboard.TabStop = True - Me.linkStartPasteScriptfromClipboard.Text = "Paste Script from Clipboard" - ' - 'panelSectionRecent - ' - Me.panelSectionRecent.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.panelSectionRecent.Controls.Add(Me.lblRecent) - Me.panelSectionRecent.Controls.Add(Me.panelRecentMenuItems) - Me.panelSectionRecent.Location = New System.Drawing.Point(28, 124) - Me.panelSectionRecent.Name = "panelSectionRecent" - Me.panelSectionRecent.Size = New System.Drawing.Size(179, 186) - Me.panelSectionRecent.TabIndex = 13 - ' - 'lblRecent - ' - Me.lblRecent.AutoSize = True - Me.lblRecent.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblRecent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRecent.Location = New System.Drawing.Point(4, 8) - Me.lblRecent.Name = "lblRecent" - Me.lblRecent.Size = New System.Drawing.Size(80, 25) - Me.lblRecent.TabIndex = 1 - Me.lblRecent.Text = "Recent" - ' - 'panelRecentMenuItems - ' - Me.panelRecentMenuItems.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.panelRecentMenuItems.AutoScroll = True - Me.panelRecentMenuItems.Location = New System.Drawing.Point(9, 44) - Me.panelRecentMenuItems.Name = "panelRecentMenuItems" - Me.panelRecentMenuItems.Size = New System.Drawing.Size(159, 138) - Me.panelRecentMenuItems.TabIndex = 6 + Me.linkStartPasteScriptfromClipboard.Text = "Paste Script From Clipboard" ' 'panelSectionHelp ' @@ -777,9 +745,9 @@ Partial Class ucrDataView Me.panelSectionHelp.Controls.Add(Me.linkHelpGettingStarted) Me.panelSectionHelp.Controls.Add(Me.lblHelp) Me.panelSectionHelp.Controls.Add(Me.linkHelpRInstatResourcesSite) - Me.panelSectionHelp.Location = New System.Drawing.Point(28, 314) + Me.panelSectionHelp.Location = New System.Drawing.Point(28, 317) Me.panelSectionHelp.Name = "panelSectionHelp" - Me.panelSectionHelp.Size = New System.Drawing.Size(374, 109) + Me.panelSectionHelp.Size = New System.Drawing.Size(374, 81) Me.panelSectionHelp.TabIndex = 12 ' 'linkHelpData @@ -788,12 +756,12 @@ Partial Class ucrDataView Me.linkHelpData.AutoSize = True Me.linkHelpData.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpData.Location = New System.Drawing.Point(8, 49) + Me.linkHelpData.Location = New System.Drawing.Point(5, 47) Me.linkHelpData.Name = "linkHelpData" - Me.linkHelpData.Size = New System.Drawing.Size(30, 13) + Me.linkHelpData.Size = New System.Drawing.Size(39, 13) Me.linkHelpData.TabIndex = 12 Me.linkHelpData.TabStop = True - Me.linkHelpData.Text = "Data" + Me.linkHelpData.Text = "Data..." ' 'linkHelpGettingStarted ' @@ -801,19 +769,19 @@ Partial Class ucrDataView Me.linkHelpGettingStarted.AutoSize = True Me.linkHelpGettingStarted.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpGettingStarted.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpGettingStarted.Location = New System.Drawing.Point(8, 33) + Me.linkHelpGettingStarted.Location = New System.Drawing.Point(5, 30) Me.linkHelpGettingStarted.Name = "linkHelpGettingStarted" - Me.linkHelpGettingStarted.Size = New System.Drawing.Size(78, 13) + Me.linkHelpGettingStarted.Size = New System.Drawing.Size(87, 13) Me.linkHelpGettingStarted.TabIndex = 11 Me.linkHelpGettingStarted.TabStop = True - Me.linkHelpGettingStarted.Text = "Getting Started" + Me.linkHelpGettingStarted.Text = "Getting Started..." ' 'lblHelp ' Me.lblHelp.AutoSize = True Me.lblHelp.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblHelp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHelp.Location = New System.Drawing.Point(6, 3) + Me.lblHelp.Location = New System.Drawing.Point(3, 4) Me.lblHelp.Name = "lblHelp" Me.lblHelp.Size = New System.Drawing.Size(56, 25) Me.lblHelp.TabIndex = 2 @@ -825,12 +793,12 @@ Partial Class ucrDataView Me.linkHelpRInstatResourcesSite.AutoSize = True Me.linkHelpRInstatResourcesSite.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpRInstatResourcesSite.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpRInstatResourcesSite.Location = New System.Drawing.Point(8, 65) + Me.linkHelpRInstatResourcesSite.Location = New System.Drawing.Point(5, 64) Me.linkHelpRInstatResourcesSite.Name = "linkHelpRInstatResourcesSite" - Me.linkHelpRInstatResourcesSite.Size = New System.Drawing.Size(119, 13) + Me.linkHelpRInstatResourcesSite.Size = New System.Drawing.Size(158, 13) Me.linkHelpRInstatResourcesSite.TabIndex = 9 Me.linkHelpRInstatResourcesSite.TabStop = True - Me.linkHelpRInstatResourcesSite.Text = "R-Instat Resources Site" + Me.linkHelpRInstatResourcesSite.Text = "R-Instat Resources Site (Online)" ' 'panelSectionStart ' @@ -839,9 +807,9 @@ Partial Class ucrDataView Me.panelSectionStart.Controls.Add(Me.linkStartNewDataFrame) Me.panelSectionStart.Controls.Add(Me.linkStartOpenFile) Me.panelSectionStart.Controls.Add(Me.linkStartOpenLibrary) - Me.panelSectionStart.Location = New System.Drawing.Point(28, 6) + Me.panelSectionStart.Location = New System.Drawing.Point(28, 15) Me.panelSectionStart.Name = "panelSectionStart" - Me.panelSectionStart.Size = New System.Drawing.Size(374, 113) + Me.panelSectionStart.Size = New System.Drawing.Size(374, 100) Me.panelSectionStart.TabIndex = 11 ' 'linkStartPasteData @@ -850,19 +818,19 @@ Partial Class ucrDataView Me.linkStartPasteData.AutoSize = True Me.linkStartPasteData.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartPasteData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartPasteData.Location = New System.Drawing.Point(7, 84) + Me.linkStartPasteData.Location = New System.Drawing.Point(5, 81) Me.linkStartPasteData.Name = "linkStartPasteData" - Me.linkStartPasteData.Size = New System.Drawing.Size(136, 13) + Me.linkStartPasteData.Size = New System.Drawing.Size(142, 13) Me.linkStartPasteData.TabIndex = 7 Me.linkStartPasteData.TabStop = True - Me.linkStartPasteData.Text = "Paste data from clipboard..." + Me.linkStartPasteData.Text = "Paste Data From Clipboard..." ' 'lblStart ' Me.lblStart.AutoSize = True Me.lblStart.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblStart.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblStart.Location = New System.Drawing.Point(5, 4) + Me.lblStart.Location = New System.Drawing.Point(3, 4) Me.lblStart.Name = "lblStart" Me.lblStart.Size = New System.Drawing.Size(57, 25) Me.lblStart.TabIndex = 0 @@ -874,7 +842,7 @@ Partial Class ucrDataView Me.linkStartNewDataFrame.AutoSize = True Me.linkStartNewDataFrame.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartNewDataFrame.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartNewDataFrame.Location = New System.Drawing.Point(7, 31) + Me.linkStartNewDataFrame.Location = New System.Drawing.Point(5, 30) Me.linkStartNewDataFrame.Name = "linkStartNewDataFrame" Me.linkStartNewDataFrame.Size = New System.Drawing.Size(96, 13) Me.linkStartNewDataFrame.TabIndex = 3 @@ -887,7 +855,7 @@ Partial Class ucrDataView Me.linkStartOpenFile.AutoSize = True Me.linkStartOpenFile.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenFile.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenFile.Location = New System.Drawing.Point(7, 48) + Me.linkStartOpenFile.Location = New System.Drawing.Point(5, 47) Me.linkStartOpenFile.Name = "linkStartOpenFile" Me.linkStartOpenFile.Size = New System.Drawing.Size(90, 13) Me.linkStartOpenFile.TabIndex = 4 @@ -900,13 +868,45 @@ Partial Class ucrDataView Me.linkStartOpenLibrary.AutoSize = True Me.linkStartOpenLibrary.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenLibrary.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenLibrary.Location = New System.Drawing.Point(7, 66) + Me.linkStartOpenLibrary.Location = New System.Drawing.Point(5, 64) Me.linkStartOpenLibrary.Name = "linkStartOpenLibrary" Me.linkStartOpenLibrary.Size = New System.Drawing.Size(105, 13) Me.linkStartOpenLibrary.TabIndex = 5 Me.linkStartOpenLibrary.TabStop = True Me.linkStartOpenLibrary.Text = "Import From Library..." ' + 'panelSectionRecent + ' + Me.panelSectionRecent.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.panelSectionRecent.Controls.Add(Me.lblRecent) + Me.panelSectionRecent.Controls.Add(Me.panelRecentMenuItems) + Me.panelSectionRecent.Location = New System.Drawing.Point(28, 124) + Me.panelSectionRecent.Name = "panelSectionRecent" + Me.panelSectionRecent.Size = New System.Drawing.Size(179, 186) + Me.panelSectionRecent.TabIndex = 13 + ' + 'lblRecent + ' + Me.lblRecent.AutoSize = True + Me.lblRecent.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblRecent.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRecent.Location = New System.Drawing.Point(3, 4) + Me.lblRecent.Name = "lblRecent" + Me.lblRecent.Size = New System.Drawing.Size(80, 25) + Me.lblRecent.TabIndex = 1 + Me.lblRecent.Text = "Recent" + ' + 'panelRecentMenuItems + ' + Me.panelRecentMenuItems.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.panelRecentMenuItems.AutoScroll = True + Me.panelRecentMenuItems.Location = New System.Drawing.Point(5, 30) + Me.panelRecentMenuItems.Name = "panelRecentMenuItems" + Me.panelRecentMenuItems.Size = New System.Drawing.Size(159, 138) + Me.panelRecentMenuItems.TabIndex = 6 + ' 'TblPanPageDisplay ' Me.TblPanPageDisplay.AutoSize = True @@ -1091,12 +1091,12 @@ Partial Class ucrDataView Me.panelSectionsAll.ResumeLayout(False) Me.panelSectionAdvanced.ResumeLayout(False) Me.panelSectionAdvanced.PerformLayout() - Me.panelSectionRecent.ResumeLayout(False) - Me.panelSectionRecent.PerformLayout() Me.panelSectionHelp.ResumeLayout(False) Me.panelSectionHelp.PerformLayout() Me.panelSectionStart.ResumeLayout(False) Me.panelSectionStart.PerformLayout() + Me.panelSectionRecent.ResumeLayout(False) + Me.panelSectionRecent.PerformLayout() Me.TblPanPageDisplay.ResumeLayout(False) Me.TblPanPageDisplay.PerformLayout() Me.ResumeLayout(False) diff --git a/instat/ucrDataView.resx b/instat/ucrDataView.resx index 796dfc9bc07..59af2d7d414 100644 --- a/instat/ucrDataView.resx +++ b/instat/ucrDataView.resx @@ -133,6 +133,6 @@ 706, 17 - 50 + 25 \ No newline at end of file diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb index ebfb3d73b3e..8f1cad6613d 100644 --- a/instat/ucrScript.vb +++ b/instat/ucrScript.vb @@ -214,12 +214,10 @@ Public Class ucrScript Using dlgSave As New SaveFileDialog dlgSave.Title = "Save " & If(bIsLog, "Log", "Script") & " To File" - dlgSave.Filter = "R Script File (*.R)|*.R|Text File (*.txt)|*.txt" + dlgSave.Filter = "R Script File (*.R)|*.R|Text File (*.txt)|*.txt|JSON File (*.json)|*.json" dlgSave.FileName = Path.GetFileName(TabControl.SelectedTab.Text) - 'Ensure that dialog opens in correct folder. - 'In theory, we should be able to use `dlgLoad.RestoreDirectory = True` but this does - 'not work (I think a bug in WinForms).So we need to use static variables instead. + ' Ensure that dialog opens in the correct folder. Static strInitialDirectory As String = frmMain.clsInstatOptions.strWorkingDirectory Static strInitialDirectoryLog As String = frmMain.clsInstatOptions.strWorkingDirectory dlgSave.InitialDirectory = If(bIsLog, strInitialDirectoryLog, strInitialDirectory) @@ -232,6 +230,7 @@ Public Class ucrScript TabControl.SelectedTab.Text = System.IO.Path.GetFileNameWithoutExtension(dlgSave.FileName) frmMain.clsRecentItems.addToMenu(Replace(Path.Combine(Path.GetFullPath(strInitialDirectory), System.IO.Path.GetFileName(dlgSave.FileName)), "\", "/")) frmMain.bDataSaved = True + If bIsLog Then strInitialDirectoryLog = Path.GetDirectoryName(dlgSave.FileName) Else @@ -239,8 +238,8 @@ Public Class ucrScript End If Catch MsgBox("Could not save the " & If(bIsLog, "Log", "Script") & " file." & Environment.NewLine & - "The file may be in use by another program or you may not have access to write to the specified location.", - vbExclamation, "Save " & If(bIsLog, "Log", "Script")) + "The file may be in use by another program or you may not have access to write to the specified location.", + vbExclamation, "Save " & If(bIsLog, "Log", "Script")) End Try End If End Using @@ -530,9 +529,9 @@ Public Class ucrScript Using dlgLoad As New OpenFileDialog dlgLoad.Title = "Load Script From Text File" - dlgLoad.Filter = "Text & R Script Files (*.txt,*.R)|*.txt;*.R|R Script File (*.R)|*.R|Text File (*.txt)|*.txt" + dlgLoad.Filter = "Text & R Script Files (*.txt, *.R, *.json)|*.txt;*.R;*.json|R Script File (*.R)|*.R|Text File (*.txt)|*.txt|JSON File (*.json)|*.json" - 'Ensure that dialog opens in correct folder. + ' Ensure that dialog opens in the correct folder. 'In theory, we should be able to use `dlgLoad.RestoreDirectory = True` but this does 'not work (I think a bug in WinForms).So we need to use a static variable instead. Static strInitialDirectory As String = frmMain.clsInstatOptions.strWorkingDirectory