diff --git a/instat/DlgDefineClimaticData.vb b/instat/DlgDefineClimaticData.vb index 2ce5343bd5a..520a349c108 100644 --- a/instat/DlgDefineClimaticData.vb +++ b/instat/DlgDefineClimaticData.vb @@ -31,6 +31,7 @@ Public Class DlgDefineClimaticData End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 328 ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$define_as_climatic") clsTypesFunction.SetRCommand("c") ucrBase.clsRsyntax.AddParameter("types", clsRFunctionParameter:=clsTypesFunction) diff --git a/instat/dlgCalculationsSummary.vb b/instat/dlgCalculationsSummary.vb index a434646dab9..b813f3cb345 100644 --- a/instat/dlgCalculationsSummary.vb +++ b/instat/dlgCalculationsSummary.vb @@ -48,6 +48,7 @@ Public Class dlgCalculationsSummary End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 513 cmdEdit.Enabled = False cmdDuplicate.Enabled = False clsApplyCalculation.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$run_instat_calculation") diff --git a/instat/dlgCircular.Designer.vb b/instat/dlgCircular.Designer.vb new file mode 100644 index 00000000000..9a9231a99b3 --- /dev/null +++ b/instat/dlgCircular.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgCircular + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(5, 203) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 2 + ' + 'dlgCircular + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(407, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgCircular" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Circular" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgCircular.resx b/instat/dlgCircular.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgCircular.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgCircular.vb b/instat/dlgCircular.vb new file mode 100644 index 00000000000..b1604ca9b8a --- /dev/null +++ b/instat/dlgCircular.vb @@ -0,0 +1,40 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgCircular + Public bFirstLoad As Boolean = True + Private Sub dlgCircular_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + End If + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 489 + End Sub + + Private Sub TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + TestOKEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgCliData.Designer.vb b/instat/dlgCliData.Designer.vb new file mode 100644 index 00000000000..ce835bc903c --- /dev/null +++ b/instat/dlgCliData.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgCliData + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(5, 205) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 1 + ' + 'dlgCliData + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(416, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgCliData" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "CliData" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgCliData.resx b/instat/dlgCliData.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgCliData.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgCliData.vb b/instat/dlgCliData.vb new file mode 100644 index 00000000000..dd26cfebbee --- /dev/null +++ b/instat/dlgCliData.vb @@ -0,0 +1,40 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgCliData + Public bFirstLoad As Boolean = True + Private Sub dlgCliData_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + End If + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 354 + End Sub + + Private Sub TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + TestOKEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgClimSoft.Designer.vb b/instat/dlgClimSoft.Designer.vb new file mode 100644 index 00000000000..8269c2e086c --- /dev/null +++ b/instat/dlgClimSoft.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgClimSoft + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(6, 201) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 0 + ' + 'dlgClimSoft + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(412, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgClimSoft" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "ClimSoft" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgClimSoft.resx b/instat/dlgClimSoft.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgClimSoft.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb new file mode 100644 index 00000000000..354fa2bee46 --- /dev/null +++ b/instat/dlgClimSoft.vb @@ -0,0 +1,40 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgClimSoft + Public bFirstLoad As Boolean = True + Private Sub dlgClimSoft_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + End If + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 329 + End Sub + + Private Sub TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + TestOKEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgClimaticSummaries.Designer.vb b/instat/dlgClimaticSummaries.Designer.vb new file mode 100644 index 00000000000..9282ba49a0c --- /dev/null +++ b/instat/dlgClimaticSummaries.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgClimaticSummaries + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(6, 204) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 2 + ' + 'dlgClimaticSummaries + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(414, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgClimaticSummaries" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Climatic Summaries" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgClimaticSummaries.resx b/instat/dlgClimaticSummaries.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgClimaticSummaries.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgClimaticSummaries.vb b/instat/dlgClimaticSummaries.vb new file mode 100644 index 00000000000..630896fdd1c --- /dev/null +++ b/instat/dlgClimaticSummaries.vb @@ -0,0 +1,40 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgClimaticSummaries + Public bFirstLoad As Boolean = True + Private Sub ucrBase_Load(sender As Object, e As EventArgs) Handles ucrBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + End If + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 510 + End Sub + + Private Sub TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + TestOKEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgClimdex.vb b/instat/dlgClimdex.vb index 9d53e7375b5..d4caad99bd5 100644 --- a/instat/dlgClimdex.vb +++ b/instat/dlgClimdex.vb @@ -48,6 +48,7 @@ Public Class dlgClimdex End Sub Private Sub InitialiseDialog() + ucrBaseClimdex.iHelpTopicID = 190 clsRClimdexInput.SetRCommand("climdexInput.raw") clsRMaxMisingDays.SetRCommand("c") clsRTmax.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") diff --git a/instat/dlgDisplayDaily.vb b/instat/dlgDisplayDaily.vb index a3b2b163b43..4eb67d73183 100644 --- a/instat/dlgDisplayDaily.vb +++ b/instat/dlgDisplayDaily.vb @@ -31,6 +31,7 @@ Public Class dlgDisplayDaily End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 361 ucrBase.clsRsyntax.SetFunction("climate_obj$display_daily_rain()") End Sub Private Sub SetDefaults() diff --git a/instat/dlgDuplicateColumns.vb b/instat/dlgDuplicateColumns.vb index 76201281b26..95d27de8c1b 100644 --- a/instat/dlgDuplicateColumns.vb +++ b/instat/dlgDuplicateColumns.vb @@ -42,6 +42,7 @@ Public Class dlgDuplicateColumns End Sub Private Sub InitialiseDialog() 'sets the function + ucrBase.iHelpTopicID = 512 ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") ucrReceiverForCopyColumns.Selector = ucrSelectorForDuplicateColumn ucrReceiverForCopyColumns.SetMeAsReceiver() diff --git a/instat/dlgExportToCPT.vb b/instat/dlgExportToCPT.vb index d5d326725ea..7d4d4531fd6 100644 --- a/instat/dlgExportToCPT.vb +++ b/instat/dlgExportToCPT.vb @@ -43,6 +43,7 @@ Public Class dlgExportToCPT End Sub Private Sub InitialiseDialog() + ucrBaseExportToCPT.iHelpTopicID = 355 clsOutPut.SetRCommand("output_for_CPT") ucrReceiverMultipleDataColumns.Selector = ucrSSTDataframe ucrReceiverDataColumn.Selector = ucrSSTDataframe diff --git a/instat/dlgExtremes.vb b/instat/dlgExtremes.vb index d7a30b6e41f..a5bd9873eda 100644 --- a/instat/dlgExtremes.vb +++ b/instat/dlgExtremes.vb @@ -36,6 +36,7 @@ Public Class dlgExtremes autoTranslate(Me) ucrReceiverDataToFit.Selector = ucrAddRemove ucrReceiverDataToFit.SetMeAsReceiver() + ucrBase.iHelpTopicID = 488 End Sub Private Sub SetDefaults() diff --git a/instat/dlgGeneral.Designer.vb b/instat/dlgGeneral.Designer.vb new file mode 100644 index 00000000000..ee47bc4121e --- /dev/null +++ b/instat/dlgGeneral.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgGeneral + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(7, 201) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 2 + ' + 'dlgGeneral + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(412, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgGeneral" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "General" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgGeneral.resx b/instat/dlgGeneral.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgGeneral.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgGeneral.vb b/instat/dlgGeneral.vb new file mode 100644 index 00000000000..8d623b3b783 --- /dev/null +++ b/instat/dlgGeneral.vb @@ -0,0 +1,40 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgGeneral + Public bFirstLoad As Boolean = True + Private Sub dlgGeneral_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + End If + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 478 + End Sub + + Private Sub TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + TestOKEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgInfill.vb b/instat/dlgInfill.vb index c86f86c7b90..3e63382fd1e 100644 --- a/instat/dlgInfill.vb +++ b/instat/dlgInfill.vb @@ -27,8 +27,10 @@ Public Class dlgInfill End Sub Private Sub InitialiseDialog() + ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$infill_missing_dates") ucrReceiverDate.Selector = ucrInfillSelector ucrReceiverFactors.Selector = ucrInfillSelector + ucrReceiverFactors.SetIncludedDataTypes({"factor"}) 'ucrBase.iHelpTopicID End Sub @@ -49,7 +51,24 @@ Public Class dlgInfill SetDefaults() End Sub + Private Sub ucrInfillSelector_DataFrameChanged() Handles ucrInfillSelector.DataFrameChanged + ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrInfillSelector.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34)) + End Sub + Private Sub ucrReceiverDate_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverDate.SelectionChanged + If Not ucrReceiverDate.IsEmpty Then + ucrBase.clsRsyntax.AddParameter("date_name", ucrReceiverDate.GetVariableNames()) + Else + ucrBase.clsRsyntax.RemoveParameter("date_name") + End If TestOkEnabled() End Sub + + Private Sub ucrReceiverFactors_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverFactors.SelectionChanged + If Not ucrReceiverDate.IsEmpty Then + ucrBase.clsRsyntax.AddParameter("factors", ucrReceiverFactors.GetVariableNames()) + Else + ucrBase.clsRsyntax.RemoveParameter("factors") + End If + End Sub End Class \ No newline at end of file diff --git a/instat/dlgInventoryPlot.vb b/instat/dlgInventoryPlot.vb index 438c34ff225..fc6ea2546e9 100644 --- a/instat/dlgInventoryPlot.vb +++ b/instat/dlgInventoryPlot.vb @@ -29,7 +29,7 @@ Public Class dlgInventoryPlot Private Sub InitialiseDialog() ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$make_inventory_plot") ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False - ucrBase.iHelpTopicID = 455 + ucrBase.iHelpTopicID = 359 ucrDayOfYearReceiver.SetIncludedDataTypes({"numeric"}) ucrColourReceiver.SetIncludedDataTypes({"numeric"}) diff --git a/instat/dlgNewMarkovChains.vb b/instat/dlgNewMarkovChains.vb index 66eded2ab1a..b178a7ef17c 100644 --- a/instat/dlgNewMarkovChains.vb +++ b/instat/dlgNewMarkovChains.vb @@ -28,6 +28,7 @@ Public Class dlgNewMarkovChains End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 491 ucrSelectorMarkovChains = ucrReceiverStation.Selector ucrInputExcludeSep.SetItems({"Exclude", "Separate"}) ucrInputMarkovType.SetItems({"Full", "Dry", "Both"}) diff --git a/instat/dlgPCSARainfall.Designer.vb b/instat/dlgPCSARainfall.Designer.vb new file mode 100644 index 00000000000..0a705b72f68 --- /dev/null +++ b/instat/dlgPCSARainfall.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgPCSARainfall + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(6, 209) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 3 + ' + 'dlgPCSARainfall + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(415, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgPCSARainfall" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "PCSA Rainfall" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgPCSARainfall.resx b/instat/dlgPCSARainfall.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgPCSARainfall.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgPCSARainfall.vb b/instat/dlgPCSARainfall.vb new file mode 100644 index 00000000000..94962f80e97 --- /dev/null +++ b/instat/dlgPCSARainfall.vb @@ -0,0 +1,40 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgPCSARainfall + Public bFirstLoad As Boolean = True + Private Sub dlgPCSARainfall_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + End If + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 118 + End Sub + + Private Sub TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + TestOKEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgPICSACrops.Designer.vb b/instat/dlgPICSACrops.Designer.vb new file mode 100644 index 00000000000..0d5928317d5 --- /dev/null +++ b/instat/dlgPICSACrops.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgPICSACrops + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(5, 205) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 1 + ' + 'dlgPICSACrops + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(413, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgPICSACrops" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "PICSA Crops" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgPICSACrops.resx b/instat/dlgPICSACrops.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgPICSACrops.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgPICSACrops.vb b/instat/dlgPICSACrops.vb new file mode 100644 index 00000000000..96a33b593f6 --- /dev/null +++ b/instat/dlgPICSACrops.vb @@ -0,0 +1,40 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgPICSACrops + Public bFirstLoad As Boolean = True + Private Sub dlgPICSACrops_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + End If + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 480 + End Sub + + Private Sub TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + TestOKEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgPICSATemperature.Designer.vb b/instat/dlgPICSATemperature.Designer.vb new file mode 100644 index 00000000000..086919fd20b --- /dev/null +++ b/instat/dlgPICSATemperature.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgPICSATemperature + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(7, 203) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 0 + ' + 'dlgPICSATemperature + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(412, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgPICSATemperature" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "PICSA Temperature" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgPICSATemperature.resx b/instat/dlgPICSATemperature.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgPICSATemperature.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgPICSATemperature.vb b/instat/dlgPICSATemperature.vb new file mode 100644 index 00000000000..81cedb50ec7 --- /dev/null +++ b/instat/dlgPICSATemperature.vb @@ -0,0 +1,40 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgPICSATemperature + Public bFirstLoad As Boolean = True + Private Sub dlgPICSATemperature_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + End If + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 479 + End Sub + + Private Sub TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + TestOKEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgQCProcedures.Designer.vb b/instat/dlgQCProcedures.Designer.vb new file mode 100644 index 00000000000..b96a7b5d11a --- /dev/null +++ b/instat/dlgQCProcedures.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgQCProcedures + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 206) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 0 + ' + 'dlgQCProcedures + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(417, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgQCProcedures" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "QC Procedures" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgQCProcedures.resx b/instat/dlgQCProcedures.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgQCProcedures.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgQCProcedures.vb b/instat/dlgQCProcedures.vb new file mode 100644 index 00000000000..1e3ec57fd8f --- /dev/null +++ b/instat/dlgQCProcedures.vb @@ -0,0 +1,40 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgQCProcedures + Public bFirstLoad As Boolean = True + Private Sub dlgQCProcedures_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + End If + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 511 + End Sub + + Private Sub TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + TestOKEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgRainfall.Designer.vb b/instat/dlgRainfall.Designer.vb new file mode 100644 index 00000000000..4573dfda9c2 --- /dev/null +++ b/instat/dlgRainfall.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgRainfall + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(5, 207) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 1 + ' + 'dlgRainfall + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(415, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgRainfall" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Rainfall" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgRainfall.resx b/instat/dlgRainfall.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgRainfall.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRainfall.vb b/instat/dlgRainfall.vb new file mode 100644 index 00000000000..d6bd2aa96ee --- /dev/null +++ b/instat/dlgRainfall.vb @@ -0,0 +1,40 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgRainfall + Public bFirstLoad As Boolean = True + Private Sub dlgRainfall_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + End If + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 118 + End Sub + + Private Sub TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + TestOKEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgSunshine.Designer.vb b/instat/dlgSunshine.Designer.vb new file mode 100644 index 00000000000..2f0e4e8f8b7 --- /dev/null +++ b/instat/dlgSunshine.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgSunshine + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(6, 204) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 1 + ' + 'dlgSunshine + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(412, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgSunshine" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Sunshine" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgSunshine.resx b/instat/dlgSunshine.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgSunshine.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgSunshine.vb b/instat/dlgSunshine.vb new file mode 100644 index 00000000000..104e7d206a0 --- /dev/null +++ b/instat/dlgSunshine.vb @@ -0,0 +1,40 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgSunshine + Public bFirstLoad As Boolean = True + Private Sub dlgSunshine_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + End If + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 432 + End Sub + + Private Sub TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + TestOKEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgTemperature.Designer.vb b/instat/dlgTemperature.Designer.vb new file mode 100644 index 00000000000..7dde19e8ea1 --- /dev/null +++ b/instat/dlgTemperature.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgTemperature + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(5, 204) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 2 + ' + 'dlgTemperature + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(411, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgTemperature" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Temperature" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgTemperature.resx b/instat/dlgTemperature.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgTemperature.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgTemperature.vb b/instat/dlgTemperature.vb new file mode 100644 index 00000000000..0eb91b349ab --- /dev/null +++ b/instat/dlgTemperature.vb @@ -0,0 +1,40 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgTemperature + Public bFirstLoad As Boolean = True + Private Sub dlgTemperature_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + End If + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 424 + End Sub + + Private Sub TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + TestOKEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgTransform.vb b/instat/dlgTransform.vb index bab0d55e18f..fa393c0d257 100644 --- a/instat/dlgTransform.vb +++ b/instat/dlgTransform.vb @@ -27,7 +27,7 @@ Public Class dlgTransform autoTranslate(Me) End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 42 + ucrBase.iHelpTopicID = 358 End Sub Private Sub SetDefaults() 'CommonTransformation() diff --git a/instat/dlgViewAndRemoveKeys.Designer.vb b/instat/dlgViewAndRemoveKeys.Designer.vb index 45e80ea0406..6bb50068b75 100644 --- a/instat/dlgViewAndRemoveKeys.Designer.vb +++ b/instat/dlgViewAndRemoveKeys.Designer.vb @@ -23,20 +23,66 @@ Partial Class dlgViewAndRemoveKeys _ Private Sub InitializeComponent() Me.ucrBase = New instat.ucrButtons() + Me.ucrSelectorKeys = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrReceiverSelectedKey = New instat.ucrReceiverSingle() + Me.lblSelectedKey = New System.Windows.Forms.Label() + Me.chkRemoveKey = New System.Windows.Forms.CheckBox() Me.SuspendLayout() ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(6, 205) + Me.ucrBase.Location = New System.Drawing.Point(12, 196) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 0 ' + 'ucrSelectorKeys + ' + Me.ucrSelectorKeys.bShowHiddenColumns = False + Me.ucrSelectorKeys.bUseCurrentFilter = True + Me.ucrSelectorKeys.Location = New System.Drawing.Point(13, 13) + Me.ucrSelectorKeys.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorKeys.Name = "ucrSelectorKeys" + Me.ucrSelectorKeys.Size = New System.Drawing.Size(210, 180) + Me.ucrSelectorKeys.TabIndex = 1 + ' + 'ucrReceiverSelectedKey + ' + Me.ucrReceiverSelectedKey.Location = New System.Drawing.Point(223, 26) + Me.ucrReceiverSelectedKey.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSelectedKey.Name = "ucrReceiverSelectedKey" + Me.ucrReceiverSelectedKey.Selector = Nothing + Me.ucrReceiverSelectedKey.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSelectedKey.TabIndex = 2 + ' + 'lblSelectedKey + ' + Me.lblSelectedKey.AutoSize = True + Me.lblSelectedKey.Location = New System.Drawing.Point(220, 13) + Me.lblSelectedKey.Name = "lblSelectedKey" + Me.lblSelectedKey.Size = New System.Drawing.Size(73, 13) + Me.lblSelectedKey.TabIndex = 3 + Me.lblSelectedKey.Text = "Selected Key:" + ' + 'chkRemoveKey + ' + Me.chkRemoveKey.AutoSize = True + Me.chkRemoveKey.Location = New System.Drawing.Point(227, 50) + Me.chkRemoveKey.Name = "chkRemoveKey" + Me.chkRemoveKey.Size = New System.Drawing.Size(87, 17) + Me.chkRemoveKey.TabIndex = 4 + Me.chkRemoveKey.Text = "Remove Key" + Me.chkRemoveKey.UseVisualStyleBackColor = True + ' 'dlgViewAndRemoveKeys ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(423, 261) + Me.ClientSize = New System.Drawing.Size(423, 256) + Me.Controls.Add(Me.chkRemoveKey) + Me.Controls.Add(Me.lblSelectedKey) + Me.Controls.Add(Me.ucrReceiverSelectedKey) + Me.Controls.Add(Me.ucrSelectorKeys) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False @@ -45,8 +91,13 @@ Partial Class dlgViewAndRemoveKeys Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "View and Remove Keys" Me.ResumeLayout(False) + Me.PerformLayout() End Sub Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrSelectorKeys As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrReceiverSelectedKey As ucrReceiverSingle + Friend WithEvents lblSelectedKey As Label + Friend WithEvents chkRemoveKey As CheckBox End Class diff --git a/instat/dlgViewAndRemoveKeys.vb b/instat/dlgViewAndRemoveKeys.vb index 846d3ec55b0..9d4b90c2be7 100644 --- a/instat/dlgViewAndRemoveKeys.vb +++ b/instat/dlgViewAndRemoveKeys.vb @@ -28,15 +28,29 @@ Public Class dlgViewAndRemoveKeys End Sub Private Sub InitialiseDialog() + ucrSelectorKeys = ucrReceiverSelectedKey.Selector + ucrReceiverSelectedKey.SetMeAsReceiver() ucrBase.iHelpTopicID = 505 End Sub Private Sub TestOKEnabled() - + If ucrReceiverSelectedKey.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If End Sub Private Sub SetDefaults() + chkRemoveKey.Checked = False + End Sub + Private Sub ucrReceiverSelectedKey_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverSelectedKey.SelectionChanged + TestOKEnabled() End Sub + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + TestOKEnabled() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgWindSpeed.Designer.vb b/instat/dlgWindSpeed.Designer.vb new file mode 100644 index 00000000000..b5512788cdf --- /dev/null +++ b/instat/dlgWindSpeed.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class dlgWindSpeed + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(5, 205) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 0 + ' + 'dlgWindSpeed + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(416, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgWindSpeed" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Wind Speed" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgWindSpeed.resx b/instat/dlgWindSpeed.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgWindSpeed.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgWindSpeed.vb b/instat/dlgWindSpeed.vb new file mode 100644 index 00000000000..45e1f6af48d --- /dev/null +++ b/instat/dlgWindSpeed.vb @@ -0,0 +1,40 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgWindSpeed + Public bFirstLoad As Boolean = True + Private Sub dlgWindSpeed_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + End If + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 429 + End Sub + + Private Sub TestOKEnabled() + + End Sub + + Private Sub SetDefaults() + TestOKEnabled() + End Sub +End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index fc23eccc97b..bc72a85674c 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -152,18 +152,22 @@ Partial Class frmMain Me.mnuClimatic = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFileOpensst = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticFileExportToCPT = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimateFileClimSoft = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFileCliData = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator15 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuClimaticFileExportToCPT = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator18 = New System.Windows.Forms.ToolStripSeparator() Me.mnuCliDefineClimaticData = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepare = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuCimaticPrepareTransform = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareDates = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareDatesGenerateDates = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareDatesMakeDate = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareDatesUseDate = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticPrepareInfillMissingDates = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareDatesMakeTime = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareDatesUseTime = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuCimaticPrepareTransform = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticPrepareClimaticSummaries = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareEvents = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareEventsStartoftheRains = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareEventsSpells = New System.Windows.Forms.ToolStripMenuItem() @@ -177,8 +181,11 @@ Partial Class frmMain Me.mnuClimaticPrepareUnstackDailyData = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareStackDailyData = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticQualityControl = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimdex = New System.Windows.Forms.ToolStripMenuItem() + Me.InventoryToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.DisplayDailyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.QCProceduresToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator30 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuClimdex = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticDescribe = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticDescribeRainfall = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticDescribeTemperatures = New System.Windows.Forms.ToolStripMenuItem() @@ -194,6 +201,11 @@ Partial Class frmMain Me.mnuClimaticPICSARainfall = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPICSATemperature = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPICSACrops = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticModels = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticModelsExtremes = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticModelsCircular = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticModelsMarkovModelling = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator23 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticSCF = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticSCFSupportOpenSST = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticSCFSupportExporttoCPT = New System.Windows.Forms.ToolStripMenuItem() @@ -201,11 +213,6 @@ Partial Class frmMain Me.mnuClimaticSCFSupportCorrelations = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticSCFSupportPrincipalComponents = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticSCFSupportCanonicalCorrelations = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticModels = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticModelsExtremes = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticModelsCircular = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticModelsMarkovModelling = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator23 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimateMethods = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimateMethodsDataManipulation = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimateMethodsDataManipulationStartOfRain = New System.Windows.Forms.ToolStripMenuItem() @@ -416,13 +423,6 @@ Partial Class frmMain Me.mnuToolsSaveCurrentOptions = New System.Windows.Forms.ToolStripMenuItem() Me.mnuToolsLoadOptions = New System.Windows.Forms.ToolStripMenuItem() Me.mnuToolsOptions = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator15 = New System.Windows.Forms.ToolStripSeparator() - Me.InventoryToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.DisplayDailyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.QCProceduresToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticPrepareInfillMissingDates = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticPrepareClimaticSummaries = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator18 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -1336,13 +1336,6 @@ Partial Class frmMain Me.mnuClimaticFileOpensst.Size = New System.Drawing.Size(155, 22) Me.mnuClimaticFileOpensst.Text = "Open SST..." ' - 'mnuClimaticFileExportToCPT - ' - Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" - Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(155, 22) - Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" - Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." - ' 'mnuClimateFileClimSoft ' Me.mnuClimateFileClimSoft.Name = "mnuClimateFileClimSoft" @@ -1356,6 +1349,23 @@ Partial Class frmMain Me.mnuClimaticFileCliData.Size = New System.Drawing.Size(155, 22) Me.mnuClimaticFileCliData.Text = "CliData..." ' + 'ToolStripSeparator15 + ' + Me.ToolStripSeparator15.Name = "ToolStripSeparator15" + Me.ToolStripSeparator15.Size = New System.Drawing.Size(152, 6) + ' + 'mnuClimaticFileExportToCPT + ' + Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" + Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(155, 22) + Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" + Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." + ' + 'ToolStripSeparator18 + ' + Me.ToolStripSeparator18.Name = "ToolStripSeparator18" + Me.ToolStripSeparator18.Size = New System.Drawing.Size(188, 6) + ' 'mnuCliDefineClimaticData ' Me.mnuCliDefineClimaticData.Name = "mnuCliDefineClimaticData" @@ -1370,12 +1380,6 @@ Partial Class frmMain Me.mnuClimaticPrepare.Tag = "Manage" Me.mnuClimaticPrepare.Text = "Prepare" ' - 'mnuCimaticPrepareTransform - ' - Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" - Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) - Me.mnuCimaticPrepareTransform.Text = "Transform..." - ' 'mnuClimaticPrepareDates ' Me.mnuClimaticPrepareDates.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPrepareDatesGenerateDates, Me.mnuClimaticPrepareDatesMakeDate, Me.mnuClimaticPrepareDatesUseDate, Me.mnuClimaticPrepareInfillMissingDates, Me.mnuClimaticPrepareDatesMakeTime, Me.mnuClimaticPrepareDatesUseTime}) @@ -1402,6 +1406,12 @@ Partial Class frmMain Me.mnuClimaticPrepareDatesUseDate.Size = New System.Drawing.Size(182, 22) Me.mnuClimaticPrepareDatesUseDate.Text = "Use Date..." ' + 'mnuClimaticPrepareInfillMissingDates + ' + Me.mnuClimaticPrepareInfillMissingDates.Name = "mnuClimaticPrepareInfillMissingDates" + Me.mnuClimaticPrepareInfillMissingDates.Size = New System.Drawing.Size(182, 22) + Me.mnuClimaticPrepareInfillMissingDates.Text = "Infill Missing Dates..." + ' 'mnuClimaticPrepareDatesMakeTime ' Me.mnuClimaticPrepareDatesMakeTime.Name = "mnuClimaticPrepareDatesMakeTime" @@ -1414,6 +1424,18 @@ Partial Class frmMain Me.mnuClimaticPrepareDatesUseTime.Size = New System.Drawing.Size(182, 22) Me.mnuClimaticPrepareDatesUseTime.Text = "Use Time..." ' + 'mnuCimaticPrepareTransform + ' + Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" + Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) + Me.mnuCimaticPrepareTransform.Text = "Transform..." + ' + 'mnuClimaticPrepareClimaticSummaries + ' + Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" + Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." + ' 'mnuClimaticPrepareEvents ' Me.mnuClimaticPrepareEvents.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPrepareEventsStartoftheRains, Me.mnuClimaticPrepareEventsSpells, Me.mnuClimaticPrepareEventsWaterBalance, Me.mnuClimaticPrepareEventsEndoftheRains}) @@ -1518,18 +1540,36 @@ Partial Class frmMain Me.mnuClimaticQualityControl.Size = New System.Drawing.Size(191, 22) Me.mnuClimaticQualityControl.Text = "Quality Control" ' - 'mnuClimdex + 'InventoryToolStripMenuItem ' - Me.mnuClimdex.Name = "mnuClimdex" - Me.mnuClimdex.Size = New System.Drawing.Size(191, 22) - Me.mnuClimdex.Tag = "Climdex" - Me.mnuClimdex.Text = "Climdex..." + Me.InventoryToolStripMenuItem.Name = "InventoryToolStripMenuItem" + Me.InventoryToolStripMenuItem.Size = New System.Drawing.Size(162, 22) + Me.InventoryToolStripMenuItem.Text = "Inventory..." + ' + 'DisplayDailyToolStripMenuItem + ' + Me.DisplayDailyToolStripMenuItem.Name = "DisplayDailyToolStripMenuItem" + Me.DisplayDailyToolStripMenuItem.Size = New System.Drawing.Size(162, 22) + Me.DisplayDailyToolStripMenuItem.Text = "Display Daily..." + ' + 'QCProceduresToolStripMenuItem + ' + Me.QCProceduresToolStripMenuItem.Name = "QCProceduresToolStripMenuItem" + Me.QCProceduresToolStripMenuItem.Size = New System.Drawing.Size(162, 22) + Me.QCProceduresToolStripMenuItem.Text = "QC Procedures..." ' 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" Me.ToolStripSeparator30.Size = New System.Drawing.Size(188, 6) ' + 'mnuClimdex + ' + Me.mnuClimdex.Name = "mnuClimdex" + Me.mnuClimdex.Size = New System.Drawing.Size(191, 22) + Me.mnuClimdex.Tag = "Climdex" + Me.mnuClimdex.Text = "Climdex..." + ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeRainfall, Me.mnuClimaticDescribeTemperatures, Me.mnuClimaticDescribeWindSpeedDirection, Me.mnuClimaticDescribeSunshineRadiation, Me.ToolStripSeparator17, Me.mnuClimaticDescribeGeneral, Me.ToolStripSeparator31, Me.mnuClimaticMoreGraphs}) @@ -1609,21 +1649,53 @@ Partial Class frmMain 'mnuClimaticPICSARainfall ' Me.mnuClimaticPICSARainfall.Name = "mnuClimaticPICSARainfall" - Me.mnuClimaticPICSARainfall.Size = New System.Drawing.Size(150, 22) + Me.mnuClimaticPICSARainfall.Size = New System.Drawing.Size(152, 22) Me.mnuClimaticPICSARainfall.Text = "Rainfall..." ' 'mnuClimaticPICSATemperature ' Me.mnuClimaticPICSATemperature.Name = "mnuClimaticPICSATemperature" - Me.mnuClimaticPICSATemperature.Size = New System.Drawing.Size(150, 22) + Me.mnuClimaticPICSATemperature.Size = New System.Drawing.Size(152, 22) Me.mnuClimaticPICSATemperature.Text = "Temperature..." ' 'mnuClimaticPICSACrops ' Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops" - Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(150, 22) + Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(152, 22) Me.mnuClimaticPICSACrops.Text = "Crops..." ' + 'mnuClimaticModels + ' + Me.mnuClimaticModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelsCircular, Me.mnuClimaticModelsMarkovModelling}) + Me.mnuClimaticModels.Name = "mnuClimaticModels" + Me.mnuClimaticModels.Size = New System.Drawing.Size(191, 22) + Me.mnuClimaticModels.Text = "Model" + ' + 'mnuClimaticModelsExtremes + ' + Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" + Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelsExtremes.Text = "Extremes..." + ' + 'mnuClimaticModelsCircular + ' + Me.mnuClimaticModelsCircular.Enabled = False + Me.mnuClimaticModelsCircular.Name = "mnuClimaticModelsCircular" + Me.mnuClimaticModelsCircular.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelsCircular.Text = "Circular..." + ' + 'mnuClimaticModelsMarkovModelling + ' + Me.mnuClimaticModelsMarkovModelling.Name = "mnuClimaticModelsMarkovModelling" + Me.mnuClimaticModelsMarkovModelling.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelsMarkovModelling.Tag = "Markov_Modelling" + Me.mnuClimaticModelsMarkovModelling.Text = "Markov Modelling..." + ' + 'ToolStripSeparator23 + ' + Me.ToolStripSeparator23.Name = "ToolStripSeparator23" + Me.ToolStripSeparator23.Size = New System.Drawing.Size(188, 6) + ' 'mnuClimaticSCF ' Me.mnuClimaticSCF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticSCFSupportOpenSST, Me.mnuClimaticSCFSupportExporttoCPT, Me.ToolStripSeparator32, Me.mnuClimaticSCFSupportCorrelations, Me.mnuClimaticSCFSupportPrincipalComponents, Me.mnuClimaticSCFSupportCanonicalCorrelations}) @@ -1667,38 +1739,6 @@ Partial Class frmMain Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..." ' - 'mnuClimaticModels - ' - Me.mnuClimaticModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelsCircular, Me.mnuClimaticModelsMarkovModelling}) - Me.mnuClimaticModels.Name = "mnuClimaticModels" - Me.mnuClimaticModels.Size = New System.Drawing.Size(191, 22) - Me.mnuClimaticModels.Text = "Model" - ' - 'mnuClimaticModelsExtremes - ' - Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" - Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) - Me.mnuClimaticModelsExtremes.Text = "Extremes..." - ' - 'mnuClimaticModelsCircular - ' - Me.mnuClimaticModelsCircular.Enabled = False - Me.mnuClimaticModelsCircular.Name = "mnuClimaticModelsCircular" - Me.mnuClimaticModelsCircular.Size = New System.Drawing.Size(180, 22) - Me.mnuClimaticModelsCircular.Text = "Circular..." - ' - 'mnuClimaticModelsMarkovModelling - ' - Me.mnuClimaticModelsMarkovModelling.Name = "mnuClimaticModelsMarkovModelling" - Me.mnuClimaticModelsMarkovModelling.Size = New System.Drawing.Size(180, 22) - Me.mnuClimaticModelsMarkovModelling.Tag = "Markov_Modelling" - Me.mnuClimaticModelsMarkovModelling.Text = "Markov Modelling..." - ' - 'ToolStripSeparator23 - ' - Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(188, 6) - ' 'mnuClimateMethods ' Me.mnuClimateMethods.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimateMethodsDataManipulation, Me.mnuClimateMethodsGraphics, Me.mnuClimateMethodsModel, Me.mnuClimateMethodsAdditional, Me.mnuClimateMethodsCreateClimateObject}) @@ -3128,25 +3168,25 @@ Partial Class frmMain 'mnuCorruptionFile ' Me.mnuCorruptionFile.Name = "mnuCorruptionFile" - Me.mnuCorruptionFile.Size = New System.Drawing.Size(152, 22) + Me.mnuCorruptionFile.Size = New System.Drawing.Size(128, 22) Me.mnuCorruptionFile.Text = "File..." ' 'mnuCorruptionPrepare ' Me.mnuCorruptionPrepare.Name = "mnuCorruptionPrepare" - Me.mnuCorruptionPrepare.Size = New System.Drawing.Size(152, 22) + Me.mnuCorruptionPrepare.Size = New System.Drawing.Size(128, 22) Me.mnuCorruptionPrepare.Text = "Prepare..." ' 'mnuCorruptionDescribe ' Me.mnuCorruptionDescribe.Name = "mnuCorruptionDescribe" - Me.mnuCorruptionDescribe.Size = New System.Drawing.Size(152, 22) + Me.mnuCorruptionDescribe.Size = New System.Drawing.Size(128, 22) Me.mnuCorruptionDescribe.Text = "Describe..." ' 'mnuCorruptionModel ' Me.mnuCorruptionModel.Name = "mnuCorruptionModel" - Me.mnuCorruptionModel.Size = New System.Drawing.Size(152, 22) + Me.mnuCorruptionModel.Size = New System.Drawing.Size(128, 22) Me.mnuCorruptionModel.Text = "Model..." ' 'mnuTools @@ -3215,46 +3255,6 @@ Partial Class frmMain Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' - 'ToolStripSeparator15 - ' - Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(152, 6) - ' - 'InventoryToolStripMenuItem - ' - Me.InventoryToolStripMenuItem.Name = "InventoryToolStripMenuItem" - Me.InventoryToolStripMenuItem.Size = New System.Drawing.Size(162, 22) - Me.InventoryToolStripMenuItem.Text = "Inventory..." - ' - 'DisplayDailyToolStripMenuItem - ' - Me.DisplayDailyToolStripMenuItem.Name = "DisplayDailyToolStripMenuItem" - Me.DisplayDailyToolStripMenuItem.Size = New System.Drawing.Size(162, 22) - Me.DisplayDailyToolStripMenuItem.Text = "Display Daily..." - ' - 'QCProceduresToolStripMenuItem - ' - Me.QCProceduresToolStripMenuItem.Name = "QCProceduresToolStripMenuItem" - Me.QCProceduresToolStripMenuItem.Size = New System.Drawing.Size(162, 22) - Me.QCProceduresToolStripMenuItem.Text = "QC Procedures..." - ' - 'mnuClimaticPrepareInfillMissingDates - ' - Me.mnuClimaticPrepareInfillMissingDates.Name = "mnuClimaticPrepareInfillMissingDates" - Me.mnuClimaticPrepareInfillMissingDates.Size = New System.Drawing.Size(182, 22) - Me.mnuClimaticPrepareInfillMissingDates.Text = "Infill Missing Dates..." - ' - 'mnuClimaticPrepareClimaticSummaries - ' - Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) - Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." - ' - 'ToolStripSeparator18 - ' - Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(188, 6) - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index f8373e1e225..598ebcfbe78 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1359,6 +1359,13 @@ Public Class frmMain dlgDisplayDaily.ShowDialog() End Sub + Private Sub mnuClimateFileClimSoft_Click(sender As Object, e As EventArgs) Handles mnuClimateFileClimSoft.Click + dlgClimSoft.ShowDialog() + End Sub + + Private Sub mnuClimaticFileCliData_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileCliData.Click + dlgCliData.ShowDialog() + End Sub 'Private Sub TESTToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TESTToolStripMenuItem.Click ' 'TEST temporary diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 0191211f419..b5ba364da08 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -178,12 +178,36 @@ Form + + dlgCircular.vb + + + Form + + + dlgCliData.vb + + + Form + + + dlgClimaticSummaries.vb + + + Form + dlgClimdex.vb Form + + dlgClimSoft.vb + + + Form + dlgCompareModels.vb @@ -250,6 +274,12 @@ Form + + dlgGeneral.vb + + + Form + dlgImportFromODK.vb @@ -322,6 +352,36 @@ Form + + dlgPCSARainfall.vb + + + Form + + + dlgPICSACrops.vb + + + Form + + + dlgPICSATemperature.vb + + + Form + + + dlgQCProcedures.vb + + + Form + + + dlgRainfall.vb + + + Form + dlgRugPlot.vb @@ -334,6 +394,18 @@ Form + + dlgSunshine.vb + + + Form + + + dlgTemperature.vb + + + Form + dlgTwoVariabletabulate.vb @@ -364,6 +436,12 @@ Form + + dlgWindSpeed.vb + + + Form + frmGraphDisplay.vb @@ -2205,6 +2283,9 @@ dlgChiSquareTest.vb + + dlgCircular.vb + dlgCliBoxplot.vb @@ -2214,9 +2295,18 @@ dlgCliBoxplot.vb + + dlgCliData.vb + + + dlgClimaticSummaries.vb + dlgClimdex.vb + + dlgClimSoft.vb + dlgCliPlot.vb @@ -2430,6 +2520,9 @@ dlgFromLibrary.vb + + dlgGeneral.vb + dlgGeneralForGraphics.vb @@ -2616,6 +2709,9 @@ dlgCorruptionOrganise.vb + + dlgPCSARainfall.vb + dlgPermuteColumn.vb @@ -2625,6 +2721,12 @@ dlgPermuteColumn.vb + + dlgPICSACrops.vb + + + dlgPICSATemperature.vb + dlgPopulationPyramids.vb @@ -2664,6 +2766,12 @@ dlgProtect.vb + + dlgQCProcedures.vb + + + dlgRainfall.vb + dlgRandomSubsets.vb @@ -2832,6 +2940,12 @@ dlgShowModel.vb + + dlgSunshine.vb + + + dlgTemperature.vb + dlgThemes.vb @@ -2964,6 +3078,9 @@ dlgColumnStructures.vb + + dlgWindSpeed.vb + frmGraphDisplay.vb diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 1ff3b182eb3..5b2e22424d3 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -1944,7 +1944,6 @@ data_object$set("public","infill_missing_dates", function(date_name, factors) { } if(merge_required) { all_dates_factors <- rbind.fill(full_dates_list) - View(all_dates_factors) self$merge_data(all_dates_factors, by = c(date_name, factors), type = "full") self$sort_dataframe(col_names = c(date_name, factors)) }