From a77f89a94219a7560f84c306f26fb1b448963f52 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Thu, 25 Jun 2020 14:45:50 +0300 Subject: [PATCH 1/2] adding new Taylor diagram dialog --- instat/dlgTaylorDiagram.Designer.vb | 39 ++++++++ instat/dlgTaylorDiagram.resx | 143 ++++++++++++++++++++++++++++ instat/dlgTaylorDiagram.vb | 21 ++++ instat/instat.vbproj | 9 ++ 4 files changed, 212 insertions(+) create mode 100644 instat/dlgTaylorDiagram.Designer.vb create mode 100644 instat/dlgTaylorDiagram.resx create mode 100644 instat/dlgTaylorDiagram.vb diff --git a/instat/dlgTaylorDiagram.Designer.vb b/instat/dlgTaylorDiagram.Designer.vb new file mode 100644 index 00000000000..90185916dac --- /dev/null +++ b/instat/dlgTaylorDiagram.Designer.vb @@ -0,0 +1,39 @@ + _ +Partial Class dlgTaylorDiagram + 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() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgTaylorDiagram)) + Me.SuspendLayout() + ' + 'dlgTaylorDiagram + ' + resources.ApplyResources(Me, "$this") + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgTaylorDiagram" + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/instat/dlgTaylorDiagram.resx b/instat/dlgTaylorDiagram.resx new file mode 100644 index 00000000000..33875fc0fb5 --- /dev/null +++ b/instat/dlgTaylorDiagram.resx @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + + 6, 13 + + + 471, 309 + + + + CenterScreen + + + Taylor Diagram + + + dlgTaylorDiagram + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgTaylorDiagram.vb b/instat/dlgTaylorDiagram.vb new file mode 100644 index 00000000000..ebd34477d49 --- /dev/null +++ b/instat/dlgTaylorDiagram.vb @@ -0,0 +1,21 @@ +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . + +Public Class dlgTaylorDiagram + Private Sub dlgTaylorDiagram_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub +End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 24199679e51..79fde081971 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -213,6 +213,12 @@ Form + + dlgTaylorDiagram.vb + + + Form + sdgFiltersFromFactor.vb @@ -2518,6 +2524,9 @@ dlgHomogenization.vb + + dlgTaylorDiagram.vb + sdgFiltersFromFactor.vb From 9739d05d2d0b5e697acb46f2373931e1d1c059f6 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Fri, 26 Jun 2020 12:02:15 +0300 Subject: [PATCH 2/2] adding taylor diagram dialog into frmmain --- instat/frmMain.Designer.vb | 29 ++++++++++++++++---------- instat/frmMain.resx | 42 ++++++++++++++++++++++++-------------- instat/frmMain.vb | 4 ++++ 3 files changed, 49 insertions(+), 26 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 49dddae140d..d739359e4fb 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -228,6 +228,8 @@ Partial Class frmMain Me.mnuClimaticPrepareLengthOfSeason = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareSpells = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareExtremes = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator64 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuClimaticPrepareCompareCalculation = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareCompareSummary = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator46 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticPrepareClimdex = New System.Windows.Forms.ToolStripMenuItem() @@ -609,14 +611,13 @@ 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.mnuClimaticPrepareCompareCalculation = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticPrepareCompareTaylor = New System.Windows.Forms.ToolStripMenuItem() Me.ucrColumnMeta = New instat.ucrColumnMetadata() Me.ucrDataFrameMeta = New instat.ucrDataFrameMetadata() Me.ucrLogWindow = New instat.ucrLog() Me.ucrScriptWindow = New instat.ucrScript() Me.ucrDataViewer = New instat.ucrDataView() Me.ucrOutput = New instat.ucrOutputWindow() - Me.ToolStripSeparator64 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -1623,7 +1624,7 @@ Partial Class frmMain ' 'mnuClimaticPrepare ' - Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareCompareCalculation, Me.mnuClimaticPrepareCompareSummary, Me.ToolStripSeparator46, Me.mnuClimaticPrepareClimdex, Me.mnuClimaticPrepareSPI, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) + Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareCompareCalculation, Me.mnuClimaticPrepareCompareSummary, Me.mnuClimaticPrepareCompareTaylor, Me.ToolStripSeparator46, Me.mnuClimaticPrepareClimdex, Me.mnuClimaticPrepareSPI, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) Me.mnuClimaticPrepare.Name = "mnuClimaticPrepare" resources.ApplyResources(Me.mnuClimaticPrepare, "mnuClimaticPrepare") Me.mnuClimaticPrepare.Tag = "Prepare" @@ -1673,6 +1674,16 @@ Partial Class frmMain Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" resources.ApplyResources(Me.mnuClimaticPrepareExtremes, "mnuClimaticPrepareExtremes") ' + 'ToolStripSeparator64 + ' + Me.ToolStripSeparator64.Name = "ToolStripSeparator64" + resources.ApplyResources(Me.ToolStripSeparator64, "ToolStripSeparator64") + ' + 'mnuClimaticPrepareCompareCalculation + ' + Me.mnuClimaticPrepareCompareCalculation.Name = "mnuClimaticPrepareCompareCalculation" + resources.ApplyResources(Me.mnuClimaticPrepareCompareCalculation, "mnuClimaticPrepareCompareCalculation") + ' 'mnuClimaticPrepareCompareSummary ' Me.mnuClimaticPrepareCompareSummary.Name = "mnuClimaticPrepareCompareSummary" @@ -3868,10 +3879,10 @@ Partial Class frmMain Me.mnuLogFile.Name = "mnuLogFile" resources.ApplyResources(Me.mnuLogFile, "mnuLogFile") ' - 'mnuClimaticPrepareCompareCalculation + 'mnuClimaticPrepareCompareTaylor ' - Me.mnuClimaticPrepareCompareCalculation.Name = "mnuClimaticPrepareCompareCalculation" - resources.ApplyResources(Me.mnuClimaticPrepareCompareCalculation, "mnuClimaticPrepareCompareCalculation") + Me.mnuClimaticPrepareCompareTaylor.Name = "mnuClimaticPrepareCompareTaylor" + resources.ApplyResources(Me.mnuClimaticPrepareCompareTaylor, "mnuClimaticPrepareCompareTaylor") ' 'ucrColumnMeta ' @@ -3912,11 +3923,6 @@ Partial Class frmMain resources.ApplyResources(Me.ucrOutput, "ucrOutput") Me.ucrOutput.Name = "ucrOutput" ' - 'ToolStripSeparator64 - ' - Me.ToolStripSeparator64.Name = "ToolStripSeparator64" - resources.ApplyResources(Me.ToolStripSeparator64, "ToolStripSeparator64") - ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4541,4 +4547,5 @@ Partial Class frmMain Friend WithEvents mnuStructuredOptionByContext As ToolStripMenuItem Friend WithEvents mnuClimaticPrepareCompareCalculation As ToolStripMenuItem Friend WithEvents ToolStripSeparator64 As ToolStripSeparator + Friend WithEvents mnuClimaticPrepareCompareTaylor As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index b18b54cd318..d1a6c592b7d 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -1191,37 +1191,37 @@ Define Climatic Data... - 174, 22 + 180, 22 Inventory... - 174, 22 + 180, 22 Display Daily... - 174, 22 + 180, 22 Boxplot... - 174, 22 + 180, 22 QC Temperatures... - 174, 22 + 180, 22 QC Rainfall... - 174, 22 + 180, 22 Homogenization... @@ -1298,6 +1298,12 @@ Compare: Summary... + + 198, 22 + + + Compare: Taylor... + 195, 6 @@ -7350,6 +7356,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator64 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuClimaticPrepareCompareCalculation + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + mnuClimaticPrepareCompareSummary @@ -9588,18 +9606,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuClimaticPrepareCompareCalculation + + mnuClimaticPrepareCompareTaylor - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ToolStripSeparator64 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - frmMain diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 4d1658453b9..46c09c344e1 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2142,4 +2142,8 @@ Public Class frmMain Private Sub mnuStructuredCircularDefine_Click(sender As Object, e As EventArgs) Handles mnuStructuredCircularDefine.Click dlgCircular.ShowDialog() End Sub + + Private Sub mnuClimaticPrepareCompareTaylor_Click(sender As Object, e As EventArgs) Handles mnuClimaticPrepareCompareTaylor.Click + dlgTaylorDiagram.ShowDialog() + End Sub End Class \ No newline at end of file