diff --git a/instat/dlgSeasonalGraph.Designer.vb b/instat/dlgSeasonalGraph.Designer.vb new file mode 100644 index 00000000000..32effdb64af --- /dev/null +++ b/instat/dlgSeasonalGraph.Designer.vb @@ -0,0 +1,41 @@ + _ +Partial Class dlgSeasonalGraph + Inherits System.Windows.Forms.Form + + 'Form remplace la méthode Dispose pour nettoyer la liste des composants. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Requise par le Concepteur Windows Form + Private components As System.ComponentModel.IContainer + + 'REMARQUE : la procédure suivante est requise par le Concepteur Windows Form + 'Elle peut être modifiée à l'aide du Concepteur Windows Form. + 'Ne la modifiez pas à l'aide de l'éditeur de code. + _ + Private Sub InitializeComponent() + Me.SuspendLayout() + ' + 'dlgSeasonalGraph + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(600, 450) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgSeasonalGraph" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Seasonal Graph" + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/instat/dlgSeasonalGraph.resx b/instat/dlgSeasonalGraph.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgSeasonalGraph.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/dlgSeasonalGraph.vb b/instat/dlgSeasonalGraph.vb new file mode 100644 index 00000000000..57ef68e0d9f --- /dev/null +++ b/instat/dlgSeasonalGraph.vb @@ -0,0 +1,3 @@ +Public Class dlgSeasonalGraph + +End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 55609bdfb37..d5dc9e36a17 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -261,10 +261,12 @@ Partial Class frmMain Me.mnuClimaticDescribeSummarise23Variables = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticDescribeGraph23Variables = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator31 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripSeparator17 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticDescribeSPISPEI = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticDescribeClimograph = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticDescribeTrendGraph = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticDescribeSeasonalGraph = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticDescribeIDF = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator17 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticDescribeWindRose = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticDescribeWindPollutionRose = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticDescribeOtherRosePlots = New System.Windows.Forms.ToolStripMenuItem() @@ -278,7 +280,6 @@ Partial Class frmMain Me.mnuClimaticPICSA = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPICSARainfallGraph = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPICSATemperatureGraph = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticPICSAGeneralGraph = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator73 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticPICSACumExeedenceGraph = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPICSACrops = New System.Windows.Forms.ToolStripMenuItem() @@ -2139,7 +2140,7 @@ Partial Class frmMain ' 'mnuClimaticDescribe ' - Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) + Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDescribe.Text = "Describe" @@ -2161,11 +2162,6 @@ Partial Class frmMain Me.ToolStripSeparator31.Name = "ToolStripSeparator31" Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6) ' - 'ToolStripSeparator17 - ' - Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) - ' 'mnuClimaticDescribeSPISPEI ' Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI" @@ -2179,6 +2175,19 @@ Partial Class frmMain Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeClimograph.Text = "Climograph..." ' + 'mnuClimaticDescribeTrendGraph + ' + Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph" + Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..." + ' + 'mnuClimaticDescribeSeasonalGraph + ' + Me.mnuClimaticDescribeSeasonalGraph.Enabled = False + Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" + Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." + ' 'mnuClimaticDescribeIDF ' Me.mnuClimaticDescribeIDF.Enabled = False @@ -2186,6 +2195,11 @@ Partial Class frmMain Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeIDF.Text = "IDF..." ' + 'ToolStripSeparator17 + ' + Me.ToolStripSeparator17.Name = "ToolStripSeparator17" + Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) + ' 'mnuClimaticDescribeWindRose ' Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose" @@ -2249,7 +2263,7 @@ Partial Class frmMain ' 'mnuClimaticPICSA ' - Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGraph, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) + Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPICSA.Text = "PICSA" @@ -2266,12 +2280,6 @@ Partial Class frmMain Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' - 'mnuClimaticPICSAGeneralGraph - ' - Me.mnuClimaticPICSAGeneralGraph.Name = "mnuClimaticPICSAGeneralGraph" - Me.mnuClimaticPICSAGeneralGraph.Size = New System.Drawing.Size(246, 22) - Me.mnuClimaticPICSAGeneralGraph.Text = "General Graph..." - ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" @@ -5084,9 +5092,7 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + - My.Application.Info.Version.Minor.ToString + "." + - My.Application.Info.Version.Build.ToString + Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() @@ -5698,8 +5704,6 @@ Partial Class frmMain Friend WithEvents mnuPrepareDataReshapeRandomSplit As ToolStripMenuItem - - Friend WithEvents mnuClimaticPICSAGeneralGraph As ToolStripMenuItem Friend WithEvents ToolStripSeparator73 As ToolStripSeparator Friend WithEvents mnuOptionsByContextCropModel As ToolStripMenuItem Friend WithEvents mnuOptionsByContextCropModelApsimxExamples As ToolStripMenuItem @@ -5766,4 +5770,6 @@ Partial Class frmMain Friend WithEvents mnuClimaticDescribeWindRose As ToolStripMenuItem Friend WithEvents mnuClimaticDescribeWindPollutionRose As ToolStripMenuItem Friend WithEvents mnuClimaticDescribeOtherRosePlots As ToolStripMenuItem + Friend WithEvents mnuClimaticDescribeTrendGraph As ToolStripMenuItem + Friend WithEvents mnuClimaticDescribeSeasonalGraph As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d57cdd8e5c4..27eb531ec8a 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2501,11 +2501,6 @@ Public Class frmMain dlgRandomSplit.ShowDialog() End Sub - Private Sub mnuClimaticPICSAGeneralGraph_Click(sender As Object, e As EventArgs) Handles mnuClimaticPICSAGeneralGraph.Click - dlgPICSARainfall.enumPICSAMode = dlgPICSARainfall.PICSAMode.General - dlgPICSARainfall.ShowDialog() - End Sub - 'Private Sub mnuOptionsByContextCropModel_Click(sender As Object, e As EventArgs) Handles mnuOptionsByContextCropModel.Click ' dlgApsimx.ShowDialog() 'End Sub @@ -2632,4 +2627,13 @@ Public Class frmMain Private Sub mnuClimaticDescribeOtherRosePlots_Click(sender As Object, e As EventArgs) Handles mnuClimaticDescribeOtherRosePlots.Click dlgOtherRosePlots.ShowDialog() End Sub + + Private Sub mnuClimaticDescribeTrendGraph_Click(sender As Object, e As EventArgs) Handles mnuClimaticDescribeTrendGraph.Click + dlgPICSARainfall.enumPICSAMode = dlgPICSARainfall.PICSAMode.General + dlgPICSARainfall.ShowDialog() + End Sub + + Private Sub mnuClimaticDescribeSeasonalGraph_Click(sender As Object, e As EventArgs) Handles mnuClimaticDescribeSeasonalGraph.Click + dlgSeasonalGraph.ShowDialog() + End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 4c289e05e77..a650e9eec1d 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -263,6 +263,12 @@ Form + + dlgSeasonalGraph.vb + + + Form + dlgSurvey.vb @@ -3071,6 +3077,9 @@ dlgSearch.vb + + dlgSeasonalGraph.vb + dlgSeasonalPlot.vb